From 779b95d6b5d219a8e5fc69e6d93706c89b55e86e Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Mon, 6 Mar 2023 10:32:03 +0800 Subject: [PATCH] =?UTF-8?q?1.pms=20bug=E4=BF=AE=E6=94=B9=202.=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E7=82=B9=E7=A8=B3=E6=80=81=E6=8C=87=E6=A0=87=E5=90=88?= =?UTF-8?q?=E6=A0=BC=E7=8E=87=E7=AE=97=E6=B3=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/RMpBenchmarkLevelParam.java | 3 + .../pojo/vo/RStatOrgBusbarVoltageVO.java | 12 +- .../mapping/RStatOrgBusbarVoltageMMapper.xml | 122 ++++++--- .../mapping/RStatOrgBusbarVoltageQMapper.xml | 124 ++++++--- .../mapping/RStatOrgBusbarVoltageYMapper.xml | 145 ++++++---- .../majornetwork/mapping/RStatOrgMMapper.xml | 20 +- .../majornetwork/mapping/RStatOrgQMapper.xml | 22 +- .../majornetwork/mapping/RStatOrgYMapper.xml | 5 +- .../impl/RMpBenchmarkLevelMServiceImpl.java | 73 ++++- .../impl/RMpBenchmarkLevelQServiceImpl.java | 73 ++++- .../impl/RMpBenchmarkLevelYServiceImpl.java | 74 +++++- .../RStatOrgBusbarVoltageServiceImpl.java | 41 +-- .../com/njcn/executor/handler/DayJob.java | 1 - .../line/RmpPassRateController.java | 65 +++++ .../mapper/mysql/line/RMpPassRateDMapper.java | 15 ++ .../mapper/mysql/line/RMpPassRateMMapper.java | 15 ++ .../mapper/mysql/line/RMpPassRateQMapper.java | 15 ++ .../mapper/mysql/line/RMpPassRateYMapper.java | 15 ++ .../mysql/line/mapping/RMpPassRateDMapper.xml | 18 ++ .../mysql/line/mapping/RMpPassRateMMapper.xml | 17 ++ .../mysql/line/mapping/RMpPassRateQMapper.xml | 17 ++ .../mysql/line/mapping/RMpPassRateYMapper.xml | 17 ++ .../area/EffectiveMinuteCountServiceImpl.java | 4 +- .../Impl/line/RMpPassRateDServiceImpl.java | 20 ++ .../Impl/line/RMpPassRateMServiceImpl.java | 20 ++ .../Impl/line/RMpPassRateQServiceImpl.java | 20 ++ .../Impl/line/RMpPassRateYServiceImpl.java | 20 ++ .../Impl/line/RmpPassRateServiceImpl.java | 250 ++++++++++++++++++ .../mysql/line/RMpPassRateDService.java | 17 ++ .../mysql/line/RMpPassRateMService.java | 17 ++ .../mysql/line/RMpPassRateQService.java | 17 ++ .../mysql/line/RMpPassRateYService.java | 17 ++ .../mysql/line/RmpPassRateService.java | 15 ++ .../pojo/mysql/po/line/RMpPassRateDPO.java | 162 ++++++++++++ .../pojo/mysql/po/line/RMpPassRateMPO.java | 138 ++++++++++ .../pojo/mysql/po/line/RMpPassRateQPO.java | 138 ++++++++++ .../pojo/mysql/po/line/RMpPassRateYPO.java | 138 ++++++++++ .../vo/RStatElectricQualityProblemLogVO.java | 8 + .../RStatElectricQualityProblemLogMapper.java | 21 ++ .../service/impl/IssuesServiceImpl.java | 21 +- .../impl/LoadTypeUserManageServiceImpl.java | 6 + .../impl/RGeneralSurveyPlanPOServiceImpl.java | 2 + .../RStatDistributionProblemServiceImpl.java | 4 + 43 files changed, 1735 insertions(+), 229 deletions(-) create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/RmpPassRateController.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPassRateDMapper.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPassRateMMapper.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPassRateQMapper.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPassRateYMapper.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPassRateDMapper.xml create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPassRateMMapper.xml create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPassRateQMapper.xml create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPassRateYMapper.xml create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateDServiceImpl.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateMServiceImpl.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateQServiceImpl.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateYServiceImpl.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RmpPassRateServiceImpl.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateDService.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateMService.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateQService.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateYService.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RmpPassRateService.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/RMpPassRateDPO.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/RMpPassRateMPO.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/RMpPassRateQPO.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/RMpPassRateYPO.java diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RMpBenchmarkLevelParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RMpBenchmarkLevelParam.java index 7516381fa..b2a45e6cc 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RMpBenchmarkLevelParam.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RMpBenchmarkLevelParam.java @@ -27,6 +27,9 @@ public class RMpBenchmarkLevelParam extends StatisticsBizBaseParam { @ApiModelProperty(name = "monitorTags", value = "监测点标签") private List monitorTags; + @ApiModelProperty(name = "type", value = "1：稳态接口返回2：暂态接口返回") + private String returnType; + @ApiModelProperty("页码") private Integer pageNum; @ApiModelProperty("页面尺寸") diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgBusbarVoltageVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgBusbarVoltageVO.java index 4295250e6..53fe20daa 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgBusbarVoltageVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgBusbarVoltageVO.java @@ -51,22 +51,22 @@ public class RStatOrgBusbarVoltageVO implements Serializable { @ApiModelProperty(value = "累计闪变超标-占比") private Float flickerAccrued; - @ApiModelProperty(value = "日均谐波电压超标同比-占比") + @ApiModelProperty(value = "日均谐波电压超标同比-同比") private Float averageSame; - @ApiModelProperty(value = "累计谐波电压超标同比-占比") + @ApiModelProperty(value = "累计谐波电压超标同比-同比") private Float accruedSame; - @ApiModelProperty(value = "日均三相电压不平衡超标同比-占比") + @ApiModelProperty(value = "日均三相电压不平衡超标同比-同比") private Float unbalanceAverageSame; - @ApiModelProperty(value = "累计三相电压不平衡超标同比-占比") + @ApiModelProperty(value = "累计三相电压不平衡超标同比-同比") private Float unbalanceAccruedSame; - @ApiModelProperty(value = "日均闪变超标同比-占比") + @ApiModelProperty(value = "日均闪变超标同比-同比") private Float flickerAverageSame; - @ApiModelProperty(value = "累计闪变超标同比-占比") + @ApiModelProperty(value = "累计闪变超标同比-同比") private Float flickerAccruedSame; } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgBusbarVoltageMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgBusbarVoltageMMapper.xml index 3cf28ff52..dbcc21f18 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgBusbarVoltageMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgBusbarVoltageMMapper.xml @@ -16,48 +16,86 @@ diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgBusbarVoltageQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgBusbarVoltageQMapper.xml index 76c19529c..d600d4acc 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgBusbarVoltageQMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgBusbarVoltageQMapper.xml @@ -16,49 +16,87 @@ + diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgBusbarVoltageYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgBusbarVoltageYMapper.xml index a62c826fb..ed467277e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgBusbarVoltageYMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgBusbarVoltageYMapper.xml @@ -1,64 +1,99 @@ - - - - - - - - - - - + + + + + + + + + + - diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml index 798d46699..b9b034d39 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml @@ -140,19 +140,15 @@ diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml index e447eeb9e..c65f51ded 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml @@ -140,19 +140,15 @@ diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml index f2ae6580e..620f0f063 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml @@ -144,11 +144,8 @@ org_no, effective_measurement_accrued as allCount, freq_pass_rate, - freq_pass_rate as freqPassRateYear, v_dev_pass_rate, - v_dev_pass_rate as vDevPassRateYear, - flicker_pass_rate, - flicker_pass_rate as flickerPassRateYear + flicker_pass_rate from r_stat_org_y rso diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelMServiceImpl.java index 344c907e4..2cb86a5e7 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelMServiceImpl.java @@ -10,9 +10,7 @@ import com.njcn.device.pms.api.MonitorClient; import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient; import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; import com.njcn.device.pms.pojo.dto.PmsMonitorDTO; -import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO; import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; -import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam; import com.njcn.device.pms.pojo.param.PmsMonitorParam; import com.njcn.harmonic.mapper.majornetwork.RMpBenchmarkLevelMMapper; import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam; @@ -27,10 +25,8 @@ import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.text.DecimalFormat; +import java.util.*; import java.util.stream.Collectors; /** @@ -48,6 +44,7 @@ implements RMpBenchmarkLevelMService { private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient; private final MonitorClient monitorClient; + private DecimalFormat df = new DecimalFormat("#.00"); @Override public List getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) { @@ -129,6 +126,70 @@ implements RMpBenchmarkLevelMService { rMpBenchmarkLevelVO.setVoltageLevelName(voltageLevelMap.get(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel())); return rMpBenchmarkLevelVO; }).collect(Collectors.toList()); + /*添加type在区分接口返回值*/ + if(Objects.equals (rMpBenchmarkLevelParam.getReturnType (), "1")){ + Map> collect = resultList.stream ( ).collect (Collectors.groupingBy (temp -> temp.getOrgName ( ) + temp.getVoltageLevel ())); + List finalList= new ArrayList<> (); + collect.forEach ((k, v) ->{ + RMpBenchmarkLevelVO rMpBenchmarkLevelVO = new RMpBenchmarkLevelVO(); + rMpBenchmarkLevelVO.setOrgName (v.get (0).getOrgName ()); + rMpBenchmarkLevelVO.setVoltageLevel (v.get (0).getVoltageLevel ()); + rMpBenchmarkLevelVO.setVoltageLevelName (v.get (0).getVoltageLevelName ()); + rMpBenchmarkLevelVO.setVoltageAvg (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getVoltageAvg). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setVoltageSd (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getVoltageSd). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setUnbalanceAvg (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getUnbalanceAvg). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setUnbalanceSd (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getUnbalanceSd). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setVthdAvg (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getVthdAvg). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setVthdSd (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getVthdSd). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setFlickerAvg (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getFlickerAvg). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setFlickerSd (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getFlickerSd). + average (). + getAsDouble ()))); + + finalList.add (rMpBenchmarkLevelVO); + }); + return finalList; + }else if( + Objects.equals (rMpBenchmarkLevelParam.getReturnType (), "2") + ){ + Map> collect = resultList.stream ( ).collect (Collectors.groupingBy (temp -> temp.getOrgName ( ) + temp.getMonitorTag ())); + List finalList= new ArrayList<> (); + collect.forEach ((k, v) ->{ + RMpBenchmarkLevelVO rMpBenchmarkLevelVO = new RMpBenchmarkLevelVO(); + rMpBenchmarkLevelVO.setOrgName (v.get (0).getOrgName ()); + rMpBenchmarkLevelVO.setMonitorTag (v.get (0).getMonitorTag ()); + + rMpBenchmarkLevelVO.setEventAvg (v.stream ().mapToDouble (RMpBenchmarkLevelVO::getEventAvg).sum ()); + rMpBenchmarkLevelVO.setRiseAvg (v.stream ().mapToDouble (RMpBenchmarkLevelVO::getRiseAvg).sum ()); + rMpBenchmarkLevelVO.setInterruptAvg (v.stream ().mapToDouble (RMpBenchmarkLevelVO::getInterruptAvg).sum ()); + finalList.add (rMpBenchmarkLevelVO); + }); + return finalList; + + } + return resultList; } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelQServiceImpl.java index 0a3bb3913..c1c84edaa 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelQServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelQServiceImpl.java @@ -10,9 +10,7 @@ import com.njcn.device.pms.api.MonitorClient; import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient; import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; import com.njcn.device.pms.pojo.dto.PmsMonitorDTO; -import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO; import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; -import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam; import com.njcn.device.pms.pojo.param.PmsMonitorParam; import com.njcn.harmonic.mapper.majornetwork.RMpBenchmarkLevelQMapper; import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam; @@ -27,10 +25,8 @@ import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.text.DecimalFormat; +import java.util.*; import java.util.stream.Collectors; /** @@ -48,6 +44,7 @@ implements RMpBenchmarkLevelQService { private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient; private final MonitorClient monitorClient; + private DecimalFormat df = new DecimalFormat("#.00"); @Override public List getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) { @@ -129,6 +126,70 @@ implements RMpBenchmarkLevelQService { rMpBenchmarkLevelVO.setVoltageLevelName(voltageLevelMap.get(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel())); return rMpBenchmarkLevelVO; }).collect(Collectors.toList()); + /*添加type在区分接口返回值*/ + if(Objects.equals (rMpBenchmarkLevelParam.getReturnType (), "1")){ + Map> collect = resultList.stream ( ).collect (Collectors.groupingBy (temp -> temp.getOrgName ( ) + temp.getVoltageLevel ())); + List finalList= new ArrayList<> (); + collect.forEach ((k, v) ->{ + RMpBenchmarkLevelVO rMpBenchmarkLevelVO = new RMpBenchmarkLevelVO(); + rMpBenchmarkLevelVO.setOrgName (v.get (0).getOrgName ()); + rMpBenchmarkLevelVO.setVoltageLevel (v.get (0).getVoltageLevel ()); + rMpBenchmarkLevelVO.setVoltageLevelName (v.get (0).getVoltageLevelName ()); + rMpBenchmarkLevelVO.setVoltageAvg (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getVoltageAvg). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setVoltageSd (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getVoltageSd). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setUnbalanceAvg (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getUnbalanceAvg). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setUnbalanceSd (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getUnbalanceSd). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setVthdAvg (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getVthdAvg). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setVthdSd (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getVthdSd). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setFlickerAvg (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getFlickerAvg). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setFlickerSd (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getFlickerSd). + average (). + getAsDouble ()))); + + finalList.add (rMpBenchmarkLevelVO); + }); + return finalList; + }else if( + Objects.equals (rMpBenchmarkLevelParam.getReturnType (), "2") + ){ + Map> collect = resultList.stream ( ).collect (Collectors.groupingBy (temp -> temp.getOrgName ( ) + temp.getMonitorTag ())); + List finalList= new ArrayList<> (); + collect.forEach ((k, v) ->{ + RMpBenchmarkLevelVO rMpBenchmarkLevelVO = new RMpBenchmarkLevelVO(); + rMpBenchmarkLevelVO.setOrgName (v.get (0).getOrgName ()); + rMpBenchmarkLevelVO.setMonitorTag (v.get (0).getMonitorTag ()); + + rMpBenchmarkLevelVO.setEventAvg (v.stream ().mapToDouble (RMpBenchmarkLevelVO::getEventAvg).sum ()); + rMpBenchmarkLevelVO.setRiseAvg (v.stream ().mapToDouble (RMpBenchmarkLevelVO::getRiseAvg).sum ()); + rMpBenchmarkLevelVO.setInterruptAvg (v.stream ().mapToDouble (RMpBenchmarkLevelVO::getInterruptAvg).sum ()); + finalList.add (rMpBenchmarkLevelVO); + }); + return finalList; + + } + return resultList; } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelYServiceImpl.java index 890103036..4f956c089 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelYServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelYServiceImpl.java @@ -10,9 +10,7 @@ import com.njcn.device.pms.api.MonitorClient; import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient; import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; import com.njcn.device.pms.pojo.dto.PmsMonitorDTO; -import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO; import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; -import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam; import com.njcn.device.pms.pojo.param.PmsMonitorParam; import com.njcn.harmonic.mapper.majornetwork.RMpBenchmarkLevelYMapper; import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam; @@ -27,10 +25,8 @@ import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.text.DecimalFormat; +import java.util.*; import java.util.stream.Collectors; /** @@ -48,6 +44,8 @@ implements RMpBenchmarkLevelYService { private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient; private final MonitorClient monitorClient; + private DecimalFormat df = new DecimalFormat("#.00"); + @Override public List getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) { @@ -129,6 +127,70 @@ implements RMpBenchmarkLevelYService { rMpBenchmarkLevelVO.setVoltageLevelName(voltageLevelMap.get(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel())); return rMpBenchmarkLevelVO; }).collect(Collectors.toList()); + /*添加type在区分接口返回值*/ + if(Objects.equals (rMpBenchmarkLevelParam.getReturnType (), "1")){ + Map> collect = resultList.stream ( ).collect (Collectors.groupingBy (temp -> temp.getOrgName ( ) + temp.getVoltageLevel ())); + List finalList= new ArrayList<> (); + collect.forEach ((k, v) ->{ + RMpBenchmarkLevelVO rMpBenchmarkLevelVO = new RMpBenchmarkLevelVO(); + rMpBenchmarkLevelVO.setOrgName (v.get (0).getOrgName ()); + rMpBenchmarkLevelVO.setVoltageLevel (v.get (0).getVoltageLevel ()); + rMpBenchmarkLevelVO.setVoltageLevelName (v.get (0).getVoltageLevelName ()); + rMpBenchmarkLevelVO.setVoltageAvg (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getVoltageAvg). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setVoltageSd (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getVoltageSd). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setUnbalanceAvg (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getUnbalanceAvg). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setUnbalanceSd (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getUnbalanceSd). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setVthdAvg (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getVthdAvg). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setVthdSd (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getVthdSd). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setFlickerAvg (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getFlickerAvg). + average (). + getAsDouble ()))); + rMpBenchmarkLevelVO.setFlickerSd (Double.valueOf (df.format (v.stream (). + mapToDouble (RMpBenchmarkLevelVO::getFlickerSd). + average (). + getAsDouble ()))); + + finalList.add (rMpBenchmarkLevelVO); + }); + return finalList; + }else if( + Objects.equals (rMpBenchmarkLevelParam.getReturnType (), "2") + ){ + Map> collect = resultList.stream ( ).collect (Collectors.groupingBy (temp -> temp.getOrgName ( ) + temp.getMonitorTag ())); + List finalList= new ArrayList<> (); + collect.forEach ((k, v) ->{ + RMpBenchmarkLevelVO rMpBenchmarkLevelVO = new RMpBenchmarkLevelVO(); + rMpBenchmarkLevelVO.setOrgName (v.get (0).getOrgName ()); + rMpBenchmarkLevelVO.setMonitorTag (v.get (0).getMonitorTag ()); + + rMpBenchmarkLevelVO.setEventAvg (v.stream ().mapToDouble (RMpBenchmarkLevelVO::getEventAvg).sum ()); + rMpBenchmarkLevelVO.setRiseAvg (v.stream ().mapToDouble (RMpBenchmarkLevelVO::getRiseAvg).sum ()); + rMpBenchmarkLevelVO.setInterruptAvg (v.stream ().mapToDouble (RMpBenchmarkLevelVO::getInterruptAvg).sum ()); + finalList.add (rMpBenchmarkLevelVO); + }); + return finalList; + + } + return resultList; } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgBusbarVoltageServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgBusbarVoltageServiceImpl.java index 7d225eaec..c19ca15d5 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgBusbarVoltageServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgBusbarVoltageServiceImpl.java @@ -2,22 +2,18 @@ package com.njcn.harmonic.service.majornetwork.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.constant.BizParamConstant; import com.njcn.device.pms.api.PmsGeneratrixClient; -import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; -import com.njcn.device.pms.pojo.param.PmsGeneratrixParam; +import com.njcn.harmonic.mapper.majornetwork.RStatOrgBusbarVoltageMMapper; import com.njcn.harmonic.mapper.majornetwork.RStatOrgBusbarVoltageQMapper; import com.njcn.harmonic.mapper.majornetwork.RStatOrgBusbarVoltageYMapper; import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam; import com.njcn.harmonic.pojo.po.RStatOrgBusbarVoltageM; -import com.njcn.harmonic.mapper.majornetwork.RStatOrgBusbarVoltageMMapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.harmonic.pojo.vo.RStatOrgBusbarVoltageVO; import com.njcn.harmonic.service.majornetwork.RStatOrgBusbarVoltageService; -import com.njcn.harmonic.utils.DeptUtil; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.dto.DeptDTO; -import com.njcn.web.utils.WebUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -48,8 +44,7 @@ public class RStatOrgBusbarVoltageServiceImpl extends ServiceImpl getRStatOrgBusbarVoltage(StatSubstationBizBaseParam param) { //获取部门信息 - List data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - //List data = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); + List data = deptFeignClient.getDepSonDetailByDeptId(param.getId()).getData(); Map deptMap = data.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); @@ -78,30 +73,12 @@ public class RStatOrgBusbarVoltageServiceImpl extends ServiceImpl busbarIds = temp.stream().map(RStatOrgBusbarVoltageVO::getBusbarId).collect(Collectors.toList()); - PmsGeneratrixParam generatrixParam = new PmsGeneratrixParam(); - generatrixParam.setGeneratrixIds(busbarIds); - generatrixParam.setGeneratrixVoltageLevel(param.getIds()); - List generatrixDTO = pmsGeneratrixClient.getGeneratrixAndPowerStationInfo(generatrixParam).getData(); - Map generatrixMap = generatrixDTO.stream().collect( - Collectors.toMap(GeneratrixAndPowerStationDTO::getGeneratrixId, Function.identity())); - Map orgMap = temp.stream().collect(Collectors.toMap(RStatOrgBusbarVoltageVO::getOrgNo, Function.identity())); - orgMap.forEach((key, value) -> { - if (deptMap.containsKey(key)) { - DeptDTO deptDTO = deptMap.get(key); - value.setOrgName(deptDTO.getName()); - if (generatrixMap.containsKey(value.getBusbarId())) { - GeneratrixAndPowerStationDTO dto = generatrixMap.get(value.getBusbarId()); - value.setBusbarVoltageLevel(dto.getGeneratrixVoltageLevel()); - value.setPowerStationName(dto.getPowerName()); - info.add(value); - } - } - }); - } - return info; + temp= temp.stream ().map (rStatOrgBusbarVoltageVO -> { + DeptDTO deptDTO = deptMap.get (rStatOrgBusbarVoltageVO.getOrgNo ( )); + rStatOrgBusbarVoltageVO.setOrgName (deptDTO.getName ()); + return rStatOrgBusbarVoltageVO; + }).collect(Collectors.toList()); + return temp; } } diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DayJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DayJob.java index 06bd6bdfb..2b69612d9 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DayJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DayJob.java @@ -2479,5 +2479,4 @@ public class DayJob { } return stringBuilder; } - } diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/RmpPassRateController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/RmpPassRateController.java new file mode 100644 index 000000000..da423ad8f --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/RmpPassRateController.java @@ -0,0 +1,65 @@ +package com.njcn.prepare.harmonic.controller.line; + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.constant.OperateType; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.pq.api.LineFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.njcn.prepare.harmonic.service.mysql.line.RmpPassRateService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.util.CollectionUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +/** + * @author qijian + * @date 2022/10/26 + * 数据是否异常 + */ +@Validated +@Slf4j +@RestController +@RequestMapping("/RmpPassRate") +@Api(tags = "监测点稳态指标合格率") +@AllArgsConstructor +public class RmpPassRateController extends BaseController { + + private final LineFeignClient lineFeignClient; + private final RmpPassRateService rmpPassRateService; + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/RmpPassRateD") + @ApiOperation("监测点稳态指标合格率-日计算") + @ApiImplicitParam(name = "lineParam", value = "算法通用查询参数", required = true) + public HttpResult rmpPassRateDHandler(@RequestBody @Validated LineParam lineParam) { + log.info(LocalDateTime.now()+"rmpPassRateDHandler开始执行"); + String methodDescribe = getMethodDescribe("rmpPassRateDHandler"); + Boolean result = true; + List indexLists = new ArrayList<> (); + if(CollectionUtils.isEmpty (lineParam.getLineIds ())){ + indexLists = lineFeignClient.getLineList ( ).getData ( ); + }else{ + indexLists = lineParam.getLineIds (); + } + rmpPassRateService.rmpPassRateDHandler (lineParam); + if (result){ + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); + } else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe); + } + } +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPassRateDMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPassRateDMapper.java new file mode 100644 index 000000000..0cd303383 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPassRateDMapper.java @@ -0,0 +1,15 @@ +package com.njcn.prepare.harmonic.mapper.mysql.line; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateDPO; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/2/28 15:39【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface RMpPassRateDMapper extends MppBaseMapper { +} \ No newline at end of file diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPassRateMMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPassRateMMapper.java new file mode 100644 index 000000000..5a110acfd --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPassRateMMapper.java @@ -0,0 +1,15 @@ +package com.njcn.prepare.harmonic.mapper.mysql.line; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateMPO; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/2/28 15:39【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface RMpPassRateMMapper extends MppBaseMapper { +} \ No newline at end of file diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPassRateQMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPassRateQMapper.java new file mode 100644 index 000000000..044d89a79 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPassRateQMapper.java @@ -0,0 +1,15 @@ +package com.njcn.prepare.harmonic.mapper.mysql.line; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateQPO; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/2/28 15:38【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface RMpPassRateQMapper extends MppBaseMapper { +} \ No newline at end of file diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPassRateYMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPassRateYMapper.java new file mode 100644 index 000000000..f2c0ac949 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPassRateYMapper.java @@ -0,0 +1,15 @@ +package com.njcn.prepare.harmonic.mapper.mysql.line; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateYPO; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/2/28 15:36【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface RMpPassRateYMapper extends MppBaseMapper { +} \ No newline at end of file diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPassRateDMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPassRateDMapper.xml new file mode 100644 index 000000000..16f4a4f62 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPassRateDMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + measurement_point_id, data_date, effective_time, freq_time, v_dev_time, flicker_time + + \ No newline at end of file diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPassRateMMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPassRateMMapper.xml new file mode 100644 index 000000000..760305132 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPassRateMMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + measurement_point_id, data_date, freq_pass_rate, v_dev_pass_rate, flicker_pass_rate + + \ No newline at end of file diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPassRateQMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPassRateQMapper.xml new file mode 100644 index 000000000..d0f6bb0a2 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPassRateQMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + measurement_point_id, data_date, freq_pass_rate, v_dev_pass_rate, flicker_pass_rate + + \ No newline at end of file diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPassRateYMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPassRateYMapper.xml new file mode 100644 index 000000000..43b75aba7 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/RMpPassRateYMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + measurement_point_id, data_date, freq_pass_rate, v_dev_pass_rate, flicker_pass_rate + + \ No newline at end of file diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/EffectiveMinuteCountServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/EffectiveMinuteCountServiceImpl.java index b6f80f83a..b2ddd7ec6 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/EffectiveMinuteCountServiceImpl.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/EffectiveMinuteCountServiceImpl.java @@ -157,7 +157,7 @@ public class EffectiveMinuteCountServiceImpl implements EffectiveMinuteCountServ Integer count = calculateEffectiveMinute (fiveItems, pmsAbnormalRules, voltage); RMpIntegrityDPO rMpIntegrityDPO = new RMpIntegrityDPO ( ); - rMpIntegrityDPO.setEffectiveMinuteCount (count * statisticalInterval); + rMpIntegrityDPO.setEffectiveMinuteCount (count ); rMpIntegrityDPO.setDataDate (tempDate); rMpIntegrityDPOS.add (rMpIntegrityDPO); }); @@ -251,7 +251,7 @@ public class EffectiveMinuteCountServiceImpl implements EffectiveMinuteCountServ /*统计间隔*/ Integer statisticalInterval = temp.getStatisticalInterval ( ); RMpIntegrityDPO rMpIntegrityDPO = new RMpIntegrityDPO ( ); - rMpIntegrityDPO.setEffectiveMinuteCount (count * statisticalInterval); + rMpIntegrityDPO.setEffectiveMinuteCount (count ); rMpIntegrityDPO.setDataDate (tempDate); rMpIntegrityDPOS.add (rMpIntegrityDPO); }); diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateDServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateDServiceImpl.java new file mode 100644 index 000000000..468b06409 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateDServiceImpl.java @@ -0,0 +1,20 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.line; + +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.prepare.harmonic.mapper.mysql.line.RMpPassRateDMapper; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateDPO; +import com.njcn.prepare.harmonic.service.mysql.line.RMpPassRateDService; +import org.springframework.stereotype.Service; +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/2/28 15:39【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +public class RMpPassRateDServiceImpl extends MppServiceImpl implements RMpPassRateDService{ + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateMServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateMServiceImpl.java new file mode 100644 index 000000000..742bf56c6 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateMServiceImpl.java @@ -0,0 +1,20 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.line; + +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.prepare.harmonic.mapper.mysql.line.RMpPassRateMMapper; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateMPO; +import com.njcn.prepare.harmonic.service.mysql.line.RMpPassRateMService; +import org.springframework.stereotype.Service; +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/2/28 15:39【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +public class RMpPassRateMServiceImpl extends MppServiceImpl implements RMpPassRateMService{ + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateQServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateQServiceImpl.java new file mode 100644 index 000000000..3d4c87157 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateQServiceImpl.java @@ -0,0 +1,20 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.line; + +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.prepare.harmonic.mapper.mysql.line.RMpPassRateQMapper; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateQPO; +import com.njcn.prepare.harmonic.service.mysql.line.RMpPassRateQService; +import org.springframework.stereotype.Service; +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/2/28 15:38【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +public class RMpPassRateQServiceImpl extends MppServiceImpl implements RMpPassRateQService{ + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateYServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateYServiceImpl.java new file mode 100644 index 000000000..45a9fddec --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPassRateYServiceImpl.java @@ -0,0 +1,20 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.line; + +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.prepare.harmonic.mapper.mysql.line.RMpPassRateYMapper; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateYPO; +import com.njcn.prepare.harmonic.service.mysql.line.RMpPassRateYService; +import org.springframework.stereotype.Service; +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/2/28 15:36【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +public class RMpPassRateYServiceImpl extends MppServiceImpl implements RMpPassRateYService{ + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RmpPassRateServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RmpPassRateServiceImpl.java new file mode 100644 index 000000000..a36bb73d2 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RmpPassRateServiceImpl.java @@ -0,0 +1,250 @@ +package com.njcn.prepare.harmonic.service.mysql.Impl.line; + +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.njcn.device.pms.api.MonitorClient; +import com.njcn.device.pms.pojo.dto.PmsMonitorDTO; +import com.njcn.device.pms.pojo.param.PmsMonitorParam; +import com.njcn.harmonic.pojo.po.RMpIntegrityDPO; +import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD; +import com.njcn.harmonic.pojo.po.RMpSurplusHarmonicDetailD; +import com.njcn.harmonic.service.majornetwork.RMpPartHarmonicDetailDService; +import com.njcn.prepare.harmonic.mapper.mysql.line.RMpSurplusHarmonicDetailDMapper; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateDPO; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateMPO; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateQPO; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateYPO; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.njcn.prepare.harmonic.service.mysql.area.RMpIntegrityDPOService; +import com.njcn.prepare.harmonic.service.mysql.line.*; +import com.njcn.prepare.harmonic.utils.PublicUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/2/28 10:27【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class RmpPassRateServiceImpl implements RmpPassRateService { + + private final MonitorClient monitorClient; + private final RMpIntegrityDPOService rMpIntegrityDPOService; + private final RMpPartHarmonicDetailDService rMpPartHarmonicDetailDService; + private final RMpSurplusHarmonicDetailDMapper rMpSurplusHarmonicDetailDMapper; + private final RMpPassRateDService rmpPassRateDService; + private final RMpPassRateMService rmpPassRateMService; + private final RMpPassRateQService rmpPassRateQService; + private final RMpPassRateYService rmpPassRateYService; + + + DecimalFormat df = new DecimalFormat("0.00"); + + + /*接口重mysql中取数据不分oracle/Influxdb*/ + @Override + public void rmpPassRateDHandler(LineParam lineParam) { + Integer type = lineParam.getType ( ); + switch (type) { + case 1: + this.hanlderYear (lineParam); + break; + case 2: + this.hanlderQtr (lineParam); + break; + case 3: + this.hanlderMonth (lineParam); + break; + case 5: + this.hanlderDay (lineParam); + break; + default: + break; + } + } + + private void hanlderYear(LineParam lineParam) { + String dataDate = lineParam.getDataDate(); + Date date = DateUtil.parse(lineParam.getDataDate()); + + List lineIds = lineParam.getLineIds(); + List rMpPassRateYPOList = new ArrayList<> (); + lineIds.forEach (temp ->{ + QueryWrapper queryWrapper = new QueryWrapper<> (); + queryWrapper.eq ("measurement_point_id", temp). + eq("YEAR( data_date )",dataDate.substring (0, 4)); + List list = rmpPassRateMService.list (queryWrapper); + /*求平均值*/ + Double flickerPassRate = list.stream ( ).map (rMpPassRateMPO -> rMpPassRateMPO.getFlickerPassRate ( )). + collect (Collectors.averagingDouble (x -> x)); + Double freqPassRate = list.stream ( ).map (rMpPassRateMPO -> rMpPassRateMPO.getFreqPassRate ( )). + collect (Collectors.averagingDouble (x -> x)); + Double vDevPassRate =list.stream ( ).map (rMpPassRateMPO -> rMpPassRateMPO.getvDevPassRate ( )). + collect (Collectors.averagingDouble (x -> x)); + RMpPassRateYPO rMpPassRateYPO = new RMpPassRateYPO(); + rMpPassRateYPO.setMeasurementPointId (temp); + rMpPassRateYPO.setDataDate (date); + rMpPassRateYPO.setFlickerPassRate ( + flickerPassRate ); + rMpPassRateYPO.setFreqPassRate ( + freqPassRate ); + rMpPassRateYPO.setvDevPassRate ( + vDevPassRate ); + rMpPassRateYPOList.add (rMpPassRateYPO); + }); + if(!CollectionUtils.isEmpty (rMpPassRateYPOList)){ + rmpPassRateYService.saveOrUpdateBatchByMultiId (rMpPassRateYPOList,500); + } + } + + private void hanlderQtr(LineParam lineParam) { + String dataDate = lineParam.getDataDate(); + Date date = DateUtil.parse(lineParam.getDataDate()); + + List lineIds = lineParam.getLineIds(); + List rMpPassRateQPOList = new ArrayList<> (); + lineIds.forEach (temp ->{ + QueryWrapper queryWrapper = new QueryWrapper<> (); + queryWrapper.eq ("measurement_point_id", temp). + eq("QUARTER( data_date)", PublicUtil.getNowQuarter (dataDate)); + List list = rmpPassRateMService.list (queryWrapper); + /*求平均值*/ + Double flickerPassRate = list.stream ( ).map (rMpPassRateMPO -> rMpPassRateMPO.getFlickerPassRate ( )). + collect (Collectors.averagingDouble (x -> x)); + Double freqPassRate = list.stream ( ).map (rMpPassRateMPO -> rMpPassRateMPO.getFreqPassRate ( )). + collect (Collectors.averagingDouble (x -> x)); + Double vDevPassRate =list.stream ( ).map (rMpPassRateMPO -> rMpPassRateMPO.getvDevPassRate ( )). + collect (Collectors.averagingDouble (x -> x)); + RMpPassRateQPO rMpPassRateQPO = new RMpPassRateQPO(); + rMpPassRateQPO.setMeasurementPointId (temp); + rMpPassRateQPO.setDataDate (date); + rMpPassRateQPO.setFlickerPassRate ( + flickerPassRate ); + rMpPassRateQPO.setFreqPassRate ( + freqPassRate ); + rMpPassRateQPO.setvDevPassRate ( + vDevPassRate ); + rMpPassRateQPOList.add (rMpPassRateQPO); + }); + if(!CollectionUtils.isEmpty (rMpPassRateQPOList)){ + rmpPassRateQService.saveOrUpdateBatchByMultiId (rMpPassRateQPOList,500); + } + } + + /** + * @Description: 月表为日表累计 + * @Param: [lineParam] + * @return: void + * @Author: clam + * @Date: 2023/2/28 + */ + private void hanlderMonth(LineParam lineParam) { + String dataDate = lineParam.getDataDate(); + Date date = DateUtil.parse(lineParam.getDataDate()); + + List lineIds = lineParam.getLineIds(); + List rMpPassRateMPOList = new ArrayList<> (); + lineIds.forEach (temp ->{ + QueryWrapper queryWrapper = new QueryWrapper<> (); + queryWrapper.eq ("measurement_point_id", temp). + eq("DATE_FORMAT( data_date ,'%Y-%m')",dataDate.substring (0, 7)); + List list = rmpPassRateDService.list (queryWrapper); + Integer effectiveTime = Integer.valueOf ( + list.stream ( ).mapToLong (RMpPassRateDPO::getEffectiveTime).sum ( ) + "" + ); + Integer flickerTime = Integer.valueOf ( + list.stream ( ).mapToLong (RMpPassRateDPO::getFlickerTime).sum ( ) + "" + ); + Integer freqTime = Integer.valueOf ( + list.stream ( ).mapToLong (RMpPassRateDPO::getFreqTime).sum ( ) + "" + ); + Integer vDevTime = Integer.valueOf ( + list.stream ( ).mapToLong (RMpPassRateDPO::getvDevTime).sum ( ) + "" + ); + RMpPassRateMPO rMpPassRateMPO = new RMpPassRateMPO(); + rMpPassRateMPO.setMeasurementPointId (temp); + rMpPassRateMPO.setDataDate (date); + rMpPassRateMPO.setFlickerPassRate ( + Double.valueOf (df.format ((float) flickerTime / effectiveTime)) + ); + rMpPassRateMPO.setFreqPassRate ( + Double.valueOf (df.format ((float) freqTime / effectiveTime)) + ); + rMpPassRateMPO.setvDevPassRate ( + Double.valueOf (df.format ((float) vDevTime / effectiveTime)) + ); + rMpPassRateMPOList.add (rMpPassRateMPO); + }); + if(!CollectionUtils.isEmpty (rMpPassRateMPOList)){ + rmpPassRateMService.saveOrUpdateBatchByMultiId (rMpPassRateMPOList,500); + } + } + + /** + * @Description: 1. 日有效监测时长(min)：表1的统计间隔*表2的有效接入分钟数量。 + * 2. 频率偏差超标时长(min)：表1的统计间隔*表3的频率偏差超标次数。 + * 3. 电压偏差超标时长(min)：表1的统计间隔*表3的电压偏差超标次数。 + * 4. 闪变超标时长(min)：2*60*闪变发生次数 + * @Param: [lineParam] + * @return: void + * @Author: clam + * @Date: 2023/2/28 + */ + private void hanlderDay(LineParam lineParam) { + + Date date = DateUtil.parse(lineParam.getDataDate()); + List lineIds = lineParam.getLineIds(); + Integer type = lineParam.getType(); + Integer lineType = lineParam.getLineType(); + PmsMonitorParam pmsMonitorParam = new PmsMonitorParam(); + pmsMonitorParam.setMonitorIds (lineIds); + List rMpPassRateDPOList = new ArrayList<> (); + List data = monitorClient.getMonitorInfoListByCond (pmsMonitorParam).getData ( ); + data.forEach (temp ->{ + RMpPassRateDPO rMpPassRateDPO = new RMpPassRateDPO(); + Integer statisticalInterval = temp.getStatisticalInterval ( ); + String id = temp.getId ( ); + QueryWrapper rMpIntegrityDPOQueryWrapper = new QueryWrapper(); + + rMpIntegrityDPOQueryWrapper.eq ("measurement_point_id", id). + eq ("data_date", date); + + RMpIntegrityDPO rMpIntegrityDPO = rMpIntegrityDPOService.getOne (rMpIntegrityDPOQueryWrapper); + + QueryWrapper rMpPartHarmonicDetailDQueryWrapper = new QueryWrapper(); + rMpPartHarmonicDetailDQueryWrapper.eq ("measurement_point_id", id). + eq ("data_date", date); + RMpPartHarmonicDetailD rMpPartHarmonicDetailD = rMpPartHarmonicDetailDService.getOne (rMpPartHarmonicDetailDQueryWrapper); + + QueryWrapper rMpSurplusHarmonicDetailDQueryWrapper = new QueryWrapper(); + rMpSurplusHarmonicDetailDQueryWrapper.eq ("measurement_point_id", id). + eq ("data_date", date); + RMpSurplusHarmonicDetailD rMpSurplusHarmonicDetailD = rMpSurplusHarmonicDetailDMapper.selectOne (rMpSurplusHarmonicDetailDQueryWrapper); + rMpPassRateDPO.setMeasurementPointId (id); + rMpPassRateDPO.setDataDate (date); + rMpPassRateDPO.setEffectiveTime (rMpIntegrityDPO.getEffectiveMinuteCount ()*statisticalInterval); + rMpPassRateDPO.setFlickerTime (2*60*rMpSurplusHarmonicDetailD.getFlickerTimes ()); + rMpPassRateDPO.setFreqTime (rMpPartHarmonicDetailD.getFreqTimes ()*statisticalInterval); + rMpPassRateDPO.setvDevTime (rMpPartHarmonicDetailD.getVDevTimes ()*statisticalInterval); + rMpPassRateDPOList.add (rMpPassRateDPO); + }); + if(!CollectionUtils.isEmpty (rMpPassRateDPOList)){ + rmpPassRateDService.saveOrUpdateBatchByMultiId (rMpPassRateDPOList,500); + } + + } +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateDService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateDService.java new file mode 100644 index 000000000..49ff637f1 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateDService.java @@ -0,0 +1,17 @@ +package com.njcn.prepare.harmonic.service.mysql.line; + +import com.github.jeffreyning.mybatisplus.service.IMppService; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateDPO; + /** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/2/28 15:39【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface RMpPassRateDService extends IMppService { + + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateMService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateMService.java new file mode 100644 index 000000000..0a5eba73e --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateMService.java @@ -0,0 +1,17 @@ +package com.njcn.prepare.harmonic.service.mysql.line; + +import com.github.jeffreyning.mybatisplus.service.IMppService; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateMPO; + /** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/2/28 15:39【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface RMpPassRateMService extends IMppService { + + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateQService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateQService.java new file mode 100644 index 000000000..fa01029ff --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateQService.java @@ -0,0 +1,17 @@ +package com.njcn.prepare.harmonic.service.mysql.line; + +import com.github.jeffreyning.mybatisplus.service.IMppService; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateQPO; + /** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/2/28 15:38【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface RMpPassRateQService extends IMppService { + + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateYService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateYService.java new file mode 100644 index 000000000..b8fb9bca9 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RMpPassRateYService.java @@ -0,0 +1,17 @@ +package com.njcn.prepare.harmonic.service.mysql.line; + +import com.github.jeffreyning.mybatisplus.service.IMppService; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPassRateYPO; + /** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/2/28 15:36【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface RMpPassRateYService extends IMppService { + + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RmpPassRateService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RmpPassRateService.java new file mode 100644 index 000000000..81c27c7bc --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/RmpPassRateService.java @@ -0,0 +1,15 @@ +package com.njcn.prepare.harmonic.service.mysql.line; + +import com.njcn.prepare.harmonic.pojo.param.LineParam; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/2/28 10:03【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface RmpPassRateService { + void rmpPassRateDHandler(LineParam lineParam); +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/RMpPassRateDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/RMpPassRateDPO.java new file mode 100644 index 000000000..12de74c96 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/RMpPassRateDPO.java @@ -0,0 +1,162 @@ +package com.njcn.prepare.harmonic.pojo.mysql.po.line; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; + +import java.util.Date; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/2/28 15:39【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@TableName(value = "r_mp_pass_rate_d") +public class RMpPassRateDPO { + /** + * 监测点ID + */ + @MppMultiId(value = "measurement_point_id") + private String measurementPointId; + + /** + * 生成数据的时间,每日统计一次 + */ + @MppMultiId(value = "data_date") + private Date dataDate; + + /** + * 有效监测时长 + */ + @TableField(value = "effective_time") + private Integer effectiveTime; + + /** + * 频率偏差超标时长 + */ + @TableField(value = "freq_time") + private Integer freqTime; + + /** + * 电压偏差超标时长 + */ + @TableField(value = "v_dev_time") + private Integer vDevTime; + + /** + * 闪变超标时长 + */ + @TableField(value = "flicker_time") + private Integer flickerTime; + + /** + * 获取监测点ID + * + * @return measurement_point_id - 监测点ID + */ + public String getMeasurementPointId() { + return measurementPointId; + } + + /** + * 设置监测点ID + * + * @param measurementPointId 监测点ID + */ + public void setMeasurementPointId(String measurementPointId) { + this.measurementPointId = measurementPointId; + } + + /** + * 获取生成数据的时间,每日统计一次 + * + * @return data_date - 生成数据的时间,每日统计一次 + */ + public Date getDataDate() { + return dataDate; + } + + /** + * 设置生成数据的时间,每日统计一次 + * + * @param dataDate 生成数据的时间,每日统计一次 + */ + public void setDataDate(Date dataDate) { + this.dataDate = dataDate; + } + + /** + * 获取有效监测时长 + * + * @return effective_time - 有效监测时长 + */ + public Integer getEffectiveTime() { + return effectiveTime; + } + + /** + * 设置有效监测时长 + * + * @param effectiveTime 有效监测时长 + */ + public void setEffectiveTime(Integer effectiveTime) { + this.effectiveTime = effectiveTime; + } + + /** + * 获取频率偏差超标时长 + * + * @return freq_time - 频率偏差超标时长 + */ + public Integer getFreqTime() { + return freqTime; + } + + /** + * 设置频率偏差超标时长 + * + * @param freqTime 频率偏差超标时长 + */ + public void setFreqTime(Integer freqTime) { + this.freqTime = freqTime; + } + + /** + * 获取电压偏差超标时长 + * + * @return v_dev_time - 电压偏差超标时长 + */ + public Integer getvDevTime() { + return vDevTime; + } + + /** + * 设置电压偏差超标时长 + * + * @param vDevTime 电压偏差超标时长 + */ + public void setvDevTime(Integer vDevTime) { + this.vDevTime = vDevTime; + } + + /** + * 获取闪变超标时长 + * + * @return flicker_time - 闪变超标时长 + */ + public Integer getFlickerTime() { + return flickerTime; + } + + /** + * 设置闪变超标时长 + * + * @param flickerTime 闪变超标时长 + */ + public void setFlickerTime(Integer flickerTime) { + this.flickerTime = flickerTime; + } +} \ No newline at end of file diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/RMpPassRateMPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/RMpPassRateMPO.java new file mode 100644 index 000000000..be80b2f68 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/RMpPassRateMPO.java @@ -0,0 +1,138 @@ +package com.njcn.prepare.harmonic.pojo.mysql.po.line; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; + +import java.util.Date; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/2/28 15:39【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@TableName(value = "r_mp_pass_rate_m") +public class RMpPassRateMPO { + /** + * 监测点ID + */ + @MppMultiId(value = "measurement_point_id") + private String measurementPointId; + + /** + * 生成数据的时间,每月统计一次 + */ + @MppMultiId(value = "data_date") + private Date dataDate; + + /** + * 频率偏差合格率 + */ + @TableField(value = "freq_pass_rate") + private Double freqPassRate; + + /** + * 电压偏差合格率 + */ + @TableField(value = "v_dev_pass_rate") + private Double vDevPassRate; + + /** + * 闪变合格率 + */ + @TableField(value = "flicker_pass_rate") + private Double flickerPassRate; + + /** + * 获取监测点ID + * + * @return measurement_point_id - 监测点ID + */ + public String getMeasurementPointId() { + return measurementPointId; + } + + /** + * 设置监测点ID + * + * @param measurementPointId 监测点ID + */ + public void setMeasurementPointId(String measurementPointId) { + this.measurementPointId = measurementPointId; + } + + /** + * 获取生成数据的时间,每月统计一次 + * + * @return data_date - 生成数据的时间,每月统计一次 + */ + public Date getDataDate() { + return dataDate; + } + + /** + * 设置生成数据的时间,每月统计一次 + * + * @param dataDate 生成数据的时间,每月统计一次 + */ + public void setDataDate(Date dataDate) { + this.dataDate = dataDate; + } + + /** + * 获取频率偏差合格率 + * + * @return freq_pass_rate - 频率偏差合格率 + */ + public Double getFreqPassRate() { + return freqPassRate; + } + + /** + * 设置频率偏差合格率 + * + * @param freqPassRate 频率偏差合格率 + */ + public void setFreqPassRate(Double freqPassRate) { + this.freqPassRate = freqPassRate; + } + + /** + * 获取电压偏差合格率 + * + * @return v_dev_pass_rate - 电压偏差合格率 + */ + public Double getvDevPassRate() { + return vDevPassRate; + } + + /** + * 设置电压偏差合格率 + * + * @param vDevPassRate 电压偏差合格率 + */ + public void setvDevPassRate(Double vDevPassRate) { + this.vDevPassRate = vDevPassRate; + } + + /** + * 获取闪变合格率 + * + * @return flicker_pass_rate - 闪变合格率 + */ + public Double getFlickerPassRate() { + return flickerPassRate; + } + + /** + * 设置闪变合格率 + * + * @param flickerPassRate 闪变合格率 + */ + public void setFlickerPassRate(Double flickerPassRate) { + this.flickerPassRate = flickerPassRate; + } +} \ No newline at end of file diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/RMpPassRateQPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/RMpPassRateQPO.java new file mode 100644 index 000000000..273a9f4ba --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/RMpPassRateQPO.java @@ -0,0 +1,138 @@ +package com.njcn.prepare.harmonic.pojo.mysql.po.line; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; + +import java.util.Date; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/2/28 15:38【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@TableName(value = "r_mp_pass_rate_q") +public class RMpPassRateQPO { + /** + * 监测点ID + */ + @MppMultiId(value = "measurement_point_id") + private String measurementPointId; + + /** + * 生成数据的时间,每季统计一次 + */ + @MppMultiId(value = "data_date") + private Date dataDate; + + /** + * 频率偏差合格率 + */ + @TableField(value = "freq_pass_rate") + private Double freqPassRate; + + /** + * 电压偏差合格率 + */ + @TableField(value = "v_dev_pass_rate") + private Double vDevPassRate; + + /** + * 闪变合格率 + */ + @TableField(value = "flicker_pass_rate") + private Double flickerPassRate; + + /** + * 获取监测点ID + * + * @return measurement_point_id - 监测点ID + */ + public String getMeasurementPointId() { + return measurementPointId; + } + + /** + * 设置监测点ID + * + * @param measurementPointId 监测点ID + */ + public void setMeasurementPointId(String measurementPointId) { + this.measurementPointId = measurementPointId; + } + + /** + * 获取生成数据的时间,每季统计一次 + * + * @return data_date - 生成数据的时间,每季统计一次 + */ + public Date getDataDate() { + return dataDate; + } + + /** + * 设置生成数据的时间,每季统计一次 + * + * @param dataDate 生成数据的时间,每季统计一次 + */ + public void setDataDate(Date dataDate) { + this.dataDate = dataDate; + } + + /** + * 获取频率偏差合格率 + * + * @return freq_pass_rate - 频率偏差合格率 + */ + public Double getFreqPassRate() { + return freqPassRate; + } + + /** + * 设置频率偏差合格率 + * + * @param freqPassRate 频率偏差合格率 + */ + public void setFreqPassRate(Double freqPassRate) { + this.freqPassRate = freqPassRate; + } + + /** + * 获取电压偏差合格率 + * + * @return v_dev_pass_rate - 电压偏差合格率 + */ + public Double getvDevPassRate() { + return vDevPassRate; + } + + /** + * 设置电压偏差合格率 + * + * @param vDevPassRate 电压偏差合格率 + */ + public void setvDevPassRate(Double vDevPassRate) { + this.vDevPassRate = vDevPassRate; + } + + /** + * 获取闪变合格率 + * + * @return flicker_pass_rate - 闪变合格率 + */ + public Double getFlickerPassRate() { + return flickerPassRate; + } + + /** + * 设置闪变合格率 + * + * @param flickerPassRate 闪变合格率 + */ + public void setFlickerPassRate(Double flickerPassRate) { + this.flickerPassRate = flickerPassRate; + } +} \ No newline at end of file diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/RMpPassRateYPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/RMpPassRateYPO.java new file mode 100644 index 000000000..0b46c73f6 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/RMpPassRateYPO.java @@ -0,0 +1,138 @@ +package com.njcn.prepare.harmonic.pojo.mysql.po.line; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; + +import java.util.Date; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2023/2/28 15:36【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@TableName(value = "r_mp_pass_rate_y") +public class RMpPassRateYPO { + /** + * 监测点ID + */ + @MppMultiId(value = "measurement_point_id") + private String measurementPointId; + + /** + * 生成数据的时间,每年统计一次 + */ + @MppMultiId(value = "data_date") + private Date dataDate; + + /** + * 频率偏差合格率 + */ + @TableField(value = "freq_pass_rate") + private Double freqPassRate; + + /** + * 电压偏差合格率 + */ + @TableField(value = "v_dev_pass_rate") + private Double vDevPassRate; + + /** + * 闪变合格率 + */ + @TableField(value = "flicker_pass_rate") + private Double flickerPassRate; + + /** + * 获取监测点ID + * + * @return measurement_point_id - 监测点ID + */ + public String getMeasurementPointId() { + return measurementPointId; + } + + /** + * 设置监测点ID + * + * @param measurementPointId 监测点ID + */ + public void setMeasurementPointId(String measurementPointId) { + this.measurementPointId = measurementPointId; + } + + /** + * 获取生成数据的时间,每年统计一次 + * + * @return data_date - 生成数据的时间,每年统计一次 + */ + public Date getDataDate() { + return dataDate; + } + + /** + * 设置生成数据的时间,每年统计一次 + * + * @param dataDate 生成数据的时间,每年统计一次 + */ + public void setDataDate(Date dataDate) { + this.dataDate = dataDate; + } + + /** + * 获取频率偏差合格率 + * + * @return freq_pass_rate - 频率偏差合格率 + */ + public Double getFreqPassRate() { + return freqPassRate; + } + + /** + * 设置频率偏差合格率 + * + * @param freqPassRate 频率偏差合格率 + */ + public void setFreqPassRate(Double freqPassRate) { + this.freqPassRate = freqPassRate; + } + + /** + * 获取电压偏差合格率 + * + * @return v_dev_pass_rate - 电压偏差合格率 + */ + public Double getvDevPassRate() { + return vDevPassRate; + } + + /** + * 设置电压偏差合格率 + * + * @param vDevPassRate 电压偏差合格率 + */ + public void setvDevPassRate(Double vDevPassRate) { + this.vDevPassRate = vDevPassRate; + } + + /** + * 获取闪变合格率 + * + * @return flicker_pass_rate - 闪变合格率 + */ + public Double getFlickerPassRate() { + return flickerPassRate; + } + + /** + * 设置闪变合格率 + * + * @param flickerPassRate 闪变合格率 + */ + public void setFlickerPassRate(Double flickerPassRate) { + this.flickerPassRate = flickerPassRate; + } +} \ No newline at end of file diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/RStatElectricQualityProblemLogVO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/RStatElectricQualityProblemLogVO.java index 4d1b6e5f7..a9b3b3fb7 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/RStatElectricQualityProblemLogVO.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/RStatElectricQualityProblemLogVO.java @@ -177,4 +177,12 @@ public class RStatElectricQualityProblemLogVO { public void setType(String type) { this.type = type; } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } } \ No newline at end of file diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemLogMapper.java b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemLogMapper.java index 8b9155bbb..ff2536191 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemLogMapper.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemLogMapper.java @@ -2,6 +2,11 @@ package com.njcn.process.mapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.process.pojo.po.RStatElectricQualityProblemLogPO; +import com.njcn.process.pojo.vo.RStatElectricQualityProblemLogVO; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * @@ -13,4 +18,20 @@ import com.njcn.process.pojo.po.RStatElectricQualityProblemLogPO; * @version V1.0.0 */ public interface RStatElectricQualityProblemLogMapper extends MppBaseMapper { + @Select ("SELECT\n" + + "\tb.power_quality_problem_no,\n" + + "\ta.org_no org_name,\n" + + "b.data_date,\n" + + "b.checker,\n" + + "b.description,\n" + + "b.report_process,\n" + + "b.report_process_content,\n" + + "b.type\n" + + "FROM\n" + + "\tr_stat_electric_quality_problem_flow a,\n" + + "\tr_stat_electric_quality_problem_log b\n" + + "WHERE\n" + + "\ta.power_quality_problem_no = b.power_quality_problem_no\n" + + "AND b.power_quality_problem_no = #{powerQualityProblemNo}") + List selectByProblemNo(@Param ("powerQualityProblemNo") String powerQualityProblemNo); } \ No newline at end of file diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java index 4495ae504..f2e3d0ad7 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java @@ -27,9 +27,11 @@ import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.vo.PvTerminalTreeVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; @@ -37,7 +39,9 @@ import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; /** * 电能质量问题实现类 @@ -385,6 +389,7 @@ public class IssuesServiceImpl implements IssuesService { * 原因分析 */ @Override + @Transactional(rollbackFor = {Exception.class}) public void reasonAnalysis(ProcessParam processParam) { LocalDateTime local = LocalDateTimeUtil.now(); RMpElectricQualityProblemFlowDetails details = new RMpElectricQualityProblemFlowDetails(); @@ -420,6 +425,7 @@ public class IssuesServiceImpl implements IssuesService { * 计划整改措施、实际采取措施、成效分析 */ @Override + @Transactional(rollbackFor = {Exception.class}) public void process(ProcessParam processParam, String code) { LambdaQueryWrapper issuesQuery = new LambdaQueryWrapper<>(); issuesQuery.eq(RStatElectricQualityProblemFlow::getPowerQualityProblemNo,processParam.getPowerQualityProblemNo()); @@ -460,6 +466,7 @@ public class IssuesServiceImpl implements IssuesService { * 问题归档 */ @Override + @Transactional(rollbackFor = {Exception.class}) public void archive(String powerQualityProblemNo) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(RStatElectricQualityProblemFlow::getPowerQualityProblemNo,powerQualityProblemNo); @@ -510,6 +517,7 @@ public class IssuesServiceImpl implements IssuesService { * 删除问题 */ @Override + @Transactional(rollbackFor = {Exception.class}) public void deleteIssues(String powerQualityProblemNo) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(RStatElectricQualityProblemFlow::getPowerQualityProblemNo,powerQualityProblemNo); @@ -574,6 +582,7 @@ public class IssuesServiceImpl implements IssuesService { * @Date: 2023/2/22 */ @Override + @Transactional(rollbackFor = {Exception.class}) public Boolean checkPowerQuality(ElectricityQualityCheckParam electricityQualityCheckParam) { boolean result = true; RStatElectricQualityProblemLogPO rStatElectricQualityProblemLogPO = new RStatElectricQualityProblemLogPO(); @@ -646,7 +655,17 @@ public class IssuesServiceImpl implements IssuesService { */ @Override public List queryCheckTrack(String powerQualityProblemNo) { - return null; + + //部门处理：根据部门code取名称 + List dept = deptFeignClient.allDeptList().getData(); + Map pvTerminalTreeVOMap = dept.stream(). + collect(Collectors. + toMap(PvTerminalTreeVO::getId, + PvTerminalTreeVO::getName)); + List rStatElectricQualityProblemLogVOList = rStatElectricQualityProblemLogMapper.selectByProblemNo(powerQualityProblemNo); + rStatElectricQualityProblemLogVOList.stream ().forEach (temp->temp.setOrgName (pvTerminalTreeVOMap.get (temp.getOrgName ()))); + + return rStatElectricQualityProblemLogVOList; } } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java index e6e8141e4..dfa362ebb 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java @@ -28,6 +28,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; @@ -134,6 +135,7 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService * @return */ @Override + @Transactional(rollbackFor = {Exception.class}) public boolean uploadLoadTypeUserI(LoadTypeUserIUploadParam loadTypeUserIUploadParam) { RLoadTypeUserManage rLoadTypeUserManage = new RLoadTypeUserManage(); @@ -166,6 +168,7 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService * @return */ @Override + @Transactional(rollbackFor = {Exception.class}) public boolean linkUser(LoadTypeUserAssociateParam loadTypeUserAssociateParam) { RLoadTypeUserManage rLoadTypeUserManage = new RLoadTypeUserManage(); //填入数据修改 @@ -221,6 +224,7 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService * @return */ @Override + @Transactional(rollbackFor = {Exception.class}) public boolean uploadLoadTypeUserA(LoadTypeUserAUploadParam loadTypeUserAUploadParam) { RLoadTypeUserManage rLoadTypeUserManage = new RLoadTypeUserManage(); @@ -353,6 +357,7 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService * @Date: 2023/2/22 */ @Override + @Transactional(rollbackFor = {Exception.class}) public Boolean checkLoadTypeUserI(LoadTypeUserCheckParam loadTypeUserCheckParam) { boolean result = true; UpdateWrapper updateWrapper = new UpdateWrapper (); @@ -378,6 +383,7 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService * @Date: 2023/2/22 */ @Override + @Transactional(rollbackFor = {Exception.class}) public Boolean checkLoadTypeUserA(LoadTypeUserCheckParam loadTypeUserCheckParam) { boolean result = true; UpdateWrapper updateWrapper = new UpdateWrapper (); diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java index 4de804af4..1318a9c6e 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java @@ -196,6 +196,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl updateWrapper = new UpdateWrapper(); diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RStatDistributionProblemServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RStatDistributionProblemServiceImpl.java index 9c76c5b84..ca6f28f43 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RStatDistributionProblemServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RStatDistributionProblemServiceImpl.java @@ -24,6 +24,7 @@ import com.njcn.user.api.DeptFeignClient; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.time.ZoneId; @@ -116,6 +117,7 @@ public class RStatDistributionProblemServiceImpl extends MppServiceImpl overLimitFlagDTOList) { List rStatDistributionProblemPOList = new ArrayList<> ( ); DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyyMMdd"); @@ -185,6 +187,7 @@ public class RStatDistributionProblemServiceImpl extends MppServiceImpl