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

微调

Browse Source
This commit is contained in:
xy
2026-04-16 16:15:23 +08:00
parent eaacce339e
commit 48c79b721e
4 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -299,12 +299,12 @@ public class RtServiceImpl implements IRtService {
baseRealDataSet.setSB(FloatUtils.get2Float(map.get("Pq_SB"))); baseRealDataSet.setSB(FloatUtils.get2Float(map.get("Pq_SB")));
baseRealDataSet.setSC(FloatUtils.get2Float(map.get("Pq_SC"))); baseRealDataSet.setSC(FloatUtils.get2Float(map.get("Pq_SC")));
baseRealDataSet.setSTot(FloatUtils.get2Float(map.get("Pq_TotSM"))); baseRealDataSet.setSTot(FloatUtils.get2Float(map.get("Pq_TotSM")));
//功率因数 //视在功率因数
baseRealDataSet.setPfA(FloatUtils.get2Float(map.get("Pq_PFA"))); baseRealDataSet.setPfA(FloatUtils.get2Float(map.get("Pq_PFA")));
baseRealDataSet.setPfB(FloatUtils.get2Float(map.get("Pq_PFB"))); baseRealDataSet.setPfB(FloatUtils.get2Float(map.get("Pq_PFB")));
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_DFA"))); baseRealDataSet.setDpfA(FloatUtils.get2Float(map.get("Pq_DFA")));
baseRealDataSet.setDpfB(FloatUtils.get2Float(map.get("Pq_DFB"))); baseRealDataSet.setDpfB(FloatUtils.get2Float(map.get("Pq_DFB")));
baseRealDataSet.setDpfC(FloatUtils.get2Float(map.get("Pq_DFC"))); baseRealDataSet.setDpfC(FloatUtils.get2Float(map.get("Pq_DFC")));

5
iot-analysis/analysis-zl-event/zl-event-boot/pom.xml
View File

@@ -99,6 +99,11 @@
<artifactId>event-common</artifactId> <artifactId>event-common</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
<version>2.7.12</version>
</dependency>
</dependencies> </dependencies>
<build> <build>

26
iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsWaveAnalysisServiceImpl.java
View File

@@ -1,8 +1,6 @@
package com.njcn.zlevent.service.impl; package com.njcn.zlevent.service.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.github.tocrhz.mqtt.publisher.MqttPublisher;
import com.njcn.access.api.CsTopicFeignClient;
import com.njcn.access.utils.ChannelObjectUtil; import com.njcn.access.utils.ChannelObjectUtil;
import com.njcn.access.utils.FileCommonUtils; import com.njcn.access.utils.FileCommonUtils;
import com.njcn.access.utils.MqttUtil; import com.njcn.access.utils.MqttUtil;
@@ -23,7 +21,6 @@ import com.njcn.zlevent.pojo.dto.WaveTimeDto;
import com.njcn.zlevent.service.ICsWaveAnalysisService; import com.njcn.zlevent.service.ICsWaveAnalysisService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@@ -43,8 +40,6 @@ import java.util.stream.Collectors;
public class CsWaveAnalysisServiceImpl implements ICsWaveAnalysisService { public class CsWaveAnalysisServiceImpl implements ICsWaveAnalysisService {
private final EquipmentFeignClient equipmentFeignClient; private final EquipmentFeignClient equipmentFeignClient;
private final MqttPublisher publisher;
private final CsTopicFeignClient csTopicFeignClient;
private final RedisUtil redisUtil; private final RedisUtil redisUtil;
private final CsLineFeignClient csLineFeignClient; private final CsLineFeignClient csLineFeignClient;
private final DicDataFeignClient dicDataFeignClient; private final DicDataFeignClient dicDataFeignClient;
@@ -172,16 +167,17 @@ public class CsWaveAnalysisServiceImpl implements ICsWaveAnalysisService {
throw new BusinessException(StatResponseEnum.LINE_NULL); throw new BusinessException(StatResponseEnum.LINE_NULL);
} }
for (CsLinePO item : lineList) { for (CsLinePO item : lineList) {
DictData dictData = dicDataFeignClient.getDicDataById(item.getPosition()).getData(); if (Objects.isNull(item.getPosition())){
if (Objects.isNull(dictData)){ map.put(item.getClDid(),item.getLineId());
throw new BusinessException(StatResponseEnum.DICT_NULL); } else {
} DictData dictData = dicDataFeignClient.getDicDataById(item.getPosition()).getData();
if (Objects.equals(dictData.getCode(), DicDataEnum.OUTPUT_SIDE.getCode())){ if (Objects.equals(dictData.getCode(), DicDataEnum.OUTPUT_SIDE.getCode())){
map.put(0,item.getLineId()); map.put(0,item.getLineId());
} else if (Objects.equals(dictData.getCode(), DicDataEnum.GRID_SIDE.getCode())){ } else if (Objects.equals(dictData.getCode(), DicDataEnum.GRID_SIDE.getCode())){
map.put(1,item.getLineId()); map.put(1,item.getLineId());
} else if (Objects.equals(dictData.getCode(), DicDataEnum.LOAD_SIDE.getCode())){ } else if (Objects.equals(dictData.getCode(), DicDataEnum.LOAD_SIDE.getCode())){
map.put(2,item.getLineId()); map.put(2,item.getLineId());
}
} }
} }
redisUtil.saveByKeyWithExpire(AppRedisKey.LINE_POSITION+id,map,30L); redisUtil.saveByKeyWithExpire(AppRedisKey.LINE_POSITION+id,map,30L);

31
iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java
View File

@@ -26,6 +26,7 @@ import com.njcn.redis.pojo.enums.AppRedisKey;
import com.njcn.redis.utils.RedisUtil; import com.njcn.redis.utils.RedisUtil;
import com.njcn.stat.enums.StatResponseEnum; import com.njcn.stat.enums.StatResponseEnum;
import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.api.DictTreeFeignClient;
import com.njcn.system.api.EpdFeignClient; import com.njcn.system.api.EpdFeignClient;
import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.pojo.dto.EpdDTO; import com.njcn.system.pojo.dto.EpdDTO;
@@ -77,6 +78,7 @@ public class EventServiceImpl implements IEventService {
private final SendEventUtils sendEventUtils; private final SendEventUtils sendEventUtils;
private final WlRecordFeignClient wlRecordFeignClient; private final WlRecordFeignClient wlRecordFeignClient;
private final WlRmpEventDetailMapper wlRmpEventDetailMapper; private final WlRmpEventDetailMapper wlRmpEventDetailMapper;
private final DictTreeFeignClient dictTreeFeignClient;
@Override @Override
@DSTransactional @DSTransactional
@@ -96,10 +98,10 @@ public class EventServiceImpl implements IEventService {
} }
//获取装置id //获取装置id
CsEquipmentDeliveryPO po = equipmentFeignClient.findDevByNDid(appEventMessage.getId()).getData(); CsEquipmentDeliveryPO po = equipmentFeignClient.findDevByNDid(appEventMessage.getId()).getData();
//获取设备类型 true:治理设备 false:其他类型的设备 //判断设备型号
boolean devModel = equipmentFeignClient.judgeDevModel(appEventMessage.getId()).getData(); String code = dictTreeFeignClient.queryById(po.getDevType()).getData().getCode();
try { try {
if (devModel) { if (Objects.equals(DicDataEnum.CONNECT_DEV.getCode(),code)) {
if (Objects.equals(appEventMessage.getDid(),1)){ if (Objects.equals(appEventMessage.getDid(),1)){
Object object = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appEventMessage.getId())), Map.class).get("0"); Object object = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appEventMessage.getId())), Map.class).get("0");
if (ObjectUtil.isNotNull(object)) { if (ObjectUtil.isNotNull(object)) {
@@ -173,7 +175,7 @@ public class EventServiceImpl implements IEventService {
fields.put(param.getName(),param.getData()); fields.put(param.getName(),param.getData());
} }
//只有治理型号的设备有监测位置 //只有治理型号的设备有监测位置
if (devModel) { if (Objects.equals(DicDataEnum.CONNECT_DEV.getCode(),code)) {
if (appEventMessage.getMsg().getClDid() == 1) { if (appEventMessage.getMsg().getClDid() == 1) {
fields.put("Evt_Param_Position","电网侧"); fields.put("Evt_Param_Position","电网侧");
csEvent.setLocation("grid"); csEvent.setLocation("grid");
@@ -420,16 +422,17 @@ public class EventServiceImpl implements IEventService {
throw new BusinessException(StatResponseEnum.LINE_NULL); throw new BusinessException(StatResponseEnum.LINE_NULL);
} }
for (CsLinePO item : lineList) { for (CsLinePO item : lineList) {
DictData dictData = dicDataFeignClient.getDicDataById(item.getPosition()).getData(); if (Objects.isNull(item.getPosition())){
if (Objects.isNull(dictData)){ map.put(item.getClDid(),item.getLineId());
throw new BusinessException(StatResponseEnum.DICT_NULL); } else {
} DictData dictData = dicDataFeignClient.getDicDataById(item.getPosition()).getData();
if (Objects.equals(dictData.getCode(), DicDataEnum.OUTPUT_SIDE.getCode())){ if (Objects.equals(dictData.getCode(), DicDataEnum.OUTPUT_SIDE.getCode())){
map.put(0,item.getLineId()); map.put(0,item.getLineId());
} else if (Objects.equals(dictData.getCode(), DicDataEnum.GRID_SIDE.getCode())){ } else if (Objects.equals(dictData.getCode(), DicDataEnum.GRID_SIDE.getCode())){
map.put(1,item.getLineId()); map.put(1,item.getLineId());
} else if (Objects.equals(dictData.getCode(), DicDataEnum.LOAD_SIDE.getCode())){ } else if (Objects.equals(dictData.getCode(), DicDataEnum.LOAD_SIDE.getCode())){
map.put(2,item.getLineId()); map.put(2,item.getLineId());
}
} }
} }
redisUtil.saveByKeyWithExpire(AppRedisKey.LINE_POSITION+id,map,30L); redisUtil.saveByKeyWithExpire(AppRedisKey.LINE_POSITION+id,map,30L);