From 4e76669d4ef887ffdd914622a3fc671de4497b01 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Fri, 15 Sep 2023 11:10:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=90=E6=B3=A2=E7=AE=97=E6=B3=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapping/RStatLimitTargetDMapper.xml | 51 ++++++++++++++++++- .../service/impl/HarmonicServiceImpl.java | 7 +-- 2 files changed, 50 insertions(+), 8 deletions(-) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml index 06489bce2..2c9117798 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml @@ -5,7 +5,31 @@ 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, diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java index 539dbf798..d9681a7fa 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java @@ -150,14 +150,10 @@ public class HarmonicServiceImpl implements IHarmonicService { deptList.forEach(item->{ List lineList = item.getLineIndexes(); if (!CollectionUtils.isEmpty(lineList)){ - HarmonicDeptVO harmonicDeptVO = new HarmonicDeptVO(); List collect = limitTargetNew.stream().filter(x -> lineList.contains(x.getLineId())).collect(Collectors.toList()); - List 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 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));