wenhua.zhou 2 years ago
parent 3b57322ef5
commit c50afa36b0

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

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

Loading…
Cancel
Save