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

谐波算法调整

Browse Source
This commit is contained in:
xuyang
2023-09-15 11:10:07 +08:00
parent ddf54a568e
commit 4e76669d4e
2 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml
View File

@@ -5,7 +5,31 @@
<select id="getSumV" resultType="com.njcn.harmonic.pojo.po.day.RStatLimitTargetDPO">
SELECT
my_index as lineId,
sum(all_time) allTime,
sum( uaberrance_overtime ) +
sum( uharm_2_overtime ) +
sum( uharm_3_overtime ) +
sum( uharm_4_overtime ) +
sum( uharm_5_overtime ) +
sum( uharm_6_overtime ) +
sum( uharm_7_overtime ) +
sum( uharm_8_overtime ) +
sum( uharm_9_overtime ) +
sum( uharm_10_overtime )+
sum( uharm_11_overtime )+
sum( uharm_12_overtime )+
sum( uharm_13_overtime )+
sum( uharm_14_overtime )+
sum( uharm_15_overtime )+
sum( uharm_16_overtime )+
sum( uharm_17_overtime )+
sum( uharm_18_overtime )+
sum( uharm_19_overtime )+
sum( uharm_20_overtime )+
sum( uharm_21_overtime )+
sum( uharm_22_overtime )+
sum( uharm_23_overtime )+
sum( uharm_24_overtime )+
sum( uharm_25_overtime ) allTime,
sum( uaberrance_overtime ) AS uaberrance_overtime,
sum( uharm_2_overtime ) AS uharm_2_overtime,
sum( uharm_3_overtime ) AS uharm_3_overtime,
@@ -53,7 +77,30 @@
<select id="getSumI" resultType="com.njcn.harmonic.pojo.po.day.RStatLimitTargetDPO">
SELECT
my_index as lineId,
sum(all_time) allTime,
sum( iharm_2_overtime ) +
sum( iharm_3_overtime ) +
sum( iharm_4_overtime ) +
sum( iharm_5_overtime ) +
sum( iharm_6_overtime ) +
sum( iharm_7_overtime ) +
sum( iharm_8_overtime ) +
sum( iharm_9_overtime ) +
sum( iharm_10_overtime ) +
sum( iharm_11_overtime ) +
sum( iharm_12_overtime ) +
sum( iharm_13_overtime ) +
sum( iharm_14_overtime ) +
sum( iharm_15_overtime ) +
sum( iharm_16_overtime ) +
sum( iharm_17_overtime ) +
sum( iharm_18_overtime ) +
sum( iharm_19_overtime ) +
sum( iharm_20_overtime ) +
sum( iharm_21_overtime ) +
sum( iharm_22_overtime ) +
sum( iharm_23_overtime ) +
sum( iharm_24_overtime ) +
sum( iharm_25_overtime ) allTime,
sum( iharm_2_overtime ) AS iharm_2_overtime,
sum( iharm_3_overtime ) AS iharm_3_overtime,
sum( iharm_4_overtime ) AS iharm_4_overtime,

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

@@ -150,14 +150,10 @@ public class HarmonicServiceImpl implements IHarmonicService {
deptList.forEach(item->{
List<String> lineList = item.getLineIndexes();
if (!CollectionUtils.isEmpty(lineList)){
HarmonicDeptVO harmonicDeptVO = new HarmonicDeptVO();
List<RStatLimitTargetDPO> collect = limitTargetNew.stream().filter(x -> lineList.contains(x.getLineId())).collect(Collectors.toList());
List<RStatLimitTargetDPO> sumList = finalAllData.stream().filter(x -> lineList.contains(x.getLineId())).collect(Collectors.toList());
AreaDTO areaDTO = handleDataNew(collect, sumList, param.getStatisticalType().getCode());
BeanUtil.copyProperties(areaDTO,harmonicDeptVO);
harmonicDeptVO.setId(item.getIndex());
harmonicDeptVO.setName(item.getName());
@@ -406,7 +402,6 @@ public class HarmonicServiceImpl implements IHarmonicService {
onlineCount = data.size();
//在线监测点个数
areaDTO.setOnlineCount(onlineCount);
//超标监测点数
for (RStatLimitTargetDPO pojo : data) {
if (pojo.getAllTime()>0){
overLineCount = overLineCount + 1;
@@ -706,7 +701,7 @@ public class HarmonicServiceImpl implements IHarmonicService {
harmonicLineVO.setOverThirteenTimes(item.getUHarm13OverTime());
harmonicLineVO.setOverTwentyThreeTimes(item.getUHarm23OverTime());
harmonicLineVO.setOverTwentyFiveTimes(item.getUHarm25OverTime());
int otherTimes = item.getUHarm2OverTime()+item.getUHarm4OverTime()+item.getUHarm6OverTime()+item.getUHarm8OverTime()+item.getUHarm9OverTime()+item.getUHarm10OverTime()+item.getUHarm12OverTime()+item.getUHarm14OverTime()+item.getUHarm15OverTime()+item.getUHarm16OverTime()+item.getUHarm17OverTime()+item.getUHarm18OverTime()+item.getUHarm19OverTime()+item.getUHarm20OverTime()+item.getUHarm21OverTime()+item.getUHarm22OverTime()+item.getUHarm24OverTime();
int otherTimes = item.getUAberranceOverTime()+item.getUHarm2OverTime()+item.getUHarm4OverTime()+item.getUHarm6OverTime()+item.getUHarm8OverTime()+item.getUHarm9OverTime()+item.getUHarm10OverTime()+item.getUHarm12OverTime()+item.getUHarm14OverTime()+item.getUHarm15OverTime()+item.getUHarm16OverTime()+item.getUHarm17OverTime()+item.getUHarm18OverTime()+item.getUHarm19OverTime()+item.getUHarm20OverTime()+item.getUHarm21OverTime()+item.getUHarm22OverTime()+item.getUHarm24OverTime();
harmonicLineVO.setOtherTimes(otherTimes);
List<Integer> over = Stream.of(item.getUAberranceOverTime(),item.getUHarm2OverTime(),item.getUHarm3OverTime(),item.getUHarm4OverTime(),item.getUHarm5OverTime(),item.getUHarm6OverTime(),item.getUHarm7OverTime(),item.getUHarm8OverTime(),item.getUHarm9OverTime(),item.getUHarm10OverTime(),item.getUHarm11OverTime(),item.getUHarm12OverTime(),item.getUHarm13OverTime(),item.getUHarm14OverTime(),item.getUHarm15OverTime(),item.getUHarm16OverTime(),item.getUHarm17OverTime(),item.getUHarm18OverTime(),item.getUHarm19OverTime(),item.getUHarm20OverTime(),item.getUHarm21OverTime(),item.getUHarm22OverTime(),item.getUHarm23OverTime(),item.getUHarm24OverTime(),item.getUHarm25OverTime()).collect(Collectors.toList());
harmonicLineVO.setOverDays(Collections.max(over));