From a369ae6160f38bdd3acd396b7c9be71743e94474 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Wed, 14 Jan 2026 20:32:57 +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 --- .../service/impl/CsDevModelServiceImpl.java | 11 ++++--- .../njcn/rt/service/impl/RtServiceImpl.java | 32 +++++++++++++------ .../stat/service/impl/StatServiceImpl.java | 17 ++++------ 3 files changed, 35 insertions(+), 25 deletions(-) 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 4efee1e..58b2e4e 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,10 +133,11 @@ public class CsDevModelServiceImpl implements ICsDevModelService { if (ObjectUtil.isNotNull(object)) { csLineFeignClient.updateDataByList(devList,csDevModelPo.getId(),object.toString()); } - //清空监测点缓存的模板信息 - + } } + //5.清空模板缓存 + redisUtil.deleteKeysByString(AppRedisKey.DEV_MODEL); csLogsFeignClient.addUserLog(logDto); } catch (Exception e) { logDto.setResult(0); @@ -966,7 +967,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService { if(CollectionUtil.isNotEmpty(setList)) { csDataSetService.addList(setList); setList.forEach(item->{ - if (Objects.equals(item.getName(),"统计数据")) { + if (Objects.equals(item.getName(),"Ds$Pqd$Stat$01")) { redisUtil.saveByKeyWithExpire("setId:" + pId,item.getId(),30L); } }); @@ -1273,7 +1274,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService { showName = "APF模块8数据模板"; break; case "Ds$Pqd$Stat$01": - if (Objects.equals(code, DicDataEnum.CONNECT_DEV.getCode()) || Objects.isNull(code)){ + if (Objects.equals(code, DicDataEnum.CONNECT_DEV.getCode())){ showName = "电网侧数据模板"; } else if (Objects.equals(code, DicDataEnum.PORTABLE.getCode())){ showName = "监测1#数据模板"; @@ -1282,7 +1283,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService { } break; case "Ds$Pqd$Stat$02": - if (Objects.equals(code, DicDataEnum.CONNECT_DEV.getCode()) || Objects.isNull(code)){ + if (Objects.equals(code, DicDataEnum.CONNECT_DEV.getCode())){ showName = "负载侧数据模板"; } else if (Objects.equals(code, DicDataEnum.PORTABLE.getCode())){ showName = "监测2#数据模板"; 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 85b3f51..d0d83b8 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 @@ -225,9 +225,15 @@ public class RtServiceImpl implements IRtService { baseRealDataSet.setVRmsC(FloatUtils.get2Float(map.get("Pq_RmsLUCA"))); } //基波电压幅值 - baseRealDataSet.setV1A(FloatUtils.get2Float(map.get("Pq_RmsFundUA"))); - baseRealDataSet.setV1B(FloatUtils.get2Float(map.get("Pq_RmsFundUB"))); - baseRealDataSet.setV1C(FloatUtils.get2Float(map.get("Pq_RmsFundUC"))); + if (conType == 0) { + baseRealDataSet.setV1A(FloatUtils.get2Float(map.get("Pq_RmsFundUA"))); + baseRealDataSet.setV1B(FloatUtils.get2Float(map.get("Pq_RmsFundUB"))); + baseRealDataSet.setV1C(FloatUtils.get2Float(map.get("Pq_RmsFundUC"))); + } else { + baseRealDataSet.setVRmsA(FloatUtils.get2Float(map.get("Pq_RmsFundLUAB"))); + baseRealDataSet.setVRmsB(FloatUtils.get2Float(map.get("Pq_RmsFundLUBC"))); + baseRealDataSet.setVRmsC(FloatUtils.get2Float(map.get("Pq_RmsFundLUCA"))); + } //电流有效值 baseRealDataSet.setIRmsA(FloatUtils.get2Float(map.get("Pq_RmsIA"))); baseRealDataSet.setIRmsB(FloatUtils.get2Float(map.get("Pq_RmsIB"))); @@ -241,9 +247,15 @@ public class RtServiceImpl implements IRtService { baseRealDataSet.setVDevB(FloatUtils.get2Float(map.get("Pq_UDevB"))); baseRealDataSet.setVDevC(FloatUtils.get2Float(map.get("Pq_UDevC"))); //基波电压相位 - baseRealDataSet.setV1AngA(FloatUtils.get2Float(map.get("Pq_FundUAngA"))); - baseRealDataSet.setV1AngB(FloatUtils.get2Float(map.get("Pq_FundUAngB"))); - baseRealDataSet.setV1AngC(FloatUtils.get2Float(map.get("Pq_FundUAngC"))); + if (conType == 0) { + baseRealDataSet.setV1AngA(FloatUtils.get2Float(map.get("Pq_FundUAngA"))); + baseRealDataSet.setV1AngB(FloatUtils.get2Float(map.get("Pq_FundUAngB"))); + baseRealDataSet.setV1AngC(FloatUtils.get2Float(map.get("Pq_FundUAngC"))); + } else { + baseRealDataSet.setV1AngA(FloatUtils.get2Float(map.get("Pq_FundLUAngAB"))); + baseRealDataSet.setV1AngB(FloatUtils.get2Float(map.get("Pq_FundLUAngBC"))); + baseRealDataSet.setV1AngC(FloatUtils.get2Float(map.get("Pq_FundLUAngCA"))); + } //基波电流相位 baseRealDataSet.setI1AngA(FloatUtils.get2Float(map.get("Pq_FundIAngA"))); baseRealDataSet.setI1AngB(FloatUtils.get2Float(map.get("Pq_FundIAngB"))); @@ -281,10 +293,10 @@ public class RtServiceImpl implements IRtService { baseRealDataSet.setPfC(FloatUtils.get2Float(map.get("Pq_PFC"))); baseRealDataSet.setPfTot(FloatUtils.get2Float(map.get("Pq_TotPFM"))); //基波功率因数 - baseRealDataSet.setDpfA(FloatUtils.get2Float(map.get("Pq_DPFA"))); - baseRealDataSet.setDpfB(FloatUtils.get2Float(map.get("Pq_DPFB"))); - baseRealDataSet.setDpfC(FloatUtils.get2Float(map.get("Pq_DPFC"))); - baseRealDataSet.setDpfTot(FloatUtils.get2Float(map.get("Pq_TotDPFM"))); + baseRealDataSet.setDpfA(FloatUtils.get2Float(map.get("Pq_DFA"))); + baseRealDataSet.setDpfB(FloatUtils.get2Float(map.get("Pq_DFB"))); + baseRealDataSet.setDpfC(FloatUtils.get2Float(map.get("Pq_DFC"))); + baseRealDataSet.setDpfTot(FloatUtils.get2Float(map.get("Pq_TotDFM"))); return baseRealDataSet; } diff --git a/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java b/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java index 20cfe75..fdd5888 100644 --- a/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java +++ b/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java @@ -3,7 +3,6 @@ package com.njcn.stat.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.alibaba.nacos.shaded.com.google.gson.Gson; import com.njcn.access.api.CsLineLatestDataFeignClient; -import com.njcn.access.pojo.po.CsLineLatestData; import com.njcn.access.utils.ChannelObjectUtil; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.utils.PubUtils; @@ -154,10 +153,10 @@ public class StatServiceImpl implements IStatService { //influx数据批量入库 influxDbUtils.batchInsert(influxDbUtils.getDbName(), "", InfluxDB.ConsistencyLevel.ALL, TimeUnit.MILLISECONDS, recordList); //记录监测点最新数据时间 - CsLineLatestData csLineLatestData = new CsLineLatestData(); - csLineLatestData.setLineId(lineId); - csLineLatestData.setTimeId(Objects.isNull(time) ? LocalDateTime.now() : time); - csLineLatestDataFeignClient.addData(csLineLatestData); +// CsLineLatestData csLineLatestData = new CsLineLatestData(); +// csLineLatestData.setLineId(lineId); +// csLineLatestData.setTimeId(Objects.isNull(time) ? LocalDateTime.now() : time); +// csLineLatestDataFeignClient.addData(csLineLatestData); } } } @@ -220,7 +219,9 @@ public class StatServiceImpl implements IStatService { String tableName = map.get(dataArrayList.get(i).getName()); Map tags = new HashMap<>(); tags.put(InfluxDBTableConstant.LINE_ID,lineId); - tags.put(InfluxDBTableConstant.PHASIC_TYPE,Objects.isNull(PHASE_MAPPING.get(dataArrayList.get(i).getPhase()))?dataArrayList.get(i).getPhase():PHASE_MAPPING.get(dataArrayList.get(i).getPhase())); + tags.put(InfluxDBTableConstant.PHASIC_TYPE,dataArrayList.get(i).getPhase()); + //todo 不清楚之前为啥要修改相别，这边按字典配置相别无法查询到数据，先改回来 + //tags.put(InfluxDBTableConstant.PHASIC_TYPE,Objects.isNull(PHASE_MAPPING.get(dataArrayList.get(i).getPhase()))?dataArrayList.get(i).getPhase():PHASE_MAPPING.get(dataArrayList.get(i).getPhase())); tags.put(InfluxDBTableConstant.VALUE_TYPE,statMethod); tags.put(InfluxDBTableConstant.CL_DID,clDid.toString()); tags.put(InfluxDBTableConstant.PROCESS,process.toString()); @@ -249,8 +250,4 @@ public class StatServiceImpl implements IStatService { } return urlList; } - - //相别处理 - - }