fix: 优化日志

main
huangfeng 2 years ago
parent 5eeee33a53
commit 4f61213d9d

@ -7,6 +7,7 @@ import com.xydl.util.MqttUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.*; import java.util.*;
@ -27,14 +28,13 @@ public class MqttServiceImpl {
try { try {
processOneTable(tableName); processOneTable(tableName);
} catch (Exception e) { } catch (Exception e) {
log.error("processOneTable exception:",e); log.error("processOneTable exception:", e);
} }
} }
} }
//单个表数据发送 //单个表数据发送
public void processOneTable(String tableName) throws Exception{ public void processOneTable(String tableName) throws Exception {
log.info("tableName:{}", tableName);
Map<String, String> fieldMap = new HashMap<>(); Map<String, String> fieldMap = new HashMap<>();
List<Map<String, String>> fieldMaps = operationDBMapper.getFieldMap(tableName); List<Map<String, String>> fieldMaps = operationDBMapper.getFieldMap(tableName);
for (Map<String, String> map : fieldMaps) { for (Map<String, String> map : fieldMaps) {
@ -51,11 +51,13 @@ public class MqttServiceImpl {
devIDLastTimeMap.put(Integer.parseInt((String) map.get("devid_val")), map.get("field_val2")); devIDLastTimeMap.put(Integer.parseInt((String) map.get("devid_val")), map.get("field_val2"));
} }
} }
log.info("表{},共{}个设备", tableName, dataEqmids.size());
mqttUtil.connect(); mqttUtil.connect();
for (int deviceID : dataEqmids) { for (int deviceID : dataEqmids) {
Object time = devIDLastTimeMap.get(deviceID); Object time = devIDLastTimeMap.get(deviceID);
if (time == null) { if (time == null) {
time = "2000-01-01 01:00:00"; time = "2010-01-01 01:00:00";
operationDBMapper.addEarliestTime("10", tableName, String.valueOf(deviceID), time.toString()); operationDBMapper.addEarliestTime("10", tableName, String.valueOf(deviceID), time.toString());
} }
publishData(String.valueOf(deviceID), time.toString(), sqlExecuting, tableName, fieldMap); publishData(String.valueOf(deviceID), time.toString(), sqlExecuting, tableName, fieldMap);
@ -69,21 +71,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()){ 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); operationDBMapper.updateSyncRecordsTable(tableName, deviceID, lastRecordTime);
log.debug("表{}设备{}推送成功:{}", tableName, deviceID, jsonStringData); log.debug("表{}设备{}推送成功", tableName, deviceID);
} }
} catch (Exception e) { } catch (Exception e) {
log.error("表{}设备{}推送异常", tableName, deviceID, e); log.error("表{}设备{}推送异常", tableName, deviceID, e);
} }
} }

@ -39,7 +39,7 @@ logging:
controller: controller:
TestControler: info TestControler: info
service: service:
impl: info impl: debug
schedule: info schedule: info
file: file:
# name: E:\log\mqtt.log # name: E:\log\mqtt.log

Loading…
Cancel
Save