diff --git a/business/src/main/java/com/fizz/business/service/DeviceSnapshotService.java b/business/src/main/java/com/fizz/business/service/DeviceSnapshotService.java index 9620030..b8e114c 100644 --- a/business/src/main/java/com/fizz/business/service/DeviceSnapshotService.java +++ b/business/src/main/java/com/fizz/business/service/DeviceSnapshotService.java @@ -88,7 +88,7 @@ public class DeviceSnapshotService { AppMeasureCoatMessage coat = (AppMeasureCoatMessage) latestMeasurements.get(AppMeasureCoatMessage.class); AppMeasureExitMessage exit = (AppMeasureExitMessage) latestMeasurements.get(AppMeasureExitMessage.class); - log.info("测量数据状态 - entry: {}, furnace: {}, coat: {}, exit: {}", + log.info("测量数据状态 - entry: {}, furnace: {}, coat: {}, exit: {}", entry != null ? "有数据" : "null", furnace != null ? "有数据" : "null", coat != null ? "有数据" : "null", @@ -127,18 +127,18 @@ public class DeviceSnapshotService { int result = deviceSnapshotMapper.insert(snapshot); if (result > 0) { savedCount++; - log.debug("设备快照保存成功: deviceCode={}, createTime={}", + log.debug("设备快照保存成功: deviceCode={}, createTime={}", snapshot.getDeviceCode(), snapshot.getCreateTime()); } else { log.warn("设备快照保存失败(insert返回0): deviceCode={}", snapshot.getDeviceCode()); } } catch (Exception e) { - log.error("保存设备快照到数据库失败: deviceCode={}, error={}", + log.error("保存设备快照到数据库失败: deviceCode={}, error={}", snapshot.getDeviceCode(), e.getMessage(), e); } } log.info("成功保存{}个设备数据快照到数据库", savedCount); - + // 推送所有设备的历史趋势数据 pushAllDevicesHistoryTrend(); @@ -758,7 +758,6 @@ public class DeviceSnapshotService { snapshot.setDeviceName(device.getDesc()); snapshot.setSectionType(device.getSectionType().name()); snapshot.setSourceType(device.getSourceType().name()); - snapshot.setBasePosition(device.getBasePosition()); List paramFields = device.getParamFields(); log.debug("设备[{}]参数字段列表: {}", device.name(), paramFields); @@ -821,7 +820,7 @@ public class DeviceSnapshotService { */ private void extractData(Object message, List fields, ObjectNode dataNode) { if (message == null || fields == null || fields.isEmpty()) { - log.debug("extractData参数无效: message={}, fields={}", + log.debug("extractData参数无效: message={}, fields={}", message != null ? message.getClass().getSimpleName() : "null", fields != null ? fields.size() : "null"); return; @@ -875,7 +874,7 @@ public class DeviceSnapshotService { log.warn("获取字段[{}]值失败: {}", field, e.getMessage()); } } - log.debug("从[{}]提取了{}个字段,共{}个字段", + log.debug("从[{}]提取了{}个字段,共{}个字段", message.getClass().getSimpleName(), extractedCount, fields.size()); } catch (Exception e) { log.error("提取数据时发生错误: {}", e.getMessage(), e);