From c50afa36b0812f40fac7f3cd9f0908ea647208f1 Mon Sep 17 00:00:00 2001
From: "wenhua.zhou" <zhouwenhua@xinyingpower.com>
Date: Tue, 12 Dec 2023 17:08:44 +0800
Subject: [PATCH] .

---
 .../xydl/service/impl/MqttServiceImpl.java    | 29 ++++++++++---------
 src/main/resources/application-dev.yml        |  2 +-
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/xydl/service/impl/MqttServiceImpl.java b/src/main/java/com/xydl/service/impl/MqttServiceImpl.java
index 4b81651..ada592a 100644
--- a/src/main/java/com/xydl/service/impl/MqttServiceImpl.java
+++ b/src/main/java/com/xydl/service/impl/MqttServiceImpl.java
@@ -27,7 +27,7 @@ public class MqttServiceImpl {
             try {
                 processOneTable(tableName);
             } catch (Exception e) {
-                throw new RuntimeException(e);
+                log.error("processOneTable exception:",e);
             }
         }
     }
@@ -69,21 +69,24 @@ 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);
-        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();
+        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);
                 }
-                operationDBMapper.updateSyncRecordsTable(tableName, deviceID, lastRecordTime);
-                log.debug("表{}设备{}推送成功:{}", tableName, deviceID, jsonStringData);
+            } catch (Exception e) {
+                log.error("表{}设备{}推送异常：", tableName, deviceID, e);
             }
-        } catch (Exception e) {
-            log.error("表{}设备{}推送异常：", tableName, deviceID, e);
         }
+
     }
 
 
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 4ee1892..8d97cf5 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -25,7 +25,7 @@ mqtt:
     clientid: publish_client
   subscribe:
     clientid: subscribe_client
-  broker: tcp://192.168.50.115:1883
+  broker: tcp://192.168.50.200:1883
   topic: mqtt/test
   username: test
   password: AliOS%1688