src/main/java/com/xydl/service/impl/MqttServiceImpl.java

@@ -27,7 +27,7 @@ public class MqttServiceImpl {
             try {
                 processOneTable(tableName);
             } catch (Exception e) {
-                log.error("processOneTable exception:",e);
+                throw new RuntimeException(e);
             }
         }
     }
@@ -69,24 +69,21 @@ public class MqttServiceImpl {
         String devIdSQL = sqlExecuting.replace("%%DEVID%%", String.valueOf(deviceID));
         String newSQL = devIdSQL.replace("%%KEYVALUE%%", "'" + time + "'");
         List<Map<String, Object>> dataOfoneDeviceID = operationDBMapper.getData(newSQL);
-        if(!dataOfoneDeviceID.isEmpty()){
-            String jsonStringData = FormatUtil.mqttFormatTransform(dataOfoneDeviceID, fieldMap);
-            try {
-                if (mqttUtil.publish2MQTT(jsonStringData)) {
-                    String lastRecordTime = "";
-                    if(dataOfoneDeviceID.get(dataOfoneDeviceID.size()-1).get("d_time") == null){
-                        lastRecordTime = dataOfoneDeviceID.get(dataOfoneDeviceID.size()-1).get("capturetime").toString();
-                    }else{
-                        lastRecordTime = dataOfoneDeviceID.get(dataOfoneDeviceID.size()-1).get("d_time").toString();
-                    }
-                    operationDBMapper.updateSyncRecordsTable(tableName, deviceID, lastRecordTime);
-                    log.debug("表{}设备{}推送成功:{}", tableName, deviceID, jsonStringData);
+        String jsonStringData = FormatUtil.mqttFormatTransform(dataOfoneDeviceID, fieldMap);
+        try {
+            if (mqttUtil.publish2MQTT(jsonStringData)) {
+                String lastRecordTime = "";
+                if(dataOfoneDeviceID.get(dataOfoneDeviceID.size()-1).get("d_time") == null){
+                    lastRecordTime = dataOfoneDeviceID.get(dataOfoneDeviceID.size()-1).get("capturetime").toString();
+                }else{
+                    lastRecordTime = dataOfoneDeviceID.get(dataOfoneDeviceID.size()-1).get("d_time").toString();
                 }
-            } catch (Exception e) {
-                log.error("表{}设备{}推送异常：", tableName, deviceID, e);
+                operationDBMapper.updateSyncRecordsTable(tableName, deviceID, lastRecordTime);
+                log.debug("表{}设备{}推送成功:{}", tableName, deviceID, jsonStringData);
             }
+        } catch (Exception e) {
+            log.error("表{}设备{}推送异常：", tableName, deviceID, e);
         }
-
     }
 
 

src/main/resources/application-dev.yml

@@ -25,7 +25,7 @@ mqtt:
     clientid: publish_client
   subscribe:
     clientid: subscribe_client
-  broker: tcp://192.168.50.200:1883
+  broker: tcp://192.168.50.115:1883
   topic: mqtt/test
   username: test
   password: AliOS%1688