Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

完成专项分析联调

Browse Source
This commit is contained in:
wr
2025-04-09 18:10:59 +08:00
parent 929200c869
commit f54781eb70
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/SpThroughServiceImpl.java
View File

@@ -44,14 +44,13 @@ public class SpThroughServiceImpl extends MppServiceImpl<SpThroughMapper, SpThro
String treeId = dicTreeId(spThroughParam); String treeId = dicTreeId(spThroughParam);
DictData dip = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData(); DictData dip = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
if (ObjectUtil.isNotNull(dip)) { if (ObjectUtil.isNotNull(dip)) {
spThroughVO.setHighPressure(eventCount(spThroughParam, treeId, dip) + ""); spThroughVO.setLowPressure(eventCount(spThroughParam, treeId, dip) + "");
} }
DictData rise = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_RISE.getCode()).getData(); DictData rise = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_RISE.getCode()).getData();
if (ObjectUtil.isNotNull(rise)) { if (ObjectUtil.isNotNull(rise)) {
spThroughVO.setLowPressure(eventCount(spThroughParam, treeId, rise) + ""); spThroughVO.setHighPressure(eventCount(spThroughParam, treeId, rise) + "");
} }
} }
return spThroughVO; return spThroughVO;
} }

7
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/activepowerrange/impl/PowerStatisticsServiceImpl.java
View File

@@ -53,10 +53,7 @@ import java.util.stream.Collectors;
public class PowerStatisticsServiceImpl implements PowerStatisticsService { public class PowerStatisticsServiceImpl implements PowerStatisticsService {
private final RActivePowerRangeService rActivePowerRangeService; private final RActivePowerRangeService rActivePowerRangeService;
private final CommonService commonService;
private final DecimalFormat df = new DecimalFormat(Param.DECIMAL_FORMATSTR);
private final DecimalFormat dftwo = new DecimalFormat(Param.DECIMAL_FORMATTWOSTR); private final DecimalFormat dftwo = new DecimalFormat(Param.DECIMAL_FORMATTWOSTR);
private final EpdFeignClient epdFeignClient;
private final DataVFeignClient dataVFeignClient; private final DataVFeignClient dataVFeignClient;
private final DataIFeignClient dataIFeignClient; private final DataIFeignClient dataIFeignClient;
private final DataPltFeignClient dataPltFeignClient; private final DataPltFeignClient dataPltFeignClient;
@@ -140,8 +137,6 @@ public class PowerStatisticsServiceImpl implements PowerStatisticsService {
} }
} }
} }
} }
return record.stream().sorted(Comparator.comparing(PowerStatisticsTargetVO::getTime)).collect(Collectors.toList()); return record.stream().sorted(Comparator.comparing(PowerStatisticsTargetVO::getTime)).collect(Collectors.toList());
} }
@@ -298,7 +293,7 @@ public class PowerStatisticsServiceImpl implements PowerStatisticsService {
if (timeCross.contains(time)) { if (timeCross.contains(time)) {
return 1; return 1;
} }
return 1; return 0;
} }
/** /**