mqtt上传接口修改

tzipc-server/tzipc-admin/src/main/resources/application.yml

@@ -136,8 +136,8 @@ datasyn:
   mqtt:
     host: tcp://111.11.4.77:15002
     clientId: tzipc
-    topicu: /usr/plcnet/roller/edge/u  #数据上行主题 设备向服务器推送数据的主题
-    topicd: /usr/plcnet/roller/edge/d #数据下行主题 服务器向设备推送数据主题
+    topicu: /usr/plcnet/youmotest/edge/u  #数据上行主题 设备向服务器推送数据的主题
+    topicd: /usr/plcnet/youmotest/edge/d #数据下行主题 服务器向设备推送数据主题
     userName: taizhong
     password: 6IYC@A5By0l
     timeOut: 10

tzipc-server/tzipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCDataSyncTask.java

@@ -41,6 +41,10 @@ public class IPCDataSyncTask implements ApplicationRunner {
     private String clientId;
     @Value("${datasyn.mqtt.topicu}")
     private String topicu;
+    @Value("${datasyn.mqtt.userName}")
+    private String userName;
+    @Value("${datasyn.mqtt.password}")
+    private String password;
 
     @Autowired
     private InfluxDBService influxDBService;
@@ -78,7 +82,7 @@ public class IPCDataSyncTask implements ApplicationRunner {
             timer3.schedule(new TimerTask() {
                 @Override
                 public void run() {
-                    threadPoolTaskExecutor.execute(new IPCDataUploadSyncThread(mqttHost,clientId,topicu));
+                    threadPoolTaskExecutor.execute(new IPCDataUploadSyncThread(mqttHost, clientId, topicu, userName, password));
                 }
             }, 1000, 1000 * 60);
         }