Microservice/iot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

微调

Browse Source
This commit is contained in:
xy
2026-01-13 14:42:10 +08:00
parent 2910770be1
commit 6714a6f582
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java
View File

@@ -133,6 +133,8 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
if (ObjectUtil.isNotNull(object)) { if (ObjectUtil.isNotNull(object)) {
csLineFeignClient.updateDataByList(devList,csDevModelPo.getId(),object.toString()); csLineFeignClient.updateDataByList(devList,csDevModelPo.getId(),object.toString());
} }
//清空监测点缓存的模板信息
} }
} }
csLogsFeignClient.addUserLog(logDto); csLogsFeignClient.addUserLog(logDto);
@@ -1275,6 +1277,8 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
showName = "电网侧数据模板"; showName = "电网侧数据模板";
} else if (Objects.equals(code, DicDataEnum.PORTABLE.getCode())){ } else if (Objects.equals(code, DicDataEnum.PORTABLE.getCode())){
showName = "监测1#数据模板"; showName = "监测1#数据模板";
} else {
showName = "统计数据";
} }
break; break;
case "Ds$Pqd$Stat$02": case "Ds$Pqd$Stat$02":
@@ -1282,8 +1286,13 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
showName = "负载侧数据模板"; showName = "负载侧数据模板";
} else if (Objects.equals(code, DicDataEnum.PORTABLE.getCode())){ } else if (Objects.equals(code, DicDataEnum.PORTABLE.getCode())){
showName = "监测2#数据模板"; showName = "监测2#数据模板";
} else {
showName = "统计数据";
} }
break; break;
case "Ds$Pqd$Rt$01":
showName = "实时数据";
break;
//波形参数名称 //波形参数名称
case "Wave_Param_Position": case "Wave_Param_Position":
showName = "录波记录位置"; showName = "录波记录位置";

2
iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java
View File

@@ -88,7 +88,7 @@ public class RtServiceImpl implements IRtService {
long timestamp = item.getDataTimeSec() - 8*3600; long timestamp = item.getDataTimeSec() - 8*3600;
baseRealDataSet.setDataTime(getTime(timestamp)); baseRealDataSet.setDataTime(getTime(timestamp));
publisher.send("/Web/RealData/" + lineId, new Gson().toJson(baseRealDataSet), 1, false); 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 //用户Id
Object redisObject = redisUtil.getObjectByKey("rtDataUserId:"+lineId); Object redisObject = redisUtil.getObjectByKey("rtDataUserId:"+lineId);
if (ObjectUtil.isNotNull(redisObject)) { if (ObjectUtil.isNotNull(redisObject)) {