From a1269382fcc6d35b87fe781798dbe11bf24d4206 Mon Sep 17 00:00:00 2001 From: "wenhua.zhou" Date: Tue, 12 Dec 2023 15:03:34 +0800 Subject: [PATCH] . --- src/main/java/com/xydl/mapper/OperationDB.java | 2 +- src/main/java/com/xydl/service/impl/MqttServiceImpl.java | 6 +++--- src/main/resources/application-dev.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/xydl/mapper/OperationDB.java b/src/main/java/com/xydl/mapper/OperationDB.java index 4f42163..426578d 100644 --- a/src/main/java/com/xydl/mapper/OperationDB.java +++ b/src/main/java/com/xydl/mapper/OperationDB.java @@ -28,7 +28,7 @@ public interface OperationDB { List> getData(String sql); - boolean updateSyncRecordsTable(String tableName, int deviceID, String time); + boolean updateSyncRecordsTable(String tableName, String deviceID, String time); } diff --git a/src/main/java/com/xydl/service/impl/MqttServiceImpl.java b/src/main/java/com/xydl/service/impl/MqttServiceImpl.java index d333e4c..c65372f 100644 --- a/src/main/java/com/xydl/service/impl/MqttServiceImpl.java +++ b/src/main/java/com/xydl/service/impl/MqttServiceImpl.java @@ -55,12 +55,12 @@ public class MqttServiceImpl { time = "2000-01-01 01:00:00"; operationDBMapper.addEarliestTime("10", tableName, String.valueOf(deviceID), time.toString()); } - publishData(deviceID, time.toString(), sqlExecuting, tableName, fieldMap); + publishData(String.valueOf(deviceID), time.toString(), sqlExecuting, tableName, fieldMap); } } //推送单个设备数据 - public void publishData(int deviceID, String time, String sqlExecuting, String tableName, Map fieldMap) { + public void publishData(String deviceID, String time, String sqlExecuting, String tableName, Map fieldMap) { String devIdSQL = sqlExecuting.replace("%%DEVID%%", String.valueOf(deviceID)); String newSQL = devIdSQL.replace("%%KEYVALUE%%", "'" + time + "'"); @@ -72,7 +72,7 @@ public class MqttServiceImpl { log.debug("表{}设备{}推送成功:{}", tableName, deviceID, jsonStringData); } } catch (Exception e) { - log.error("表{}设备{}推送异常：{}", tableName, deviceID, e.getMessage()); + log.error("表{}设备{}推送异常：", tableName, deviceID, e); } } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index fecb0bf..4ee1892 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://139.196.211.222:10883 + broker: tcp://192.168.50.115:1883 topic: mqtt/test username: test password: AliOS%1688