topic

src/main/java/com/care/bms/service/DeviceService.java

@@ -59,10 +59,10 @@ public class DeviceService {
     @Resource
     private CareOrganizationService careOrganizationService;
 
-    @Value("${mqtt.topic.work.template:#{null}}")
-    private String mqttTopicWorkTemplate;
-    @Value("${mqtt.topic.install.template:#{null}}")
-    private String mqttTopicInstallTemplate;
+//    @Value("${mqtt.topic.work.template:#{null}}")
+//    private String mqttTopicWorkTemplate;
+//    @Value("${mqtt.topic.install.template:#{null}}")
+//    private String mqttTopicInstallTemplate;
     @Value("${syn.dev.url:#{null}}")
     private String synDevUrl;
     /**
@@ -162,11 +162,11 @@ public class DeviceService {
         device.setCreateTime(new Date());
         device.setOrgId(loginUser.getOrgId());
 
-        String topic = mqttTopicWorkTemplate.replace("XXXXX",device.getDevCode());
-        device.setTopic(topic);
-
-        String topicInstall = mqttTopicInstallTemplate.replace("XXXXX",device.getDevCode());
-        device.setTopicInstall(topicInstall);
+//        String topic = mqttTopicWorkTemplate.replace("XXXXX",device.getDevCode());
+//        device.setTopic(topic);
+//
+//        String topicInstall = mqttTopicInstallTemplate.replace("XXXXX",device.getDevCode());
+//        device.setTopicInstall(topicInstall);
 
         device.setClientId(UUID.randomUUID().toString());
         device.setClientIdInstall(UUID.randomUUID().toString());
@@ -242,14 +242,14 @@ public class DeviceService {
 
 
         //mqtt
-        if(StringUtils.isEmpty(device.getTopic())){
-            String topic = mqttTopicWorkTemplate.replace("XXXXX",device.getDevCode());
-            device.setTopic(topic);
-        }
-        if(StringUtils.isEmpty(device.getTopicInstall())){
-            String topicInstall = mqttTopicInstallTemplate.replace("XXXXX",device.getDevCode());
-            device.setTopicInstall(topicInstall);
-        }
+//        if(StringUtils.isEmpty(device.getTopic())){
+//            String topic = mqttTopicWorkTemplate.replace("XXXXX",device.getDevCode());
+//            device.setTopic(topic);
+//        }
+//        if(StringUtils.isEmpty(device.getTopicInstall())){
+//            String topicInstall = mqttTopicInstallTemplate.replace("XXXXX",device.getDevCode());
+//            device.setTopicInstall(topicInstall);
+//        }
         if(StringUtils.isEmpty(device.getClientId())){
             device.setClientId(UUID.randomUUID().toString());
         }
@@ -377,11 +377,14 @@ public class DeviceService {
     }
 
     /**
-     * 同步机构
+     * 同步设备
      */
     public boolean synDev(String companyId) {
 
         try {
+            if (StringUtils.isEmpty(companyId)){
+                return false;
+            }
             // 通过synDevUrl获取data
             JSONObject jsonObject = HttpUtil.httpGet(synDevUrl + "?companyId=" + companyId);
             int code = jsonObject.getInt("code");
@@ -399,6 +402,8 @@ public class DeviceService {
                         CareDevice careDevice = new CareDevice();
                         careDevice.setDevCode(obj.getStr("mdid"));
                         careDevice.setOrgId(careOrganization.getId());
+                        careDevice.setTopic("/companyId/" + careDevice.getDevCode() + "/event");
+                        careDevice.setTopicInstall("/companyId/" + careDevice.getDevCode() + "/control");
                         careDeviceService.synDev(careDevice);
                     } else {
                         continue;

src/main/java/com/care/installation/service/DevInstallService.java

@@ -26,10 +26,10 @@ public class DevInstallService {
     private CareDeviceService careDeviceService;
     @Resource
     private CareHouseService careHouseService;
-    @Value("${mqtt.topic.work.template:#{null}}")
-    private String mqttTopicWorkTemplate;
-    @Value("${mqtt.topic.install.template:#{null}}")
-    private String mqttTopicInstallTemplate;
+//    @Value("${mqtt.topic.work.template:#{null}}")
+//    private String mqttTopicWorkTemplate;
+//    @Value("${mqtt.topic.install.template:#{null}}")
+//    private String mqttTopicInstallTemplate;
 
 
     public Boolean checkDevCode(String devCode) {
@@ -127,14 +127,14 @@ public class DevInstallService {
             }
         }
         //mqtt
-        if(StringUtils.isEmpty(careDevice.getTopic())){
-            String topic = mqttTopicWorkTemplate.replace("XXXXX",careDevice.getDevCode());
-            careDevice.setTopic(topic);
-        }
-        if(StringUtils.isEmpty(careDevice.getTopicInstall())){
-            String topicInstall = mqttTopicInstallTemplate.replace("XXXXX",careDevice.getDevCode());
-            careDevice.setTopicInstall(topicInstall);
-        }
+//        if(StringUtils.isEmpty(careDevice.getTopic())){
+//            String topic = mqttTopicWorkTemplate.replace("XXXXX",careDevice.getDevCode());
+//            careDevice.setTopic(topic);
+//        }
+//        if(StringUtils.isEmpty(careDevice.getTopicInstall())){
+//            String topicInstall = mqttTopicInstallTemplate.replace("XXXXX",careDevice.getDevCode());
+//            careDevice.setTopicInstall(topicInstall);
+//        }
         if(StringUtils.isEmpty(careDevice.getClientId())){
             careDevice.setClientId(UUID.randomUUID().toString());
         }

src/main/resources/application-dev.properties

@@ -48,10 +48,10 @@ mqtt.dev.jihuo.timeout=30
 
 #设备工作时接受消息的mqtt topic
 #mqtt.topic.work.template=5JPD/monitor/XXXXX/event
-mqtt.topic.work.template=/shangxingkeji/XXXXX/event
+#=/shangxingkeji/XXXXX/event
 
 #设备安装时发送消息的mqtt topic
-mqtt.topic.install.template=5JPD/monintor/XXXXX/control
+#mqtt.topic.install.template=5JPD/monintor/XXXXX/control
 ############# 设备MQTT消息配置 end #####################
 
 #同步机构地址

src/main/resources/application-prod.properties

@@ -52,11 +52,11 @@ mqtt.on=1
 mqtt.dev.jihuo.timeout=30
 
 #设备工作时接受消息的mqtt topic
-mqtt.topic.work.template=5JPD/monitor/XXXXX/event
+#mqtt.topic.work.template=5JPD/monitor/XXXXX/event
 #mqtt.topic.work.template=/shangxingkeji/XXXXX/event
 
 #设备安装时发送消息的mqtt topic
-mqtt.topic.install.template=5JPD/monintor/XXXXX/control
+#mqtt.topic.install.template=5JPD/monintor/XXXXX/control
 ############# 设备MQTT消息配置 end #####################
 
 #同步机构地址

src/main/resources/mybatis/CareDeviceMapper.xml

@@ -79,9 +79,11 @@
      </update>
 
     <insert id = "synDev">
-        insert into care_device(org_id,dev_code,create_time)
-        values(#{orgId},#{devCode},now())
+        insert into care_device(org_id,dev_code,topic,topic_install,create_time)
+        values(#{orgId},#{devCode},#{topic},#{topicInstall},now())
         on duplicate key update
-        org_id = values(org_id)
+        org_id = values(org_id),
+        topic = values(topic),
+        topic_install = values(topic_install)
     </insert>
 </mapper>