From 458b2347ed9eb7234d8b7851c3ff61b37ca79ddf Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Tue, 16 Jul 2024 09:21:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pq/mapper/mapping/LineMapper.xml | 3 +- .../impl/RStatIntegrityDServiceImpl.java | 1 + .../service/impl/TerminalBaseServiceImpl.java | 2 +- .../mapping/RStatLimitTargetDMapper.xml | 285 ++++++++---------- .../harmonic/mapper/mapping/ReportMapper.xml | 102 +++---- .../service/impl/GridServiceImpl.java | 63 ++-- .../impl/RStatLimitServiceImpl.java | 2 +- .../device/impl/LineWarningServiceImpl.java | 43 ++- .../survey/impl/SurveyTestServiceImpl.java | 7 +- .../user/impl/UserReportPOServiceImpl.java | 12 +- .../main/resources/file/warningReport.docx | Bin 18216 -> 18774 bytes .../njcn/system/enums/DicDataTypeEnum.java | 1 + 12 files changed, 274 insertions(+), 247 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml index e60c36171..56be71c32 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml @@ -1714,12 +1714,13 @@ left join pq_voltage pv on pv.Id = pl2.Id left join pq_device pd on pl3.Id = pd.Id left join sys_dict_data sdd on pv.`Scale` = sdd.Id - where + pl.Id IN #{item} + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java index 6faeedb10..993db2817 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java @@ -96,6 +96,7 @@ public class RStatIntegrityDServiceImpl extends ServiceImpl imple deviceDetail.setCheckFlag(1); deviceDetail.setThisTimeCheck(PubUtils.localDateFormat(deviceParam.getThisTimeCheck())); deviceDetail.setNextTimeCheck(PubUtils.localDateFormat(deviceParam.getNextTimeCheck())); - deviceDetail.setLoginTime(PubUtils.localDateFormat(deviceParam.getNextTimeCheck())); + deviceDetail.setLoginTime(PubUtils.localDateFormat(deviceParam.getLoginTime())); deviceDetail.setUpdateTime(LocalDateTime.now()); //处理装置识别码秘钥 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 88045b35d..ef0a873b6 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 @@ -308,7 +308,7 @@ inuharm_15_overtime+ inuharm_16_overtime)>0,1,0)) AS allCount FROM - r_stat_limit_target_d + r_stat_limit_rate_d AND my_index IN @@ -353,160 +353,135 @@ diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/ReportMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/ReportMapper.xml index 8ea2a3998..968e3efab 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/ReportMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/ReportMapper.xml @@ -7,21 +7,21 @@ AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue, MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue, MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue, - MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value + MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value FROM ( SELECT phasic_type, value_type, rms, - rank + rankSum FROM ( SELECT phasic_type, value_type, rms, - @rank := IF( @CI := phasic_type, @rank + 1, 1 ) AS rank, + @rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum, @CI := phasic_type FROM r_stat_data_i_d @@ -61,21 +61,21 @@ AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue, MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue, MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue, - MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value + MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value FROM ( SELECT phasic_type, value_type, rms, - rank + rankSum FROM ( SELECT phasic_type, value_type, rms, - @rank := IF( @CI = phasic_type, @rank + 1, 1 ) AS rank, + @rankSum := IF( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum, @CI := phasic_type FROM r_stat_data_v_d @@ -175,21 +175,21 @@ AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue, MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue, MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue, - MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value + MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value FROM ( SELECT phasic_type, value_type, rms, - rank + rankSum FROM ( SELECT phasic_type, value_type, rms_lvr as rms, - @rank := IF( @CI = phasic_type, @rank + 1, 1 ) AS rank, + @rankSum := IF( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum, @CI := phasic_type FROM r_stat_data_v_d @@ -229,23 +229,23 @@ AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue, MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue, MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue, - MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value + MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value FROM ( SELECT phasic_type, value_type, rms, - rank + rankSum FROM ( SELECT phasic_type, value_type, p as rms, - @rank := + @rankSum := IF - ( @CI = phasic_type, @rank + 1, 1 ) AS rank, + ( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum, @CI := phasic_type FROM r_stat_data_harmpower_p_d @@ -288,23 +288,23 @@ AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue, MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue, MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue, - MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value + MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value FROM ( SELECT phasic_type, value_type, rms, - rank + rankSum FROM ( SELECT phasic_type, value_type, pf as rms, - @rank := + @rankSum := IF - ( @CI = phasic_type, @rank + 1, 1 ) AS rank, + ( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum, @CI := phasic_type FROM r_stat_data_harmpower_p_d @@ -347,23 +347,23 @@ AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue, MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue, MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue, - MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value + MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value FROM ( SELECT phasic_type, value_type, rms, - rank + rankSum FROM ( SELECT phasic_type, value_type, q as rms, - @rank := + @rankSum := IF - ( @CI = phasic_type, @rank + 1, 1 ) AS rank, + ( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum, @CI := phasic_type FROM r_stat_data_harmpower_q_d @@ -406,23 +406,23 @@ AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue, MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue, MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue, - MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value + MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value FROM ( SELECT phasic_type, value_type, rms, - rank + rankSum FROM ( SELECT phasic_type, value_type, s as rms, - @rank := + @rankSum := IF - ( @CI = phasic_type, @rank + 1, 1 ) AS rank, + ( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum, @CI := phasic_type FROM r_stat_data_harmpower_s_d @@ -465,23 +465,23 @@ AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue, MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue, MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue, - MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value + MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value FROM ( SELECT phasic_type, value_type, rms, - rank + rankSum FROM ( SELECT phasic_type, value_type, plt as rms, - @rank := + @rankSum := IF - ( @CI = phasic_type, @rank + 1, 1 ) AS rank, + ( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum, @CI := phasic_type FROM r_stat_data_flicker_d @@ -524,23 +524,23 @@ AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue, MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue, MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue, - MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value + MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value FROM ( SELECT phasic_type, value_type, rms, - rank + rankSum FROM ( SELECT phasic_type, value_type, pst as rms, - @rank := + @rankSum := IF - ( @CI = phasic_type, @rank + 1, 1 ) AS rank, + ( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum, @CI := phasic_type FROM r_stat_data_flicker_d @@ -583,21 +583,21 @@ AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue, MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue, MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue, - MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value + MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value FROM ( SELECT phasic_type, value_type, rms, - rank + rankSum FROM ( SELECT phasic_type, value_type, vu_dev as rms, - @rank := IF( @CI := phasic_type, @rank + 1, 1 ) AS rank, + @rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum, @CI := phasic_type FROM r_stat_data_v_d @@ -637,21 +637,21 @@ AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue, MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue, MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue, - MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value + MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value FROM ( SELECT phasic_type, value_type, rms, - rank + rankSum FROM ( SELECT phasic_type, value_type, vl_dev as rms, - @rank := IF( @CI := phasic_type, @rank + 1, 1 ) AS rank, + @rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum, @CI := phasic_type FROM r_stat_data_v_d @@ -691,21 +691,21 @@ AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue, MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue, MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue, - MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value + MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value FROM ( SELECT phasic_type, value_type, rms, - rank + rankSum FROM ( SELECT phasic_type, value_type, v_thd as rms, - @rank := IF( @CI := phasic_type, @rank + 1, 1 ) AS rank, + @rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum, @CI := phasic_type FROM r_stat_data_v_d @@ -745,21 +745,21 @@ AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue, MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue, MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue, - MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value + MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value FROM ( SELECT phasic_type, value_type, rms, - rank + rankSum FROM ( SELECT phasic_type, value_type, i_thd as rms, - @rank := IF( @CI := phasic_type, @rank + 1, 1 ) AS rank, + @rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum, @CI := phasic_type FROM r_stat_data_i_d @@ -799,21 +799,21 @@ AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue, MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue, MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue, - MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value + MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value FROM ( SELECT phasic_type, value_type, rms, - rank + rankSum FROM ( SELECT phasic_type, value_type, freq as rms, - @rank := IF( @CI := phasic_type, @rank + 1, 1 ) AS rank, + @rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum, @CI := phasic_type FROM r_stat_data_v_d @@ -853,21 +853,21 @@ AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue, MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue, MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue, - MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value + MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value FROM ( SELECT phasic_type, value_type, rms, - rank + rankSum FROM ( SELECT phasic_type, value_type, freq_dev as rms, - @rank := IF( @CI := phasic_type, @rank + 1, 1 ) AS rank, + @rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum, @CI := phasic_type FROM r_stat_data_v_d diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java index 6812c030d..a94c87bff 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java @@ -20,6 +20,7 @@ import com.njcn.harmonic.pojo.po.day.RStatAssesDPO; import com.njcn.harmonic.pojo.po.day.RStatDataPltDPO; import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO; import com.njcn.harmonic.pojo.po.day.RStatLimitTargetDPO; +import com.njcn.harmonic.pojo.vo.RStatLimitTargetVO; import com.njcn.harmonic.pojo.vo.hebeinorth.AssessDetailVo; import com.njcn.harmonic.pojo.vo.hebeinorth.AssessVo; import com.njcn.harmonic.pojo.vo.hebeinorth.EvaluationLevelVo; @@ -72,7 +73,6 @@ public class GridServiceImpl implements IGridService { List children = new ArrayList<>(); DeptGetLineParam deptGetLineParam = new DeptGetLineParam(); deptGetLineParam.setDeptId(param.getDeptIndex()); - deptGetLineParam.setServerName("harmonic-boot"); deptGetLineParam.setLineRunFlag(0); List list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData(); //获取监测点集合 @@ -124,7 +124,6 @@ public class GridServiceImpl implements IGridService { //查询部门监测点关系 DeptGetLineParam deptGetLineParam = new DeptGetLineParam(); deptGetLineParam.setDeptId(param.getDeptIndex()); - deptGetLineParam.setServerName("harmonic-boot"); deptGetLineParam.setLineRunFlag(0); List list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData(); //获取监测点集合 @@ -166,7 +165,6 @@ public class GridServiceImpl implements IGridService { //查询部门监测点关系 DeptGetLineParam deptGetLineParam = new DeptGetLineParam(); deptGetLineParam.setDeptId(param.getDeptIndex()); - deptGetLineParam.setServerName("harmonic-boot"); deptGetLineParam.setLineRunFlag(0); List list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData(); //获取监测点集合 @@ -270,7 +268,6 @@ public class GridServiceImpl implements IGridService { List childrenList = new ArrayList<>(); DeptGetLineParam deptGetLineParam = new DeptGetLineParam(); deptGetLineParam.setDeptId(param.getDeptIndex()); - deptGetLineParam.setServerName("harmonic-boot"); deptGetLineParam.setLineRunFlag(0); List list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData(); //获取监测点集合 @@ -319,7 +316,6 @@ public class GridServiceImpl implements IGridService { List result = new ArrayList<>(); DeptGetLineParam deptGetLineParam = new DeptGetLineParam(); deptGetLineParam.setDeptId(param.getDeptIndex()); - deptGetLineParam.setServerName("harmonic-boot"); deptGetLineParam.setLineRunFlag(0); List list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData(); //获取监测点集合 @@ -385,7 +381,6 @@ public class GridServiceImpl implements IGridService { List result = new ArrayList<>(); DeptGetLineParam deptGetLineParam = new DeptGetLineParam(); deptGetLineParam.setDeptId(param.getDeptIndex()); - deptGetLineParam.setServerName("harmonic-boot"); deptGetLineParam.setLineRunFlag(0); List list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData(); //获取监测点集合 @@ -430,7 +425,6 @@ public class GridServiceImpl implements IGridService { List result = new ArrayList<>(); DeptGetLineParam deptGetLineParam = new DeptGetLineParam(); deptGetLineParam.setDeptId(param.getDeptIndex()); - deptGetLineParam.setServerName("harmonic-boot"); deptGetLineParam.setLineRunFlag(0); List list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData(); //获取监测点集合 @@ -441,7 +435,7 @@ public class GridServiceImpl implements IGridService { .collect(Collectors.toList()); if (CollUtil.isNotEmpty(lineList)) { //获取监测点越限集合 - List overLimitList = rStatLimitTargetDMapper.getSumTarget(lineList,param.getStartTime(),param.getEndTime()); + List overLimitList = rStatLimitTargetDMapper.getSumTargetDetails(lineList,param.getStartTime(),param.getEndTime()); //获取部门 List deptList = deptFeignClient.getDepSonDetailByDeptId(param.getDeptIndex()).getData(); deptList.forEach(item->{ @@ -453,7 +447,7 @@ public class GridServiceImpl implements IGridService { List ll = lineMap.get(item.getId()); detail.setOnlineNum(ll.size()); //筛选当前部门下监测点的超标数据 - List list2 = overLimitList.stream().filter(it->ll.contains(it.getLineId())).collect(Collectors.toList()); + List list2 = overLimitList.stream().filter(it->ll.contains(it.getLineId())).collect(Collectors.toList()); EvaluationLevelVo.TargetDetail detail1 = new EvaluationLevelVo.TargetDetail(); detail1.setTargetName(DicDataEnum.FREQUENCY_DEV.getName()); EvaluationLevelVo.TargetDetail detail2 = new EvaluationLevelVo.TargetDetail(); @@ -464,47 +458,71 @@ public class GridServiceImpl implements IGridService { detail4.setTargetName(DicDataEnum.FLICKER.getName()); EvaluationLevelVo.TargetDetail detail5 = new EvaluationLevelVo.TargetDetail(); detail5.setTargetName(DicDataEnum.phase_Voltage.getName()); - + EvaluationLevelVo.TargetDetail detail6 = new EvaluationLevelVo.TargetDetail(); + detail6.setTargetName(DicDataEnum.NEG_CURRENT.getName()); + EvaluationLevelVo.TargetDetail detail7 = new EvaluationLevelVo.TargetDetail(); + detail7.setTargetName(DicDataEnum.HARMONIC_CURRENT.getName()); + EvaluationLevelVo.TargetDetail detail8 = new EvaluationLevelVo.TargetDetail(); + detail8.setTargetName(DicDataEnum.HARMONIC_VOLTAGE.getName()); + EvaluationLevelVo.TargetDetail detail9 = new EvaluationLevelVo.TargetDetail(); + detail9.setTargetName(DicDataEnum.INTERHARMONIC_VOLTAGE.getName()); if (CollUtil.isNotEmpty(list2)) { - //筛选出五项指标(电压偏差、频率偏差、电压总谐波畸变率、电压闪变、三相电压不平衡度)超标监测点 - long allNum = list2.stream().filter(o->o.getFreqDevOvertime() > 0 - || o.getVoltageDevOvertime() > 0 - || o.getFlickerOvertime() > 0 - || o.getUaberranceOvertime() > 0 - || o.getUbalanceOvertime() > 0).count(); + //筛选出9项指标(电压偏差、频率偏差、电压总谐波畸变率、电压闪变、三相电压不平衡度、负序电流、谐波电流、间谐波电压、谐波电压)超标监测点 + long allNum = list2.stream().filter(o->o.getAllOvertime() > 0).count(); detail.setOverNum((int) allNum); detail.setOverRatio(PubUtils.doubleRound(2,detail.getOverNum()*100.0/detail.getOnlineNum())); //筛选出电压偏差超标监测点 long num1 = list2.stream().filter(o->o.getFreqDevOvertime() > 0).count(); - Integer day1 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getFreqDevOvertime)).get().getFreqDevOvertime(); + Integer day1 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getFreqDevOvertime)).get().getFreqDevOvertime(); detail1.setOverNum((int) num1); detail1.setOverDay(day1); //筛选出频率偏差超标监测点 long num2 = list2.stream().filter(o->o.getVoltageDevOvertime() > 0).count(); - Integer day2 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getVoltageDevOvertime)).get().getVoltageDevOvertime(); + Integer day2 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getVoltageDevOvertime)).get().getVoltageDevOvertime(); detail2.setOverNum((int) num2); detail2.setOverDay(day2); //筛选出电压总谐波畸变率超标监测点 long num3 = list2.stream().filter(o->o.getUaberranceOvertime() > 0).count(); - Integer day3 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getUaberranceOvertime)).get().getUaberranceOvertime(); + Integer day3 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getUaberranceOvertime)).get().getUaberranceOvertime(); detail3.setOverNum((int) num3); detail3.setOverDay(day3); //筛选出电压闪变超标监测点 long num4 = list2.stream().filter(o->o.getFlickerOvertime() > 0).count(); - Integer day4 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getFlickerOvertime)).get().getFlickerOvertime(); + Integer day4 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getFlickerOvertime)).get().getFlickerOvertime(); detail4.setOverNum((int) num4); detail4.setOverDay(day4); //筛选出三相电压不平衡度超标监测点 long num5 = list2.stream().filter(o->o.getUbalanceOvertime() > 0).count(); - Integer day5 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getUbalanceOvertime)).get().getUbalanceOvertime(); + Integer day5 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getUbalanceOvertime)).get().getUbalanceOvertime(); detail5.setOverNum((int) num5); detail5.setOverDay(day5); + + //筛选出负序电流超标监测点 + long num6 = list2.stream().filter(o->o.getINegOvertime() > 0).count(); + Integer day6 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getINegOvertime)).get().getINegOvertime(); + detail6.setOverNum((int) num6); + detail6.setOverDay(day6); + + long num7 = list2.stream().filter(o->o.getIharmOvertime() > 0).count(); + Integer day7 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getIharmOvertime)).get().getIharmOvertime(); + detail7.setOverNum((int) num7); + detail7.setOverDay(day7); + + long num8 = list2.stream().filter(o->o.getUharmOvertime() > 0).count(); + Integer day8 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getUharmOvertime)).get().getUharmOvertime(); + detail8.setOverNum((int) num8); + detail8.setOverDay(day8); + + long num9 = list2.stream().filter(o->o.getInuharmOvertime() > 0).count(); + Integer day9 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getInuharmOvertime)).get().getInuharmOvertime(); + detail9.setOverNum((int) num9); + detail9.setOverDay(day9); } - List details = Arrays.asList(detail1, detail2, detail3, detail4, detail5); + List details = Arrays.asList(detail1, detail2, detail3, detail4, detail5, detail6, detail7, detail8, detail9); detail.setList(details); } result.add(detail); @@ -519,7 +537,6 @@ public class GridServiceImpl implements IGridService { List result = new ArrayList<>(); DeptGetLineParam deptGetLineParam = new DeptGetLineParam(); deptGetLineParam.setDeptId(param.getDeptIndex()); - deptGetLineParam.setServerName("harmonic-boot"); deptGetLineParam.setLineRunFlag(0); List list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData(); //获取监测点集合 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java index 0bd414450..5b8d9803e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java @@ -259,7 +259,7 @@ public class RStatLimitServiceImpl implements RStatLimitService { List online = onData.stream().flatMap(x -> x.getLineIndexes().stream()).distinct().collect(Collectors.toList()); StatSubstationBizBaseParam baseParam=new StatSubstationBizBaseParam(); - baseParam.setIds(online); + baseParam.setIds(line); baseParam.setStartTime(DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())).toString()); baseParam.setEndTime(DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())).toString()); List linesTarget=targetDService.getLinesTarget(baseParam); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java index 5917c3bab..eb681e311 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java @@ -86,7 +86,7 @@ public class LineWarningServiceImpl extends MppServiceImpl list1 = getReportLineInfo(true,param.getIdList(),null,param.getSearchBeginTime(),param.getSearchEndTime(),param.getDeptId(),allLineWarnings); //获取谐波电压超标监测点集合 @@ -272,7 +272,10 @@ public class LineWarningServiceImpl extends MppServiceImpl dataList1 = new ArrayList(),dataList2 = new ArrayList(),dataList3 = new ArrayList(); if (CollUtil.isNotEmpty(list1)) { @@ -336,13 +339,18 @@ public class LineWarningServiceImpl extends MppServiceImpl getOverLimitDetail(OnlineParam.DetailParam param) { + List result = new ArrayList<>(); String targetCode = dicDataFeignClient.getDicDataById(param.getTargetId()).getData().getCode(); //获取监测点统计间隔 Integer timeInterval = commTerminalGeneralClient.getMonitorDetail(param.getLineId()).getData().getInterval(); //获取限值 Overlimit overlimit = commTerminalGeneralClient.getOverLimitData(param.getLineId()).getData(); //处理数据 - return chanelTarget(param,overlimit,timeInterval,targetCode); + List data = chanelTarget(param,overlimit,timeInterval,targetCode); + if (CollUtil.isNotEmpty(data)) { + result = data.stream().sorted(Comparator.comparing(LineLimitDetailVo::getTime)).collect(Collectors.toList()); + } + return result; } //指标数据处理 @@ -401,7 +409,7 @@ public class LineWarningServiceImpl extends MppServiceImpl list = limitRateDClient.getOverData(param.getLineId(),param.getSearchBeginTime(),param.getSearchEndTime(),4).getData(); if (CollUtil.isNotEmpty(list)) { list.forEach(item->{ @@ -583,6 +591,19 @@ public class LineWarningServiceImpl extends MppServiceImpl getReportLineInfo(boolean type, List idList, String codeId, String startTime, String endTime, String deptId,List allLineWarnings) { List list = new ArrayList<>(); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -786,7 +807,7 @@ public class LineWarningServiceImpl extends MppServiceImpl result = new ArrayList<>(dataVMapper.getStatisticsByWraper(influxQueryWrapper)); InfluxQueryWrapper influxQueryWrapper2 = new InfluxQueryWrapper(DataV.class); influxQueryWrapper2.eq(DataV::getLineId, lineIndex) .eq(DataV::getValueType, InfluxDbSqlConstant.MAX) - .regular(DataV::getPhaseType,Arrays.asList("A","B","C")) + .regular(DataV::getPhasicType,Arrays.asList("A","B","C")) .max(DataV::getVuDev) .between(DataV::getTime, startTime, endTime); result.addAll(dataVMapper.getStatisticsByWraper(influxQueryWrapper2)); @@ -832,7 +853,7 @@ public class LineWarningServiceImpl extends MppServiceImpl surveyTestVOQueryWrapper = new QueryWrapper<>(); if (Objects.nonNull(surveyTestQueryParam)) { //添加上时间范围 - surveyTestVOQueryWrapper.between("supervision_survey_test.create_time", + surveyTestVOQueryWrapper.between("supervision_survey_plan.plan_start_time", DateUtil.beginOfDay(DateUtil.parse(surveyTestQueryParam.getSearchBeginTime())), DateUtil.endOfDay(DateUtil.parse(surveyTestQueryParam.getSearchEndTime()))); //根据工程名称模糊搜索 @@ -121,6 +121,9 @@ public class SurveyTestServiceImpl extends ServiceImpl surveyTestVOPage = this.baseMapper.surveyTestPage(new Page<>(PageFactory.getPageNum(surveyTestQueryParam), PageFactory.getPageSize(surveyTestQueryParam)), surveyTestVOQueryWrapper); List records = surveyTestVOPage.getRecords(); if (CollectionUtil.isNotEmpty(records)) { @@ -358,7 +361,7 @@ public class SurveyTestServiceImpl extends ServiceImpl evaluationType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVALUATION_TYPE.getCode()).getData(); //指标类型 - List indicatorType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.INDICATOR_TYPE.getCode()).getData(); + List indicatorType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.PROBLEM_INDICATORS.getCode()).getData(); //行业类型 List industryType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.INDUSTRY_TYPE_JB.getCode()).getData(); //负荷级别 @@ -671,6 +671,8 @@ public class UserReportPOServiceImpl extends ServiceImpl devVoltage = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData(); //指标类型 List indicatorType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.INDICATOR_TYPE.getCode()).getData(); + //敏感用户字典 + List problemIndicators = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.PROBLEM_INDICATORS.getCode()).getData(); //评估类型 List evaluationType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVALUATION_TYPE.getCode()).getData(); //行业类型 @@ -717,12 +719,18 @@ public class UserReportPOServiceImpl extends ServiceImpl indexList = new ArrayList<>(); UserReportSensitivePO userReportSensitivePO = new UserReportSensitivePO(); userReportSensitivePO.setId(userReportPO.getId()); userReportSensitivePO.setPccPoint(userExcel.getPccPoint()); userReportSensitivePO.setDeviceName(userExcel.getDeviceName()); userReportSensitivePO.setPowerSupplyCount(userExcel.getPowerSupplyCount()); - userReportSensitivePO.setEnergyQualityIndex(PubUtil.getDicById(userExcel.getEnergyQualityIndex(), indicatorType)); + //处理多指标数据 + String[] indexArr = userExcel.getEnergyQualityIndex().split(","); + for (String s : indexArr) { + indexList.add(PubUtil.getDicById(s, problemIndicators)); + } + userReportSensitivePO.setEnergyQualityIndex(indexList.stream().map(String::valueOf).collect(Collectors.joining(","))); userReportSensitivePO.setEvaluationType(PubUtil.getDicById(userExcel.getEvaluationType(), evaluationType)); userReportSensitivePO.setAntiInterferenceTest(userExcel.getAntiInterferenceTest() + ""); userReportSensitivePO.setEvaluationChekDept(userExcel.getEvaluationChekDept()); diff --git a/pqs-supervision/supervision-boot/src/main/resources/file/warningReport.docx b/pqs-supervision/supervision-boot/src/main/resources/file/warningReport.docx index d78405cbf0077fbbb682b372d803c660a4a23dea..e198fc6b06d4a05964a32461169fff34c69eba0a 100644 GIT binary patch delta 9902 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 Jk^Il>{{dxW3C#ci delta 9306 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 diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java index e3b9f0c97..788177b08 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java @@ -80,6 +80,7 @@ public enum DicDataTypeEnum { CS_DATA_TYPE("数据模型类别", "Cs_Data_Type"), + PROBLEM_INDICATORS("问题指标","Problem_Indicators"), //pms