From 6714a6f582283868c6bfd9437c7c0f20cdf834e5 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Tue, 13 Jan 2026 14:42:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/access/service/impl/CsDevModelServiceImpl.java | 9 +++++++++ .../java/com/njcn/rt/service/impl/RtServiceImpl.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java index f47031d..4efee1e 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java @@ -133,6 +133,8 @@ public class CsDevModelServiceImpl implements ICsDevModelService { if (ObjectUtil.isNotNull(object)) { csLineFeignClient.updateDataByList(devList,csDevModelPo.getId(),object.toString()); } + //清空监测点缓存的模板信息 + } } csLogsFeignClient.addUserLog(logDto); @@ -1275,6 +1277,8 @@ public class CsDevModelServiceImpl implements ICsDevModelService { showName = "电网侧数据模板"; } else if (Objects.equals(code, DicDataEnum.PORTABLE.getCode())){ showName = "监测1#数据模板"; + } else { + showName = "统计数据"; } break; case "Ds$Pqd$Stat$02": @@ -1282,8 +1286,13 @@ public class CsDevModelServiceImpl implements ICsDevModelService { showName = "负载侧数据模板"; } else if (Objects.equals(code, DicDataEnum.PORTABLE.getCode())){ showName = "监测2#数据模板"; + } else { + showName = "统计数据"; } break; + case "Ds$Pqd$Rt$01": + showName = "实时数据"; + break; //波形参数名称 case "Wave_Param_Position": showName = "录波记录位置"; diff --git a/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java b/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java index 0b5a08b..85b3f51 100644 --- a/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java +++ b/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java @@ -88,7 +88,7 @@ public class RtServiceImpl implements IRtService { long timestamp = item.getDataTimeSec() - 8*3600; baseRealDataSet.setDataTime(getTime(timestamp)); publisher.send("/Web/RealData/" + lineId, new Gson().toJson(baseRealDataSet), 1, false); - } else if (dataSet.getName().contains("实时数据")) { + } else if (dataSet.getName().contains("实时数据") || dataSet.getName().contains("Ds$Pqd$Rt$01")) { //用户Id Object redisObject = redisUtil.getObjectByKey("rtDataUserId:"+lineId); if (ObjectUtil.isNotNull(redisObject)) {