Compare commits

..

No commits in common. '5eeee33a53c56632d1ad0fb8b2766f9287631c95' and '0bdb7ebb14b4a805caa7a31641fc9e774367297f' have entirely different histories.

@ -27,7 +27,7 @@ public class MqttServiceImpl {
try { try {
processOneTable(tableName); processOneTable(tableName);
} catch (Exception e) { } 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 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);
if(!dataOfoneDeviceID.isEmpty()){ String jsonStringData = FormatUtil.mqttFormatTransform(dataOfoneDeviceID, fieldMap);
String jsonStringData = FormatUtil.mqttFormatTransform(dataOfoneDeviceID, fieldMap); try {
try { if (mqttUtil.publish2MQTT(jsonStringData)) {
if (mqttUtil.publish2MQTT(jsonStringData)) { String lastRecordTime = "";
String lastRecordTime = ""; if(dataOfoneDeviceID.get(dataOfoneDeviceID.size()-1).get("d_time") == null){
if(dataOfoneDeviceID.get(dataOfoneDeviceID.size()-1).get("d_time") == null){ lastRecordTime = dataOfoneDeviceID.get(dataOfoneDeviceID.size()-1).get("capturetime").toString();
lastRecordTime = dataOfoneDeviceID.get(dataOfoneDeviceID.size()-1).get("capturetime").toString(); }else{
}else{ lastRecordTime = dataOfoneDeviceID.get(dataOfoneDeviceID.size()-1).get("d_time").toString();
lastRecordTime = dataOfoneDeviceID.get(dataOfoneDeviceID.size()-1).get("d_time").toString();
}
operationDBMapper.updateSyncRecordsTable(tableName, deviceID, lastRecordTime);
log.debug("表{}设备{}推送成功:{}", tableName, deviceID, jsonStringData);
} }
} catch (Exception e) { operationDBMapper.updateSyncRecordsTable(tableName, deviceID, lastRecordTime);
log.error("表{}设备{}推送异常:", tableName, deviceID, e); log.debug("表{}设备{}推送成功:{}", tableName, deviceID, jsonStringData);
} }
} 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.200:1883 broker: tcp://192.168.50.115:1883
topic: mqtt/test topic: mqtt/test
username: test username: test
password: AliOS%1688 password: AliOS%1688

Loading…
Cancel
Save