From ae440613fb299f2b5d6871e07a2920a472f0a24d Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Fri, 27 Sep 2024 11:34:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2mysql=E4=B8=BA=E8=BE=BE?= =?UTF-8?q?=E6=A2=A6=E6=95=B0=E6=8D=AE=E5=BA=93-=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=AE=A1=E6=9F=A5=201.harmonic-boot=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ComAssessController.java | 4 +- .../controller/CustomReportController.java | 1 - .../controller/ExportModelController.java | 332 ++++++++++++------ .../controller/ExportModelJBController.java | 25 +- .../controller/HistoryResultController.java | 1 - .../PollutionSubstationController.java | 4 - .../RMpHarmonicReportDController.java | 2 - .../SteadyExceedRateController.java | 4 +- .../controller/SteadyQualifyController.java | 4 +- .../harmonic/controller/THDController.java | 4 +- .../controller/TerminalController.java | 4 +- .../algorithm/AlgorithmController.java | 29 +- .../RMpPartHarmonicDetailController.java | 2 - .../dim/DimGlobalDealController.java | 1 - .../distribution/PwOverviewController.java | 1 - .../PwRMpBenchmarkLevelController.java | 31 +- .../distribution/PwRStatOrgController.java | 15 - .../distribution/PwUserLimitController.java | 3 +- .../RStatPwPermeabilityMController.java | 10 +- .../majornetwork/LargeScreenController.java | 4 +- .../majornetwork/PVOverviewController.java | 1 - .../RMpBenchmarkLevelController.java | 24 +- .../majornetwork/RStatOrgController.java | 12 - .../controller/pmsWifi/PmsWifiController.java | 3 - .../controller/report/QualifiedReport.java | 4 - .../PermeabilityController.java | 2 - .../RMpEmissionController.java | 2 - .../RMpInfluenceController.java | 4 - .../RStatOrgPvPowerQualityController.java | 6 +- .../StreamReverseController.java | 2 - .../specialanalysis/WindFarmController.java | 4 - .../upload/EvaluationDownController.java | 1 - .../upload/RUploadDataLogController.java | 5 - .../upload/RUploadReportController.java | 3 - .../upload/RUploadWorkOrderController.java | 4 - .../TypicalSourceLoadDownController.java | 1 - .../algorithm/mapping/RStatFileMapper.xml | 9 - .../mapper/dim/RDimBusGlobalDMapper.java | 1 - .../mapper/dim/RDimBusGlobalMMapper.java | 1 - .../mapper/dim/RDimBusGlobalYMapper.java | 1 - .../dim/RDimBusStationEventDMapper.java | 1 - .../dim/RDimBusStationEventMMapper.java | 1 - .../mapper/dim/RDimBusTargetDPOMapper.java | 1 - .../mapper/dim/RDimMonitorRateDMapper.java | 1 - .../mapper/dim/RDimMonitorRateMMapper.java | 1 - .../mapper/dim/RDimMonitorRateYMapper.java | 1 - .../mapper/dim/RDimObjEventDMapper.java | 1 - .../mapper/dim/RDimObjEventMMapper.java | 1 - .../mapper/dim/RDimObjEventYMapper.java | 1 - .../mapper/dim/RDimObjRateDMapper.java | 1 - .../mapper/dim/RDimObjRateMMapper.java | 1 - .../mapper/dim/RDimObjRateYMapper.java | 1 - .../mapper/dim/RDimObjTargetDMapper.java | 1 - .../mapper/dim/RDimObjTargetMMapper.java | 1 - .../mapper/dim/RDimObjTargetYMapper.java | 1 - .../mapper/dim/RDimStationTargetYMapper.java | 1 - .../mapper/dim/RDimVoltageDMapper.java | 1 - .../mapping/RDimBusbarHarmnicDPOMapper.xml | 23 +- .../mapping/RDimStationHarmnicDPOMapper.xml | 18 +- .../PwRMpBenchmarkLevelMMapper.java | 3 - .../PwRMpBenchmarkLevelQMapper.java | 3 - .../PwRMpBenchmarkLevelYMapper.java | 3 - .../mapper/distribution/PwRStatOrgMapper.java | 14 - .../RStatPwPermeabilityMMapper.java | 5 - .../mapping/PwRMpBenchmarkLevelMMapper.xml | 18 - .../mapping/PwRMpBenchmarkLevelQMapper.xml | 18 - .../mapping/PwRMpBenchmarkLevelYMapper.xml | 18 - .../mapping/RStatPwPermeabilityMMapper.xml | 23 -- .../majornetwork/LargeScreenMapper.java | 4 +- .../mapper/majornetwork/PVOverviewMapper.java | 4 +- .../RMpBenchmarkLevelMMapper.java | 3 - .../RMpBenchmarkLevelQMapper.java | 3 - .../RMpBenchmarkLevelYMapper.java | 3 - .../RMpPartHarmonicDetailDMapper.java | 2 - .../majornetwork/RMpPassRateMMapper.java | 2 - .../majornetwork/RMpPassRateQMapper.java | 2 - .../majornetwork/RMpPassRateYMapper.java | 2 - .../RMpSurplusHarmonicDetailMMapper.java | 2 - .../majornetwork/RStatHarmonicDMapper.java | 5 - .../majornetwork/RStatHarmonicMMapper.java | 3 - .../majornetwork/RStatHarmonicQMapper.java | 3 - .../RStatHarmonicVoltageMMapper.java | 5 - .../majornetwork/RStatHarmonicYMapper.java | 3 - .../majornetwork/RStatLoadTypeMMapper.java | 2 - .../majornetwork/RStatLoadTypeQMapper.java | 2 - .../majornetwork/RStatLoadTypeYMapper.java | 1 - .../RStatOrgBusbarVoltageMMapper.java | 2 - .../RStatOrgBusbarVoltageQMapper.java | 2 - .../RStatOrgBusbarVoltageYMapper.java | 2 - .../mapper/majornetwork/RStatOrgMMapper.java | 11 - .../mapper/majornetwork/RStatOrgQMapper.java | 9 - .../mapper/majornetwork/RStatOrgYMapper.java | 10 - .../majornetwork/RStatSubstationMMapper.java | 4 - .../majornetwork/RStatSubstationQMapper.java | 4 - .../RStatSubstationVoltageMMapper.java | 2 - .../majornetwork/RStatSubstationYMapper.java | 4 - .../mapping/LargeScreenMapper.xml | 8 +- .../mapping/RMpBenchmarkLevelMMapper.xml | 18 - .../mapping/RMpBenchmarkLevelQMapper.xml | 18 - .../mapping/RMpBenchmarkLevelYMapper.xml | 18 - .../mapping/RMpPartHarmonicDetailDMapper.xml | 119 ------- .../mapping/RMpPartHarmonicDetailMMapper.xml | 117 ------ .../mapping/RMpPassRateMMapper.xml | 9 +- .../mapping/RMpPassRateQMapper.xml | 8 - .../mapping/RMpPassRateYMapper.xml | 9 +- .../RMpSurplusHarmonicDetailDMapper.xml | 60 ---- .../RMpSurplusHarmonicDetailMMapper.xml | 58 +-- .../mapping/RStatHarmonicDMapper.xml | 10 - .../mapping/RStatHarmonicMMapper.xml | 14 +- .../mapping/RStatHarmonicQMapper.xml | 14 +- .../mapping/RStatHarmonicVoltageDMapper.xml | 11 - .../mapping/RStatHarmonicVoltageMMapper.xml | 15 +- .../mapping/RStatHarmonicYMapper.xml | 14 +- .../mapping/RStatLoadTypeMMapper.xml | 17 - .../mapping/RStatLoadTypeQMapper.xml | 18 +- .../mapping/RStatLoadTypeYMapper.xml | 18 +- .../mapping/RStatOrgBusbarVoltageMMapper.xml | 14 +- .../mapping/RStatOrgBusbarVoltageQMapper.xml | 14 +- .../mapping/RStatOrgBusbarVoltageYMapper.xml | 14 +- .../majornetwork/mapping/RStatOrgMMapper.xml | 25 +- .../majornetwork/mapping/RStatOrgQMapper.xml | 25 +- .../majornetwork/mapping/RStatOrgYMapper.xml | 25 +- .../mapping/RStatSubstationMMapper.xml | 33 -- .../mapping/RStatSubstationQMapper.xml | 25 +- .../mapping/RStatSubstationVoltageMMapper.xml | 10 +- .../mapping/RStatSubstationYMapper.xml | 25 +- 126 files changed, 317 insertions(+), 1301 deletions(-) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ComAssessController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ComAssessController.java index e027b9638..f103555c3 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ComAssessController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ComAssessController.java @@ -24,8 +24,8 @@ import java.util.List; /** * @version 1.0.0 - * @author: chenchao - * @date: 2022/04/21 09:05 + * @author chenchao + * @date 2022/04/21 09:05 * 对应菜单 谐波系统-区域-电能质量评估 */ @Validated diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/CustomReportController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/CustomReportController.java index 804a70bd4..bee939d66 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/CustomReportController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/CustomReportController.java @@ -24,7 +24,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.List; /** diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java index 0582c3392..8fba0440a 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java @@ -48,6 +48,9 @@ import java.util.*; import java.util.stream.Collectors; +/** + * @author wr + */ @Slf4j @RestController @RequestMapping("/exportmodel") @@ -55,7 +58,9 @@ import java.util.stream.Collectors; @AllArgsConstructor public class ExportModelController extends BaseController { - // 非谐波数据 + /** + * 非谐波数据 + */ List listVirtual; List listPower; List listFlicker; @@ -63,9 +68,13 @@ public class ExportModelController extends BaseController { List listVdeviation; List listFrequency; List listThreephase; - // 谐波电压数据 + /** + * 谐波电压数据 + */ List listVoltageRate; - // 谐波电流数据 + /** + * 谐波电流数据 + */ List listICurrent; @@ -119,12 +128,12 @@ public class ExportModelController extends BaseController { } bdname = lineDto.getBdName(); areaName = lineDto.getAreaName(); - if(areaName.equals("冀北")){ + if("冀北".equals(areaName)){ areaName="国网"+areaName; } pttype = PubUtils.ptTypeName(lineDto.getPtType()); } else { - List monitorList = monitorClient.getMonitorList(Arrays.asList(lineIndex)).getData(); + List monitorList = monitorClient.getMonitorList(Collections.singletonList(lineIndex)).getData(); if (ObjectUtil.isNull(monitorList)) { throw new BusinessException(EventResponseEnum.NOT_FOUND); } @@ -210,8 +219,8 @@ public class ExportModelController extends BaseController { log.info("获取报表发生异常，异常是" + e1.getMessage()); } - - Map reportmap = new HashMap<>();// 报告Map + // 报告Map + Map reportmap = new HashMap<>(16); //数据单位 PqsDeviceUnit deviceUnit = deviceUnitClient.lineUnitDetail(lineIndex).getData(); reportmap.putAll(unitMap(deviceUnit)); @@ -219,7 +228,7 @@ public class ExportModelController extends BaseController { reportmap.put("$btype$", btype); reportmap.put("$ctype$", ctype); - Map header = new HashMap(); + Map header = new HashMap<>(16); if (ObjectUtil.isNotEmpty(file)) { byte[] bytes = file.getBytes(); if(bytes.length>0){ @@ -271,21 +280,27 @@ public class ExportModelController extends BaseController { reportmap.put("$image$", header); getVirtualData(param); - ReportValue voltage1 = this.listVirtual.get(0).getList().get(0);// 电压幅值 - ReportValue voltage2 = this.listVirtual.get(0).getList().get(1);// 电压幅值 - ReportValue voltage3 = this.listVirtual.get(0).getList().get(2);// 电压幅值 - ReportValue current1 = this.listVirtual.get(1).getList().get(0);// 电流幅值 - ReportValue current2 = this.listVirtual.get(1).getList().get(1);// 电流幅值 - ReportValue current3 = this.listVirtual.get(1).getList().get(2);// 电流幅值 + // 电压幅值 + ReportValue voltage1 = this.listVirtual.get(0).getList().get(0); + // 电压幅值 + ReportValue voltage2 = this.listVirtual.get(0).getList().get(1); + // 电压幅值 + ReportValue voltage3 = this.listVirtual.get(0).getList().get(2); + // 电流幅值 + ReportValue current1 = this.listVirtual.get(1).getList().get(0); + // 电流幅值 + ReportValue current2 = this.listVirtual.get(1).getList().get(1); + // 电流幅值 + ReportValue current3 = this.listVirtual.get(1).getList().get(2); String strLineBaseName = String.format("%s%s", new String[]{bdname + "_", name}); - String strAnalysis = "";// 分析建议 - String strError = "";// 报表错误 + // 分析建议 + String strAnalysis = ""; + // 报表错误 + String strError = ""; /************************************************************** **** 基波电压/电流有效值表格 - ************************************** - ************************************** * 一、用基波电压和基波电流做是否有值的判断， 判断策略为所有的基波电压和基波电流都为空 * ************************************* * ************************************* 二、基本数据判断 @@ -407,7 +422,7 @@ public class ExportModelController extends BaseController { case 1: tmpstrMap = "B"; break; - case 2: + default: tmpstrMap = "C"; break; } @@ -463,37 +478,55 @@ public class ExportModelController extends BaseController { // Depts dep = R.getCurrentDept(); // String detpName = dep.getArea(); - reportmap.put("$detpName$", areaName); // 区域名称 + // 区域名称 + reportmap.put("$detpName$", areaName); // 获取报告生成时间 Date currentTime = new Date(); - SimpleDateFormat formatter = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分ss秒");// 报告时分秒格式 + // 报告时分秒格式 + SimpleDateFormat formatter = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分ss秒"); String strTime = String.format("%s——%s。", new String[]{DateUtil.format(startDate, "yyyy年MM月dd日 HH时mm分ss秒"), DateUtil.format(endDate, "yyyy年MM月dd日 HH时mm分ss秒")}); - reportmap.put("$number$", reportNumber); // 报告编号 - reportmap.put("$titlePoint$", crmName); // 客户名称 - - reportmap.put("$TitleTime$", formatter.format(currentTime)); // 报告生成时间 + // 报告编号 + reportmap.put("$number$", reportNumber); + // 客户名称 + reportmap.put("$titlePoint$", crmName); + // 报告生成时间 + reportmap.put("$TitleTime$", formatter.format(currentTime)); + // 报告标题 reportmap.put("$ReportTitle$", - String.format("对该地区%s电能质量在线监测数据进行分析， 以判断电能质量指标是否满足国标。", new String[]{strLineBaseName}));// 报告标题 - reportmap.put("$ReportTime$", strTime);// 报告分析时间段 + String.format("对该地区%s电能质量在线监测数据进行分析， 以判断电能质量指标是否满足国标。", new String[]{strLineBaseName})); + // 报告分析时间段 + reportmap.put("$ReportTime$", strTime); + // 运行数据分析 reportmap.put("$RunBaseName$", String.format("以下将对%s电能质量统计数据进行分析，数据包括基波电压/电流、谐波电压/电流、电压偏差、三相电压不平衡度、电压闪变、频率偏差。", - new String[]{strLineBaseName}));// 运行数据分析 - reportmap.put("$BaseVITable$", String.format("报告分析时间段内%s的基波电压/电流分钟统计数据见下表。", new String[]{strLineBaseName}));// 基波电压和电流 - reportmap.put("$VDTable$", String.format("报告分析时间段内%s的电压偏差统计数据见下表。", new String[]{strLineBaseName}));// 供电电压偏差 - reportmap.put("$FRETable$", String.format("报告分析时间段内%s的频率偏差统计数据见下表。", new String[]{strLineBaseName}));// 频率偏差 - reportmap.put("$THETable$", String.format("报告分析时间段内%s的三相电压不平衡度统计数据见下表。", new String[]{strLineBaseName}));// 三相电压不平衡度 - reportmap.put("$PLTTable$", String.format("报告分析时间段内%s的闪变统计数据见下表。", new String[]{strLineBaseName}));// 闪变 + new String[]{strLineBaseName})); + // 基波电压和电流 + reportmap.put("$BaseVITable$", String.format("报告分析时间段内%s的基波电压/电流分钟统计数据见下表。", new String[]{strLineBaseName})); + // 供电电压偏差 + reportmap.put("$VDTable$", String.format("报告分析时间段内%s的电压偏差统计数据见下表。", new String[]{strLineBaseName})); + // 频率偏差 + reportmap.put("$FRETable$", String.format("报告分析时间段内%s的频率偏差统计数据见下表。", new String[]{strLineBaseName})); + // 三相电压不平衡度 + reportmap.put("$THETable$", String.format("报告分析时间段内%s的三相电压不平衡度统计数据见下表。", new String[]{strLineBaseName})); + // 闪变 + reportmap.put("$PLTTable$", String.format("报告分析时间段内%s的闪变统计数据见下表。", new String[]{strLineBaseName})); + // 谐波电压 reportmap.put("$RVTable$", - String.format("报告分析时间段内%s的2-25次谐波电压含有率CP95概率值统计数据见下表。", new String[]{strLineBaseName}));// 谐波电压 + String.format("报告分析时间段内%s的2-25次谐波电压含有率CP95概率值统计数据见下表。", new String[]{strLineBaseName})); + // 谐波电流 reportmap.put("$RITable$", - String.format("报告分析时间段内%s的2-25次谐波电流幅值CP95概率值统计数据见下表。", new String[]{strLineBaseName}));// 谐波电流 - - reportmap.put("$LineName1$", name);// 监测点名称1 - reportmap.put("$LineName2$", name);// 监测点名称2 - reportmap.put("$LineName3$", name);// 监测点名称3 - reportmap.put("$LineName4$", name);// 监测点名称4 - reportmap.put("$LineName5$", name);// 监测点名称5 + String.format("报告分析时间段内%s的2-25次谐波电流幅值CP95概率值统计数据见下表。", new String[]{strLineBaseName})); + // 监测点名称1 + reportmap.put("$LineName1$", name); + // 监测点名称2 + reportmap.put("$LineName2$", name); + // 监测点名称3 + reportmap.put("$LineName3$", name); + // 监测点名称4 + reportmap.put("$LineName4$", name); + // 监测点名称5 + reportmap.put("$LineName5$", name); /********************** **** 数据获取 @@ -507,16 +540,21 @@ public class ExportModelController extends BaseController { getThreePhase(param, overLimit); getVoltageRate(param, overLimit); getCurrentRate(param, overLimit); - - ReportValue pst1 = this.listFlicker.get(0).getList().get(0);// 短闪 - ReportValue pst2 = this.listFlicker.get(0).getList().get(1);// 短闪 - ReportValue pst3 = this.listFlicker.get(0).getList().get(2);// 短闪 - ReportValue plt1 = this.listFlicker.get(1).getList().get(0);// 长闪 - ReportValue plt2 = this.listFlicker.get(1).getList().get(1);// 长闪 - ReportValue plt3 = this.listFlicker.get(1).getList().get(2);// 长闪 - + // 短闪 + ReportValue pst1 = this.listFlicker.get(0).getList().get(0); + // 短闪 + ReportValue pst2 = this.listFlicker.get(0).getList().get(1); + // 短闪 + ReportValue pst3 = this.listFlicker.get(0).getList().get(2); + // 长闪 + ReportValue plt1 = this.listFlicker.get(1).getList().get(0); + // 长闪 + ReportValue plt2 = this.listFlicker.get(1).getList().get(1); + // 长闪 + ReportValue plt3 = this.listFlicker.get(1).getList().get(2); + // 监测点基本信息 reportmap.put("$LineBase$", String.format("%s%s，CT变比为：%s，PT变比为：%s。", - new String[]{bdname, name, lineDto.getCt(), lineDto.getPt()}));// 监测点基本信息 + new String[]{bdname, name, lineDto.getCt(), lineDto.getPt()})); /************************************************************** **** 三张大表基础数据幅值 @@ -570,7 +608,8 @@ public class ExportModelController extends BaseController { ReportValue vdeviation1 = this.listVdeviation.get(0).getList().get(0); ReportValue vdeviation2 = this.listVdeviation.get(0).getList().get(1); ReportValue vdeviation3 = this.listVdeviation.get(0).getList().get(2); - String vdeviationLimit = judgeNull(this.listVdeviation.get(0).getOverLimit());// 获取电压上下偏差的国标限值 + // 获取电压上下偏差的国标限值 + String vdeviationLimit = judgeNull(this.listVdeviation.get(0).getOverLimit()); reportmap.put("$VD_L$", vdeviationLimit); String strResultVdeviationdata = ""; String tmpstrResultVdeviationdata = ""; @@ -644,7 +683,8 @@ public class ExportModelController extends BaseController { **** 频率偏差 ***************************************************************/ ReportValue valueOfFreValue = this.listFrequency.get(1).getList().get(0); - String valueOfFreLimit = judgeNull(this.listFrequency.get(1).getOverLimit());// 获取频率偏差国标限值 + // 获取频率偏差国标限值 + String valueOfFreLimit = judgeNull(this.listFrequency.get(1).getOverLimit()); reportmap.put("$FRE_L$", valueOfFreLimit); String strResultFre = ""; String tmpstrResultFre = ""; @@ -699,10 +739,12 @@ public class ExportModelController extends BaseController { } if ("".equals(tmpstrResultFre)) { - reportmap.put("$FV0R$", "合格");// 三张大表取值 + // 三张大表取值 + reportmap.put("$FV0R$", "合格"); strResultFre += "从上表中可以看出" + strLineBaseName + "频率偏差均满足国标限值（±" + valueOfFreLimit + deviceUnit.getUnitFrequencyDev() + "）的要求。"; } else { - reportmap.put("$FV0R$", "不合格");// 三张大表取值 + // 三张大表取值 + reportmap.put("$FV0R$", "不合格"); strAnalysis += tmpstrResultFre + ",均不满足国标限值（±" + valueOfFreLimit + deviceUnit.getUnitFrequencyDev() + "）的要求。"; strResultFre += "从上表中可以看出" + strLineBaseName + "频率偏差" + tmpstrResultFre + ",均不满足国标限值（±" + valueOfFreLimit + deviceUnit.getUnitFrequencyDev() + "）的要求。"; @@ -716,7 +758,8 @@ public class ExportModelController extends BaseController { **** 三相电压不平衡度 ***************************************************************/ ReportValue valueOfThree = this.listThreephase.get(0).getList().get(0); - String valueOfThreeLimit = judgeNull(this.listThreephase.get(0).getOverLimit());// 获取三相电压不平衡度国标限值 + // 获取三相电压不平衡度国标限值 + String valueOfThreeLimit = judgeNull(this.listThreephase.get(0).getOverLimit()); reportmap.put("$THE_L$", valueOfThreeLimit); String strResultThree = ""; String tmpstrResultThree = ""; @@ -745,10 +788,12 @@ public class ExportModelController extends BaseController { strResultThreeValue += "注意:从上表中可以看出" + strLineBaseName + "三相电压不平衡度数据存在异常(不是数值类型)。"; } if (cp95Value > limit) { - reportmap.put("$TV0R$", "不合格");// 三张大表取值 + // 三张大表取值 + reportmap.put("$TV0R$", "不合格"); tmpstrResultThree += "三相电压不平衡度95%概率值为：" + valueOfThree.getCp95Value().toString(); } else { - reportmap.put("$TV0R$", "合格");// 三张大表取值 + // 三张大表取值 + reportmap.put("$TV0R$", "合格"); } if (!(maxValue >= minValue && maxValue >= aveValue && maxValue >= cp95Value)) { @@ -778,7 +823,8 @@ public class ExportModelController extends BaseController { /************************************************************** **** 电压闪变 ***************************************************************/ - String valueOfFlickerLimit = judgeNull(this.listFlicker.get(1).getOverLimit());// 获取电压长时闪变的限值 + // 获取电压长时闪变的限值 + String valueOfFlickerLimit = judgeNull(this.listFlicker.get(1).getOverLimit()); reportmap.put("$PLT_L$", valueOfFlickerLimit); String strResultFlicker = ""; String tmpstrResultFlicker = ""; @@ -981,26 +1027,38 @@ public class ExportModelController extends BaseController { String tmpstrResult = ""; if (maxValue > limit) { - if (!"".equals(tmpstrResult)) + if (!"".equals(tmpstrResult)) { tmpstrResult += "、"; + } tmpstrResult += "A"; - reportmap.put("$CV" + (i + 1) + "R_A$", "不合格");// 三张大表取值 - } else - reportmap.put("$CV" + (i + 1) + "R_A$", "合格");// 三张大表取值 + // 三张大表取值 + reportmap.put("$CV" + (i + 1) + "R_A$", "不合格"); + } else { + // 三张大表取值 + reportmap.put("$CV" + (i + 1) + "R_A$", "合格"); + } if (minValue > limit) { - if (!"".equals(tmpstrResult)) + if (!"".equals(tmpstrResult)) { tmpstrResult += "、"; + } tmpstrResult += "B"; - reportmap.put("$CV" + (i + 1) + "R_B$", "不合格");// 三张大表取值 - } else - reportmap.put("$CV" + (i + 1) + "R_B$", "合格");// 三张大表取值 + // 三张大表取值 + reportmap.put("$CV" + (i + 1) + "R_B$", "不合格"); + } else { + // 三张大表取值 + reportmap.put("$CV" + (i + 1) + "R_B$", "合格"); + } if (aveValue > limit) { - if (!"".equals(tmpstrResult)) + if (!"".equals(tmpstrResult)) { tmpstrResult += "、"; + } tmpstrResult += "C"; - reportmap.put("$CV" + (i + 1) + "R_C$", "不合格");// 三张大表取值 - } else - reportmap.put("$CV" + (i + 1) + "R_C$", "合格");// 三张大表取值 + // 三张大表取值 + reportmap.put("$CV" + (i + 1) + "R_C$", "不合格"); + } else { + // 三张大表取值 + reportmap.put("$CV" + (i + 1) + "R_C$", "合格"); + } // 判断单个结论是否存在 if (!"".equals(tmpstrResult)) { tmpstrResultVoltageRate += (i + 1) + "次谐波电压含有率95%概率值" + tmpstrResult + ";"; @@ -1062,28 +1120,37 @@ public class ExportModelController extends BaseController { } // 限值判断 if (cp95ValueA > limit) { - if (!"".equals(tmpstrResultDistortion)) + if (!"".equals(tmpstrResultDistortion)) { tmpstrResultDistortion += "、"; + } tmpstrResultDistortion += atype; - reportmap.put("$TV0R_A$", "不合格");// 三张大表取值 + // 三张大表取值 + reportmap.put("$TV0R_A$", "不合格"); } else { - reportmap.put("$TV0R_A$", "合格");// 三张大表取值 + // 三张大表取值 + reportmap.put("$TV0R_A$", "合格"); } if (cp95ValueB > limit) { - if (!"".equals(tmpstrResultDistortion)) + if (!"".equals(tmpstrResultDistortion)) { tmpstrResultDistortion += "、"; + } tmpstrResultDistortion += btype; - reportmap.put("$TV0R_B$", "不合格");// 三张大表取值 + // 三张大表取值 + reportmap.put("$TV0R_B$", "不合格"); } else { - reportmap.put("$TV0R_B$", "合格");// 三张大表取值 + // 三张大表取值 + reportmap.put("$TV0R_B$", "合格"); } if (cp95ValueC > limit && pttype != 2) { - if (!"".equals(tmpstrResultDistortion)) + if (!"".equals(tmpstrResultDistortion)) { tmpstrResultDistortion += "、"; + } tmpstrResultDistortion += ctype; - reportmap.put("$TV0R_C$", "不合格");// 三张大表取值 + // 三张大表取值 + reportmap.put("$TV0R_C$", "不合格"); } else { - reportmap.put("$TV0R_C$", "合格");// 三张大表取值 + // 三张大表取值 + reportmap.put("$TV0R_C$", "合格"); } // 假如为空则所有的都满足 @@ -1150,26 +1217,38 @@ public class ExportModelController extends BaseController { String tmpstrResult = ""; if (maxValue > limit) { - if (!"".equals(tmpstrResult)) + if (!"".equals(tmpstrResult)) { tmpstrResult += "、"; + } tmpstrResult += "A"; - reportmap.put("$CI" + (i + 1) + "R_A$", "不合格");// 三张大表取值 - } else - reportmap.put("$CI" + (i + 1) + "R_A$", "合格");// 三张大表取值 + // 三张大表取值 + reportmap.put("$CI" + (i + 1) + "R_A$", "不合格"); + } else { + // 三张大表取值 + reportmap.put("$CI" + (i + 1) + "R_A$", "合格"); + } if (minValue > limit) { - if (!"".equals(tmpstrResult)) + if (!"".equals(tmpstrResult)) { tmpstrResult += "、"; + } tmpstrResult += "B"; - reportmap.put("$CI" + (i + 1) + "R_B$", "不合格");// 三张大表取值 - } else - reportmap.put("$CI" + (i + 1) + "R_B$", "合格");// 三张大表取值 + // 三张大表取值 + reportmap.put("$CI" + (i + 1) + "R_B$", "不合格"); + } else { + // 三张大表取值 + reportmap.put("$CI" + (i + 1) + "R_B$", "合格"); + } if (aveValue > limit) { - if (!"".equals(tmpstrResult)) + if (!"".equals(tmpstrResult)) { tmpstrResult += "、"; + } tmpstrResult += "C"; - reportmap.put("$CI" + (i + 1) + "R_C$", "不合格");// 三张大表取值 - } else - reportmap.put("$CI" + (i + 1) + "R_C$", "合格");// 三张大表取值 + // 三张大表取值 + reportmap.put("$CI" + (i + 1) + "R_C$", "不合格"); + } else { + // 三张大表取值 + reportmap.put("$CI" + (i + 1) + "R_C$", "合格"); + } // 判断单个结论是否存在 if (!"".equals(tmpstrResult)) { tmpstrResultCurrent += (i + 1) + "次谐波电流幅值95%概率值" + tmpstrResult + ";"; @@ -1191,18 +1270,27 @@ public class ExportModelController extends BaseController { // 测试结果填写 reportmap.put("$ResultTitle$", String.format("通过对（%s——%s）时间段内%s电能质量统计数据分析后得出以下结论：", new String[]{DateUtil.format(startDate, "yyyy年MM月dd日 HH时mm分ss秒"), - DateUtil.format(endDate, "yyyy年MM月dd日 HH时mm分ss秒"), strLineBaseName}));// 结论标题 - reportmap.put("$Result_VD$", String.format("（1）电压偏差：%s", new String[]{strResultVdeviationdata}));// 电压偏差 - reportmap.put("$Result_FRE$", String.format("（2）频率偏差：%s", new String[]{strResultFre}));// 频率偏差 - reportmap.put("$Result_THE$", String.format("（3）三相电压不平衡度：%s", new String[]{strResultThree}));// 三相电压不平衡度 - reportmap.put("$Result_FIC$", String.format("（4）电压长时闪变：%s", new String[]{strResultFlicker}));// 电压长时闪变 - reportmap.put("$Result_VOL$", String.format("（5）谐波电压：%s", new String[]{strResultVoltageRate}));// 谐波电压 - reportmap.put("$Result_CUR$", String.format("（6）谐波电流：%s", new String[]{strResultCurrent}));// 谐波电流 + DateUtil.format(endDate, "yyyy年MM月dd日 HH时mm分ss秒"), strLineBaseName})); + + // 电压偏差 + reportmap.put("$Result_VD$", String.format("（1）电压偏差：%s", new String[]{strResultVdeviationdata})); + // 频率偏差 + reportmap.put("$Result_FRE$", String.format("（2）频率偏差：%s", new String[]{strResultFre})); + // 三相电压不平衡度 + reportmap.put("$Result_THE$", String.format("（3）三相电压不平衡度：%s", new String[]{strResultThree})); + // 电压长时闪变 + reportmap.put("$Result_FIC$", String.format("（4）电压长时闪变：%s", new String[]{strResultFlicker})); + // 谐波电压 + reportmap.put("$Result_VOL$", String.format("（5）谐波电压：%s", new String[]{strResultVoltageRate})); + // 谐波电流 + reportmap.put("$Result_CUR$", String.format("（6）谐波电流：%s", new String[]{strResultCurrent})); // 分析建议填写 if (!"".equals(strAnalysis) || !"".equals(strError)) { - reportmap.put("$Analysis$", "根据统计数据结果分析,监测点为：" + name + "," + strAnalysis + strError);// 分析建议 + // 分析建议 + reportmap.put("$Analysis$", "根据统计数据结果分析,监测点为：" + name + "," + strAnalysis + strError); } else { - reportmap.put("$Analysis$", "根据统计数据结果分析,监测点为：" + name + "，电能质量数据满足国标限值要求。");// 分析建议 + // 分析建议 + reportmap.put("$Analysis$", "根据统计数据结果分析,监测点为：" + name + "，电能质量数据满足国标限值要求。"); } /************************************ @@ -1228,7 +1316,8 @@ public class ExportModelController extends BaseController { reportmap.put("$YF0X$", judgeNull(powerDto4.getFmaxValue())); reportmap.put("$YF0N$", judgeNull(powerDto4.getMinValue())); reportmap.put("$YF0E$", judgeNull(powerDto4.getMeanValue())); - formatter = new SimpleDateFormat("yyyyMMddHHmmss");// 报告时分秒格式 + // 报告时分秒格式 + formatter = new SimpleDateFormat("yyyyMMddHHmmss"); String reportFileUrl = ""; try { @@ -1254,7 +1343,7 @@ public class ExportModelController extends BaseController { */ private Map unitMap(PqsDeviceUnit deviceUnit) { List dictData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEVICE_UNIT.getCode()).getData(); - Map unit = new HashMap<>(); + Map unit = new HashMap<>(16); List list = dictData.stream().map(DictData::getCode).collect(Collectors.toList()); for (String s : list) { //有效值 @@ -1305,9 +1394,6 @@ public class ExportModelController extends BaseController { /** * 解析base64，返回图片所在路径 - * - * @param base64Info - * @return */ @SuppressWarnings("restriction") private String decodeBase64(byte[] base64Info) { @@ -1391,7 +1477,9 @@ public class ExportModelController extends BaseController { } } - // 基波幅值 + /** + * 基波幅值 + */ public void getVirtualData(ReportQueryParam param) { List listVirtual = reportService.getVirtualData(param); @@ -1410,7 +1498,9 @@ public class ExportModelController extends BaseController { } - // 功率 + /** + * 功率 + */ public void getPowerData(ReportQueryParam param) { List listPower = reportService.getPowerData(param); @@ -1424,7 +1514,9 @@ public class ExportModelController extends BaseController { transformData(this.listPower, listPower, list, true, false); } - // 闪变 + /** + * 闪变 + */ public void getFlicker(ReportQueryParam param, Overlimit overLimit) { List listFlicker = reportService.getFlickerData(param); List list = new ArrayList<>(); @@ -1441,7 +1533,9 @@ public class ExportModelController extends BaseController { transformData(this.listFlicker, listFlicker, list, true); } - // 电压偏差 + /** + * 电压偏差 + */ public void getVdeviation(ReportQueryParam param, Overlimit overLimit) { List listVdeviation = reportService.getVdeviation(param); List list = new ArrayList<>(); @@ -1454,7 +1548,9 @@ public class ExportModelController extends BaseController { transformData(this.listVdeviation, listVdeviation, list, true); } - // 畸变率 + /** + * 畸变率 + */ public void getDistortion(ReportQueryParam param, Overlimit overLimit) { List listDistortion = reportService.getDistortionData(param); List list = new ArrayList<>(); @@ -1473,7 +1569,9 @@ public class ExportModelController extends BaseController { transformData(this.listDistortion, listDistortion, list, true); } - // 频率 + /** + * 频率 + */ public void getFre(ReportQueryParam param, Overlimit overLimit) { List listFrequency = reportService.getFrequencyData(param); @@ -1494,7 +1592,9 @@ public class ExportModelController extends BaseController { } - // 三相不平衡 + /** + * 三相不平衡 + */ public void getThreePhase(ReportQueryParam param, Overlimit overLimit) { List listThreephase = reportService.getThreephase(param); @@ -1517,7 +1617,9 @@ public class ExportModelController extends BaseController { } - // 谐波电流 + /** + * 谐波电流 + */ public void getCurrentRate(ReportQueryParam param, Overlimit overLimit) { List listICurrent = reportService.getICurrent(param); @@ -1538,7 +1640,9 @@ public class ExportModelController extends BaseController { transformData(this.listICurrent, listICurrent, list, true); } - // 谐波电压 + /** + * 谐波电压 + */ public void getVoltageRate(ReportQueryParam param, Overlimit overLimit) { List listVoltageRate = reportService.getVoltageRate(param); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelJBController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelJBController.java index 1c2a86eb5..a9fa28850 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelJBController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelJBController.java @@ -56,6 +56,9 @@ import java.util.*; import java.util.stream.Collectors; +/** + * @author wr + */ @Slf4j @RestController @RequestMapping("/exportmodel") @@ -63,7 +66,9 @@ import java.util.stream.Collectors; @AllArgsConstructor public class ExportModelJBController extends BaseController { - // 非谐波数据 + /** + * 非谐波数据 + */ List listVirtual; List listPower; List listFlicker; @@ -71,14 +76,22 @@ public class ExportModelJBController extends BaseController { List listVdeviation; List listFrequency; List listThreephase; - // 谐波电压数据 + /** + * 谐波电压数据 + */ List listVoltageRate; - // 谐波电流数据 + /** + * 谐波电流数据 + */ List listICurrent; - // 间谐波电压 + /** + * 间谐波电压 + */ List listInRate; - // 负序电流 + /** + * 负序电流 + */ List listIneRate; private final LineFeignClient lineFeignClient; @@ -425,7 +438,7 @@ public class ExportModelJBController extends BaseController { case 1: tmpstrMap = "B"; break; - case 2: + default: tmpstrMap = "C"; break; } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java index 14757d3a9..aa598b15c 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java @@ -33,7 +33,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Arrays; import java.util.List; /** diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java index 508ea5d6a..338b24333 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionSubstationController.java @@ -8,8 +8,6 @@ import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; import com.njcn.device.pq.pojo.dto.PollutionLineDTO; import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO; -import com.njcn.device.pq.pojo.param.GridDiagramParam; -import com.njcn.device.pq.pojo.param.RunManageParam; import com.njcn.harmonic.pojo.param.HarmonicPublicParam; import com.njcn.harmonic.pojo.param.PollutionSubstationQuryParam; import com.njcn.harmonic.pojo.vo.PollutionSubstationVO; @@ -30,8 +28,6 @@ import java.util.List; /** * Description: - * 接口文档访问地址：http://serverIP:port/swagger-ui.html - * Date: 2022/10/13 9:39【需求编号】 * * @author clam * @version V1.0.0 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpHarmonicReportDController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpHarmonicReportDController.java index 4d514e192..c948a08b5 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpHarmonicReportDController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpHarmonicReportDController.java @@ -20,8 +20,6 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; /** - * @Title RMpHarmonicReportDController - * @Package com.njcn.harmonic.controller * @Author jianghaifei * @Date 2022-10-20 19:08 * @Version V1.0 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/SteadyExceedRateController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/SteadyExceedRateController.java index 9781d6d00..ef29fcfbe 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/SteadyExceedRateController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/SteadyExceedRateController.java @@ -25,8 +25,8 @@ import java.util.List; /** * @version 1.0.0 - * @author: chenchao - * @date: 2022/04/12 11:44 + * @author chenchao + * @date 2022/04/12 11:44 */ @Validated @Slf4j diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/SteadyQualifyController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/SteadyQualifyController.java index 0faaa2fd5..0dea8dbd8 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/SteadyQualifyController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/SteadyQualifyController.java @@ -25,8 +25,8 @@ import java.util.List; /** * @version 1.0.0 - * @author: chenchao - * @date: 2022/03/30 19:18 + * @author chenchao + * @date 2022/03/30 19:18 */ @Validated @Slf4j diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/THDController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/THDController.java index 363fc1bc4..fa26412b6 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/THDController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/THDController.java @@ -24,8 +24,8 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * @author: chenchao - * @date: 2022/03/10 21:39 + * @author chenchao + * @date 2022/03/10 21:39 * @Description: <描述> */ @Validated diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/TerminalController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/TerminalController.java index 3ff016309..9b5f858b5 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/TerminalController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/TerminalController.java @@ -24,8 +24,8 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; /** - * @author: chenchao - * @date: 2022/03/01 21:57 + * @author chenchao + * @date 2022/03/01 21:57 * @Description: <描述> */ @Validated diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/algorithm/AlgorithmController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/algorithm/AlgorithmController.java index 98fea3d0a..0ba53436f 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/algorithm/AlgorithmController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/algorithm/AlgorithmController.java @@ -1,7 +1,6 @@ package com.njcn.harmonic.controller.algorithm; import cn.hutool.core.bean.BeanUtil; -import com.njcn.common.config.GeneralInfo; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; @@ -25,6 +24,9 @@ import org.springframework.web.multipart.MultipartFile; import java.util.*; +/** + * @author hongawen + */ @RestController @RequiredArgsConstructor @Api(tags = "算法") @@ -40,14 +42,11 @@ public class AlgorithmController extends BaseController { /** * 算法保存 - * - * @param param - * @return */ @PostMapping("/getAlgorithmSave") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("算法保存") - @ApiImplicitParam(name = "param", value = "算发内容", required = true) + @ApiImplicitParam(name = "param", value = "算法内容", required = true) public HttpResult getAlgorithmSave(@RequestBody RStatFileVO param) { String methodDescribe = getMethodDescribe("getAlgorithmSave"); RStatFile rStatFile = BeanUtil.copyProperties(param, RStatFile.class); @@ -83,24 +82,4 @@ public class AlgorithmController extends BaseController { } } - /** - * 通用删除请求 - */ -// @PostMapping("/common/delete") -// @ResponseBody -// public HttpResult delete() -// { -// try -// { -// List aaa=new ArrayList<>(); -// aaa.add("algorithm/0CA99CB427A94A8A833499A41C557405.png"); -// aaa.add("algorithm/07D8A0FD304A42CDB73F514FBEE641BC.png"); -// minIoUtils.removeObjects( minIoProperties.getBucket(),aaa); -// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, null); -// } -// catch (Exception e) -// { -// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, null); -// } -// } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/dataquality/RMpPartHarmonicDetailController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/dataquality/RMpPartHarmonicDetailController.java index 805b2875f..7a13d07ee 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/dataquality/RMpPartHarmonicDetailController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/dataquality/RMpPartHarmonicDetailController.java @@ -34,8 +34,6 @@ public class RMpPartHarmonicDetailController extends BaseController { /** * 稳态指标超标明细表-月表统计 * - * @param param - * @return */ @PostMapping("/getRMpPartHarmonicDetail") @ApiOperation("稳态指标超标在线监测超标问题详情") diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/dim/DimGlobalDealController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/dim/DimGlobalDealController.java index 395b060a7..4e256b443 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/dim/DimGlobalDealController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/dim/DimGlobalDealController.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.controller.dim; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwOverviewController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwOverviewController.java index 42bb8af39..2ff690731 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwOverviewController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwOverviewController.java @@ -28,7 +28,6 @@ import java.util.List; * <分布式光伏概览> * * @author wr - * @createTime: 2022-12-29 */ @RestController @RequestMapping("/pwOverview") diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRMpBenchmarkLevelController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRMpBenchmarkLevelController.java index 6a019ab53..8166b6990 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRMpBenchmarkLevelController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRMpBenchmarkLevelController.java @@ -21,14 +21,11 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; /** - * @Title RMpBenchmarkLevelController - * @Package com.njcn.device.pms.controller - * @Author jianghaifei - * @Date 2022-10-11 10:34 - * @Version V1.0 + * @author jianghaifei + * @date 2022-10-11 10:34 + * @version V1.0 */ @RestController @Api(tags = "配网-基准水平评估") @@ -36,11 +33,20 @@ import java.util.List; @RequestMapping("/pwRMpBenchmarkLevel") public class PwRMpBenchmarkLevelController extends BaseController { - private final PwRMpBenchmarkLevelMService rMpBenchmarkLevelMService; //基准水平-月 + /** + * 基准水平-月 + */ + private final PwRMpBenchmarkLevelMService rMpBenchmarkLevelMService; - private final PwRMpBenchmarkLevelQService rMpBenchmarkLevelQService; //基准水平-季 + /** + * 基准水平-季 + */ + private final PwRMpBenchmarkLevelQService rMpBenchmarkLevelQService; - private final PwRMpBenchmarkLevelYService rMpBenchmarkLevelYService; //基准水平-年 + /** + * 基准水平-年 + */ + private final PwRMpBenchmarkLevelYService rMpBenchmarkLevelYService; @PostMapping("getPwRMpBenchmarkLevelList") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @@ -62,13 +68,10 @@ public class PwRMpBenchmarkLevelController extends BaseController { //查询基准水平-季数据 rMpBenchmarkLevelList = rMpBenchmarkLevelQService.getPwRMpBenchmarkLevelList(rMpBenchmarkLevelParam); break; - case BizParamConstant.STAT_BIZ_MONTH: - //查询基准水平-月数据 + default: + //查询月数据 rMpBenchmarkLevelList = rMpBenchmarkLevelMService.getPwRMpBenchmarkLevelList(rMpBenchmarkLevelParam); break; - default: - //如果前端没有传type默认查询月数据 - rMpBenchmarkLevelList = rMpBenchmarkLevelMService.getPwRMpBenchmarkLevelList(rMpBenchmarkLevelParam); } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpBenchmarkLevelList, methodDescribe); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatOrgController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatOrgController.java index be55b8a5a..932635b5f 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatOrgController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatOrgController.java @@ -70,9 +70,6 @@ public class PwRStatOrgController extends BaseController { /** * 配网稳态指标超标明细表 - * - * @param param - * @return */ @PostMapping("/getPwRMpPartHarmonicDetail") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @@ -86,9 +83,6 @@ public class PwRStatOrgController extends BaseController { /** * 配网稳态指标超标明细表-指标趋势图 - * - * @param param - * @return */ @PostMapping("/getRMpPartHarmonicDetailIcon") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @@ -102,9 +96,6 @@ public class PwRStatOrgController extends BaseController { /** * 配网区域稳态指标合格率统计表-配网（稳态指标合格率统计） - * - * @param param、 - * @return */ @PostMapping("/getPwRStatOrgIndex") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @@ -118,9 +109,6 @@ public class PwRStatOrgController extends BaseController { /** * 区域稳态指标合格率统计表-配网（稳态指标合格率统计） - * - * @param param - * @return */ @PostMapping("/getPwRMpPassRateInfo") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @@ -134,9 +122,6 @@ public class PwRStatOrgController extends BaseController { /** * 变电站稳态指标超标分类统计表 - * - * @param param - * @return */ @PostMapping("/getPwRStatSubstationOrg") @OperateInfo(info = LogEnum.BUSINESS_COMMON) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwUserLimitController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwUserLimitController.java index 2a22c45fa..4c23e2a2f 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwUserLimitController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwUserLimitController.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.controller.distribution; -import com.njcn.harmonic.service.majornetwork.RStatLimitService; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -9,6 +8,7 @@ import org.springframework.web.bind.annotation.RestController; /** * 配网用户侧指标越限 + * @author cdf */ @RestController @RequestMapping("/pwLimit") @@ -16,5 +16,4 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "配网用户侧指标越限") @RequiredArgsConstructor public class PwUserLimitController { - private final RStatLimitService rStatLimitService; } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/RStatPwPermeabilityMController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/RStatPwPermeabilityMController.java index fc57c966c..28ec52391 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/RStatPwPermeabilityMController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/RStatPwPermeabilityMController.java @@ -18,14 +18,10 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - /** - * @Title RStatPwPermeabilityMController - * @Package com.njcn.harmonic.controller - * @Author jianghaifei - * @Date 2022-11-07 13:55 - * @Version V1.0 + * @author jianghaifei + * @date 2022-11-07 13:55 + * @version V1.0 */ @RestController @RequestMapping("/rStatPwPermeability") diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java index a46c03de7..146278ff4 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/LargeScreenController.java @@ -25,8 +25,8 @@ import java.util.List; /** * @version 1.0.0 - * @author: zbj - * @date: 2023/04/06 + * @author zbj + * @date 2023/04/06 */ @Slf4j @Api(tags = "大屏") diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/PVOverviewController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/PVOverviewController.java index 9077b697d..216184c10 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/PVOverviewController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/PVOverviewController.java @@ -22,7 +22,6 @@ import java.util.List; /** * @author wr - * @description * @date 2023/5/10 9:25 */ @RestController diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RMpBenchmarkLevelController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RMpBenchmarkLevelController.java index ac0e0fc6d..fd2667a34 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RMpBenchmarkLevelController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RMpBenchmarkLevelController.java @@ -23,8 +23,6 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; /** - * @Title RMpBenchmarkLevelController - * @Package com.njcn.device.pms.controller * @Author jianghaifei * @Date 2022-10-11 10:34 * @Version V1.0 @@ -35,11 +33,20 @@ import java.util.List; @RequestMapping("/rMpBenchmarkLevel") public class RMpBenchmarkLevelController extends BaseController { - private final RMpBenchmarkLevelMService rMpBenchmarkLevelMService; //基准水平-月 + /** + * 基准水平-月 + */ + private final RMpBenchmarkLevelMService rMpBenchmarkLevelMService; - private final RMpBenchmarkLevelQService rMpBenchmarkLevelQService; //基准水平-季 + /** + * 基准水平-季 + */ + private final RMpBenchmarkLevelQService rMpBenchmarkLevelQService; - private final RMpBenchmarkLevelYService rMpBenchmarkLevelYService; //基准水平-年 + /** + * 基准水平-年 + */ + private final RMpBenchmarkLevelYService rMpBenchmarkLevelYService; @PostMapping("getAllRMpBenchmarkLevelList") @@ -59,13 +66,10 @@ public class RMpBenchmarkLevelController extends BaseController { //查询基准水平-季数据 rMpBenchmarkLevelList = rMpBenchmarkLevelQService.getRMpBenchmarkLevelList(rMpBenchmarkLevelParam); break; - case BizParamConstant.STAT_BIZ_MONTH: - //查询基准水平-月数据 + default: + //查询月数据 rMpBenchmarkLevelList = rMpBenchmarkLevelMService.getRMpBenchmarkLevelList(rMpBenchmarkLevelParam); break; - default: - //如果前端没有传type默认查询月数据 - rMpBenchmarkLevelList = rMpBenchmarkLevelMService.getRMpBenchmarkLevelList(rMpBenchmarkLevelParam); } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpBenchmarkLevelList, methodDescribe); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatOrgController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatOrgController.java index 49a99e4c8..93c9b0581 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatOrgController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatOrgController.java @@ -103,8 +103,6 @@ public class RStatOrgController extends BaseController { /** * 区域干扰源电流类指标超标统计 * - * @param param - * @return */ @GetMapping("/getRStatLoadType") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @@ -118,8 +116,6 @@ public class RStatOrgController extends BaseController { /** * 变电站（换流站）稳态指标超标分类统计表 * - * @param param - * @return */ @PostMapping("/getRStatSubstationOrg") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @@ -134,8 +130,6 @@ public class RStatOrgController extends BaseController { /** * 稳态指标超标明细表 * - * @param param - * @return */ @PostMapping("/getRMpPartHarmonicDetail") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @@ -149,8 +143,6 @@ public class RStatOrgController extends BaseController { /** * 稳态指标超标明细表-指标趋势图 * - * @param param - * @return */ @GetMapping("/getRMpPartHarmonicDetailIcon") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @@ -164,8 +156,6 @@ public class RStatOrgController extends BaseController { /** * 区域稳态指标合格率统计表-主网（稳态指标合格率统计） * - * @param param - * @return */ @GetMapping("/getRStatOrgIndex") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @@ -179,8 +169,6 @@ public class RStatOrgController extends BaseController { /** * 区域稳态指标合格率统计表-主网（稳态指标合格率统计） * - * @param param - * @return */ @PostMapping("/getRMpPassRateInfo") @OperateInfo(info = LogEnum.BUSINESS_COMMON) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/pmsWifi/PmsWifiController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/pmsWifi/PmsWifiController.java index 52ca58fb2..5c6793ccb 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/pmsWifi/PmsWifiController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/pmsWifi/PmsWifiController.java @@ -10,7 +10,6 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.harmonic.mapper.pmsWifi.PmsMonitorRealDataMapper; import com.njcn.harmonic.pojo.po.pmsWifi.MonitorRealData; -import com.njcn.influx.service.IDataVService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -31,8 +30,6 @@ public class PmsWifiController extends BaseController { private final PmsMonitorRealDataMapper pmsMonitorRealDataMapper; - private final IDataVService iDataVService; - @OperateInfo(info = LogEnum.BUSINESS_COMMON) @GetMapping("/getPmsInfo") diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/report/QualifiedReport.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/report/QualifiedReport.java index cc8081491..5a62cc05d 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/report/QualifiedReport.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/report/QualifiedReport.java @@ -7,10 +7,8 @@ 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.pojo.param.PulicTimeStatisParam; import com.njcn.harmonic.pojo.dto.FpyReportDTO; import com.njcn.harmonic.pojo.param.QualifiedReportParam; -import com.njcn.harmonic.pojo.vo.AssesVO; import com.njcn.harmonic.service.majornetwork.QualifiedReportService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -18,14 +16,12 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; 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.util.List; /** * pqs diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/PermeabilityController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/PermeabilityController.java index 0ac571683..a8f92813c 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/PermeabilityController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/PermeabilityController.java @@ -19,8 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * @Title permeabilityController - * @Package com.njcn.harmonic.controller.specialanalysis * @Author jianghaifei * @Date 2022-11-28 11:22 * @Version V1.0 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RMpEmissionController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RMpEmissionController.java index 6025087fd..4536d39a3 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RMpEmissionController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RMpEmissionController.java @@ -22,8 +22,6 @@ import java.util.List; /** * 专项分析-风电场-发射特性分析 - * @Title RMpEmissionController - * @Package com.njcn.harmonic.controller.specialanalysis * @Author jianghaifei * @Date 2022-11-30 19:11 * @Version V1.0 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RMpInfluenceController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RMpInfluenceController.java index 6cacd0afc..364d621e3 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RMpInfluenceController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RMpInfluenceController.java @@ -5,9 +5,7 @@ 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.harmonic.pojo.param.RMpEmissionParam; import com.njcn.harmonic.pojo.param.RMpInfluenceParam; -import com.njcn.harmonic.pojo.vo.RMpEmissionChartVO; import com.njcn.harmonic.pojo.vo.RMpInfluenceChartVO; import com.njcn.harmonic.pojo.vo.RMpInfluenceVO; import com.njcn.harmonic.service.specialanalysis.RMpInfluenceMService; @@ -23,8 +21,6 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; /** - * @Title RMpInfluenceController - * @Package com.njcn.harmonic.controller.specialanalysis * @Author jianghaifei * @Date 2022-12-01 19:54 * @Version V1.0 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RStatOrgPvPowerQualityController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RStatOrgPvPowerQualityController.java index 8d61df90f..479ef4fc2 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RStatOrgPvPowerQualityController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RStatOrgPvPowerQualityController.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; * <专项分析-分布式光伏> * * @author wr - * @createTime: 2022-11-25 + * @createTime 2022-11-25 */ @RestController @RequestMapping("/distributedPvVolOver") @@ -39,8 +39,6 @@ public class RStatOrgPvPowerQualityController extends BaseController { /** * 低功率因数统计 * - * @param param - * @return */ @PostMapping("/getPowerQualityStream") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @@ -55,8 +53,6 @@ public class RStatOrgPvPowerQualityController extends BaseController { /** * 详细数据表分页查询 * - * @param param - * @return */ @PostMapping("/getPowerQualityInfo") @OperateInfo(info = LogEnum.BUSINESS_COMMON) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/StreamReverseController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/StreamReverseController.java index 6051fc182..1d6207ff3 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/StreamReverseController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/StreamReverseController.java @@ -21,8 +21,6 @@ import org.springframework.web.bind.annotation.RestController; /** * 潮流倒送分析 - * @Title StreamReverseController - * @Package com.njcn.harmonic.controller.specialanalysis * @Author jianghaifei * @Date 2022-11-25 10:19 * @Version V1.0 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/WindFarmController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/WindFarmController.java index 9e7aeeb24..535fe451b 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/WindFarmController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/WindFarmController.java @@ -41,8 +41,6 @@ public class WindFarmController extends BaseController { /** * 详细数据表分页查询 * - * @param param - * @return */ @PostMapping("/getWindFarmDetailInfo") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @@ -57,8 +55,6 @@ public class WindFarmController extends BaseController { /** * 详细数据表分页查询 * - * @param param - * @return */ @PostMapping("/getRailwayDetailInfo") @OperateInfo(info = LogEnum.BUSINESS_COMMON) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/EvaluationDownController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/EvaluationDownController.java index af3c7d95b..c5c36a9b7 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/EvaluationDownController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/EvaluationDownController.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.controller.upload; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.harmonic.pojo.param.upload.DimBusBarParam; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadDataLogController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadDataLogController.java index 5f3bbeecc..774a4c4b7 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadDataLogController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadDataLogController.java @@ -7,18 +7,13 @@ 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.common.utils.LogUtil; -import com.njcn.harmonic.pojo.param.UploadDataParam; import com.njcn.harmonic.pojo.po.upload.RUploadDataLog; -import com.njcn.harmonic.pojo.vo.upload.UploadEvaluationDataVo; import com.njcn.harmonic.service.upload.IRUploadDataLogService; -import com.njcn.harmonic.service.upload.impl.RUploadDataLogServiceImpl; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -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; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadReportController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadReportController.java index 23ea72bbb..fb7fdfeaa 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadReportController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadReportController.java @@ -10,11 +10,8 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.harmonic.pojo.param.DimGlobalDataParam; import com.njcn.harmonic.pojo.po.upload.RUploadReport; -import com.njcn.harmonic.pojo.vo.DimGlobalDataStandVO; import com.njcn.harmonic.service.upload.IRUploadReportService; -import com.njcn.system.api.DicDataFeignClient; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.po.Dept; import com.njcn.web.enums.GWSendEnum; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadWorkOrderController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadWorkOrderController.java index d5f4a7722..194e641cf 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadWorkOrderController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/RUploadWorkOrderController.java @@ -9,16 +9,13 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; -import com.njcn.harmonic.pojo.param.UploadDataParam; import com.njcn.harmonic.pojo.param.upload.RUploadWorkOrderParam; import com.njcn.harmonic.pojo.po.upload.RUploadWorkOrderPO; -import com.njcn.harmonic.pojo.vo.upload.UploadEvaluationDataVo; import com.njcn.harmonic.service.upload.IRUploadWorkOrderService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -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; @@ -28,7 +25,6 @@ import com.njcn.web.controller.BaseController; import java.util.List; -import static org.reflections.Reflections.log; /** *

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/TypicalSourceLoadDownController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/TypicalSourceLoadDownController.java index da9bda27e..3726f8610 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/TypicalSourceLoadDownController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/TypicalSourceLoadDownController.java @@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RestController; /** * @author wr - * @description * @date 2024/5/16 9:22 */ @Slf4j diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/algorithm/mapping/RStatFileMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/algorithm/mapping/RStatFileMapper.xml index c193aaa55..6e5fa8957 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/algorithm/mapping/RStatFileMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/algorithm/mapping/RStatFileMapper.xml @@ -2,14 +2,5 @@ - - - - - - - - - diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusGlobalDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusGlobalDMapper.java index 2b5eba436..96f82dfdb 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusGlobalDMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusGlobalDMapper.java @@ -1,7 +1,6 @@ package com.njcn.harmonic.mapper.dim; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.dim.RDimBusGlobalD; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusGlobalMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusGlobalMMapper.java index 371727ec5..588c51a41 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusGlobalMMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusGlobalMMapper.java @@ -1,7 +1,6 @@ package com.njcn.harmonic.mapper.dim; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.dim.RDimBusGlobalM; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusGlobalYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusGlobalYMapper.java index d4744e9e6..e86262bd1 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusGlobalYMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusGlobalYMapper.java @@ -1,7 +1,6 @@ package com.njcn.harmonic.mapper.dim; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.dim.RDimBusGlobalY; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusStationEventDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusStationEventDMapper.java index 43bcfd883..4659cc794 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusStationEventDMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusStationEventDMapper.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.mapper.dim; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.dim.RDimBusStationEventD; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusStationEventMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusStationEventMMapper.java index 23f583694..a24b290ce 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusStationEventMMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusStationEventMMapper.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.mapper.dim; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.dim.RDimBusStationEventM; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusTargetDPOMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusTargetDPOMapper.java index de5ca4e2b..5561b2837 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusTargetDPOMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimBusTargetDPOMapper.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.mapper.dim; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.dim.RDimBusTargetDPO; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimMonitorRateDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimMonitorRateDMapper.java index bfe62e4d1..5df3608fd 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimMonitorRateDMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimMonitorRateDMapper.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.mapper.dim; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.dim.RDimMonitorRateD; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimMonitorRateMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimMonitorRateMMapper.java index c67766db0..ac2409135 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimMonitorRateMMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimMonitorRateMMapper.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.mapper.dim; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.dim.RDimMonitorRateM; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimMonitorRateYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimMonitorRateYMapper.java index 0d34f9015..0919f3a1e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimMonitorRateYMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimMonitorRateYMapper.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.mapper.dim; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.dim.RDimMonitorRateY; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjEventDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjEventDMapper.java index 0976ce35e..2fddaf0b9 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjEventDMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjEventDMapper.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.mapper.dim; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.dim.RDimObjEventD; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjEventMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjEventMMapper.java index d56da8cb3..b4c6233ef 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjEventMMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjEventMMapper.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.mapper.dim; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.dim.RDimObjEventM; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjEventYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjEventYMapper.java index 0709df8ba..ab25c5910 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjEventYMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjEventYMapper.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.mapper.dim; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.dim.RDimObjEventY; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjRateDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjRateDMapper.java index 5e8ea6abb..270407a7e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjRateDMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjRateDMapper.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.mapper.dim; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.dim.RDimObjRateD; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjRateMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjRateMMapper.java index dfe17f849..a89e65f80 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjRateMMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjRateMMapper.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.mapper.dim; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.dim.RDimObjRateM; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjRateYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjRateYMapper.java index 14ab10088..767e36af0 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjRateYMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjRateYMapper.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.mapper.dim; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.dim.RDimObjRateY; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjTargetDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjTargetDMapper.java index 42f62a887..e7311dd47 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjTargetDMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjTargetDMapper.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.mapper.dim; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.dim.RDimObjTargetD; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjTargetMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjTargetMMapper.java index 660f513ee..d7cef821f 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjTargetMMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjTargetMMapper.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.mapper.dim; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.dim.RDimObjTargetM; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjTargetYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjTargetYMapper.java index 8a6653670..ecb8ee606 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjTargetYMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimObjTargetYMapper.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.mapper.dim; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.dim.RDimObjTargetY; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimStationTargetYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimStationTargetYMapper.java index 692621b93..696223655 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimStationTargetYMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimStationTargetYMapper.java @@ -1,6 +1,5 @@ package com.njcn.harmonic.mapper.dim; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.dim.RDimStationTargetY; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimVoltageDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimVoltageDMapper.java index 039e9566d..386d16aca 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimVoltageDMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/RDimVoltageDMapper.java @@ -18,6 +18,5 @@ import java.util.Set; */ public interface RDimVoltageDMapper extends MppBaseMapper { - List getLineData(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("collection") Set list); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/mapping/RDimBusbarHarmnicDPOMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/mapping/RDimBusbarHarmnicDPOMapper.xml index 66f58ff0d..99b8f73fd 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/mapping/RDimBusbarHarmnicDPOMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/mapping/RDimBusbarHarmnicDPOMapper.xml @@ -1,26 +1,5 @@ - - - - - - - - - - - - - - - - - - - - Org_Id, Statis_Date, BusBar_Id, Target_type, Voltage_level, Level, limit count, - Statis_count, State, Create_By, Create_Time, Update_By, Update_Time - + diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/mapping/RDimStationHarmnicDPOMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/mapping/RDimStationHarmnicDPOMapper.xml index 340638dac..9245fa196 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/mapping/RDimStationHarmnicDPOMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/dim/mapping/RDimStationHarmnicDPOMapper.xml @@ -1,21 +1,5 @@ - - - - - - - - - - - - - - - Org_Id, Statis_Date, Station Id, Target_type, Level, Monitor_Tag, Voltage_level, - limit_count, Statis_count - + diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRMpBenchmarkLevelMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRMpBenchmarkLevelMMapper.java index eec3becd0..d7f1142ed 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRMpBenchmarkLevelMMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRMpBenchmarkLevelMMapper.java @@ -5,9 +5,6 @@ import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM; /** * @author jianghf -* @description 针对表【r_mp_benchmark_level_m】的数据库操作Mapper -* @createDate 2022-10-11 10:32:18 -* @Entity com.njcn.device.pms.pojo.po.RMpBenchmarkLevelM */ public interface PwRMpBenchmarkLevelMMapper extends BaseMapper { diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRMpBenchmarkLevelQMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRMpBenchmarkLevelQMapper.java index 4695524b0..fafdf16ca 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRMpBenchmarkLevelQMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRMpBenchmarkLevelQMapper.java @@ -5,9 +5,6 @@ import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ; /** * @author jianghf -* @description 针对表【r_mp_benchmark_level_q】的数据库操作Mapper -* @createDate 2022-10-11 10:32:18 -* @Entity com.njcn.device.pms.pojo.po.RMpBenchmarkLevelQ */ public interface PwRMpBenchmarkLevelQMapper extends BaseMapper { diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRMpBenchmarkLevelYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRMpBenchmarkLevelYMapper.java index 1c76fd6f7..77cfa1add 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRMpBenchmarkLevelYMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRMpBenchmarkLevelYMapper.java @@ -5,9 +5,6 @@ import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelY; /** * @author jianghf -* @description 针对表【r_mp_benchmark_level_y】的数据库操作Mapper -* @createDate 2022-10-11 10:32:18 -* @Entity com.njcn.device.pms.pojo.po.RMpBenchmarkLevelY */ public interface PwRMpBenchmarkLevelYMapper extends BaseMapper { diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRStatOrgMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRStatOrgMapper.java index 3a0537794..e66cf6202 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRStatOrgMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/PwRStatOrgMapper.java @@ -3,9 +3,7 @@ package com.njcn.harmonic.mapper.distribution; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam; import com.njcn.harmonic.pojo.po.RStatOrgQ; -import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO; import com.njcn.harmonic.pojo.vo.RStatOrgVO; -import com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -22,10 +20,6 @@ public interface PwRStatOrgMapper extends BaseMapper { /** * 配网查询区域超标统计-年数据 - * @param param - * @param deptIds - * @param dataType - * @return */ List selectListY(@Param("param") StatSubstationBizBaseParam param, @Param("deptIds")List deptIds, @@ -33,10 +27,6 @@ public interface PwRStatOrgMapper extends BaseMapper { /** * 配网查询区域超标统计-季数据 - * @param param - * @param deptIds - * @param dataType - * @return */ List selectListQ(@Param("param") StatSubstationBizBaseParam param, @Param("deptIds")List deptIds, @@ -44,10 +34,6 @@ public interface PwRStatOrgMapper extends BaseMapper { /** * 配网查询区域超标统计-月数据 - * @param param - * @param deptIds - * @param dataType - * @return */ List selectListM(@Param("param") StatSubstationBizBaseParam param, @Param("deptIds")List deptIds, diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/RStatPwPermeabilityMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/RStatPwPermeabilityMMapper.java index 5831ec247..0903306e4 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/RStatPwPermeabilityMMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/RStatPwPermeabilityMMapper.java @@ -2,20 +2,15 @@ package com.njcn.harmonic.mapper.distribution; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.harmonic.pojo.param.RStatPwPermeabilityMParam; import com.njcn.harmonic.pojo.po.RStatPwPermeabilityM; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.harmonic.pojo.vo.RStatPwPermeabilityMVO; import org.apache.ibatis.annotations.Param; -import java.util.List; import java.util.Map; /** * @author jianghf -* @description 针对表【r_stat_pw_permeability_m】的数据库操作Mapper -* @createDate 2022-11-07 10:35:21 -* @Entity com.njcn.harmonic.pojo.po.RStatPwPermeabilityM */ public interface RStatPwPermeabilityMMapper extends BaseMapper { diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRMpBenchmarkLevelMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRMpBenchmarkLevelMMapper.xml index 556b3dba4..8bb4813e7 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRMpBenchmarkLevelMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRMpBenchmarkLevelMMapper.xml @@ -4,23 +4,5 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - measurement_point_id,data_date,voltage_avg, - voltage_sd,unbalance_avg,unbalance_sd, - vthd_avg,vthd_sd,flicker_avg, - flicker_sd - diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRMpBenchmarkLevelQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRMpBenchmarkLevelQMapper.xml index 8293b4ea6..b5e13dedc 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRMpBenchmarkLevelQMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRMpBenchmarkLevelQMapper.xml @@ -4,23 +4,5 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - measurement_point_id,data_date,voltage_avg, - voltage_sd,unbalance_avg,unbalance_sd, - vthd_avg,vthd_sd,flicker_avg, - flicker_sd - diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRMpBenchmarkLevelYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRMpBenchmarkLevelYMapper.xml index 16612deec..6f469b889 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRMpBenchmarkLevelYMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRMpBenchmarkLevelYMapper.xml @@ -4,23 +4,5 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - measurement_point_id,data_date,voltage_avg, - voltage_sd,unbalance_avg,unbalance_sd, - vthd_avg,vthd_sd,flicker_avg, - flicker_sd - diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/RStatPwPermeabilityMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/RStatPwPermeabilityMMapper.xml index 1c5df3643..14af4a993 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/RStatPwPermeabilityMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/RStatPwPermeabilityMMapper.xml @@ -3,29 +3,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - org_no,data_date,psr_id, - voltage_avg,voltage_sd,unbalance_avg, - unbalance_sd,vthd_avg,vthd_sd, - flicker_avg,flicker_sd,permeability_type - - select - rshom.org_no "id", + rshom.org_no id, round(avg(rshom.over_limit_measurement_ratio_accrued),2) avg from r_stat_harmonic_org_m rshom left join sys_dict_data sdd on rshom.data_type = sdd.Id and sdd.Code = 'Mainnet_Point' @@ -24,7 +24,7 @@ SELECT diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RMpPartHarmonicDetailMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RMpPartHarmonicDetailMMapper.xml index 2568a93b3..5ff89e45f 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RMpPartHarmonicDetailMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RMpPartHarmonicDetailMMapper.xml @@ -2,121 +2,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RMpPassRateMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RMpPassRateMMapper.xml index 5718b46ea..d049f5c66 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RMpPassRateMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RMpPassRateMMapper.xml @@ -2,14 +2,7 @@ - - - - - - - - + SELECT measurement_point_id, diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RMpPassRateYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RMpPassRateYMapper.xml index 40ecad13d..8396d8794 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RMpPassRateYMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RMpPassRateYMapper.xml @@ -2,14 +2,7 @@ - - - - - - - - + select rms.measurement_point_id, diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicDMapper.xml index f8748199f..001b74b67 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicDMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicDMapper.xml @@ -2,16 +2,6 @@ - - - - - - - - - - SELECT measurement_type_class, diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicQMapper.xml index 146b49128..4eb139670 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicQMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicQMapper.xml @@ -2,19 +2,7 @@ - - - - - - - - - - - - - + SELECT measurement_type_class, diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicYMapper.xml index f69ea6327..541830286 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicYMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicYMapper.xml @@ -2,19 +2,7 @@ - - - - - - - - - - - - - + select org_no, diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatLoadTypeQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatLoadTypeQMapper.xml index 9a2cb17ea..3b770eefd 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatLoadTypeQMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatLoadTypeQMapper.xml @@ -2,23 +2,7 @@ - - - - - - - - - - - - - - - - - + select org_no, 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 351e9adaf..66f587aab 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 @@ -2,19 +2,7 @@ - - - - - - - - - - - - - + SELECT aa.org_no, aa.busbarId , 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 d30c7b135..048b03623 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,19 +1,7 @@ - - - - - - - - - - - - - + SELECT rso.org_no AS orgNo, 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 31ea3afe7..4c6ac288d 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 @@ -2,30 +2,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - + SELECT rso.org_no AS orgNo, diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatSubstationMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatSubstationMMapper.xml index f2c4c941a..189483cd6 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatSubstationMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatSubstationMMapper.xml @@ -2,39 +2,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SELECT COALESCE( sum( CASE WHEN X.harmonic_average_over_day BETWEEN 1 AND 10 THEN 1 ELSE 0 END ), 0 ) "num_1", diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatSubstationVoltageMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatSubstationVoltageMMapper.xml index 9332dddad..9c56e7b11 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatSubstationVoltageMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatSubstationVoltageMMapper.xml @@ -2,15 +2,7 @@ - - - - - - - - - + SELECT COALESCE( sum( CASE WHEN X.harmonic_over_day BETWEEN 1 AND 10 THEN 1 ELSE 0 END ), 0 ) "num_1",