|
|
|
@ -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);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|