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-14 20:32:57 +08:00
parent 6714a6f582
commit a369ae6160
3 changed files with 35 additions and 25 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,10 +133,11 @@ 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());
} }
//清空监测点缓存的模板信息
} }
} }
//5.清空模板缓存
redisUtil.deleteKeysByString(AppRedisKey.DEV_MODEL);
csLogsFeignClient.addUserLog(logDto); csLogsFeignClient.addUserLog(logDto);
} catch (Exception e) { } catch (Exception e) {
logDto.setResult(0); logDto.setResult(0);
@@ -966,7 +967,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
if(CollectionUtil.isNotEmpty(setList)) { if(CollectionUtil.isNotEmpty(setList)) {
csDataSetService.addList(setList); csDataSetService.addList(setList);
setList.forEach(item->{ setList.forEach(item->{
if (Objects.equals(item.getName(),"统计数据")) { if (Objects.equals(item.getName(),"Ds$Pqd$Stat$01")) {
redisUtil.saveByKeyWithExpire("setId:" + pId,item.getId(),30L); redisUtil.saveByKeyWithExpire("setId:" + pId,item.getId(),30L);
} }
}); });
@@ -1273,7 +1274,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
showName = "APF模块8数据模板"; showName = "APF模块8数据模板";
break; break;
case "Ds$Pqd$Stat$01": 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 = "电网侧数据模板"; showName = "电网侧数据模板";
} else if (Objects.equals(code, DicDataEnum.PORTABLE.getCode())){ } else if (Objects.equals(code, DicDataEnum.PORTABLE.getCode())){
showName = "监测1#数据模板"; showName = "监测1#数据模板";
@@ -1282,7 +1283,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
} }
break; break;
case "Ds$Pqd$Stat$02": 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 = "负载侧数据模板"; showName = "负载侧数据模板";
} else if (Objects.equals(code, DicDataEnum.PORTABLE.getCode())){ } else if (Objects.equals(code, DicDataEnum.PORTABLE.getCode())){
showName = "监测2#数据模板"; showName = "监测2#数据模板";

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

@@ -225,9 +225,15 @@ public class RtServiceImpl implements IRtService {
baseRealDataSet.setVRmsC(FloatUtils.get2Float(map.get("Pq_RmsLUCA"))); baseRealDataSet.setVRmsC(FloatUtils.get2Float(map.get("Pq_RmsLUCA")));
} }
//基波电压幅值 //基波电压幅值
baseRealDataSet.setV1A(FloatUtils.get2Float(map.get("Pq_RmsFundUA"))); if (conType == 0) {
baseRealDataSet.setV1B(FloatUtils.get2Float(map.get("Pq_RmsFundUB"))); baseRealDataSet.setV1A(FloatUtils.get2Float(map.get("Pq_RmsFundUA")));
baseRealDataSet.setV1C(FloatUtils.get2Float(map.get("Pq_RmsFundUC"))); 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.setIRmsA(FloatUtils.get2Float(map.get("Pq_RmsIA")));
baseRealDataSet.setIRmsB(FloatUtils.get2Float(map.get("Pq_RmsIB"))); 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.setVDevB(FloatUtils.get2Float(map.get("Pq_UDevB")));
baseRealDataSet.setVDevC(FloatUtils.get2Float(map.get("Pq_UDevC"))); baseRealDataSet.setVDevC(FloatUtils.get2Float(map.get("Pq_UDevC")));
//基波电压相位 //基波电压相位
baseRealDataSet.setV1AngA(FloatUtils.get2Float(map.get("Pq_FundUAngA"))); if (conType == 0) {
baseRealDataSet.setV1AngB(FloatUtils.get2Float(map.get("Pq_FundUAngB"))); baseRealDataSet.setV1AngA(FloatUtils.get2Float(map.get("Pq_FundUAngA")));
baseRealDataSet.setV1AngC(FloatUtils.get2Float(map.get("Pq_FundUAngC"))); 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.setI1AngA(FloatUtils.get2Float(map.get("Pq_FundIAngA")));
baseRealDataSet.setI1AngB(FloatUtils.get2Float(map.get("Pq_FundIAngB"))); 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.setPfC(FloatUtils.get2Float(map.get("Pq_PFC")));
baseRealDataSet.setPfTot(FloatUtils.get2Float(map.get("Pq_TotPFM"))); baseRealDataSet.setPfTot(FloatUtils.get2Float(map.get("Pq_TotPFM")));
//基波功率因数 //基波功率因数
baseRealDataSet.setDpfA(FloatUtils.get2Float(map.get("Pq_DPFA"))); baseRealDataSet.setDpfA(FloatUtils.get2Float(map.get("Pq_DFA")));
baseRealDataSet.setDpfB(FloatUtils.get2Float(map.get("Pq_DPFB"))); baseRealDataSet.setDpfB(FloatUtils.get2Float(map.get("Pq_DFB")));
baseRealDataSet.setDpfC(FloatUtils.get2Float(map.get("Pq_DPFC"))); baseRealDataSet.setDpfC(FloatUtils.get2Float(map.get("Pq_DFC")));
baseRealDataSet.setDpfTot(FloatUtils.get2Float(map.get("Pq_TotDPFM"))); baseRealDataSet.setDpfTot(FloatUtils.get2Float(map.get("Pq_TotDFM")));
return baseRealDataSet; return baseRealDataSet;
} }

17
iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java
View File

@@ -3,7 +3,6 @@ package com.njcn.stat.service.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.nacos.shaded.com.google.gson.Gson; import com.alibaba.nacos.shaded.com.google.gson.Gson;
import com.njcn.access.api.CsLineLatestDataFeignClient; import com.njcn.access.api.CsLineLatestDataFeignClient;
import com.njcn.access.pojo.po.CsLineLatestData;
import com.njcn.access.utils.ChannelObjectUtil; import com.njcn.access.utils.ChannelObjectUtil;
import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.utils.PubUtils; import com.njcn.common.utils.PubUtils;
@@ -154,10 +153,10 @@ public class StatServiceImpl implements IStatService {
//influx数据批量入库 //influx数据批量入库
influxDbUtils.batchInsert(influxDbUtils.getDbName(), "", InfluxDB.ConsistencyLevel.ALL, TimeUnit.MILLISECONDS, recordList); influxDbUtils.batchInsert(influxDbUtils.getDbName(), "", InfluxDB.ConsistencyLevel.ALL, TimeUnit.MILLISECONDS, recordList);
//记录监测点最新数据时间 //记录监测点最新数据时间
CsLineLatestData csLineLatestData = new CsLineLatestData(); // CsLineLatestData csLineLatestData = new CsLineLatestData();
csLineLatestData.setLineId(lineId); // csLineLatestData.setLineId(lineId);
csLineLatestData.setTimeId(Objects.isNull(time) ? LocalDateTime.now() : time); // csLineLatestData.setTimeId(Objects.isNull(time) ? LocalDateTime.now() : time);
csLineLatestDataFeignClient.addData(csLineLatestData); // csLineLatestDataFeignClient.addData(csLineLatestData);
} }
} }
} }
@@ -220,7 +219,9 @@ public class StatServiceImpl implements IStatService {
String tableName = map.get(dataArrayList.get(i).getName()); String tableName = map.get(dataArrayList.get(i).getName());
Map<String, String> tags = new HashMap<>(); Map<String, String> tags = new HashMap<>();
tags.put(InfluxDBTableConstant.LINE_ID,lineId); 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.VALUE_TYPE,statMethod);
tags.put(InfluxDBTableConstant.CL_DID,clDid.toString()); tags.put(InfluxDBTableConstant.CL_DID,clDid.toString());
tags.put(InfluxDBTableConstant.PROCESS,process.toString()); tags.put(InfluxDBTableConstant.PROCESS,process.toString());
@@ -249,8 +250,4 @@ public class StatServiceImpl implements IStatService {
} }
return urlList; return urlList;
} }
//相别处理
} }