init

src/main/java/com/tuoren/forward/config/amqp/AmqpClient1.java

@@ -314,9 +314,11 @@ public class AmqpClient1 {
     					for(String t : topics) {
     						MqTick mt = mqTickMapper.selectOnlineByTopic(t);
     						if(mt != null) {
-    							mqttUtil.pub(CommonConstant.MQTT_PUBLISH_PREFIX+hospitalCode+t, mqttJson.toString());
+    							mqttUtil.pub(CommonConstant.MQTTUSER_PUBLISH_PREFIX+hospitalCode+"/"+t, mqttJson.toString());
     						}
     					}
+    				}else {
+    					mqttUtil.pub(CommonConstant.MQTT_PUBLISH_PREFIX+hospitalCode, mqttJson.toString());
     				}
     			}else {
     				mqttUtil.pub(CommonConstant.MQTT_PUBLISH_PREFIX+hospitalCode, mqttJson.toString());

src/main/java/com/tuoren/forward/config/amqp/AmqpClient2.java

@@ -322,9 +322,11 @@ public class AmqpClient2 {
     					for(String t : topics) {
     						MqTick mt = mqTickMapper.selectOnlineByTopic(t);
     						if(mt != null) {
-    							mqttUtil.pub(CommonConstant.MQTT_PUBLISH_PREFIX+hospitalCode+t, mqttJson.toString());
+    							mqttUtil.pub(CommonConstant.MQTTUSER_PUBLISH_PREFIX+hospitalCode+"/"+t, mqttJson.toString());
     						}
     					}
+    				}else {
+    					mqttUtil.pub(CommonConstant.MQTT_PUBLISH_PREFIX+hospitalCode, mqttJson.toString());
     				}
     			}else {
     				mqttUtil.pub(CommonConstant.MQTT_PUBLISH_PREFIX+hospitalCode, mqttJson.toString());

src/main/java/com/tuoren/forward/constant/CommonConstant.java

@@ -17,6 +17,7 @@ public final class CommonConstant {
 	public static final Integer MQTT_QOS1 = 1;
 	public static final Integer MQTT_QOS2 = 2;
 	public static final String MQTT_PUBLISH_PREFIX = "hospital/";
+	public static final String MQTTUSER_PUBLISH_PREFIX = "user/";
 	public static final String MQTT_TICK_TOPIC = "user/tick";
 
 	

src/main/java/com/tuoren/forward/service/UserService.java

@@ -328,7 +328,7 @@ public class UserService {
         	user.setId(UUIDUtil.get32UUID());
             user.setPassword(MD5Util.encode32(CommonConstant.INI_PWD));
             user.setCreatetime(new Date());
-            user.setCode(UUIDUtil.getUniqStr().toUpperCase());
+            //user.setCode(UUIDUtil.getUniqStr().toUpperCase());
             userMapper.insertSelective(user);
             userRoleMapper.deleteByUserId(user.getId());
             UserRole ur = new UserRole();