From 0d959fe747618c38a164c31f55ee57592cbd5fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Thu, 10 Nov 2022 15:40:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pq/service/impl/GeneralDeviceService.java | 14 +- .../controller/HarmonicController.java | 2 +- .../controller/PollutionController.java | 2 +- .../service/impl/CustomReportServiceImpl.java | 24 +- .../service/impl/IntegrityServiceImpl.java | 13 +- pqs-job/job-executor/pom.xml | 1 - .../executor/handler/HarmCustomReportJob.java | 1 + .../api/line/CoustmReportFeignClient.java | 31 + .../harmonic/api/line/DayDataFeignClient.java | 31 + .../api/line/DistortionRateFeignClient.java | 27 + .../api/line/HarmonicGeneralFeignClient.java | 28 + .../api/line/HarmonicMetricFeignClient.java | 27 + .../api/line/IntegrityFeignClient.java | 32 + .../api/line/LimitTargetFeignClient.java | 32 + .../api/line/LimitrateFeignClient.java | 29 + .../api/line/NormalLimitFeignClient.java | 32 + .../api/line/OnlineRateFeignClient.java | 30 + .../api/line/PollutionFeignClient.java | 30 + ...ustomReportFeignClientFallbackFactory.java | 44 + .../DayDataFeignClientFallbackFactory.java | 42 + ...tortionRateFeignClientFallbackFactory.java | 40 + ...onicGeneralFeignClientFallbackFactory.java | 40 + ...monicMetricFeignClientFallbackFactory.java | 40 + .../IntegrityFeignClientFallbackFactory.java | 39 + ...LimitTargetFeignClientFallbackFactory.java | 43 + .../LimitrateFeignClientFallbackFactory.java | 42 + .../NormalFeignClientFallbackFactory.java | 37 + .../OnlineRateFeignClientFallbackFactory.java | 39 + .../PollutionFeignClientFallbackFactory.java | 40 + .../api/voltage/VoltageFeignClient.java | 10 + .../line/NormalLimitController.java | 14 +- .../harmonic/mapper/line/AbnormalMapper.java | 3 +- .../harmonic/pojo/po/MpSurplusAbnormalD.java | 465 ++++ .../Impl/line/NormalLimitServiceImpl.java | 2215 +++++++++++++---- .../Impl/line/OnlineRateServiceImpl.java | 25 +- .../service/Impl/line/ReportServiceImpl.java | 25 +- .../service/line/NormalLimitService.java | 14 +- .../api/line/HarmonicGeneralFeignClient.java | 28 + .../api/line/HarmonicMetricFeignClient.java | 27 + .../api/line/NormalLimitFeignClient.java | 8 +- ...ustomReportFeignClientFallbackFactory.java | 5 +- .../DayDataFeignClientFallbackFactory.java | 3 +- ...onicGeneralFeignClientFallbackFactory.java | 40 + ...monicMetricFeignClientFallbackFactory.java | 40 + .../IntegrityFeignClientFallbackFactory.java | 6 +- ...LimitTargetFeignClientFallbackFactory.java | 6 +- .../LimitrateFeignClientFallbackFactory.java | 5 +- .../NormalFeignClientFallbackFactory.java | 2 +- .../OnlineRateFeignClientFallbackFactory.java | 6 +- .../PollutionFeignClientFallbackFactory.java | 6 +- .../harmonic/pojo/po/DataFlickerPO.java | 4 + .../harmonic/pojo/po/DataInHarmVPO.java | 2 +- .../prepare/harmonic/pojo/po/DataPltPO.java | 3 + .../harmonic/pojo/po/DataPolluctionPO.java | 2 +- .../prepare/harmonic/pojo/po/DataVPO.java | 8 + .../harmonic/pojo/po/MpSurplusAbnormalD.java | 464 ++++ .../harmonic/pojo/po/PqsCommunicatePO.java | 3 + .../harmonic/pojo/po/RMpPollutionD.java | 116 +- .../prepare/harmonic/pojo/po/RMpVThd.java | 82 + .../harmonic/pojo/po/line/LimitTargetPO.java | 4 +- .../pojo/po/line/RMpFlickerReportDPO.java | 4 +- .../pojo/po/line/RMpHarmonicPReportDPO.java | 2 +- .../po/line/RMpInharmonicIMagReportDPO.java | 2 +- .../po/line/RMpInharmonicVRateReportDPO.java | 2 +- .../po/line/RMpMeasurePhaseReportDPO.java | 4 +- .../pojo/po/line/RMpMeasureReportDPO.java | 4 +- .../pojo/po/line/RMpPltReportDPO.java | 4 +- 67 files changed, 3894 insertions(+), 601 deletions(-) create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/CoustmReportFeignClient.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DayDataFeignClient.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DistortionRateFeignClient.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/IntegrityFeignClient.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitTargetFeignClient.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitrateFeignClient.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/OnlineRateFeignClient.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/PollutionFeignClient.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DistortionRateFeignClientFallbackFactory.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/voltage/VoltageFeignClient.java create mode 100644 pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/MpSurplusAbnormalD.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/MpSurplusAbnormalD.java create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RMpVThd.java diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java index e6b79b806..5a5df6a71 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java @@ -305,7 +305,7 @@ public class GeneralDeviceService { //获取包括当前部门的后代所有部门信息 List deptInfos = deptFeignClient.getDeptDescendantIndexes(deviceInfoParam.getDeptIndex(), deptType).getData(); List directDeptInfos = deptInfos.stream() - .filter(deptDTO -> deptDTO.getPid().equals(deviceInfoParam.getDeptIndex())) + .filter(deptDTO -> deptDTO.getPid().equals(deviceInfoParam.getDeptIndex())).sorted(Comparator.comparing(DeptDTO::getSort)) .collect(Collectors.toList()); if (CollectionUtil.isEmpty(directDeptInfos)) { //没有直接子部门，获取当前部门所有信息 @@ -631,13 +631,13 @@ public class GeneralDeviceService { return exceptionDeviceInfoVOS; } - /** - * @Description: getDeptDeviceDetail - * @Param: [deviceInfoParam] - * @return: com.njcn.device.pq.pojo.vo.DeptDeviceDetailVO + /** + * @Description: getDeptDeviceDetail + * @Param: [deviceInfoParam] + * @return: com.njcn.device.pq.pojo.vo.DeptDeviceDetailVO * @Author: clam - * @Date: 2022/11/4 - */ + * @Date: 2022/11/4 + */ public DeptDeviceDetailVO getDeptDeviceDetail(DeviceInfoParam deviceInfoParam) { diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HarmonicController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HarmonicController.java index a0fbf175c..a935f1672 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HarmonicController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HarmonicController.java @@ -1,4 +1,4 @@ -//package com.njcn.harmonic.controller; +package com.njcn.harmonic.controller;//package com.njcn.harmonic.controller; // //import com.njcn.common.pojo.annotation.OperateInfo; //import com.njcn.common.pojo.enums.common.LogEnum; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionController.java index d2cba9871..de15cbea4 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionController.java @@ -1,4 +1,4 @@ -//package com.njcn.harmonic.controller; +package com.njcn.harmonic.controller;//package com.njcn.harmonic.controller; // //import com.njcn.common.pojo.annotation.OperateInfo; //import com.njcn.common.pojo.enums.common.LogEnum; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java index 50ab9b70d..0e1706de3 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java @@ -469,19 +469,21 @@ public class CustomReportServiceImpl implements CustomReportService { */ private void assSql(ReportTemplateDTO data, StringBuilder sql, List endList, String method, ReportSearchParam reportSearchParam) { //sql拼接示例：select MAX(IHA2) as IHA2 from power_quality_data where Phase = 'A' and LineId='1324564568' and Stat_Method='max' tz('Asia/Shanghai') + + //cp95函数特殊处理 PERCENTILE(field_key, N) + if (InfluxDBSqlConstant.CP95.equals(method)){ + sql.append(method).append(InfluxDBSqlConstant.LBK).append(data.getTemplateName()).append(InfluxDBSqlConstant.NUM_95).append(InfluxDBSqlConstant.RBK).append(InfluxDBSqlConstant.AS_VALUE); + }else{ + sql.append(method).append(InfluxDBSqlConstant.LBK).append(data.getTemplateName()).append(InfluxDBSqlConstant.RBK).append(InfluxDBSqlConstant.AS_VALUE); + } + + //相别特殊处理 if (InfluxDBTableConstant.NO_PHASE.equals(data.getPhase())) { - sql.append(method).append(InfluxDBSqlConstant.LBK).append(data.getTemplateName()).append(InfluxDBSqlConstant.RBK).append(InfluxDBSqlConstant.AS_VALUE) - .append(InfluxDBSqlConstant.FROM).append(data.getClassId()) - .append(InfluxDBSqlConstant.WHERE).append(InfluxDBTableConstant.LINE_ID).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(reportSearchParam.getLineId()).append(InfluxDBSqlConstant.QM) - .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.VALUE_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getStatMethod()).append(InfluxDBSqlConstant.QM) - .append(InfluxDBSqlConstant.TZ); + sql.append(InfluxDBSqlConstant.FROM).append(data.getClassId()) + .append(InfluxDBSqlConstant.WHERE).append(InfluxDBTableConstant.LINE_ID).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(reportSearchParam.getLineId()).append(InfluxDBSqlConstant.QM) + .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.VALUE_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getStatMethod()).append(InfluxDBSqlConstant.QM) + .append(InfluxDBSqlConstant.TZ); } else { - //cp95函数特殊处理 PERCENTILE(field_key, N) - if (InfluxDBSqlConstant.CP95.equals(method)){ - sql.append(method).append(InfluxDBSqlConstant.LBK).append(data.getTemplateName()).append(InfluxDBSqlConstant.NUM_95).append(InfluxDBSqlConstant.RBK).append(InfluxDBSqlConstant.AS_VALUE); - }else{ - sql.append(method).append(InfluxDBSqlConstant.LBK).append(data.getTemplateName()).append(InfluxDBSqlConstant.RBK).append(InfluxDBSqlConstant.AS_VALUE); - } sql.append(InfluxDBSqlConstant.FROM).append(data.getClassId()) .append(InfluxDBSqlConstant.WHERE).append(InfluxDBTableConstant.LINE_ID).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(reportSearchParam.getLineId()).append(InfluxDBSqlConstant.QM) .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.VALUE_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getStatMethod()).append(InfluxDBSqlConstant.QM) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java index 7f0145a40..3c8604f9c 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java @@ -1,6 +1,7 @@ package com.njcn.harmonic.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.StrUtil; @@ -31,9 +32,8 @@ import org.springframework.util.CollectionUtils; import java.io.File; import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.text.Collator; +import java.util.*; import java.util.stream.Collectors; /** @@ -189,6 +189,13 @@ public class IntegrityServiceImpl implements IntegrityService { out.add(outParam); } } + out.sort(new Comparator() { + @Override + public int compare(IntegrityIconVO o1, IntegrityIconVO o2) { + Comparator com = Collator.getInstance(Locale.CHINA); + return com.compare(o1.getType(), o2.getType()); + } + }); return out; } diff --git a/pqs-job/job-executor/pom.xml b/pqs-job/job-executor/pom.xml index 3a137fbfd..6a39aaa1e 100644 --- a/pqs-job/job-executor/pom.xml +++ b/pqs-job/job-executor/pom.xml @@ -65,7 +65,6 @@ com.njcn prepare-api ${project.version} - compile diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmCustomReportJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmCustomReportJob.java index c32ee8ccc..b0bb1e07f 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmCustomReportJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmCustomReportJob.java @@ -25,6 +25,7 @@ public class HarmCustomReportJob { private final CoustmReportFeignClient coustmReportFeignClient; + @XxlJob("harmCustomReportHandler") public void harmCustomReportHandler(){ long a = System.currentTimeMillis(); diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/CoustmReportFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/CoustmReportFeignClient.java new file mode 100644 index 000000000..7417cf3dd --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/CoustmReportFeignClient.java @@ -0,0 +1,31 @@ +package com.njcn.prepare.harmonic.api.line; + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.line.fallback.CoustomReportFeignClientFallbackFactory; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 自定义报表 + * @author qijian + * @date 2022/10/20 + */ +@FeignClient( + value = ServerInfo.HARMONIC_PREPARE,//对应模块名 + path = "/report",//对应controller请求类 + fallbackFactory = CoustomReportFeignClientFallbackFactory.class//服务降级处理类 +) +public interface CoustmReportFeignClient { + + /** + * 批量处理报表 + * @author qijian + * @date 2022/10/19 + */ + @PostMapping("/batchReport") + HttpResult batchReport(@RequestBody LineParam reportParam); + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DayDataFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DayDataFeignClient.java new file mode 100644 index 000000000..ba9b051f7 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DayDataFeignClient.java @@ -0,0 +1,31 @@ +package com.njcn.prepare.harmonic.api.line; + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.line.fallback.DayDataFeignClientFallbackFactory; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 自定义报表 + * @author qijian + * @date 2022/10/20 + */ +@FeignClient( + value = ServerInfo.HARMONIC_PREPARE,//对应模块名 + path = "/daydata",//对应controller请求类 + fallbackFactory = DayDataFeignClientFallbackFactory.class//服务降级处理类 +) +public interface DayDataFeignClient { + + /** + * 批量处理报表 + * @author qijian + * @date 2022/10/19 + */ + @PostMapping("/dayDataHanlder") + HttpResult dayDataHanlder(@RequestBody LineParam jobParam); + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DistortionRateFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DistortionRateFeignClient.java new file mode 100644 index 000000000..300711029 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DistortionRateFeignClient.java @@ -0,0 +1,27 @@ +package com.njcn.prepare.harmonic.api.line; + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.line.fallback.DistortionRateFeignClientFallbackFactory; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 谐波畸变率 + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/4 15:58 + */ +@FeignClient( + value = ServerInfo.HARMONIC_PREPARE, + path = "/distortion", + fallbackFactory = DistortionRateFeignClientFallbackFactory.class +) +public interface DistortionRateFeignClient { + + @PostMapping("/distortionRate") + HttpResult distortionRate(@RequestBody @Validated LineParam lineParam); +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java new file mode 100644 index 000000000..783fef079 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java @@ -0,0 +1,28 @@ +package com.njcn.prepare.harmonic.api.line; + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.line.fallback.DistortionRateFeignClientFallbackFactory; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 稳态综合评估 + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/7 15:11 + */ + +@FeignClient( + value = ServerInfo.HARMONIC_PREPARE, + path = "/general", + fallbackFactory = DistortionRateFeignClientFallbackFactory.class +) +public interface HarmonicGeneralFeignClient { + + @PostMapping("/generalData") + HttpResult generalData(@RequestBody @Validated LineParam lineParam); +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java new file mode 100644 index 000000000..9733f79de --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java @@ -0,0 +1,27 @@ +package com.njcn.prepare.harmonic.api.line; + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.line.fallback.HarmonicMetricFeignClientFallbackFactory; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/7 15:12 + */ + +@FeignClient( + value = ServerInfo.HARMONIC_PREPARE, + path = "/metric", + fallbackFactory = HarmonicMetricFeignClientFallbackFactory.class +) +public interface HarmonicMetricFeignClient { + + @PostMapping("/metricData") + HttpResult metricData(@RequestBody @Validated LineParam lineParam); +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/IntegrityFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/IntegrityFeignClient.java new file mode 100644 index 000000000..d0bfd73a4 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/IntegrityFeignClient.java @@ -0,0 +1,32 @@ +package com.njcn.prepare.harmonic.api.line; + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.line.fallback.IntegrityFeignClientFallbackFactory; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 自定义报表 + * @author qijian + * @date 2022/10/20 + */ +@FeignClient( + value = ServerInfo.HARMONIC_PREPARE,//对应模块名 + path = "/integrity",//对应controller请求类 + fallbackFactory = IntegrityFeignClientFallbackFactory.class//服务降级处理类 +) +public interface IntegrityFeignClient { + + /** + * 批量处理报表 + * @author qijian + * @date 2022/10/19 + */ + @PostMapping("/computeDataIntegrity") + HttpResult computeDataIntegrity(@RequestBody @Validated LineParam lineParam); + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitTargetFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitTargetFeignClient.java new file mode 100644 index 000000000..51341caa4 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitTargetFeignClient.java @@ -0,0 +1,32 @@ +package com.njcn.prepare.harmonic.api.line; + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.line.fallback.LimitTargetFeignClientFallbackFactory; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 自定义报表 + * @author qijian + * @date 2022/10/20 + */ +@FeignClient( + value = ServerInfo.HARMONIC_PREPARE,//对应模块名 + path = "/limitTarget",//对应controller请求类 + fallbackFactory = LimitTargetFeignClientFallbackFactory.class//服务降级处理类 +) +public interface LimitTargetFeignClient { + + /** + * 批量处理报表 + * @author qijian + * @date 2022/10/19 + */ + @PostMapping("/getLimitTargetData") + HttpResult getLimitTargetData(@RequestBody @Validated LineParam lineParam); + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitrateFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitrateFeignClient.java new file mode 100644 index 000000000..b6135bd1c --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitrateFeignClient.java @@ -0,0 +1,29 @@ +package com.njcn.prepare.harmonic.api.line; + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.line.fallback.LimitrateFeignClientFallbackFactory; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 自定义报表 + * @author qijian + * @date 2022/10/20 + */ +@FeignClient( + value = ServerInfo.HARMONIC_PREPARE,//对应模块名 + path = "/limitrate",//对应controller请求类 + fallbackFactory = LimitrateFeignClientFallbackFactory.class//服务降级处理类 +) +public interface LimitrateFeignClient { + + /** + * 越限 + */ + @PostMapping("/LimitRateHanlder") + HttpResult limitRateHanlder(@RequestBody LineParam limitRateHanlderParam ); + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java new file mode 100644 index 000000000..dd3b1a80a --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java @@ -0,0 +1,32 @@ +package com.njcn.prepare.harmonic.api.line; + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.line.fallback.NormalFeignClientFallbackFactory; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * + * @author denghaujun + * @date 2022/10/20 + */ +@FeignClient( + value = ServerInfo.HARMONIC_PREPARE,//对应模块名 + path = "/normalLimit",//对应controller请求类 + fallbackFactory = NormalFeignClientFallbackFactory.class//服务降级处理类 +) +public interface NormalLimitFeignClient { + + /** + * + * @author denghaujun + * @date 2022/10/19 + */ + @PostMapping("/getNormLimitData") + HttpResult getNormLimitData(@RequestBody @Validated LineParam lineParam) ; + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/OnlineRateFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/OnlineRateFeignClient.java new file mode 100644 index 000000000..586c7d11e --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/OnlineRateFeignClient.java @@ -0,0 +1,30 @@ +package com.njcn.prepare.harmonic.api.line; + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.line.fallback.OnlineRateFeignClientFallbackFactory; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 自定义报表 + * @author qijian + * @date 2022/10/20 + */ +@FeignClient( + value = ServerInfo.HARMONIC_PREPARE,//对应模块名 + path = "/onlineRate",//对应controller请求类 + fallbackFactory = OnlineRateFeignClientFallbackFactory.class//服务降级处理类 +) +public interface OnlineRateFeignClient { + + /** + * 在线率 + */ + @PostMapping("/getOnlineRateData") + HttpResult getOnlineRateData(@RequestBody @Validated LineParam lineParam); + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/PollutionFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/PollutionFeignClient.java new file mode 100644 index 000000000..3cccf3d4d --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/PollutionFeignClient.java @@ -0,0 +1,30 @@ +package com.njcn.prepare.harmonic.api.line; + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.line.fallback.PollutionFeignClientFallbackFactory; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 自定义报表 + * @author qijian + * @date 2022/10/20 + */ +@FeignClient( + value = ServerInfo.HARMONIC_PREPARE,//对应模块名 + path = "/pollution",//对应controller请求类 + fallbackFactory = PollutionFeignClientFallbackFactory.class//服务降级处理类 +) +public interface PollutionFeignClient { + + /** + * 污区 + */ + @PostMapping("/processPollutionData") + HttpResult processPollutionData(@RequestBody @Validated LineParam lineParam); + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java new file mode 100644 index 000000000..a88d40d8a --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java @@ -0,0 +1,44 @@ +package com.njcn.prepare.harmonic.api.line.fallback; + +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.device.pq.utils.DeviceEnumUtil; +import com.njcn.prepare.harmonic.api.line.CoustmReportFeignClient; +import com.njcn.prepare.harmonic.api.line.DayDataFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * ReportFeignClientFallbackFactory + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/10/24 - 9:52 + */ +@Slf4j +@Component +public class CoustomReportFeignClientFallbackFactory implements FallbackFactory { + + @Override + public CoustmReportFeignClient create(Throwable throwable) { + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException)throwable.getCause(); + exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); + } + + Enum finalExceptionEnum = exceptionEnum; + return new CoustmReportFeignClient() { + @Override + public HttpResult batchReport(@RequestBody LineParam reportParam){ + log.error("{}异常，降级处理，异常为：{}", "生成自定义报表: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java new file mode 100644 index 000000000..0e772755f --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java @@ -0,0 +1,42 @@ +package com.njcn.prepare.harmonic.api.line.fallback; + +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.device.pq.utils.DeviceEnumUtil; +import com.njcn.prepare.harmonic.api.line.DayDataFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * ReportFeignClientFallbackFactory + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/10/24 - 9:52 + */ +@Slf4j +@Component +public class DayDataFeignClientFallbackFactory implements FallbackFactory { + + @Override + public DayDataFeignClient create(Throwable throwable) { + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException)throwable.getCause(); + exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); + } + + Enum finalExceptionEnum = exceptionEnum; + return new DayDataFeignClient() { + @Override + public HttpResult dayDataHanlder(@RequestBody LineParam jobParam){ + log.error("{}异常，降级处理，异常为：{}", "Date数据转Day数据: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DistortionRateFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DistortionRateFeignClientFallbackFactory.java new file mode 100644 index 000000000..f9e83540f --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DistortionRateFeignClientFallbackFactory.java @@ -0,0 +1,40 @@ +package com.njcn.prepare.harmonic.api.line.fallback; + +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.device.pq.utils.DeviceEnumUtil; +import com.njcn.prepare.harmonic.api.line.DistortionRateFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/7 14:37 + */ +@Slf4j +@Component +public class DistortionRateFeignClientFallbackFactory implements FallbackFactory { + @Override + public DistortionRateFeignClient create(Throwable throwable) { + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException)throwable.getCause(); + exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); + } + + Enum finalExceptionEnum = exceptionEnum; + return new DistortionRateFeignClient() { + @Override + public HttpResult distortionRate(@RequestBody @Validated LineParam lineParam){ + log.error("{}异常，降级处理，异常为：{}", "谐波畸变率: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java new file mode 100644 index 000000000..01c971378 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java @@ -0,0 +1,40 @@ +package com.njcn.prepare.harmonic.api.line.fallback; + +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.device.pq.utils.DeviceEnumUtil; +import com.njcn.prepare.harmonic.api.line.HarmonicGeneralFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/7 15:17 + */ +@Slf4j +@Component +public class HarmonicGeneralFeignClientFallbackFactory implements FallbackFactory { + @Override + public HarmonicGeneralFeignClient create(Throwable throwable) { + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException)throwable.getCause(); + exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); + } + + Enum finalExceptionEnum = exceptionEnum; + return new HarmonicGeneralFeignClient() { + @Override + public HttpResult generalData(@RequestBody @Validated LineParam lineParam){ + log.error("{}异常，降级处理，异常为：{}", "稳态综合评估: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java new file mode 100644 index 000000000..0acf887c1 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java @@ -0,0 +1,40 @@ +package com.njcn.prepare.harmonic.api.line.fallback; + +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.device.pq.utils.DeviceEnumUtil; +import com.njcn.prepare.harmonic.api.line.HarmonicMetricFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/7 15:14 + */ +@Slf4j +@Component +public class HarmonicMetricFeignClientFallbackFactory implements FallbackFactory { + @Override + public HarmonicMetricFeignClient create(Throwable throwable) { + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException)throwable.getCause(); + exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); + } + + Enum finalExceptionEnum = exceptionEnum; + return new HarmonicMetricFeignClient() { + @Override + public HttpResult metricData(@RequestBody @Validated LineParam lineParam){ + log.error("{}异常，降级处理，异常为：{}", "稳态指标评估: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java new file mode 100644 index 000000000..bdd909121 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java @@ -0,0 +1,39 @@ +package com.njcn.prepare.harmonic.api.line.fallback; + +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.device.pq.utils.DeviceEnumUtil; +import com.njcn.prepare.harmonic.api.line.IntegrityFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * IntegrityFeignClientFallbackFactory + */ +@Slf4j +@Component +public class IntegrityFeignClientFallbackFactory implements FallbackFactory { + + @Override + public IntegrityFeignClient create(Throwable throwable) { + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException)throwable.getCause(); + exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); + } + + Enum finalExceptionEnum = exceptionEnum; + return new IntegrityFeignClient() { + @Override + public HttpResult computeDataIntegrity(@RequestBody @Validated LineParam lineParam) { + log.error("{}异常，降级处理，异常为：{}", "数据完整性处理: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java new file mode 100644 index 000000000..2c6844bd3 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java @@ -0,0 +1,43 @@ +package com.njcn.prepare.harmonic.api.line.fallback; + +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.device.pq.utils.DeviceEnumUtil; +import com.njcn.prepare.harmonic.api.line.LimitTargetFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * ReportFeignClientFallbackFactory + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/10/24 - 9:52 + */ +@Slf4j +@Component +public class LimitTargetFeignClientFallbackFactory implements FallbackFactory { + + @Override + public LimitTargetFeignClient create(Throwable throwable) { + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException)throwable.getCause(); + exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); + } + + Enum finalExceptionEnum = exceptionEnum; + return new LimitTargetFeignClient() { + @Override + public HttpResult getLimitTargetData(@RequestBody @Validated LineParam lineParam) { + log.error("{}异常，降级处理，异常为：{}", "越限数据: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java new file mode 100644 index 000000000..93780ce7f --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java @@ -0,0 +1,42 @@ +package com.njcn.prepare.harmonic.api.line.fallback; + +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.device.pq.utils.DeviceEnumUtil; +import com.njcn.prepare.harmonic.api.line.LimitrateFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * ReportFeignClientFallbackFactory + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/10/24 - 9:52 + */ +@Slf4j +@Component +public class LimitrateFeignClientFallbackFactory implements FallbackFactory { + + @Override + public LimitrateFeignClient create(Throwable throwable) { + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException)throwable.getCause(); + exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); + } + + Enum finalExceptionEnum = exceptionEnum; + return new LimitrateFeignClient() { + @Override + public HttpResult limitRateHanlder(@RequestBody LineParam limitRateHanlderParam ){ + log.error("{}异常，降级处理，异常为：{}", "越限数据处理: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java new file mode 100644 index 000000000..5cef19e96 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java @@ -0,0 +1,37 @@ +package com.njcn.prepare.harmonic.api.line.fallback; + +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.device.pq.utils.DeviceEnumUtil; +import com.njcn.prepare.harmonic.api.line.NormalLimitFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * NormalFeignClientFallbackFactory + */ +@Slf4j +@Component +public class NormalFeignClientFallbackFactory implements FallbackFactory { + + @Override + public NormalLimitFeignClient create(Throwable throwable) { + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException)throwable.getCause(); + exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); + } + + Enum finalExceptionEnum = exceptionEnum; + return new NormalLimitFeignClient() { + @Override + public HttpResult getNormLimitData(LineParam lineParam) { + log.error("{}异常，降级处理，异常为：{}", "告警数据: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java new file mode 100644 index 000000000..b3f509d66 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java @@ -0,0 +1,39 @@ +package com.njcn.prepare.harmonic.api.line.fallback; + +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.device.pq.utils.DeviceEnumUtil; +import com.njcn.prepare.harmonic.api.line.OnlineRateFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * OnlineRateFeignClientFallbackFactory + */ +@Slf4j +@Component +public class OnlineRateFeignClientFallbackFactory implements FallbackFactory { + + @Override + public OnlineRateFeignClient create(Throwable throwable) { + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException)throwable.getCause(); + exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); + } + + Enum finalExceptionEnum = exceptionEnum; + return new OnlineRateFeignClient() { + @Override + public HttpResult getOnlineRateData(@RequestBody @Validated LineParam lineParam){ + log.error("{}异常，降级处理，异常为：{}", "在线率: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java new file mode 100644 index 000000000..c7063a0f8 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java @@ -0,0 +1,40 @@ +package com.njcn.prepare.harmonic.api.line.fallback; + +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.device.pq.utils.DeviceEnumUtil; +import com.njcn.prepare.harmonic.api.line.PollutionFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * PollutionFeignClientFallbackFactory + * + */ +@Slf4j +@Component +public class PollutionFeignClientFallbackFactory implements FallbackFactory { + + @Override + public PollutionFeignClient create(Throwable throwable) { + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException)throwable.getCause(); + exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); + } + + Enum finalExceptionEnum = exceptionEnum; + return new PollutionFeignClient() { + @Override + public HttpResult processPollutionData(@RequestBody @Validated LineParam lineParam){ + log.error("{}异常，降级处理，异常为：{}", "污区数据: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/voltage/VoltageFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/voltage/VoltageFeignClient.java new file mode 100644 index 000000000..943bc253a --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/voltage/VoltageFeignClient.java @@ -0,0 +1,10 @@ +package com.njcn.prepare.harmonic.api.voltage; + +/** + * @author qijian + * @version 1.0.0 + * @date 2022年10月24日 20:13 + */ +public interface VoltageFeignClient { + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/NormalLimitController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/NormalLimitController.java index b2c459f5f..71c4dd12c 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/NormalLimitController.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/NormalLimitController.java @@ -5,13 +5,16 @@ 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.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.service.line.NormalLimitService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; 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; import org.springframework.web.bind.annotation.RestController; @@ -32,9 +35,14 @@ public class NormalLimitController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getNormLimitData") @ApiOperation("告警数据预处理") - public HttpResult getNormLimitData() { + public HttpResult getNormLimitData(@RequestBody LineParam lineParam) { String methodDescribe = getMethodDescribe("getNormLimitData"); - String list = normLimitService.getNormLimitData(); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + try { + normLimitService.AbnormalLineData(lineParam); + }catch (Exception e){ + e.printStackTrace(); + log.error("告警数据预处理异常:"+e.getMessage()); + } + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } } diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/AbnormalMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/AbnormalMapper.java index a88627736..0e43ae6fd 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/AbnormalMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/AbnormalMapper.java @@ -2,11 +2,12 @@ package com.njcn.prepare.harmonic.mapper.line; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.prepare.harmonic.pojo.po.AbnormalPO; +import com.njcn.prepare.harmonic.pojo.po.MpSurplusAbnormalD; /** * @author denghuajun * @version 1.0.0 * @date 2022年10月18日 11:12 */ -public interface AbnormalMapper extends BaseMapper { +public interface AbnormalMapper extends BaseMapper { } diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/MpSurplusAbnormalD.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/MpSurplusAbnormalD.java new file mode 100644 index 000000000..e437f0464 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/pojo/po/MpSurplusAbnormalD.java @@ -0,0 +1,465 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.db.bo.BaseEntity; +import java.time.LocalDateTime; + +import lombok.Data; + + +/** + *

+ * + *

+ * + * @author hongawen + * @since 2022-11-08 + */ +@Data +@TableName("r_mp_surplus_abnormal_d") +public class MpSurplusAbnormalD{ + + private static final long serialVersionUID = 1L; + + /** + * 统计数据时间 + */ + private LocalDateTime timeId; + + /** + * 越限监测点 + */ + private String id; + + /** + * 数据类型,’A’表示A相，’B’表示B相,’C’表示C相,’T’表示总 + */ + private String phasicType; + + /** + * 指标类型，’AVG’代表平均值平均值，‘MAX’代表最大值，‘MIN’代表最小值，‘CP95’代表CP95值 + */ + private String valueType; + + /** + * 电压上偏差数值 + */ + private Float voltageDev = -3.14159f; + + /** + * 电压下偏差数值 + */ + private Float uvoltageDev = -3.14159f; + + /** + * 三相电压不平衡度数值 + */ + private Float ubalance = -3.14159f; + + /** + * 闪变数值 + */ + private Float flicker = -3.14159f; + + /** + * 电压总畸变率数值 + */ + private Float uaberrance = -3.14159f; + + /** + * 负序电流 + */ + private Float iNeg = -3.14159f; + + /** + * 频率 + */ + private Float freq = -3.14159f; + + /** + * 2次谐波电压数值 + */ + @TableField(value = "uharm_2") + private Float uharm2 = -3.14159f; + + /** + * 3次谐波电压数值 + */ + @TableField(value = "uharm_3") + private Float uharm3 = -3.14159f; + + /** + * 4次谐波电压数值 + */ + @TableField(value = "uharm_4") + private Float uharm4 = -3.14159f; + + /** + * 5次谐波电压数值 + */ + @TableField(value = "uharm_5") + private Float uharm5 = -3.14159f; + + /** + * 6次谐波电压数值 + */ + @TableField(value = "uharm_6") + private Float uharm6 = -3.14159f; + + /** + * 7次谐波电压数值 + */ + @TableField(value = "uharm_7") + private Float uharm7 = -3.14159f; + + /** + * 8次谐波电压数值 + */ + @TableField(value = "uharm_8") + private Float uharm8 = -3.14159f; + + /** + * 9次谐波电压数值 + */ + @TableField(value = "uharm_9") + private Float uharm9 = -3.14159f; + + /** + * 10次谐波电压数值 + */ + @TableField(value = "uharm_10") + private Float uharm10 = -3.14159f; + + /** + * 11次谐波电压数值 + */ + @TableField(value = "uharm_11") + private Float uharm11 = -3.14159f; + + /** + * 12次谐波电压数值 + */ + @TableField(value = "uharm_12") + private Float uharm12 = -3.14159f; + + /** + * 13次谐波电压数值 + */ + @TableField(value = "uharm_13") + private Float uharm13 = -3.14159f; + + /** + * 14次谐波电压数值 + */ + @TableField(value = "uharm_14") + private Float uharm14 = -3.14159f; + + /** + * 15次谐波电压数值 + */ + @TableField(value = "uharm_15") + private Float uharm15 = -3.14159f; + + /** + * 16次谐波电压数值 + */ + @TableField(value = "uharm_16") + private Float uharm16 = -3.14159f; + + /** + * 17次谐波电压数值 + */ + @TableField(value = "uharm_17") + private Float uharm17 = -3.14159f; + + /** + * 18次谐波电压数值 + */ + @TableField(value = "uharm_18") + private Float uharm18 = -3.14159f; + + /** + * 19次谐波电压数值 + */ + @TableField(value = "uharm_19") + private Float uharm19 = -3.14159f; + + /** + * 20次谐波电压数值 + */ + @TableField(value = "uharm_20") + private Float uharm20 = -3.14159f; + + /** + * 21次谐波电压数值 + */ + @TableField(value = "uharm_21") + private Float uharm21 = -3.14159f; + + /** + * 22次谐波电压数值 + */ + @TableField(value = "uharm_22") + private Float uharm22 = -3.14159f; + + /** + * 23次谐波电压数值 + */ + @TableField(value = "uharm_23") + private Float uharm23 = -3.14159f; + + /** + * 24次谐波电压数值 + */ + @TableField(value = "uharm_24") + private Float uharm24 = -3.14159f; + + /** + * 25次谐波电压数值 + */ + @TableField(value = "uharm_25") + private Float uharm25 = -3.14159f; + + /** + * 2次谐波电流数值 + */ + @TableField(value = "iharm_2") + private Float iharm2 = -3.14159f; + + /** + * 3次谐波电流数值 + */ + @TableField(value = "iharm_3") + private Float iharm3 = -3.14159f; + + /** + * 4次谐波电流数值 + */ + @TableField(value = "iharm_4") + private Float iharm4 = -3.14159f; + + /** + * 5次谐波电流数值 + */ + @TableField(value = "iharm_5") + private Float iharm5 = -3.14159f; + + /** + * 6次谐波电流数值 + */ + @TableField(value = "iharm_6") + private Float iharm6 = -3.14159f; + + /** + * 7次谐波电流数值 + */ + @TableField(value = "iharm_7") + private Float iharm7 = -3.14159f; + + /** + * 8次谐波电流数值 + */ + @TableField(value = "iharm_8") + private Float iharm8 = -3.14159f; + + /** + * 9次谐波电流数值 + */ + @TableField(value = "iharm_9") + private Float iharm9 = -3.14159f; + + /** + * 10次谐波电流数值 + */ + @TableField(value = "iharm_10") + private Float iharm10 = -3.14159f; + + /** + * 11次谐波电流数值 + */ + @TableField(value = "iharm_11") + private Float iharm11 = -3.14159f; + + /** + * 12次谐波电流数值 + */ + @TableField(value = "iharm_12") + private Float iharm12 = -3.14159f; + + /** + * 13次谐波电流数值 + */ + @TableField(value = "iharm_13") + private Float iharm13 = -3.14159f; + + /** + * 14次谐波电流数值 + */ + @TableField(value = "iharm_14") + private Float iharm14 = -3.14159f; + + /** + * 15次谐波电流数值 + */ + @TableField(value = "iharm_15") + private Float iharm15 = -3.14159f; + + /** + * 16次谐波电流数值 + */ + @TableField(value = "iharm_16") + private Float iharm16 = -3.14159f; + + /** + * 17次谐波电流数值 + */ + @TableField(value = "iharm_17") + private Float iharm17 = -3.14159f; + + /** + * 18次谐波电流数值 + */ + @TableField(value = "iharm_18") + private Float iharm18 = -3.14159f; + + /** + * 19次谐波电流数值 + */ + @TableField(value = "iharm_19") + private Float iharm19 = -3.14159f; + + /** + * 20次谐波电流数值 + */ + @TableField(value = "iharm_20") + private Float iharm20 = -3.14159f; + + /** + * 21次谐波电流数值 + */ + @TableField(value = "iharm_21") + private Float iharm21 = -3.14159f; + + /** + * 22次谐波电流数值 + */ + @TableField(value = "iharm_22") + private Float iharm22 = -3.14159f; + + /** + * 23次谐波电流数值 + */ + @TableField(value = "iharm_23") + private Float iharm23 = -3.14159f; + + /** + * 24次谐波电流数值 + */ + @TableField(value = "iharm_24") + private Float iharm24 = -3.14159f; + + /** + * 25次谐波电流数值 + */ + @TableField(value = "iharm_25") + private Float iharm25 = -3.14159f; + + /** + * 0.5次间谐波电压数值 + */ + @TableField(value = "inuharm_1") + private Float inuharm1 = -3.14159f; + + /** + * 1.5次间谐波电压数值 + */ + @TableField(value = "inuharm_2") + private Float inuharm2 = -3.14159f; + + /** + * 2.5次间谐波电压数值 + */ + @TableField(value = "inuharm_3") + private Float inuharm3 = -3.14159f; + + /** + * 3.5次间谐波电压数值 + */ + @TableField(value = "inuharm_4") + private Float inuharm4 = -3.14159f; + + /** + * 4.5次间谐波电压数值 + */ + @TableField(value = "inuharm_5") + private Float inuharm5 = -3.14159f; + + /** + * 5.5次间谐波电压数值 + */ + @TableField(value = "inuharm_6") + private Float inuharm6 = -3.14159f; + + /** + * 6.5次间谐波电压数值 + */ + @TableField(value = "inuharm_7") + private Float inuharm7 = -3.14159f; + + /** + * 7.5次间谐波电压数值 + */ + @TableField(value = "inuharm_8") + private Float inuharm8 = -3.14159f; + + /** + * 8.5次间谐波电压数值 + */ + @TableField(value = "inuharm_9") + private Float inuharm9 = -3.14159f; + + /** + * 9.5次间谐波电压数值 + */ + @TableField(value = "inuharm_10") + private Float inuharm10 = -3.14159f; + + /** + * 10.5次间谐波电压数值 + */ + @TableField(value = "inuharm_11") + private Float inuharm11 = -3.14159f; + + /** + * 11.5次间谐波电压数值 + */ + @TableField(value = "inuharm_12") + private Float inuharm12 = -3.14159f; + + /** + * 12.5次间谐波电压数值 + */ + @TableField(value = "inuharm_13") + private Float inuharm13 = -3.14159f; + + /** + * 13.5次间谐波电压数值 + */ + @TableField(value = "inuharm_14") + private Float inuharm14 = -3.14159f; + + /** + * 14.5次间谐波电压数值 + */ + @TableField(value = "inuharm_15") + private Float inuharm15 = -3.14159f; + + /** + * 15.5次间谐波电压数值 + */ + @TableField(value = "inuharm_16") + private Float inuharm16 = -3.14159f; + + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/NormalLimitServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/NormalLimitServiceImpl.java index 541f45ca5..a89d01b52 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/NormalLimitServiceImpl.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/NormalLimitServiceImpl.java @@ -1,18 +1,23 @@ package com.njcn.prepare.harmonic.service.Impl.line; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.common.pojo.enums.common.ServerEnum; import com.njcn.device.pq.api.GeneralDeviceInfoClient; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; +import com.njcn.device.pq.pojo.po.Node; import com.njcn.device.pq.pojo.po.Overlimit; import com.njcn.influxdb.param.InfluxDBPublicParam; import com.njcn.influxdb.utils.InfluxDbUtils; import com.njcn.prepare.harmonic.mapper.line.AbnormalMapper; +import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.pojo.po.AbnormalPO; +import com.njcn.prepare.harmonic.pojo.po.MpSurplusAbnormalD; import com.njcn.prepare.harmonic.pojo.vo.AbnormalVO; import com.njcn.prepare.harmonic.service.line.NormalLimitService; import com.njcn.web.utils.RequestUtil; @@ -21,9 +26,11 @@ import org.influxdb.dto.QueryResult; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.lang.reflect.Field; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.*; /** * @author denghuajun @@ -33,7 +40,7 @@ import java.util.List; @Service @AllArgsConstructor -public class NormalLimitServiceImpl implements NormalLimitService { +public class NormalLimitServiceImpl extends ServiceImpl implements NormalLimitService { private final GeneralDeviceInfoClient generalDeviceInfoClient; @@ -44,440 +51,860 @@ public class NormalLimitServiceImpl implements NormalLimitService { private final AbnormalMapper abnormalMapper; @Override - public String getNormLimitData() { + public Boolean getNormLimitData(LineParam lineParam) { List lineIds = new ArrayList<>(); - DeviceInfoParam deviceInfoParam = new DeviceInfoParam(); - deviceInfoParam.setDeptIndex("5699e5916a18a6381e1ac92da5bd2628"); - deviceInfoParam.setPowerFlag(2); - deviceInfoParam.setMonitorFlag(2); - deviceInfoParam.setServerName(ServerEnum.HARMONIC.getName()); - SimpleDTO simpleDTO = new SimpleDTO(); - simpleDTO.setName("电网拓扑"); - simpleDTO.setSort(0); - simpleDTO.setCode("Power_Network"); - deviceInfoParam.setStatisticalType(simpleDTO); - //处理监测点 - List deviceDataList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData(); - for (GeneralDeviceDTO generalDeviceDTO : deviceDataList) { - lineIds.addAll(generalDeviceDTO.getLineIndexes()); - } - if (!lineIds.isEmpty()) { - for (String lineIndex : lineIds) { - //获取当前监测点的限值详情 - Overlimit overlimit = lineFeignClient.getOverLimitData(lineIndex).getData(); - for (int i = 1; i < 5; i++) { - for (int j = 1; j < 5; j++) { - //电压上偏差 - List voDev = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 1); - //电压下偏差 - List uoDev = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 2); - //三相电压不平衡度 - List uba = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 3); - //电压总畸变率 - List uab = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 4); - //负序电流 - List ing = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 5); - //频率 - List freq = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 6); - //2-25次谐波含有率 - //谐波电压含有率 - List uharm2 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 7); - List uharm3 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 8); - List uharm4 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 9); - List uharm5 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 10); - List uharm6 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 11); - List uharm7 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 12); - List uharm8 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 13); - List uharm9 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 14); - List uharm10 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 15); - List uharm11 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 16); - List uharm12 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 17); - List uharm13 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 18); - List uharm14 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 19); - List uharm15 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 20); - List uharm16 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 21); - List uharm17 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 22); - List uharm18 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 23); - List uharm19 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 24); - List uharm20 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 25); - List uharm21 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 26); - List uharm22 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 27); - List uharm23 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 28); - List uharm24 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 29); - List uharm25 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 30); + + DateTime start = DateUtil.beginOfDay(DateUtil.parse(lineParam.getDataDate())); + DateTime end = DateUtil.endOfDay(DateUtil.parse(lineParam.getDataDate())); + + if (CollectionUtils.isEmpty(lineParam.getLineIds())) { + DeviceInfoParam deviceInfoParam = new DeviceInfoParam(); + deviceInfoParam.setDeptIndex("5699e5916a18a6381e1ac92da5bd2628"); + deviceInfoParam.setPowerFlag(2); + deviceInfoParam.setMonitorFlag(2); + deviceInfoParam.setServerName(ServerEnum.HARMONIC.getName()); + SimpleDTO simpleDTO = new SimpleDTO(); + simpleDTO.setName("电网拓扑"); + simpleDTO.setSort(0); + simpleDTO.setCode("Power_Network"); + deviceInfoParam.setStatisticalType(simpleDTO); + //处理监测点 + List deviceDataList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData(); + for (GeneralDeviceDTO generalDeviceDTO : deviceDataList) { + lineIds.addAll(generalDeviceDTO.getLineIndexes()); + } + if (!lineIds.isEmpty()) { + for (String lineIndex : lineIds) { + //获取当前监测点的限值详情 + Overlimit overlimit = lineFeignClient.getOverLimitData(lineIndex).getData(); + for (int i = 1; i < 5; i++) { + for (int j = 1; j < 5; j++) { + //电压上偏差 + List voDev = getConntion(i, j, start, end, lineIndex, 1); + //电压下偏差 + List uoDev = getConntion(i, j, start, end, lineIndex, 2); + //三相电压不平衡度 + List uba = getConntion(i, j, start, end, lineIndex, 3); + //电压总畸变率 + List uab = getConntion(i, j, start, end, lineIndex, 4); + //负序电流 + List ing = getConntion(i, j, start, end, lineIndex, 5); + //频率 + List freq = getConntion(i, j, start, end, lineIndex, 6); + //2-25次谐波含有率 + //谐波电压含有率 + List uharm2 = getConntion(i, j, start, end, lineIndex, 7); + List uharm3 = getConntion(i, j, start, end, lineIndex, 8); + List uharm4 = getConntion(i, j, start, end, lineIndex, 9); + List uharm5 = getConntion(i, j, start, end, lineIndex, 10); + List uharm6 = getConntion(i, j, start, end, lineIndex, 11); + List uharm7 = getConntion(i, j, start, end, lineIndex, 12); + List uharm8 = getConntion(i, j, start, end, lineIndex, 13); + List uharm9 = getConntion(i, j, start, end, lineIndex, 14); + List uharm10 = getConntion(i, j, start, end, lineIndex, 15); + List uharm11 = getConntion(i, j, start, end, lineIndex, 16); + List uharm12 = getConntion(i, j, start, end, lineIndex, 17); + List uharm13 = getConntion(i, j, start, end, lineIndex, 18); + List uharm14 = getConntion(i, j, start, end, lineIndex, 19); + List uharm15 = getConntion(i, j, start, end, lineIndex, 20); + List uharm16 = getConntion(i, j, start, end, lineIndex, 21); + List uharm17 = getConntion(i, j, start, end, lineIndex, 22); + List uharm18 = getConntion(i, j, start, end, lineIndex, 23); + List uharm19 = getConntion(i, j, start, end, lineIndex, 24); + List uharm20 = getConntion(i, j, start, end, lineIndex, 25); + List uharm21 = getConntion(i, j, start, end, lineIndex, 26); + List uharm22 = getConntion(i, j, start, end, lineIndex, 27); + List uharm23 = getConntion(i, j, start, end, lineIndex, 28); + List uharm24 = getConntion(i, j, start, end, lineIndex, 29); + List uharm25 = getConntion(i, j, start, end, lineIndex, 30); - //2-25次谐波电流幅值 - List iharm2 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 31); - List iharm3 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 32); - List iharm4 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 33); - List iharm5 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 34); - List iharm6 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 35); - List iharm7 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 36); - List iharm8 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 37); - List iharm9 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 38); - List iharm10 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 39); - List iharm11 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 40); - List iharm12 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 41); - List iharm13 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 42); - List iharm14 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 43); - List iharm15 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 44); - List iharm16 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 45); - List iharm17 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 46); - List iharm18 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 47); - List iharm19 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 48); - List iharm20 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 49); - List iharm21 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 50); - List iharm22 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 51); - List iharm23 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 52); - List iharm24 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 53); - List iharm25 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 54); + //2-25次谐波电流幅值 + List iharm2 = getConntion(i, j, start, end, lineIndex, 31); + List iharm3 = getConntion(i, j, start, end, lineIndex, 32); + List iharm4 = getConntion(i, j, start, end, lineIndex, 33); + List iharm5 = getConntion(i, j, start, end, lineIndex, 34); + List iharm6 = getConntion(i, j, start, end, lineIndex, 35); + List iharm7 = getConntion(i, j, start, end, lineIndex, 36); + List iharm8 = getConntion(i, j, start, end, lineIndex, 37); + List iharm9 = getConntion(i, j, start, end, lineIndex, 38); + List iharm10 = getConntion(i, j, start, end, lineIndex, 39); + List iharm11 = getConntion(i, j, start, end, lineIndex, 40); + List iharm12 = getConntion(i, j, start, end, lineIndex, 41); + List iharm13 = getConntion(i, j, start, end, lineIndex, 42); + List iharm14 = getConntion(i, j, start, end, lineIndex, 43); + List iharm15 = getConntion(i, j, start, end, lineIndex, 44); + List iharm16 = getConntion(i, j, start, end, lineIndex, 45); + List iharm17 = getConntion(i, j, start, end, lineIndex, 46); + List iharm18 = getConntion(i, j, start, end, lineIndex, 47); + List iharm19 = getConntion(i, j, start, end, lineIndex, 48); + List iharm20 = getConntion(i, j, start, end, lineIndex, 49); + List iharm21 = getConntion(i, j, start, end, lineIndex, 50); + List iharm22 = getConntion(i, j, start, end, lineIndex, 51); + List iharm23 = getConntion(i, j, start, end, lineIndex, 52); + List iharm24 = getConntion(i, j, start, end, lineIndex, 53); + List iharm25 = getConntion(i, j, start, end, lineIndex, 54); - //0.5-15.5次间谐波电压含有率 - List inharm = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 55); - List inharm1 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 56); - List inharm2 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 57); - List inharm3 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 58); - List inharm4 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 59); - List inharm5 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 60); - List inharm6 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 61); - List inharm7 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 62); - List inharm8 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 63); - List inharm9 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 64); - List inharm10 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 65); - List inharm11 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 66); - List inharm12 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 67); - List inharm13 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 68); - List inharm14 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 69); - List inharm15 = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 70); - //长时闪变 - List flicker = getConntion(i, j, DateUtil.beginOfDay(DateUtil.yesterday()), DateUtil.endOfDay(DateUtil.yesterday()), lineIndex, 71); - //只需要判断一个指标即可 - if (voDev.size() > 0 && uoDev.size() > 0 && uba.size() > 0 && uab.size() > 0 && ing.size() > 0 && freq.size() > 0 && uharm2.size() > 0 && uharm3.size() > 0 && uharm4.size() > 0 - && uharm5.size() > 0 && uharm6.size() > 0 && uharm7.size() > 0 && uharm8.size() > 0 && uharm9.size() > 0 && uharm10.size() > 0 && uharm11.size() > 0 && uharm12.size() > 0 && uharm13.size() > 0 && uharm14.size() > 0 - && uharm15.size() > 0 && uharm16.size() > 0 && uharm17.size() > 0 && uharm18.size() > 0 && uharm19.size() > 0 && uharm20.size() > 0 && uharm21.size() > 0 && uharm22.size() > 0 && uharm23.size() > 0 && uharm24.size() > 0 - && uharm25.size() > 0 && iharm2.size() > 0 && iharm3.size() > 0 && iharm4.size() > 0 - && iharm5.size() > 0 && iharm6.size() > 0 && iharm7.size() > 0 && iharm8.size() > 0 && iharm9.size() > 0 && iharm10.size() > 0 && iharm11.size() > 0 && iharm12.size() > 0 && iharm13.size() > 0 && iharm14.size() > 0 - && iharm15.size() > 0 && iharm16.size() > 0 && iharm17.size() > 0 && iharm18.size() > 0 && iharm19.size() > 0 && iharm20.size() > 0 && iharm21.size() > 0 && iharm22.size() > 0 && iharm23.size() > 0 && iharm24.size() > 0 - && iharm25.size() > 0 && inharm.size() > 0 && inharm1.size() > 0 && inharm2.size() > 0 - && inharm3.size() > 0 && inharm4.size() > 0 && inharm5.size() > 0 && inharm6.size() > 0 && inharm7.size() > 0 && inharm8.size() > 0 && inharm9.size() > 0 && inharm10.size() > 0 && inharm11.size() > 0 && inharm12.size() > 0 - && inharm13.size() > 0 && inharm14.size() > 0 && inharm15.size() > 0) { - AbnormalPO abnormalPO = new AbnormalPO(); - abnormalPO.setTimeId(DateUtil.beginOfDay(DateUtil.beginOfDay(DateUtil.yesterday()))); - abnormalPO.setId(lineIndex); - if (i == 1) { - abnormalPO.setPhasicType("A"); - } else if (i == 2) { - abnormalPO.setPhasicType("B"); - } else if (i == 3) { - abnormalPO.setPhasicType("C"); - } else { - abnormalPO.setPhasicType("T"); + //0.5-15.5次间谐波电压含有率 + List inharm = getConntion(i, j, start, end, lineIndex, 55); + List inharm1 = getConntion(i, j, start, end, lineIndex, 56); + List inharm2 = getConntion(i, j, start, end, lineIndex, 57); + List inharm3 = getConntion(i, j, start, end, lineIndex, 58); + List inharm4 = getConntion(i, j, start, end, lineIndex, 59); + List inharm5 = getConntion(i, j, start, end, lineIndex, 60); + List inharm6 = getConntion(i, j, start, end, lineIndex, 61); + List inharm7 = getConntion(i, j, start, end, lineIndex, 62); + List inharm8 = getConntion(i, j, start, end, lineIndex, 63); + List inharm9 = getConntion(i, j, start, end, lineIndex, 64); + List inharm10 = getConntion(i, j, start, end, lineIndex, 65); + List inharm11 = getConntion(i, j, start, end, lineIndex, 66); + List inharm12 = getConntion(i, j, start, end, lineIndex, 67); + List inharm13 = getConntion(i, j, start, end, lineIndex, 68); + List inharm14 = getConntion(i, j, start, end, lineIndex, 69); + List inharm15 = getConntion(i, j, start, end, lineIndex, 70); + //长时闪变 + List flicker = getConntion(i, j, start, end, lineIndex, 71); + //只需要判断一个指标即可 + if (voDev.size() > 0 && uoDev.size() > 0 && uba.size() > 0 && uab.size() > 0 && ing.size() > 0 && freq.size() > 0 && uharm2.size() > 0 && uharm3.size() > 0 && uharm4.size() > 0 + && uharm5.size() > 0 && uharm6.size() > 0 && uharm7.size() > 0 && uharm8.size() > 0 && uharm9.size() > 0 && uharm10.size() > 0 && uharm11.size() > 0 && uharm12.size() > 0 && uharm13.size() > 0 && uharm14.size() > 0 + && uharm15.size() > 0 && uharm16.size() > 0 && uharm17.size() > 0 && uharm18.size() > 0 && uharm19.size() > 0 && uharm20.size() > 0 && uharm21.size() > 0 && uharm22.size() > 0 && uharm23.size() > 0 && uharm24.size() > 0 + && uharm25.size() > 0 && iharm2.size() > 0 && iharm3.size() > 0 && iharm4.size() > 0 + && iharm5.size() > 0 && iharm6.size() > 0 && iharm7.size() > 0 && iharm8.size() > 0 && iharm9.size() > 0 && iharm10.size() > 0 && iharm11.size() > 0 && iharm12.size() > 0 && iharm13.size() > 0 && iharm14.size() > 0 + && iharm15.size() > 0 && iharm16.size() > 0 && iharm17.size() > 0 && iharm18.size() > 0 && iharm19.size() > 0 && iharm20.size() > 0 && iharm21.size() > 0 && iharm22.size() > 0 && iharm23.size() > 0 && iharm24.size() > 0 + && iharm25.size() > 0 && inharm.size() > 0 && inharm1.size() > 0 && inharm2.size() > 0 + && inharm3.size() > 0 && inharm4.size() > 0 && inharm5.size() > 0 && inharm6.size() > 0 && inharm7.size() > 0 && inharm8.size() > 0 && inharm9.size() > 0 && inharm10.size() > 0 && inharm11.size() > 0 && inharm12.size() > 0 + && inharm13.size() > 0 && inharm14.size() > 0 && inharm15.size() > 0) { + AbnormalPO abnormalPO = new AbnormalPO(); + abnormalPO.setTimeId(DateUtil.beginOfDay(start)); + abnormalPO.setId(lineIndex); + if (i == 1) { + abnormalPO.setPhasicType("A"); + } else if (i == 2) { + abnormalPO.setPhasicType("B"); + } else if (i == 3) { + abnormalPO.setPhasicType("C"); + } else { + abnormalPO.setPhasicType("T"); + } + if (j == 1) { + abnormalPO.setFreq(freq.get(0).getNormValue()); + abnormalPO.setValueType("AVG"); + abnormalPO.setVoltageDev(voDev.get(0).getNormValue()); + abnormalPO.setUvoltageDev(uoDev.get(0).getNormValue()); + abnormalPO.setFlicker(flicker.get(0).getNormValue()); + abnormalPO.setUaberrance(uab.get(0).getNormValue()); + abnormalPO.setUbalance(uba.get(0).getNormValue()); + abnormalPO.setINeg(ing.get(0).getNormValue()); + abnormalPO.setUharm_2(uharm2.get(0).getNormValue()); + abnormalPO.setUharm_3(uharm3.get(0).getNormValue()); + abnormalPO.setUharm_4(uharm4.get(0).getNormValue()); + abnormalPO.setUharm_5(uharm5.get(0).getNormValue()); + abnormalPO.setUharm_6(uharm6.get(0).getNormValue()); + abnormalPO.setUharm_7(uharm7.get(0).getNormValue()); + abnormalPO.setUharm_8(uharm8.get(0).getNormValue()); + abnormalPO.setUharm_9(uharm9.get(0).getNormValue()); + abnormalPO.setUharm_10(uharm10.get(0).getNormValue()); + abnormalPO.setUharm_11(uharm11.get(0).getNormValue()); + abnormalPO.setUharm_12(uharm12.get(0).getNormValue()); + abnormalPO.setUharm_13(uharm13.get(0).getNormValue()); + abnormalPO.setUharm_14(uharm14.get(0).getNormValue()); + abnormalPO.setUharm_15(uharm15.get(0).getNormValue()); + abnormalPO.setUharm_16(uharm16.get(0).getNormValue()); + abnormalPO.setUharm_17(uharm17.get(0).getNormValue()); + abnormalPO.setUharm_18(uharm18.get(0).getNormValue()); + abnormalPO.setUharm_19(uharm19.get(0).getNormValue()); + abnormalPO.setUharm_20(uharm20.get(0).getNormValue()); + abnormalPO.setUharm_21(uharm21.get(0).getNormValue()); + abnormalPO.setUharm_22(uharm22.get(0).getNormValue()); + abnormalPO.setUharm_23(uharm23.get(0).getNormValue()); + abnormalPO.setUharm_24(uharm24.get(0).getNormValue()); + abnormalPO.setUharm_25(uharm25.get(0).getNormValue()); + abnormalPO.setIharm_2(iharm2.get(0).getNormValue()); + abnormalPO.setIharm_3(iharm3.get(0).getNormValue()); + abnormalPO.setIharm_4(iharm4.get(0).getNormValue()); + abnormalPO.setIharm_5(iharm5.get(0).getNormValue()); + abnormalPO.setIharm_6(iharm6.get(0).getNormValue()); + abnormalPO.setIharm_7(iharm7.get(0).getNormValue()); + abnormalPO.setIharm_8(iharm8.get(0).getNormValue()); + abnormalPO.setIharm_9(iharm9.get(0).getNormValue()); + abnormalPO.setIharm_10(iharm10.get(0).getNormValue()); + abnormalPO.setIharm_11(iharm11.get(0).getNormValue()); + abnormalPO.setIharm_12(iharm12.get(0).getNormValue()); + abnormalPO.setIharm_13(iharm13.get(0).getNormValue()); + abnormalPO.setIharm_14(iharm14.get(0).getNormValue()); + abnormalPO.setIharm_15(iharm15.get(0).getNormValue()); + abnormalPO.setIharm_16(iharm16.get(0).getNormValue()); + abnormalPO.setIharm_17(iharm17.get(0).getNormValue()); + abnormalPO.setIharm_18(iharm18.get(0).getNormValue()); + abnormalPO.setIharm_19(iharm19.get(0).getNormValue()); + abnormalPO.setIharm_20(iharm20.get(0).getNormValue()); + abnormalPO.setIharm_21(iharm21.get(0).getNormValue()); + abnormalPO.setIharm_22(iharm22.get(0).getNormValue()); + abnormalPO.setIharm_23(iharm23.get(0).getNormValue()); + abnormalPO.setIharm_24(iharm24.get(0).getNormValue()); + abnormalPO.setIharm_25(iharm25.get(0).getNormValue()); + abnormalPO.setInuharm_1(inharm.get(0).getNormValue()); + abnormalPO.setInuharm_2(inharm1.get(0).getNormValue()); + abnormalPO.setInuharm_3(inharm2.get(0).getNormValue()); + abnormalPO.setInuharm_4(inharm3.get(0).getNormValue()); + abnormalPO.setInuharm_5(inharm4.get(0).getNormValue()); + abnormalPO.setInuharm_6(inharm5.get(0).getNormValue()); + abnormalPO.setInuharm_7(inharm6.get(0).getNormValue()); + abnormalPO.setInuharm_8(inharm7.get(0).getNormValue()); + abnormalPO.setInuharm_9(inharm8.get(0).getNormValue()); + abnormalPO.setInuharm_10(inharm9.get(0).getNormValue()); + abnormalPO.setInuharm_11(inharm10.get(0).getNormValue()); + abnormalPO.setInuharm_12(inharm11.get(0).getNormValue()); + abnormalPO.setInuharm_13(inharm12.get(0).getNormValue()); + abnormalPO.setInuharm_14(inharm13.get(0).getNormValue()); + abnormalPO.setInuharm_15(inharm14.get(0).getNormValue()); + abnormalPO.setInuharm_16(inharm15.get(0).getNormValue()); + } else if (j == 2) { + abnormalPO.setFreq(freq.get(0).getNormValue() > 50 + overlimit.getFreqDev() ? freq.get(0).getNormValue() : -3.14159f); + abnormalPO.setValueType("MAX"); + abnormalPO.setVoltageDev(voDev.get(0).getNormValue() > overlimit.getVoltageDev() ? voDev.get(0).getNormValue() : -3.14159f); + abnormalPO.setUvoltageDev(uoDev.get(0).getNormValue() > Math.abs(overlimit.getUvoltageDev()) ? uoDev.get(0).getNormValue() : -3.14159f); + abnormalPO.setFlicker(flicker.get(0).getNormValue() > overlimit.getFlicker() ? flicker.get(0).getNormValue() : -3.14159f); + abnormalPO.setUaberrance(uab.get(0).getNormValue() > overlimit.getUaberrance() ? uab.get(0).getNormValue() : -3.14159f); + abnormalPO.setUbalance(uba.get(0).getNormValue() > overlimit.getUbalance() ? uba.get(0).getNormValue() : -3.14159f); + abnormalPO.setINeg(ing.get(0).getNormValue() > overlimit.getINeg() ? ing.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_2(uharm2.get(0).getNormValue() > overlimit.getUharm2() ? uharm2.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_3(uharm3.get(0).getNormValue() > overlimit.getUharm3() ? uharm3.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_4(uharm4.get(0).getNormValue() > overlimit.getUharm4() ? uharm4.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_5(uharm5.get(0).getNormValue() > overlimit.getUharm5() ? uharm5.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_6(uharm6.get(0).getNormValue() > overlimit.getUharm6() ? uharm6.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_7(uharm7.get(0).getNormValue() > overlimit.getUharm7() ? uharm7.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_8(uharm8.get(0).getNormValue() > overlimit.getUharm8() ? uharm8.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_9(uharm9.get(0).getNormValue() > overlimit.getUharm9() ? uharm9.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_10(uharm10.get(0).getNormValue() > overlimit.getUharm10() ? uharm10.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_11(uharm11.get(0).getNormValue() > overlimit.getUharm11() ? uharm11.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_12(uharm12.get(0).getNormValue() > overlimit.getUharm12() ? uharm12.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_13(uharm13.get(0).getNormValue() > overlimit.getUharm13() ? uharm13.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_14(uharm14.get(0).getNormValue() > overlimit.getUharm14() ? uharm14.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_15(uharm15.get(0).getNormValue() > overlimit.getUharm15() ? uharm15.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_16(uharm16.get(0).getNormValue() > overlimit.getUharm16() ? uharm16.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_17(uharm17.get(0).getNormValue() > overlimit.getUharm17() ? uharm17.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_18(uharm18.get(0).getNormValue() > overlimit.getUharm18() ? uharm18.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_19(uharm19.get(0).getNormValue() > overlimit.getUharm19() ? uharm19.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_20(uharm20.get(0).getNormValue() > overlimit.getUharm20() ? uharm20.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_21(uharm21.get(0).getNormValue() > overlimit.getUharm21() ? uharm21.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_22(uharm22.get(0).getNormValue() > overlimit.getUharm22() ? uharm22.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_23(uharm23.get(0).getNormValue() > overlimit.getUharm23() ? uharm23.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_24(uharm24.get(0).getNormValue() > overlimit.getUharm24() ? uharm24.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_25(uharm25.get(0).getNormValue() > overlimit.getUharm25() ? uharm25.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_2(iharm2.get(0).getNormValue() > overlimit.getIharm2() ? iharm2.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_3(iharm3.get(0).getNormValue() > overlimit.getIharm3() ? iharm3.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_4(iharm4.get(0).getNormValue() > overlimit.getIharm4() ? iharm4.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_5(iharm5.get(0).getNormValue() > overlimit.getIharm5() ? iharm5.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_6(iharm6.get(0).getNormValue() > overlimit.getIharm6() ? iharm6.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_7(iharm7.get(0).getNormValue() > overlimit.getIharm7() ? iharm7.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_8(iharm8.get(0).getNormValue() > overlimit.getIharm8() ? iharm8.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_9(iharm9.get(0).getNormValue() > overlimit.getIharm9() ? iharm9.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_10(iharm10.get(0).getNormValue() > overlimit.getIharm10() ? iharm10.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_11(iharm11.get(0).getNormValue() > overlimit.getIharm11() ? iharm11.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_12(iharm12.get(0).getNormValue() > overlimit.getIharm12() ? iharm12.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_13(iharm13.get(0).getNormValue() > overlimit.getIharm13() ? iharm13.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_14(iharm14.get(0).getNormValue() > overlimit.getIharm14() ? iharm14.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_15(iharm15.get(0).getNormValue() > overlimit.getIharm15() ? iharm15.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_16(iharm16.get(0).getNormValue() > overlimit.getIharm16() ? iharm16.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_17(iharm17.get(0).getNormValue() > overlimit.getIharm17() ? iharm17.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_18(iharm18.get(0).getNormValue() > overlimit.getIharm18() ? iharm18.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_19(iharm19.get(0).getNormValue() > overlimit.getIharm19() ? iharm19.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_20(iharm20.get(0).getNormValue() > overlimit.getIharm20() ? iharm20.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_21(iharm21.get(0).getNormValue() > overlimit.getIharm21() ? iharm21.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_22(iharm22.get(0).getNormValue() > overlimit.getIharm22() ? iharm22.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_23(iharm23.get(0).getNormValue() > overlimit.getIharm23() ? iharm23.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_24(iharm24.get(0).getNormValue() > overlimit.getIharm24() ? iharm24.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_25(iharm25.get(0).getNormValue() > overlimit.getIharm25() ? iharm25.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_1(inharm.get(0).getNormValue() > overlimit.getInuharm1() ? inharm.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_2(inharm1.get(0).getNormValue() > overlimit.getInuharm2() ? inharm1.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_3(inharm2.get(0).getNormValue() > overlimit.getInuharm3() ? inharm2.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_4(inharm3.get(0).getNormValue() > overlimit.getInuharm4() ? inharm3.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_5(inharm4.get(0).getNormValue() > overlimit.getInuharm5() ? inharm4.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_6(inharm5.get(0).getNormValue() > overlimit.getInuharm6() ? inharm5.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_7(inharm6.get(0).getNormValue() > overlimit.getInuharm7() ? inharm6.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_8(inharm7.get(0).getNormValue() > overlimit.getInuharm8() ? inharm7.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_9(inharm8.get(0).getNormValue() > overlimit.getInuharm9() ? inharm8.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_10(inharm9.get(0).getNormValue() > overlimit.getInuharm10() ? inharm9.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_11(inharm10.get(0).getNormValue() > overlimit.getInuharm11() ? inharm10.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_12(inharm11.get(0).getNormValue() > overlimit.getInuharm12() ? inharm11.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_13(inharm12.get(0).getNormValue() > overlimit.getInuharm13() ? inharm12.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_14(inharm13.get(0).getNormValue() > overlimit.getInuharm14() ? inharm13.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_15(inharm14.get(0).getNormValue() > overlimit.getInuharm15() ? inharm14.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_16(inharm15.get(0).getNormValue() > overlimit.getInuharm16() ? inharm15.get(0).getNormValue() : -3.14159f); + } else if (j == 3) { + abnormalPO.setFreq(freq.get(0).getNormValue()); + abnormalPO.setValueType("MIN"); + abnormalPO.setVoltageDev(voDev.get(0).getNormValue()); + abnormalPO.setUvoltageDev(uoDev.get(0).getNormValue()); + abnormalPO.setFlicker(flicker.get(0).getNormValue()); + abnormalPO.setUaberrance(uab.get(0).getNormValue()); + abnormalPO.setUbalance(uba.get(0).getNormValue()); + abnormalPO.setINeg(ing.get(0).getNormValue()); + abnormalPO.setUharm_2(uharm2.get(0).getNormValue()); + abnormalPO.setUharm_3(uharm3.get(0).getNormValue()); + abnormalPO.setUharm_4(uharm4.get(0).getNormValue()); + abnormalPO.setUharm_5(uharm5.get(0).getNormValue()); + abnormalPO.setUharm_6(uharm6.get(0).getNormValue()); + abnormalPO.setUharm_7(uharm7.get(0).getNormValue()); + abnormalPO.setUharm_8(uharm8.get(0).getNormValue()); + abnormalPO.setUharm_9(uharm9.get(0).getNormValue()); + abnormalPO.setUharm_10(uharm10.get(0).getNormValue()); + abnormalPO.setUharm_11(uharm11.get(0).getNormValue()); + abnormalPO.setUharm_12(uharm12.get(0).getNormValue()); + abnormalPO.setUharm_13(uharm13.get(0).getNormValue()); + abnormalPO.setUharm_14(uharm14.get(0).getNormValue()); + abnormalPO.setUharm_15(uharm15.get(0).getNormValue()); + abnormalPO.setUharm_16(uharm16.get(0).getNormValue()); + abnormalPO.setUharm_17(uharm17.get(0).getNormValue()); + abnormalPO.setUharm_18(uharm18.get(0).getNormValue()); + abnormalPO.setUharm_19(uharm19.get(0).getNormValue()); + abnormalPO.setUharm_20(uharm20.get(0).getNormValue()); + abnormalPO.setUharm_21(uharm21.get(0).getNormValue()); + abnormalPO.setUharm_22(uharm22.get(0).getNormValue()); + abnormalPO.setUharm_23(uharm23.get(0).getNormValue()); + abnormalPO.setUharm_24(uharm24.get(0).getNormValue()); + abnormalPO.setUharm_25(uharm25.get(0).getNormValue()); + abnormalPO.setIharm_2(iharm2.get(0).getNormValue()); + abnormalPO.setIharm_3(iharm3.get(0).getNormValue()); + abnormalPO.setIharm_4(iharm4.get(0).getNormValue()); + abnormalPO.setIharm_5(iharm5.get(0).getNormValue()); + abnormalPO.setIharm_6(iharm6.get(0).getNormValue()); + abnormalPO.setIharm_7(iharm7.get(0).getNormValue()); + abnormalPO.setIharm_8(iharm8.get(0).getNormValue()); + abnormalPO.setIharm_9(iharm9.get(0).getNormValue()); + abnormalPO.setIharm_10(iharm10.get(0).getNormValue()); + abnormalPO.setIharm_11(iharm11.get(0).getNormValue()); + abnormalPO.setIharm_12(iharm12.get(0).getNormValue()); + abnormalPO.setIharm_13(iharm13.get(0).getNormValue()); + abnormalPO.setIharm_14(iharm14.get(0).getNormValue()); + abnormalPO.setIharm_15(iharm15.get(0).getNormValue()); + abnormalPO.setIharm_16(iharm16.get(0).getNormValue()); + abnormalPO.setIharm_17(iharm17.get(0).getNormValue()); + abnormalPO.setIharm_18(iharm18.get(0).getNormValue()); + abnormalPO.setIharm_19(iharm19.get(0).getNormValue()); + abnormalPO.setIharm_20(iharm20.get(0).getNormValue()); + abnormalPO.setIharm_21(iharm21.get(0).getNormValue()); + abnormalPO.setIharm_22(iharm22.get(0).getNormValue()); + abnormalPO.setIharm_23(iharm23.get(0).getNormValue()); + abnormalPO.setIharm_24(iharm24.get(0).getNormValue()); + abnormalPO.setIharm_25(iharm25.get(0).getNormValue()); + abnormalPO.setInuharm_1(inharm.get(0).getNormValue()); + abnormalPO.setInuharm_2(inharm1.get(0).getNormValue()); + abnormalPO.setInuharm_3(inharm2.get(0).getNormValue()); + abnormalPO.setInuharm_4(inharm3.get(0).getNormValue()); + abnormalPO.setInuharm_5(inharm4.get(0).getNormValue()); + abnormalPO.setInuharm_6(inharm5.get(0).getNormValue()); + abnormalPO.setInuharm_7(inharm6.get(0).getNormValue()); + abnormalPO.setInuharm_8(inharm7.get(0).getNormValue()); + abnormalPO.setInuharm_9(inharm8.get(0).getNormValue()); + abnormalPO.setInuharm_10(inharm9.get(0).getNormValue()); + abnormalPO.setInuharm_11(inharm10.get(0).getNormValue()); + abnormalPO.setInuharm_12(inharm11.get(0).getNormValue()); + abnormalPO.setInuharm_13(inharm12.get(0).getNormValue()); + abnormalPO.setInuharm_14(inharm13.get(0).getNormValue()); + abnormalPO.setInuharm_15(inharm14.get(0).getNormValue()); + abnormalPO.setInuharm_16(inharm15.get(0).getNormValue()); + } else { + abnormalPO.setFreq(freq.get(0).getNormValue()); + abnormalPO.setValueType("CP95"); + abnormalPO.setVoltageDev(voDev.get(0).getNormValue()); + abnormalPO.setUvoltageDev(uoDev.get(0).getNormValue()); + abnormalPO.setFlicker(flicker.get(0).getNormValue()); + abnormalPO.setUaberrance(uab.get(0).getNormValue()); + abnormalPO.setUbalance(uba.get(0).getNormValue()); + abnormalPO.setINeg(ing.get(0).getNormValue()); + abnormalPO.setUharm_2(uharm2.get(0).getNormValue()); + abnormalPO.setUharm_3(uharm3.get(0).getNormValue()); + abnormalPO.setUharm_4(uharm4.get(0).getNormValue()); + abnormalPO.setUharm_5(uharm5.get(0).getNormValue()); + abnormalPO.setUharm_6(uharm6.get(0).getNormValue()); + abnormalPO.setUharm_7(uharm7.get(0).getNormValue()); + abnormalPO.setUharm_8(uharm8.get(0).getNormValue()); + abnormalPO.setUharm_9(uharm9.get(0).getNormValue()); + abnormalPO.setUharm_10(uharm10.get(0).getNormValue()); + abnormalPO.setUharm_11(uharm11.get(0).getNormValue()); + abnormalPO.setUharm_12(uharm12.get(0).getNormValue()); + abnormalPO.setUharm_13(uharm13.get(0).getNormValue()); + abnormalPO.setUharm_14(uharm14.get(0).getNormValue()); + abnormalPO.setUharm_15(uharm15.get(0).getNormValue()); + abnormalPO.setUharm_16(uharm16.get(0).getNormValue()); + abnormalPO.setUharm_17(uharm17.get(0).getNormValue()); + abnormalPO.setUharm_18(uharm18.get(0).getNormValue()); + abnormalPO.setUharm_19(uharm19.get(0).getNormValue()); + abnormalPO.setUharm_20(uharm20.get(0).getNormValue()); + abnormalPO.setUharm_21(uharm21.get(0).getNormValue()); + abnormalPO.setUharm_22(uharm22.get(0).getNormValue()); + abnormalPO.setUharm_23(uharm23.get(0).getNormValue()); + abnormalPO.setUharm_24(uharm24.get(0).getNormValue()); + abnormalPO.setUharm_25(uharm25.get(0).getNormValue()); + abnormalPO.setIharm_2(iharm2.get(0).getNormValue()); + abnormalPO.setIharm_3(iharm3.get(0).getNormValue()); + abnormalPO.setIharm_4(iharm4.get(0).getNormValue()); + abnormalPO.setIharm_5(iharm5.get(0).getNormValue()); + abnormalPO.setIharm_6(iharm6.get(0).getNormValue()); + abnormalPO.setIharm_7(iharm7.get(0).getNormValue()); + abnormalPO.setIharm_8(iharm8.get(0).getNormValue()); + abnormalPO.setIharm_9(iharm9.get(0).getNormValue()); + abnormalPO.setIharm_10(iharm10.get(0).getNormValue()); + abnormalPO.setIharm_11(iharm11.get(0).getNormValue()); + abnormalPO.setIharm_12(iharm12.get(0).getNormValue()); + abnormalPO.setIharm_13(iharm13.get(0).getNormValue()); + abnormalPO.setIharm_14(iharm14.get(0).getNormValue()); + abnormalPO.setIharm_15(iharm15.get(0).getNormValue()); + abnormalPO.setIharm_16(iharm16.get(0).getNormValue()); + abnormalPO.setIharm_17(iharm17.get(0).getNormValue()); + abnormalPO.setIharm_18(iharm18.get(0).getNormValue()); + abnormalPO.setIharm_19(iharm19.get(0).getNormValue()); + abnormalPO.setIharm_20(iharm20.get(0).getNormValue()); + abnormalPO.setIharm_21(iharm21.get(0).getNormValue()); + abnormalPO.setIharm_22(iharm22.get(0).getNormValue()); + abnormalPO.setIharm_23(iharm23.get(0).getNormValue()); + abnormalPO.setIharm_24(iharm24.get(0).getNormValue()); + abnormalPO.setIharm_25(iharm25.get(0).getNormValue()); + abnormalPO.setInuharm_1(inharm.get(0).getNormValue()); + abnormalPO.setInuharm_2(inharm1.get(0).getNormValue()); + abnormalPO.setInuharm_3(inharm2.get(0).getNormValue()); + abnormalPO.setInuharm_4(inharm3.get(0).getNormValue()); + abnormalPO.setInuharm_5(inharm4.get(0).getNormValue()); + abnormalPO.setInuharm_6(inharm5.get(0).getNormValue()); + abnormalPO.setInuharm_7(inharm6.get(0).getNormValue()); + abnormalPO.setInuharm_8(inharm7.get(0).getNormValue()); + abnormalPO.setInuharm_9(inharm8.get(0).getNormValue()); + abnormalPO.setInuharm_10(inharm9.get(0).getNormValue()); + abnormalPO.setInuharm_11(inharm10.get(0).getNormValue()); + abnormalPO.setInuharm_12(inharm11.get(0).getNormValue()); + abnormalPO.setInuharm_13(inharm12.get(0).getNormValue()); + abnormalPO.setInuharm_14(inharm13.get(0).getNormValue()); + abnormalPO.setInuharm_15(inharm14.get(0).getNormValue()); + abnormalPO.setInuharm_16(inharm15.get(0).getNormValue()); + } + // abnormalMapper.insert(abnormalPO); } - if (j == 1) { - abnormalPO.setFreq(freq.get(0).getNormValue()); - abnormalPO.setValueType("AVG"); - abnormalPO.setVoltageDev(voDev.get(0).getNormValue()); - abnormalPO.setUvoltageDev(uoDev.get(0).getNormValue()); - abnormalPO.setFlicker(flicker.get(0).getNormValue()); - abnormalPO.setUaberrance(uab.get(0).getNormValue()); - abnormalPO.setUbalance(uba.get(0).getNormValue()); - abnormalPO.setINeg(ing.get(0).getNormValue()); - abnormalPO.setUharm_2(uharm2.get(0).getNormValue()); - abnormalPO.setUharm_3(uharm3.get(0).getNormValue()); - abnormalPO.setUharm_4(uharm4.get(0).getNormValue()); - abnormalPO.setUharm_5(uharm5.get(0).getNormValue()); - abnormalPO.setUharm_6(uharm6.get(0).getNormValue()); - abnormalPO.setUharm_7(uharm7.get(0).getNormValue()); - abnormalPO.setUharm_8(uharm8.get(0).getNormValue()); - abnormalPO.setUharm_9(uharm9.get(0).getNormValue()); - abnormalPO.setUharm_10(uharm10.get(0).getNormValue()); - abnormalPO.setUharm_11(uharm11.get(0).getNormValue()); - abnormalPO.setUharm_12(uharm12.get(0).getNormValue()); - abnormalPO.setUharm_13(uharm13.get(0).getNormValue()); - abnormalPO.setUharm_14(uharm14.get(0).getNormValue()); - abnormalPO.setUharm_15(uharm15.get(0).getNormValue()); - abnormalPO.setUharm_16(uharm16.get(0).getNormValue()); - abnormalPO.setUharm_17(uharm17.get(0).getNormValue()); - abnormalPO.setUharm_18(uharm18.get(0).getNormValue()); - abnormalPO.setUharm_19(uharm19.get(0).getNormValue()); - abnormalPO.setUharm_20(uharm20.get(0).getNormValue()); - abnormalPO.setUharm_21(uharm21.get(0).getNormValue()); - abnormalPO.setUharm_22(uharm22.get(0).getNormValue()); - abnormalPO.setUharm_23(uharm23.get(0).getNormValue()); - abnormalPO.setUharm_24(uharm24.get(0).getNormValue()); - abnormalPO.setUharm_25(uharm25.get(0).getNormValue()); - abnormalPO.setIharm_2(iharm2.get(0).getNormValue()); - abnormalPO.setIharm_3(iharm3.get(0).getNormValue()); - abnormalPO.setIharm_4(iharm4.get(0).getNormValue()); - abnormalPO.setIharm_5(iharm5.get(0).getNormValue()); - abnormalPO.setIharm_6(iharm6.get(0).getNormValue()); - abnormalPO.setIharm_7(iharm7.get(0).getNormValue()); - abnormalPO.setIharm_8(iharm8.get(0).getNormValue()); - abnormalPO.setIharm_9(iharm9.get(0).getNormValue()); - abnormalPO.setIharm_10(iharm10.get(0).getNormValue()); - abnormalPO.setIharm_11(iharm11.get(0).getNormValue()); - abnormalPO.setIharm_12(iharm12.get(0).getNormValue()); - abnormalPO.setIharm_13(iharm13.get(0).getNormValue()); - abnormalPO.setIharm_14(iharm14.get(0).getNormValue()); - abnormalPO.setIharm_15(iharm15.get(0).getNormValue()); - abnormalPO.setIharm_16(iharm16.get(0).getNormValue()); - abnormalPO.setIharm_17(iharm17.get(0).getNormValue()); - abnormalPO.setIharm_18(iharm18.get(0).getNormValue()); - abnormalPO.setIharm_19(iharm19.get(0).getNormValue()); - abnormalPO.setIharm_20(iharm20.get(0).getNormValue()); - abnormalPO.setIharm_21(iharm21.get(0).getNormValue()); - abnormalPO.setIharm_22(iharm22.get(0).getNormValue()); - abnormalPO.setIharm_23(iharm23.get(0).getNormValue()); - abnormalPO.setIharm_24(iharm24.get(0).getNormValue()); - abnormalPO.setIharm_25(iharm25.get(0).getNormValue()); - abnormalPO.setInuharm_1(inharm.get(0).getNormValue()); - abnormalPO.setInuharm_2(inharm1.get(0).getNormValue()); - abnormalPO.setInuharm_3(inharm2.get(0).getNormValue()); - abnormalPO.setInuharm_4(inharm3.get(0).getNormValue()); - abnormalPO.setInuharm_5(inharm4.get(0).getNormValue()); - abnormalPO.setInuharm_6(inharm5.get(0).getNormValue()); - abnormalPO.setInuharm_7(inharm6.get(0).getNormValue()); - abnormalPO.setInuharm_8(inharm7.get(0).getNormValue()); - abnormalPO.setInuharm_9(inharm8.get(0).getNormValue()); - abnormalPO.setInuharm_10(inharm9.get(0).getNormValue()); - abnormalPO.setInuharm_11(inharm10.get(0).getNormValue()); - abnormalPO.setInuharm_12(inharm11.get(0).getNormValue()); - abnormalPO.setInuharm_13(inharm12.get(0).getNormValue()); - abnormalPO.setInuharm_14(inharm13.get(0).getNormValue()); - abnormalPO.setInuharm_15(inharm14.get(0).getNormValue()); - abnormalPO.setInuharm_16(inharm15.get(0).getNormValue()); - } else if (j == 2) { - abnormalPO.setFreq(freq.get(0).getNormValue() > 50 + overlimit.getFreqDev() ? freq.get(0).getNormValue() : -3.14159f); - abnormalPO.setValueType("MAX"); - abnormalPO.setVoltageDev(voDev.get(0).getNormValue() > overlimit.getVoltageDev() ? voDev.get(0).getNormValue() : -3.14159f); - abnormalPO.setUvoltageDev(uoDev.get(0).getNormValue() > Math.abs(overlimit.getUvoltageDev()) ? uoDev.get(0).getNormValue() : -3.14159f); - abnormalPO.setFlicker(flicker.get(0).getNormValue() > overlimit.getFlicker() ? flicker.get(0).getNormValue() : -3.14159f); - abnormalPO.setUaberrance(uab.get(0).getNormValue() > overlimit.getUaberrance() ? uab.get(0).getNormValue() : -3.14159f); - abnormalPO.setUbalance(uba.get(0).getNormValue() > overlimit.getUbalance() ? uba.get(0).getNormValue() : -3.14159f); - abnormalPO.setINeg(ing.get(0).getNormValue() > overlimit.getINeg() ? ing.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_2(uharm2.get(0).getNormValue() > overlimit.getUharm2() ? uharm2.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_3(uharm3.get(0).getNormValue() > overlimit.getUharm3() ? uharm3.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_4(uharm4.get(0).getNormValue() > overlimit.getUharm4() ? uharm4.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_5(uharm5.get(0).getNormValue() > overlimit.getUharm5() ? uharm5.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_6(uharm6.get(0).getNormValue() > overlimit.getUharm6() ? uharm6.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_7(uharm7.get(0).getNormValue() > overlimit.getUharm7() ? uharm7.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_8(uharm8.get(0).getNormValue() > overlimit.getUharm8() ? uharm8.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_9(uharm9.get(0).getNormValue() > overlimit.getUharm9() ? uharm9.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_10(uharm10.get(0).getNormValue() > overlimit.getUharm10() ? uharm10.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_11(uharm11.get(0).getNormValue() > overlimit.getUharm11() ? uharm11.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_12(uharm12.get(0).getNormValue() > overlimit.getUharm12() ? uharm12.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_13(uharm13.get(0).getNormValue() > overlimit.getUharm13() ? uharm13.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_14(uharm14.get(0).getNormValue() > overlimit.getUharm14() ? uharm14.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_15(uharm15.get(0).getNormValue() > overlimit.getUharm15() ? uharm15.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_16(uharm16.get(0).getNormValue() > overlimit.getUharm16() ? uharm16.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_17(uharm17.get(0).getNormValue() > overlimit.getUharm17() ? uharm17.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_18(uharm18.get(0).getNormValue() > overlimit.getUharm18() ? uharm18.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_19(uharm19.get(0).getNormValue() > overlimit.getUharm19() ? uharm19.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_20(uharm20.get(0).getNormValue() > overlimit.getUharm20() ? uharm20.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_21(uharm21.get(0).getNormValue() > overlimit.getUharm21() ? uharm21.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_22(uharm22.get(0).getNormValue() > overlimit.getUharm22() ? uharm22.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_23(uharm23.get(0).getNormValue() > overlimit.getUharm23() ? uharm23.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_24(uharm24.get(0).getNormValue() > overlimit.getUharm24() ? uharm24.get(0).getNormValue() : -3.14159f); - abnormalPO.setUharm_25(uharm25.get(0).getNormValue() > overlimit.getUharm25() ? uharm25.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_2(iharm2.get(0).getNormValue() > overlimit.getIharm2() ? iharm2.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_3(iharm3.get(0).getNormValue() > overlimit.getIharm3() ? iharm3.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_4(iharm4.get(0).getNormValue() > overlimit.getIharm4() ? iharm4.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_5(iharm5.get(0).getNormValue() > overlimit.getIharm5() ? iharm5.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_6(iharm6.get(0).getNormValue() > overlimit.getIharm6() ? iharm6.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_7(iharm7.get(0).getNormValue() > overlimit.getIharm7() ? iharm7.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_8(iharm8.get(0).getNormValue() > overlimit.getIharm8() ? iharm8.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_9(iharm9.get(0).getNormValue() > overlimit.getIharm9() ? iharm9.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_10(iharm10.get(0).getNormValue() > overlimit.getIharm10() ? iharm10.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_11(iharm11.get(0).getNormValue() > overlimit.getIharm11() ? iharm11.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_12(iharm12.get(0).getNormValue() > overlimit.getIharm12() ? iharm12.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_13(iharm13.get(0).getNormValue() > overlimit.getIharm13() ? iharm13.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_14(iharm14.get(0).getNormValue() > overlimit.getIharm14() ? iharm14.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_15(iharm15.get(0).getNormValue() > overlimit.getIharm15() ? iharm15.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_16(iharm16.get(0).getNormValue() > overlimit.getIharm16() ? iharm16.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_17(iharm17.get(0).getNormValue() > overlimit.getIharm17() ? iharm17.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_18(iharm18.get(0).getNormValue() > overlimit.getIharm18() ? iharm18.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_19(iharm19.get(0).getNormValue() > overlimit.getIharm19() ? iharm19.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_20(iharm20.get(0).getNormValue() > overlimit.getIharm20() ? iharm20.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_21(iharm21.get(0).getNormValue() > overlimit.getIharm21() ? iharm21.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_22(iharm22.get(0).getNormValue() > overlimit.getIharm22() ? iharm22.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_23(iharm23.get(0).getNormValue() > overlimit.getIharm23() ? iharm23.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_24(iharm24.get(0).getNormValue() > overlimit.getIharm24() ? iharm24.get(0).getNormValue() : -3.14159f); - abnormalPO.setIharm_25(iharm25.get(0).getNormValue() > overlimit.getIharm25() ? iharm25.get(0).getNormValue() : -3.14159f); - abnormalPO.setInuharm_1(inharm.get(0).getNormValue() > overlimit.getInuharm1() ? inharm.get(0).getNormValue() : -3.14159f); - abnormalPO.setInuharm_2(inharm1.get(0).getNormValue() > overlimit.getInuharm2() ? inharm1.get(0).getNormValue() : -3.14159f); - abnormalPO.setInuharm_3(inharm2.get(0).getNormValue() > overlimit.getInuharm3() ? inharm2.get(0).getNormValue() : -3.14159f); - abnormalPO.setInuharm_4(inharm3.get(0).getNormValue() > overlimit.getInuharm4() ? inharm3.get(0).getNormValue() : -3.14159f); - abnormalPO.setInuharm_5(inharm4.get(0).getNormValue() > overlimit.getInuharm5() ? inharm4.get(0).getNormValue() : -3.14159f); - abnormalPO.setInuharm_6(inharm5.get(0).getNormValue() > overlimit.getInuharm6() ? inharm5.get(0).getNormValue() : -3.14159f); - abnormalPO.setInuharm_7(inharm6.get(0).getNormValue() > overlimit.getInuharm7() ? inharm6.get(0).getNormValue() : -3.14159f); - abnormalPO.setInuharm_8(inharm7.get(0).getNormValue() > overlimit.getInuharm8() ? inharm7.get(0).getNormValue() : -3.14159f); - abnormalPO.setInuharm_9(inharm8.get(0).getNormValue() > overlimit.getInuharm9() ? inharm8.get(0).getNormValue() : -3.14159f); - abnormalPO.setInuharm_10(inharm9.get(0).getNormValue() > overlimit.getInuharm10() ? inharm9.get(0).getNormValue() : -3.14159f); - abnormalPO.setInuharm_11(inharm10.get(0).getNormValue() > overlimit.getInuharm11() ? inharm10.get(0).getNormValue() : -3.14159f); - abnormalPO.setInuharm_12(inharm11.get(0).getNormValue() > overlimit.getInuharm12() ? inharm11.get(0).getNormValue() : -3.14159f); - abnormalPO.setInuharm_13(inharm12.get(0).getNormValue() > overlimit.getInuharm13() ? inharm12.get(0).getNormValue() : -3.14159f); - abnormalPO.setInuharm_14(inharm13.get(0).getNormValue() > overlimit.getInuharm14() ? inharm13.get(0).getNormValue() : -3.14159f); - abnormalPO.setInuharm_15(inharm14.get(0).getNormValue() > overlimit.getInuharm15() ? inharm14.get(0).getNormValue() : -3.14159f); - abnormalPO.setInuharm_16(inharm15.get(0).getNormValue() > overlimit.getInuharm16() ? inharm15.get(0).getNormValue() : -3.14159f); - } else if (j == 3) { - abnormalPO.setFreq(freq.get(0).getNormValue()); - abnormalPO.setValueType("MIN"); - abnormalPO.setVoltageDev(voDev.get(0).getNormValue()); - abnormalPO.setUvoltageDev(uoDev.get(0).getNormValue()); - abnormalPO.setFlicker(flicker.get(0).getNormValue()); - abnormalPO.setUaberrance(uab.get(0).getNormValue()); - abnormalPO.setUbalance(uba.get(0).getNormValue()); - abnormalPO.setINeg(ing.get(0).getNormValue()); - abnormalPO.setUharm_2(uharm2.get(0).getNormValue()); - abnormalPO.setUharm_3(uharm3.get(0).getNormValue()); - abnormalPO.setUharm_4(uharm4.get(0).getNormValue()); - abnormalPO.setUharm_5(uharm5.get(0).getNormValue()); - abnormalPO.setUharm_6(uharm6.get(0).getNormValue()); - abnormalPO.setUharm_7(uharm7.get(0).getNormValue()); - abnormalPO.setUharm_8(uharm8.get(0).getNormValue()); - abnormalPO.setUharm_9(uharm9.get(0).getNormValue()); - abnormalPO.setUharm_10(uharm10.get(0).getNormValue()); - abnormalPO.setUharm_11(uharm11.get(0).getNormValue()); - abnormalPO.setUharm_12(uharm12.get(0).getNormValue()); - abnormalPO.setUharm_13(uharm13.get(0).getNormValue()); - abnormalPO.setUharm_14(uharm14.get(0).getNormValue()); - abnormalPO.setUharm_15(uharm15.get(0).getNormValue()); - abnormalPO.setUharm_16(uharm16.get(0).getNormValue()); - abnormalPO.setUharm_17(uharm17.get(0).getNormValue()); - abnormalPO.setUharm_18(uharm18.get(0).getNormValue()); - abnormalPO.setUharm_19(uharm19.get(0).getNormValue()); - abnormalPO.setUharm_20(uharm20.get(0).getNormValue()); - abnormalPO.setUharm_21(uharm21.get(0).getNormValue()); - abnormalPO.setUharm_22(uharm22.get(0).getNormValue()); - abnormalPO.setUharm_23(uharm23.get(0).getNormValue()); - abnormalPO.setUharm_24(uharm24.get(0).getNormValue()); - abnormalPO.setUharm_25(uharm25.get(0).getNormValue()); - abnormalPO.setIharm_2(iharm2.get(0).getNormValue()); - abnormalPO.setIharm_3(iharm3.get(0).getNormValue()); - abnormalPO.setIharm_4(iharm4.get(0).getNormValue()); - abnormalPO.setIharm_5(iharm5.get(0).getNormValue()); - abnormalPO.setIharm_6(iharm6.get(0).getNormValue()); - abnormalPO.setIharm_7(iharm7.get(0).getNormValue()); - abnormalPO.setIharm_8(iharm8.get(0).getNormValue()); - abnormalPO.setIharm_9(iharm9.get(0).getNormValue()); - abnormalPO.setIharm_10(iharm10.get(0).getNormValue()); - abnormalPO.setIharm_11(iharm11.get(0).getNormValue()); - abnormalPO.setIharm_12(iharm12.get(0).getNormValue()); - abnormalPO.setIharm_13(iharm13.get(0).getNormValue()); - abnormalPO.setIharm_14(iharm14.get(0).getNormValue()); - abnormalPO.setIharm_15(iharm15.get(0).getNormValue()); - abnormalPO.setIharm_16(iharm16.get(0).getNormValue()); - abnormalPO.setIharm_17(iharm17.get(0).getNormValue()); - abnormalPO.setIharm_18(iharm18.get(0).getNormValue()); - abnormalPO.setIharm_19(iharm19.get(0).getNormValue()); - abnormalPO.setIharm_20(iharm20.get(0).getNormValue()); - abnormalPO.setIharm_21(iharm21.get(0).getNormValue()); - abnormalPO.setIharm_22(iharm22.get(0).getNormValue()); - abnormalPO.setIharm_23(iharm23.get(0).getNormValue()); - abnormalPO.setIharm_24(iharm24.get(0).getNormValue()); - abnormalPO.setIharm_25(iharm25.get(0).getNormValue()); - abnormalPO.setInuharm_1(inharm.get(0).getNormValue()); - abnormalPO.setInuharm_2(inharm1.get(0).getNormValue()); - abnormalPO.setInuharm_3(inharm2.get(0).getNormValue()); - abnormalPO.setInuharm_4(inharm3.get(0).getNormValue()); - abnormalPO.setInuharm_5(inharm4.get(0).getNormValue()); - abnormalPO.setInuharm_6(inharm5.get(0).getNormValue()); - abnormalPO.setInuharm_7(inharm6.get(0).getNormValue()); - abnormalPO.setInuharm_8(inharm7.get(0).getNormValue()); - abnormalPO.setInuharm_9(inharm8.get(0).getNormValue()); - abnormalPO.setInuharm_10(inharm9.get(0).getNormValue()); - abnormalPO.setInuharm_11(inharm10.get(0).getNormValue()); - abnormalPO.setInuharm_12(inharm11.get(0).getNormValue()); - abnormalPO.setInuharm_13(inharm12.get(0).getNormValue()); - abnormalPO.setInuharm_14(inharm13.get(0).getNormValue()); - abnormalPO.setInuharm_15(inharm14.get(0).getNormValue()); - abnormalPO.setInuharm_16(inharm15.get(0).getNormValue()); - } else { - abnormalPO.setFreq(freq.get(0).getNormValue()); - abnormalPO.setValueType("CP95"); - abnormalPO.setVoltageDev(voDev.get(0).getNormValue()); - abnormalPO.setUvoltageDev(uoDev.get(0).getNormValue()); - abnormalPO.setFlicker(flicker.get(0).getNormValue()); - abnormalPO.setUaberrance(uab.get(0).getNormValue()); - abnormalPO.setUbalance(uba.get(0).getNormValue()); - abnormalPO.setINeg(ing.get(0).getNormValue()); - abnormalPO.setUharm_2(uharm2.get(0).getNormValue()); - abnormalPO.setUharm_3(uharm3.get(0).getNormValue()); - abnormalPO.setUharm_4(uharm4.get(0).getNormValue()); - abnormalPO.setUharm_5(uharm5.get(0).getNormValue()); - abnormalPO.setUharm_6(uharm6.get(0).getNormValue()); - abnormalPO.setUharm_7(uharm7.get(0).getNormValue()); - abnormalPO.setUharm_8(uharm8.get(0).getNormValue()); - abnormalPO.setUharm_9(uharm9.get(0).getNormValue()); - abnormalPO.setUharm_10(uharm10.get(0).getNormValue()); - abnormalPO.setUharm_11(uharm11.get(0).getNormValue()); - abnormalPO.setUharm_12(uharm12.get(0).getNormValue()); - abnormalPO.setUharm_13(uharm13.get(0).getNormValue()); - abnormalPO.setUharm_14(uharm14.get(0).getNormValue()); - abnormalPO.setUharm_15(uharm15.get(0).getNormValue()); - abnormalPO.setUharm_16(uharm16.get(0).getNormValue()); - abnormalPO.setUharm_17(uharm17.get(0).getNormValue()); - abnormalPO.setUharm_18(uharm18.get(0).getNormValue()); - abnormalPO.setUharm_19(uharm19.get(0).getNormValue()); - abnormalPO.setUharm_20(uharm20.get(0).getNormValue()); - abnormalPO.setUharm_21(uharm21.get(0).getNormValue()); - abnormalPO.setUharm_22(uharm22.get(0).getNormValue()); - abnormalPO.setUharm_23(uharm23.get(0).getNormValue()); - abnormalPO.setUharm_24(uharm24.get(0).getNormValue()); - abnormalPO.setUharm_25(uharm25.get(0).getNormValue()); - abnormalPO.setIharm_2(iharm2.get(0).getNormValue()); - abnormalPO.setIharm_3(iharm3.get(0).getNormValue()); - abnormalPO.setIharm_4(iharm4.get(0).getNormValue()); - abnormalPO.setIharm_5(iharm5.get(0).getNormValue()); - abnormalPO.setIharm_6(iharm6.get(0).getNormValue()); - abnormalPO.setIharm_7(iharm7.get(0).getNormValue()); - abnormalPO.setIharm_8(iharm8.get(0).getNormValue()); - abnormalPO.setIharm_9(iharm9.get(0).getNormValue()); - abnormalPO.setIharm_10(iharm10.get(0).getNormValue()); - abnormalPO.setIharm_11(iharm11.get(0).getNormValue()); - abnormalPO.setIharm_12(iharm12.get(0).getNormValue()); - abnormalPO.setIharm_13(iharm13.get(0).getNormValue()); - abnormalPO.setIharm_14(iharm14.get(0).getNormValue()); - abnormalPO.setIharm_15(iharm15.get(0).getNormValue()); - abnormalPO.setIharm_16(iharm16.get(0).getNormValue()); - abnormalPO.setIharm_17(iharm17.get(0).getNormValue()); - abnormalPO.setIharm_18(iharm18.get(0).getNormValue()); - abnormalPO.setIharm_19(iharm19.get(0).getNormValue()); - abnormalPO.setIharm_20(iharm20.get(0).getNormValue()); - abnormalPO.setIharm_21(iharm21.get(0).getNormValue()); - abnormalPO.setIharm_22(iharm22.get(0).getNormValue()); - abnormalPO.setIharm_23(iharm23.get(0).getNormValue()); - abnormalPO.setIharm_24(iharm24.get(0).getNormValue()); - abnormalPO.setIharm_25(iharm25.get(0).getNormValue()); - abnormalPO.setInuharm_1(inharm.get(0).getNormValue()); - abnormalPO.setInuharm_2(inharm1.get(0).getNormValue()); - abnormalPO.setInuharm_3(inharm2.get(0).getNormValue()); - abnormalPO.setInuharm_4(inharm3.get(0).getNormValue()); - abnormalPO.setInuharm_5(inharm4.get(0).getNormValue()); - abnormalPO.setInuharm_6(inharm5.get(0).getNormValue()); - abnormalPO.setInuharm_7(inharm6.get(0).getNormValue()); - abnormalPO.setInuharm_8(inharm7.get(0).getNormValue()); - abnormalPO.setInuharm_9(inharm8.get(0).getNormValue()); - abnormalPO.setInuharm_10(inharm9.get(0).getNormValue()); - abnormalPO.setInuharm_11(inharm10.get(0).getNormValue()); - abnormalPO.setInuharm_12(inharm11.get(0).getNormValue()); - abnormalPO.setInuharm_13(inharm12.get(0).getNormValue()); - abnormalPO.setInuharm_14(inharm13.get(0).getNormValue()); - abnormalPO.setInuharm_15(inharm14.get(0).getNormValue()); - abnormalPO.setInuharm_16(inharm15.get(0).getNormValue()); - } - abnormalMapper.insert(abnormalPO); } } } } } else { - return "预处理失败,未获取到监测点"; + //不为空则为补招 + lineIds.addAll(lineParam.getLineIds()); } - return "预处理成功！"; + + + for (String lineIndex : lineIds) { + //获取当前监测点的限值详情 + Overlimit overlimit = lineFeignClient.getOverLimitData(lineIndex).getData(); + for (int i = 1; i < 5; i++) { + for (int j = 1; j < 5; j++) { + //电压上偏差 + List voDev = getConntion(i, j, start, end, lineIndex, 1); + //电压下偏差 + List uoDev = getConntion(i, j, start, end, lineIndex, 2); + //三相电压不平衡度 + List uba = getConntion(i, j, start, end, lineIndex, 3); + //电压总畸变率 + List uab = getConntion(i, j, start, end, lineIndex, 4); + //负序电流 + List ing = getConntion(i, j, start, end, lineIndex, 5); + //频率 + List freq = getConntion(i, j, start, end, lineIndex, 6); + //2-25次谐波含有率 + //谐波电压含有率 + List uharm2 = getConntion(i, j, start, end, lineIndex, 7); + List uharm3 = getConntion(i, j, start, end, lineIndex, 8); + List uharm4 = getConntion(i, j, start, end, lineIndex, 9); + List uharm5 = getConntion(i, j, start, end, lineIndex, 10); + List uharm6 = getConntion(i, j, start, end, lineIndex, 11); + List uharm7 = getConntion(i, j, start, end, lineIndex, 12); + List uharm8 = getConntion(i, j, start, end, lineIndex, 13); + List uharm9 = getConntion(i, j, start, end, lineIndex, 14); + List uharm10 = getConntion(i, j, start, end, lineIndex, 15); + List uharm11 = getConntion(i, j, start, end, lineIndex, 16); + List uharm12 = getConntion(i, j, start, end, lineIndex, 17); + List uharm13 = getConntion(i, j, start, end, lineIndex, 18); + List uharm14 = getConntion(i, j, start, end, lineIndex, 19); + List uharm15 = getConntion(i, j, start, end, lineIndex, 20); + List uharm16 = getConntion(i, j, start, end, lineIndex, 21); + List uharm17 = getConntion(i, j, start, end, lineIndex, 22); + List uharm18 = getConntion(i, j, start, end, lineIndex, 23); + List uharm19 = getConntion(i, j, start, end, lineIndex, 24); + List uharm20 = getConntion(i, j, start, end, lineIndex, 25); + List uharm21 = getConntion(i, j, start, end, lineIndex, 26); + List uharm22 = getConntion(i, j, start, end, lineIndex, 27); + List uharm23 = getConntion(i, j, start, end, lineIndex, 28); + List uharm24 = getConntion(i, j, start, end, lineIndex, 29); + List uharm25 = getConntion(i, j, start, end, lineIndex, 30); + + + //2-25次谐波电流幅值 + List iharm2 = getConntion(i, j, start, end, lineIndex, 31); + List iharm3 = getConntion(i, j, start, end, lineIndex, 32); + List iharm4 = getConntion(i, j, start, end, lineIndex, 33); + List iharm5 = getConntion(i, j, start, end, lineIndex, 34); + List iharm6 = getConntion(i, j, start, end, lineIndex, 35); + List iharm7 = getConntion(i, j, start, end, lineIndex, 36); + List iharm8 = getConntion(i, j, start, end, lineIndex, 37); + List iharm9 = getConntion(i, j, start, end, lineIndex, 38); + List iharm10 = getConntion(i, j, start, end, lineIndex, 39); + List iharm11 = getConntion(i, j, start, end, lineIndex, 40); + List iharm12 = getConntion(i, j, start, end, lineIndex, 41); + List iharm13 = getConntion(i, j, start, end, lineIndex, 42); + List iharm14 = getConntion(i, j, start, end, lineIndex, 43); + List iharm15 = getConntion(i, j, start, end, lineIndex, 44); + List iharm16 = getConntion(i, j, start, end, lineIndex, 45); + List iharm17 = getConntion(i, j, start, end, lineIndex, 46); + List iharm18 = getConntion(i, j, start, end, lineIndex, 47); + List iharm19 = getConntion(i, j, start, end, lineIndex, 48); + List iharm20 = getConntion(i, j, start, end, lineIndex, 49); + List iharm21 = getConntion(i, j, start, end, lineIndex, 50); + List iharm22 = getConntion(i, j, start, end, lineIndex, 51); + List iharm23 = getConntion(i, j, start, end, lineIndex, 52); + List iharm24 = getConntion(i, j, start, end, lineIndex, 53); + List iharm25 = getConntion(i, j, start, end, lineIndex, 54); + + + //0.5-15.5次间谐波电压含有率 + List inharm = getConntion(i, j, start, end, lineIndex, 55); + List inharm1 = getConntion(i, j, start, end, lineIndex, 56); + List inharm2 = getConntion(i, j, start, end, lineIndex, 57); + List inharm3 = getConntion(i, j, start, end, lineIndex, 58); + List inharm4 = getConntion(i, j, start, end, lineIndex, 59); + List inharm5 = getConntion(i, j, start, end, lineIndex, 60); + List inharm6 = getConntion(i, j, start, end, lineIndex, 61); + List inharm7 = getConntion(i, j, start, end, lineIndex, 62); + List inharm8 = getConntion(i, j, start, end, lineIndex, 63); + List inharm9 = getConntion(i, j, start, end, lineIndex, 64); + List inharm10 = getConntion(i, j, start, end, lineIndex, 65); + List inharm11 = getConntion(i, j, start, end, lineIndex, 66); + List inharm12 = getConntion(i, j, start, end, lineIndex, 67); + List inharm13 = getConntion(i, j, start, end, lineIndex, 68); + List inharm14 = getConntion(i, j, start, end, lineIndex, 69); + List inharm15 = getConntion(i, j, start, end, lineIndex, 70); + //长时闪变 + List flicker = getConntion(i, j, start, end, lineIndex, 71); + //只需要判断一个指标即可 + if (voDev.size() > 0 && uoDev.size() > 0 && uba.size() > 0 && uab.size() > 0 && ing.size() > 0 && freq.size() > 0 && uharm2.size() > 0 && uharm3.size() > 0 && uharm4.size() > 0 + && uharm5.size() > 0 && uharm6.size() > 0 && uharm7.size() > 0 && uharm8.size() > 0 && uharm9.size() > 0 && uharm10.size() > 0 && uharm11.size() > 0 && uharm12.size() > 0 && uharm13.size() > 0 && uharm14.size() > 0 + && uharm15.size() > 0 && uharm16.size() > 0 && uharm17.size() > 0 && uharm18.size() > 0 && uharm19.size() > 0 && uharm20.size() > 0 && uharm21.size() > 0 && uharm22.size() > 0 && uharm23.size() > 0 && uharm24.size() > 0 + && uharm25.size() > 0 && iharm2.size() > 0 && iharm3.size() > 0 && iharm4.size() > 0 + && iharm5.size() > 0 && iharm6.size() > 0 && iharm7.size() > 0 && iharm8.size() > 0 && iharm9.size() > 0 && iharm10.size() > 0 && iharm11.size() > 0 && iharm12.size() > 0 && iharm13.size() > 0 && iharm14.size() > 0 + && iharm15.size() > 0 && iharm16.size() > 0 && iharm17.size() > 0 && iharm18.size() > 0 && iharm19.size() > 0 && iharm20.size() > 0 && iharm21.size() > 0 && iharm22.size() > 0 && iharm23.size() > 0 && iharm24.size() > 0 + && iharm25.size() > 0 && inharm.size() > 0 && inharm1.size() > 0 && inharm2.size() > 0 + && inharm3.size() > 0 && inharm4.size() > 0 && inharm5.size() > 0 && inharm6.size() > 0 && inharm7.size() > 0 && inharm8.size() > 0 && inharm9.size() > 0 && inharm10.size() > 0 && inharm11.size() > 0 && inharm12.size() > 0 + && inharm13.size() > 0 && inharm14.size() > 0 && inharm15.size() > 0) { + AbnormalPO abnormalPO = new AbnormalPO(); + abnormalPO.setTimeId(DateUtil.beginOfDay(start)); + abnormalPO.setId(lineIndex); + if (i == 1) { + abnormalPO.setPhasicType("A"); + } else if (i == 2) { + abnormalPO.setPhasicType("B"); + } else if (i == 3) { + abnormalPO.setPhasicType("C"); + } else { + abnormalPO.setPhasicType("T"); + } + if (j == 1) { + abnormalPO.setFreq(freq.get(0).getNormValue()); + abnormalPO.setValueType("AVG"); + abnormalPO.setVoltageDev(voDev.get(0).getNormValue()); + abnormalPO.setUvoltageDev(uoDev.get(0).getNormValue()); + abnormalPO.setFlicker(flicker.get(0).getNormValue()); + abnormalPO.setUaberrance(uab.get(0).getNormValue()); + abnormalPO.setUbalance(uba.get(0).getNormValue()); + abnormalPO.setINeg(ing.get(0).getNormValue()); + abnormalPO.setUharm_2(uharm2.get(0).getNormValue()); + abnormalPO.setUharm_3(uharm3.get(0).getNormValue()); + abnormalPO.setUharm_4(uharm4.get(0).getNormValue()); + abnormalPO.setUharm_5(uharm5.get(0).getNormValue()); + abnormalPO.setUharm_6(uharm6.get(0).getNormValue()); + abnormalPO.setUharm_7(uharm7.get(0).getNormValue()); + abnormalPO.setUharm_8(uharm8.get(0).getNormValue()); + abnormalPO.setUharm_9(uharm9.get(0).getNormValue()); + abnormalPO.setUharm_10(uharm10.get(0).getNormValue()); + abnormalPO.setUharm_11(uharm11.get(0).getNormValue()); + abnormalPO.setUharm_12(uharm12.get(0).getNormValue()); + abnormalPO.setUharm_13(uharm13.get(0).getNormValue()); + abnormalPO.setUharm_14(uharm14.get(0).getNormValue()); + abnormalPO.setUharm_15(uharm15.get(0).getNormValue()); + abnormalPO.setUharm_16(uharm16.get(0).getNormValue()); + abnormalPO.setUharm_17(uharm17.get(0).getNormValue()); + abnormalPO.setUharm_18(uharm18.get(0).getNormValue()); + abnormalPO.setUharm_19(uharm19.get(0).getNormValue()); + abnormalPO.setUharm_20(uharm20.get(0).getNormValue()); + abnormalPO.setUharm_21(uharm21.get(0).getNormValue()); + abnormalPO.setUharm_22(uharm22.get(0).getNormValue()); + abnormalPO.setUharm_23(uharm23.get(0).getNormValue()); + abnormalPO.setUharm_24(uharm24.get(0).getNormValue()); + abnormalPO.setUharm_25(uharm25.get(0).getNormValue()); + abnormalPO.setIharm_2(iharm2.get(0).getNormValue()); + abnormalPO.setIharm_3(iharm3.get(0).getNormValue()); + abnormalPO.setIharm_4(iharm4.get(0).getNormValue()); + abnormalPO.setIharm_5(iharm5.get(0).getNormValue()); + abnormalPO.setIharm_6(iharm6.get(0).getNormValue()); + abnormalPO.setIharm_7(iharm7.get(0).getNormValue()); + abnormalPO.setIharm_8(iharm8.get(0).getNormValue()); + abnormalPO.setIharm_9(iharm9.get(0).getNormValue()); + abnormalPO.setIharm_10(iharm10.get(0).getNormValue()); + abnormalPO.setIharm_11(iharm11.get(0).getNormValue()); + abnormalPO.setIharm_12(iharm12.get(0).getNormValue()); + abnormalPO.setIharm_13(iharm13.get(0).getNormValue()); + abnormalPO.setIharm_14(iharm14.get(0).getNormValue()); + abnormalPO.setIharm_15(iharm15.get(0).getNormValue()); + abnormalPO.setIharm_16(iharm16.get(0).getNormValue()); + abnormalPO.setIharm_17(iharm17.get(0).getNormValue()); + abnormalPO.setIharm_18(iharm18.get(0).getNormValue()); + abnormalPO.setIharm_19(iharm19.get(0).getNormValue()); + abnormalPO.setIharm_20(iharm20.get(0).getNormValue()); + abnormalPO.setIharm_21(iharm21.get(0).getNormValue()); + abnormalPO.setIharm_22(iharm22.get(0).getNormValue()); + abnormalPO.setIharm_23(iharm23.get(0).getNormValue()); + abnormalPO.setIharm_24(iharm24.get(0).getNormValue()); + abnormalPO.setIharm_25(iharm25.get(0).getNormValue()); + abnormalPO.setInuharm_1(inharm.get(0).getNormValue()); + abnormalPO.setInuharm_2(inharm1.get(0).getNormValue()); + abnormalPO.setInuharm_3(inharm2.get(0).getNormValue()); + abnormalPO.setInuharm_4(inharm3.get(0).getNormValue()); + abnormalPO.setInuharm_5(inharm4.get(0).getNormValue()); + abnormalPO.setInuharm_6(inharm5.get(0).getNormValue()); + abnormalPO.setInuharm_7(inharm6.get(0).getNormValue()); + abnormalPO.setInuharm_8(inharm7.get(0).getNormValue()); + abnormalPO.setInuharm_9(inharm8.get(0).getNormValue()); + abnormalPO.setInuharm_10(inharm9.get(0).getNormValue()); + abnormalPO.setInuharm_11(inharm10.get(0).getNormValue()); + abnormalPO.setInuharm_12(inharm11.get(0).getNormValue()); + abnormalPO.setInuharm_13(inharm12.get(0).getNormValue()); + abnormalPO.setInuharm_14(inharm13.get(0).getNormValue()); + abnormalPO.setInuharm_15(inharm14.get(0).getNormValue()); + abnormalPO.setInuharm_16(inharm15.get(0).getNormValue()); + } else if (j == 2) { + abnormalPO.setFreq(freq.get(0).getNormValue() > 50 + overlimit.getFreqDev() ? freq.get(0).getNormValue() : -3.14159f); + abnormalPO.setValueType("MAX"); + abnormalPO.setVoltageDev(voDev.get(0).getNormValue() > overlimit.getVoltageDev() ? voDev.get(0).getNormValue() : -3.14159f); + abnormalPO.setUvoltageDev(uoDev.get(0).getNormValue() > Math.abs(overlimit.getUvoltageDev()) ? uoDev.get(0).getNormValue() : -3.14159f); + abnormalPO.setFlicker(flicker.get(0).getNormValue() > overlimit.getFlicker() ? flicker.get(0).getNormValue() : -3.14159f); + abnormalPO.setUaberrance(uab.get(0).getNormValue() > overlimit.getUaberrance() ? uab.get(0).getNormValue() : -3.14159f); + abnormalPO.setUbalance(uba.get(0).getNormValue() > overlimit.getUbalance() ? uba.get(0).getNormValue() : -3.14159f); + abnormalPO.setINeg(ing.get(0).getNormValue() > overlimit.getINeg() ? ing.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_2(uharm2.get(0).getNormValue() > overlimit.getUharm2() ? uharm2.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_3(uharm3.get(0).getNormValue() > overlimit.getUharm3() ? uharm3.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_4(uharm4.get(0).getNormValue() > overlimit.getUharm4() ? uharm4.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_5(uharm5.get(0).getNormValue() > overlimit.getUharm5() ? uharm5.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_6(uharm6.get(0).getNormValue() > overlimit.getUharm6() ? uharm6.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_7(uharm7.get(0).getNormValue() > overlimit.getUharm7() ? uharm7.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_8(uharm8.get(0).getNormValue() > overlimit.getUharm8() ? uharm8.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_9(uharm9.get(0).getNormValue() > overlimit.getUharm9() ? uharm9.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_10(uharm10.get(0).getNormValue() > overlimit.getUharm10() ? uharm10.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_11(uharm11.get(0).getNormValue() > overlimit.getUharm11() ? uharm11.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_12(uharm12.get(0).getNormValue() > overlimit.getUharm12() ? uharm12.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_13(uharm13.get(0).getNormValue() > overlimit.getUharm13() ? uharm13.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_14(uharm14.get(0).getNormValue() > overlimit.getUharm14() ? uharm14.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_15(uharm15.get(0).getNormValue() > overlimit.getUharm15() ? uharm15.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_16(uharm16.get(0).getNormValue() > overlimit.getUharm16() ? uharm16.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_17(uharm17.get(0).getNormValue() > overlimit.getUharm17() ? uharm17.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_18(uharm18.get(0).getNormValue() > overlimit.getUharm18() ? uharm18.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_19(uharm19.get(0).getNormValue() > overlimit.getUharm19() ? uharm19.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_20(uharm20.get(0).getNormValue() > overlimit.getUharm20() ? uharm20.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_21(uharm21.get(0).getNormValue() > overlimit.getUharm21() ? uharm21.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_22(uharm22.get(0).getNormValue() > overlimit.getUharm22() ? uharm22.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_23(uharm23.get(0).getNormValue() > overlimit.getUharm23() ? uharm23.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_24(uharm24.get(0).getNormValue() > overlimit.getUharm24() ? uharm24.get(0).getNormValue() : -3.14159f); + abnormalPO.setUharm_25(uharm25.get(0).getNormValue() > overlimit.getUharm25() ? uharm25.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_2(iharm2.get(0).getNormValue() > overlimit.getIharm2() ? iharm2.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_3(iharm3.get(0).getNormValue() > overlimit.getIharm3() ? iharm3.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_4(iharm4.get(0).getNormValue() > overlimit.getIharm4() ? iharm4.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_5(iharm5.get(0).getNormValue() > overlimit.getIharm5() ? iharm5.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_6(iharm6.get(0).getNormValue() > overlimit.getIharm6() ? iharm6.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_7(iharm7.get(0).getNormValue() > overlimit.getIharm7() ? iharm7.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_8(iharm8.get(0).getNormValue() > overlimit.getIharm8() ? iharm8.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_9(iharm9.get(0).getNormValue() > overlimit.getIharm9() ? iharm9.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_10(iharm10.get(0).getNormValue() > overlimit.getIharm10() ? iharm10.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_11(iharm11.get(0).getNormValue() > overlimit.getIharm11() ? iharm11.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_12(iharm12.get(0).getNormValue() > overlimit.getIharm12() ? iharm12.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_13(iharm13.get(0).getNormValue() > overlimit.getIharm13() ? iharm13.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_14(iharm14.get(0).getNormValue() > overlimit.getIharm14() ? iharm14.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_15(iharm15.get(0).getNormValue() > overlimit.getIharm15() ? iharm15.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_16(iharm16.get(0).getNormValue() > overlimit.getIharm16() ? iharm16.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_17(iharm17.get(0).getNormValue() > overlimit.getIharm17() ? iharm17.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_18(iharm18.get(0).getNormValue() > overlimit.getIharm18() ? iharm18.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_19(iharm19.get(0).getNormValue() > overlimit.getIharm19() ? iharm19.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_20(iharm20.get(0).getNormValue() > overlimit.getIharm20() ? iharm20.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_21(iharm21.get(0).getNormValue() > overlimit.getIharm21() ? iharm21.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_22(iharm22.get(0).getNormValue() > overlimit.getIharm22() ? iharm22.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_23(iharm23.get(0).getNormValue() > overlimit.getIharm23() ? iharm23.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_24(iharm24.get(0).getNormValue() > overlimit.getIharm24() ? iharm24.get(0).getNormValue() : -3.14159f); + abnormalPO.setIharm_25(iharm25.get(0).getNormValue() > overlimit.getIharm25() ? iharm25.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_1(inharm.get(0).getNormValue() > overlimit.getInuharm1() ? inharm.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_2(inharm1.get(0).getNormValue() > overlimit.getInuharm2() ? inharm1.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_3(inharm2.get(0).getNormValue() > overlimit.getInuharm3() ? inharm2.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_4(inharm3.get(0).getNormValue() > overlimit.getInuharm4() ? inharm3.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_5(inharm4.get(0).getNormValue() > overlimit.getInuharm5() ? inharm4.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_6(inharm5.get(0).getNormValue() > overlimit.getInuharm6() ? inharm5.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_7(inharm6.get(0).getNormValue() > overlimit.getInuharm7() ? inharm6.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_8(inharm7.get(0).getNormValue() > overlimit.getInuharm8() ? inharm7.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_9(inharm8.get(0).getNormValue() > overlimit.getInuharm9() ? inharm8.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_10(inharm9.get(0).getNormValue() > overlimit.getInuharm10() ? inharm9.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_11(inharm10.get(0).getNormValue() > overlimit.getInuharm11() ? inharm10.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_12(inharm11.get(0).getNormValue() > overlimit.getInuharm12() ? inharm11.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_13(inharm12.get(0).getNormValue() > overlimit.getInuharm13() ? inharm12.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_14(inharm13.get(0).getNormValue() > overlimit.getInuharm14() ? inharm13.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_15(inharm14.get(0).getNormValue() > overlimit.getInuharm15() ? inharm14.get(0).getNormValue() : -3.14159f); + abnormalPO.setInuharm_16(inharm15.get(0).getNormValue() > overlimit.getInuharm16() ? inharm15.get(0).getNormValue() : -3.14159f); + } else if (j == 3) { + abnormalPO.setFreq(freq.get(0).getNormValue()); + abnormalPO.setValueType("MIN"); + abnormalPO.setVoltageDev(voDev.get(0).getNormValue()); + abnormalPO.setUvoltageDev(uoDev.get(0).getNormValue()); + abnormalPO.setFlicker(flicker.get(0).getNormValue()); + abnormalPO.setUaberrance(uab.get(0).getNormValue()); + abnormalPO.setUbalance(uba.get(0).getNormValue()); + abnormalPO.setINeg(ing.get(0).getNormValue()); + abnormalPO.setUharm_2(uharm2.get(0).getNormValue()); + abnormalPO.setUharm_3(uharm3.get(0).getNormValue()); + abnormalPO.setUharm_4(uharm4.get(0).getNormValue()); + abnormalPO.setUharm_5(uharm5.get(0).getNormValue()); + abnormalPO.setUharm_6(uharm6.get(0).getNormValue()); + abnormalPO.setUharm_7(uharm7.get(0).getNormValue()); + abnormalPO.setUharm_8(uharm8.get(0).getNormValue()); + abnormalPO.setUharm_9(uharm9.get(0).getNormValue()); + abnormalPO.setUharm_10(uharm10.get(0).getNormValue()); + abnormalPO.setUharm_11(uharm11.get(0).getNormValue()); + abnormalPO.setUharm_12(uharm12.get(0).getNormValue()); + abnormalPO.setUharm_13(uharm13.get(0).getNormValue()); + abnormalPO.setUharm_14(uharm14.get(0).getNormValue()); + abnormalPO.setUharm_15(uharm15.get(0).getNormValue()); + abnormalPO.setUharm_16(uharm16.get(0).getNormValue()); + abnormalPO.setUharm_17(uharm17.get(0).getNormValue()); + abnormalPO.setUharm_18(uharm18.get(0).getNormValue()); + abnormalPO.setUharm_19(uharm19.get(0).getNormValue()); + abnormalPO.setUharm_20(uharm20.get(0).getNormValue()); + abnormalPO.setUharm_21(uharm21.get(0).getNormValue()); + abnormalPO.setUharm_22(uharm22.get(0).getNormValue()); + abnormalPO.setUharm_23(uharm23.get(0).getNormValue()); + abnormalPO.setUharm_24(uharm24.get(0).getNormValue()); + abnormalPO.setUharm_25(uharm25.get(0).getNormValue()); + abnormalPO.setIharm_2(iharm2.get(0).getNormValue()); + abnormalPO.setIharm_3(iharm3.get(0).getNormValue()); + abnormalPO.setIharm_4(iharm4.get(0).getNormValue()); + abnormalPO.setIharm_5(iharm5.get(0).getNormValue()); + abnormalPO.setIharm_6(iharm6.get(0).getNormValue()); + abnormalPO.setIharm_7(iharm7.get(0).getNormValue()); + abnormalPO.setIharm_8(iharm8.get(0).getNormValue()); + abnormalPO.setIharm_9(iharm9.get(0).getNormValue()); + abnormalPO.setIharm_10(iharm10.get(0).getNormValue()); + abnormalPO.setIharm_11(iharm11.get(0).getNormValue()); + abnormalPO.setIharm_12(iharm12.get(0).getNormValue()); + abnormalPO.setIharm_13(iharm13.get(0).getNormValue()); + abnormalPO.setIharm_14(iharm14.get(0).getNormValue()); + abnormalPO.setIharm_15(iharm15.get(0).getNormValue()); + abnormalPO.setIharm_16(iharm16.get(0).getNormValue()); + abnormalPO.setIharm_17(iharm17.get(0).getNormValue()); + abnormalPO.setIharm_18(iharm18.get(0).getNormValue()); + abnormalPO.setIharm_19(iharm19.get(0).getNormValue()); + abnormalPO.setIharm_20(iharm20.get(0).getNormValue()); + abnormalPO.setIharm_21(iharm21.get(0).getNormValue()); + abnormalPO.setIharm_22(iharm22.get(0).getNormValue()); + abnormalPO.setIharm_23(iharm23.get(0).getNormValue()); + abnormalPO.setIharm_24(iharm24.get(0).getNormValue()); + abnormalPO.setIharm_25(iharm25.get(0).getNormValue()); + abnormalPO.setInuharm_1(inharm.get(0).getNormValue()); + abnormalPO.setInuharm_2(inharm1.get(0).getNormValue()); + abnormalPO.setInuharm_3(inharm2.get(0).getNormValue()); + abnormalPO.setInuharm_4(inharm3.get(0).getNormValue()); + abnormalPO.setInuharm_5(inharm4.get(0).getNormValue()); + abnormalPO.setInuharm_6(inharm5.get(0).getNormValue()); + abnormalPO.setInuharm_7(inharm6.get(0).getNormValue()); + abnormalPO.setInuharm_8(inharm7.get(0).getNormValue()); + abnormalPO.setInuharm_9(inharm8.get(0).getNormValue()); + abnormalPO.setInuharm_10(inharm9.get(0).getNormValue()); + abnormalPO.setInuharm_11(inharm10.get(0).getNormValue()); + abnormalPO.setInuharm_12(inharm11.get(0).getNormValue()); + abnormalPO.setInuharm_13(inharm12.get(0).getNormValue()); + abnormalPO.setInuharm_14(inharm13.get(0).getNormValue()); + abnormalPO.setInuharm_15(inharm14.get(0).getNormValue()); + abnormalPO.setInuharm_16(inharm15.get(0).getNormValue()); + } else { + abnormalPO.setFreq(freq.get(0).getNormValue()); + abnormalPO.setValueType("CP95"); + abnormalPO.setVoltageDev(voDev.get(0).getNormValue()); + abnormalPO.setUvoltageDev(uoDev.get(0).getNormValue()); + abnormalPO.setFlicker(flicker.get(0).getNormValue()); + abnormalPO.setUaberrance(uab.get(0).getNormValue()); + abnormalPO.setUbalance(uba.get(0).getNormValue()); + abnormalPO.setINeg(ing.get(0).getNormValue()); + abnormalPO.setUharm_2(uharm2.get(0).getNormValue()); + abnormalPO.setUharm_3(uharm3.get(0).getNormValue()); + abnormalPO.setUharm_4(uharm4.get(0).getNormValue()); + abnormalPO.setUharm_5(uharm5.get(0).getNormValue()); + abnormalPO.setUharm_6(uharm6.get(0).getNormValue()); + abnormalPO.setUharm_7(uharm7.get(0).getNormValue()); + abnormalPO.setUharm_8(uharm8.get(0).getNormValue()); + abnormalPO.setUharm_9(uharm9.get(0).getNormValue()); + abnormalPO.setUharm_10(uharm10.get(0).getNormValue()); + abnormalPO.setUharm_11(uharm11.get(0).getNormValue()); + abnormalPO.setUharm_12(uharm12.get(0).getNormValue()); + abnormalPO.setUharm_13(uharm13.get(0).getNormValue()); + abnormalPO.setUharm_14(uharm14.get(0).getNormValue()); + abnormalPO.setUharm_15(uharm15.get(0).getNormValue()); + abnormalPO.setUharm_16(uharm16.get(0).getNormValue()); + abnormalPO.setUharm_17(uharm17.get(0).getNormValue()); + abnormalPO.setUharm_18(uharm18.get(0).getNormValue()); + abnormalPO.setUharm_19(uharm19.get(0).getNormValue()); + abnormalPO.setUharm_20(uharm20.get(0).getNormValue()); + abnormalPO.setUharm_21(uharm21.get(0).getNormValue()); + abnormalPO.setUharm_22(uharm22.get(0).getNormValue()); + abnormalPO.setUharm_23(uharm23.get(0).getNormValue()); + abnormalPO.setUharm_24(uharm24.get(0).getNormValue()); + abnormalPO.setUharm_25(uharm25.get(0).getNormValue()); + abnormalPO.setIharm_2(iharm2.get(0).getNormValue()); + abnormalPO.setIharm_3(iharm3.get(0).getNormValue()); + abnormalPO.setIharm_4(iharm4.get(0).getNormValue()); + abnormalPO.setIharm_5(iharm5.get(0).getNormValue()); + abnormalPO.setIharm_6(iharm6.get(0).getNormValue()); + abnormalPO.setIharm_7(iharm7.get(0).getNormValue()); + abnormalPO.setIharm_8(iharm8.get(0).getNormValue()); + abnormalPO.setIharm_9(iharm9.get(0).getNormValue()); + abnormalPO.setIharm_10(iharm10.get(0).getNormValue()); + abnormalPO.setIharm_11(iharm11.get(0).getNormValue()); + abnormalPO.setIharm_12(iharm12.get(0).getNormValue()); + abnormalPO.setIharm_13(iharm13.get(0).getNormValue()); + abnormalPO.setIharm_14(iharm14.get(0).getNormValue()); + abnormalPO.setIharm_15(iharm15.get(0).getNormValue()); + abnormalPO.setIharm_16(iharm16.get(0).getNormValue()); + abnormalPO.setIharm_17(iharm17.get(0).getNormValue()); + abnormalPO.setIharm_18(iharm18.get(0).getNormValue()); + abnormalPO.setIharm_19(iharm19.get(0).getNormValue()); + abnormalPO.setIharm_20(iharm20.get(0).getNormValue()); + abnormalPO.setIharm_21(iharm21.get(0).getNormValue()); + abnormalPO.setIharm_22(iharm22.get(0).getNormValue()); + abnormalPO.setIharm_23(iharm23.get(0).getNormValue()); + abnormalPO.setIharm_24(iharm24.get(0).getNormValue()); + abnormalPO.setIharm_25(iharm25.get(0).getNormValue()); + abnormalPO.setInuharm_1(inharm.get(0).getNormValue()); + abnormalPO.setInuharm_2(inharm1.get(0).getNormValue()); + abnormalPO.setInuharm_3(inharm2.get(0).getNormValue()); + abnormalPO.setInuharm_4(inharm3.get(0).getNormValue()); + abnormalPO.setInuharm_5(inharm4.get(0).getNormValue()); + abnormalPO.setInuharm_6(inharm5.get(0).getNormValue()); + abnormalPO.setInuharm_7(inharm6.get(0).getNormValue()); + abnormalPO.setInuharm_8(inharm7.get(0).getNormValue()); + abnormalPO.setInuharm_9(inharm8.get(0).getNormValue()); + abnormalPO.setInuharm_10(inharm9.get(0).getNormValue()); + abnormalPO.setInuharm_11(inharm10.get(0).getNormValue()); + abnormalPO.setInuharm_12(inharm11.get(0).getNormValue()); + abnormalPO.setInuharm_13(inharm12.get(0).getNormValue()); + abnormalPO.setInuharm_14(inharm13.get(0).getNormValue()); + abnormalPO.setInuharm_15(inharm14.get(0).getNormValue()); + abnormalPO.setInuharm_16(inharm15.get(0).getNormValue()); + } + // abnormalMapper.insert(abnormalPO); + } + } + } + } + return true; } public List getConntion(int i, int j, DateTime startTime, DateTime endTime, String lineIndex, int conntion) { @@ -757,4 +1184,944 @@ public class NormalLimitServiceImpl implements NormalLimitService { return abnormalVOList; } } + + + @Override + public Boolean AbnormalLineData(LineParam lineParam) { + + List lineIds = new ArrayList<>(); + List all = new ArrayList<>(); + + + if (CollectionUtils.isEmpty(lineParam.getLineIds())) { + DeviceInfoParam deviceInfoParam = new DeviceInfoParam(); + deviceInfoParam.setDeptIndex("5699e5916a18a6381e1ac92da5bd2628"); + deviceInfoParam.setPowerFlag(2); + deviceInfoParam.setMonitorFlag(2); + deviceInfoParam.setServerName(ServerEnum.HARMONIC.getName()); + SimpleDTO simpleDTO = new SimpleDTO(); + simpleDTO.setName("电网拓扑"); + simpleDTO.setSort(0); + simpleDTO.setCode("Power_Network"); + deviceInfoParam.setStatisticalType(simpleDTO); + //处理监测点 + List deviceDataList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData(); + for (GeneralDeviceDTO generalDeviceDTO : deviceDataList) { + lineIds.addAll(generalDeviceDTO.getLineIndexes()); + } + } else { + //不为空则为补招 + lineIds.addAll(lineParam.getLineIds()); + + } + String lastSql = " and time>='" + lineParam.getDataDate() + InfluxDBPublicParam.START_TIME + "' and time <='" + lineParam.getDataDate() + InfluxDBPublicParam.END_TIME + "'"; + if (!lineIds.isEmpty()) { + for (String lineIndex : lineIds) { + //获取当前监测点的限值详情 + Overlimit overlimit = lineFeignClient.getOverLimitData(lineIndex).getData(); + + String phasic = ""; + for (int phase = 1; phase < 5; phase++) { + switch (phase) { + case 1: + phasic = "A"; + break; + case 2: + phasic = "B"; + break; + case 3: + phasic = "C"; + break; + case 4: + phasic = "T"; + break; + } + + + MpSurplusAbnormalD mpSurplusAbnormalD = new MpSurplusAbnormalD(); + mpSurplusAbnormalD.setPhasicType(phasic); + mpSurplusAbnormalD.setValueType("CP95"); + mpSurplusAbnormalD.setId(lineIndex); + mpSurplusAbnormalD.setTimeId(LocalDateTime.parse(lineParam.getDataDate() + InfluxDBPublicParam.START_TIME, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + + + MpSurplusAbnormalD mpSurplusAbnormalDMax = new MpSurplusAbnormalD(); + mpSurplusAbnormalDMax.setPhasicType(phasic); + mpSurplusAbnormalDMax.setValueType("MAX"); + mpSurplusAbnormalDMax.setId(lineIndex); + mpSurplusAbnormalDMax.setTimeId(LocalDateTime.parse(lineParam.getDataDate() + InfluxDBPublicParam.START_TIME, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + + + MpSurplusAbnormalD mpSurplusAbnormalDMin = new MpSurplusAbnormalD(); + mpSurplusAbnormalDMin.setPhasicType(phasic); + mpSurplusAbnormalDMin.setValueType("MIN"); + mpSurplusAbnormalDMin.setId(lineIndex); + mpSurplusAbnormalDMin.setTimeId(LocalDateTime.parse(lineParam.getDataDate() + InfluxDBPublicParam.START_TIME, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + + + MpSurplusAbnormalD mpSurplusAbnormalDAvg = new MpSurplusAbnormalD(); + mpSurplusAbnormalDAvg.setPhasicType(phasic); + mpSurplusAbnormalDAvg.setValueType("AVG"); + mpSurplusAbnormalDAvg.setId(lineIndex); + mpSurplusAbnormalDAvg.setTimeId(LocalDateTime.parse(lineParam.getDataDate() + InfluxDBPublicParam.START_TIME, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + + //判断标识 true:没有异常 false:存在异常 + Boolean flag = true; + + /*2-25次谐波电压含有率*/ + String bang = " where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic+"' "; + StringBuilder tem = new StringBuilder(); + for (int i = 2; i < 26; i++) { + if (i == 25) { + tem.append("MAX(v_").append(i).append(") as ").append("v_").append(i); + } else { + tem.append("MAX(v_").append(i).append(") as ").append("v_").append(i).append(","); + } + } + String sql = "select " + tem + " from data_harmrate_v "+ bang + " and value_type = 'CP95'"+InfluxDBPublicParam.TIME_ZONE; + List> mapList = influxDbUtils.getMapResult(sql); + if (CollUtil.isNotEmpty(mapList)) { + List useList = new ArrayList<>(); + Float i2 = compareToOver(overlimit.getUharm2(), Float.parseFloat(mapList.get(0).get("v_2").toString()), flag); + if (Objects.nonNull(i2)) { + mpSurplusAbnormalD.setUharm2(i2); + useList.add("v_2"); + + } + Float i3 = compareToOver(overlimit.getUharm3(), Float.parseFloat(mapList.get(0).get("v_3").toString()), flag); + if (Objects.nonNull(i3)) { + mpSurplusAbnormalD.setUharm3(i3); + useList.add("v_3"); + } + Float i4 = compareToOver(overlimit.getUharm4(), Float.parseFloat(mapList.get(0).get("v_4").toString()), flag); + if (Objects.nonNull(i4)) { + mpSurplusAbnormalD.setUharm4(i4); + } + Float i5 = compareToOver(overlimit.getUharm5(), Float.parseFloat(mapList.get(0).get("v_5").toString()), flag); + if (Objects.nonNull(i5)) { + mpSurplusAbnormalD.setUharm5(i5); + useList.add("v_5"); + } + Float i6 = compareToOver(overlimit.getUharm6(), Float.parseFloat(mapList.get(0).get("v_6").toString()), flag); + if (Objects.nonNull(i6)) { + mpSurplusAbnormalD.setUharm6(i6); + useList.add("v_6"); + } + Float i7 = compareToOver(overlimit.getUharm7(), Float.parseFloat(mapList.get(0).get("v_7").toString()), flag); + if (Objects.nonNull(i7)) { + mpSurplusAbnormalD.setUharm7(i7); + useList.add("v_7"); + } + Float i8 = compareToOver(overlimit.getUharm8(), Float.parseFloat(mapList.get(0).get("v_8").toString()), flag); + if (Objects.nonNull(i8)) { + mpSurplusAbnormalD.setUharm8(i8); + useList.add("v_8"); + } + Float i9 = compareToOver(overlimit.getUharm9(), Float.parseFloat(mapList.get(0).get("v_9").toString()), flag); + if (Objects.nonNull(i9)) { + mpSurplusAbnormalD.setUharm9(i9); + useList.add("v_9"); + } + Float i10 = compareToOver(overlimit.getUharm10(), Float.parseFloat(mapList.get(0).get("v_10").toString()), flag); + if (Objects.nonNull(i10)) { + mpSurplusAbnormalD.setUharm10(i10); + useList.add("v_10"); + } + Float i11 = compareToOver(overlimit.getUharm11(), Float.parseFloat(mapList.get(0).get("v_11").toString()), flag); + if (Objects.nonNull(i11)) { + mpSurplusAbnormalD.setUharm11(i11); + useList.add("v_11"); + } + Float i12 = compareToOver(overlimit.getUharm12(), Float.parseFloat(mapList.get(0).get("v_12").toString()), flag); + if (Objects.nonNull(i12)) { + mpSurplusAbnormalD.setUharm12(i12); + useList.add("v_12"); + } + Float i13 = compareToOver(overlimit.getUharm13(), Float.parseFloat(mapList.get(0).get("v_13").toString()), flag); + if (Objects.nonNull(i13)) { + mpSurplusAbnormalD.setUharm13(i13); + useList.add("v_13"); + } + Float i14 = compareToOver(overlimit.getUharm14(), Float.parseFloat(mapList.get(0).get("v_14").toString()), flag); + if (Objects.nonNull(i14)) { + mpSurplusAbnormalD.setUharm14(i14); + useList.add("v_14"); + } + Float i15 = compareToOver(overlimit.getUharm15(), Float.parseFloat(mapList.get(0).get("v_15").toString()), flag); + if (Objects.nonNull(i15)) { + mpSurplusAbnormalD.setUharm15(i15); + useList.add("v_15"); + } + Float i16 = compareToOver(overlimit.getUharm16(), Float.parseFloat(mapList.get(0).get("v_16").toString()), flag); + if (Objects.nonNull(i16)) { + mpSurplusAbnormalD.setUharm16(i16); + useList.add("v_16"); + } + Float i17 = compareToOver(overlimit.getUharm17(), Float.parseFloat(mapList.get(0).get("v_17").toString()), flag); + if (Objects.nonNull(i17)) { + mpSurplusAbnormalD.setUharm17(i17); + useList.add("v_17"); + } + Float i18 = compareToOver(overlimit.getUharm18(), Float.parseFloat(mapList.get(0).get("v_18").toString()), flag); + if (Objects.nonNull(i18)) { + mpSurplusAbnormalD.setUharm18(i18); + useList.add("v_18"); + } + Float i19 = compareToOver(overlimit.getUharm19(), Float.parseFloat(mapList.get(0).get("v_19").toString()), flag); + if (Objects.nonNull(i19)) { + mpSurplusAbnormalD.setUharm19(i19); + useList.add("v_19"); + } + Float i20 = compareToOver(overlimit.getUharm20(), Float.parseFloat(mapList.get(0).get("v_20").toString()), flag); + if (Objects.nonNull(i20)) { + mpSurplusAbnormalD.setUharm20(i20); + useList.add("v_20"); + } + Float i21 = compareToOver(overlimit.getUharm21(), Float.parseFloat(mapList.get(0).get("v_21").toString()), flag); + if (Objects.nonNull(i21)) { + mpSurplusAbnormalD.setUharm3(i21); + } + Float i22 = compareToOver(overlimit.getUharm22(), Float.parseFloat(mapList.get(0).get("v_22").toString()), flag); + if (Objects.nonNull(i22)) { + mpSurplusAbnormalD.setUharm22(i22); + useList.add("v_22"); + } + Float i23 = compareToOver(overlimit.getUharm23(), Float.parseFloat(mapList.get(0).get("v_23").toString()), flag); + if (Objects.nonNull(i23)) { + mpSurplusAbnormalD.setUharm23(i23); + useList.add("v_23"); + } + Float i24 = compareToOver(overlimit.getUharm24(), Float.parseFloat(mapList.get(0).get("v_24").toString()), flag); + if (Objects.nonNull(i24)) { + mpSurplusAbnormalD.setUharm2(i24); + useList.add("v_24"); + } + Float i25 = compareToOver(overlimit.getUharm25(), Float.parseFloat(mapList.get(0).get("v_25").toString()), flag); + if (Objects.nonNull(i25)) { + mpSurplusAbnormalD.setUharm25(i25); + useList.add("v_25"); + } + + if (CollUtil.isNotEmpty(useList)) { + assTest(useList,bang,"data_harmrate_v",1,mpSurplusAbnormalDMax,mpSurplusAbnormalDMin,mpSurplusAbnormalDAvg); + } + + } + + /*2-25次谐波电流*/ + StringBuilder tem1 = new StringBuilder(); + for (int i = 2; i < 26; i++) { + if (i == 25) { + tem1.append("MAX(i_").append(i).append(") as ").append("i_").append(i); + } else { + tem1.append("MAX(i_").append(i).append(") as ").append("i_").append(i).append(","); + } + } + String sqlData_I = "select " + tem1 + " from data_i "+bang+ " and value_type = 'CP95'" + InfluxDBPublicParam.TIME_ZONE; + List> mapData_I = influxDbUtils.getMapResult(sqlData_I); + + if (CollUtil.isNotEmpty(mapData_I)) { + List useList = new ArrayList<>(); + Float i2 = compareToOver(overlimit.getIharm2(), Float.parseFloat(mapData_I.get(0).get("i_2").toString()), flag); + if (Objects.nonNull(i2)) { + mpSurplusAbnormalD.setIharm2(i2); + useList.add("i_2"); + } + Float i3 = compareToOver(overlimit.getIharm3(), Float.parseFloat(mapData_I.get(0).get("i_3").toString()), flag); + if (Objects.nonNull(i3)) { + mpSurplusAbnormalD.setIharm3(i3); + useList.add("i_3"); + } + Float i4 = compareToOver(overlimit.getIharm4(), Float.parseFloat(mapData_I.get(0).get("i_4").toString()), flag); + if (Objects.nonNull(i4)) { + mpSurplusAbnormalD.setIharm4(i4); + useList.add("i_4"); + } + Float i5 = compareToOver(overlimit.getIharm5(), Float.parseFloat(mapData_I.get(0).get("i_5").toString()), flag); + if (Objects.nonNull(i5)) { + mpSurplusAbnormalD.setIharm5(i5); + useList.add("i_5"); + } + Float i6 = compareToOver(overlimit.getIharm6(), Float.parseFloat(mapData_I.get(0).get("i_6").toString()), flag); + if (Objects.nonNull(i6)) { + mpSurplusAbnormalD.setIharm6(i6); + useList.add("i_6"); + } + Float i7 = compareToOver(overlimit.getIharm7(), Float.parseFloat(mapData_I.get(0).get("i_7").toString()), flag); + if (Objects.nonNull(i7)) { + mpSurplusAbnormalD.setIharm7(i7); + useList.add("i_7"); + } + Float i8 = compareToOver(overlimit.getIharm8(), Float.parseFloat(mapData_I.get(0).get("i_8").toString()), flag); + if (Objects.nonNull(i8)) { + mpSurplusAbnormalD.setIharm8(i8); + useList.add("i_8"); + } + Float i9 = compareToOver(overlimit.getIharm9(), Float.parseFloat(mapData_I.get(0).get("i_9").toString()), flag); + if (Objects.nonNull(i9)) { + mpSurplusAbnormalD.setIharm9(i9); + useList.add("i_9"); + } + Float i10 = compareToOver(overlimit.getIharm10(), Float.parseFloat(mapData_I.get(0).get("i_10").toString()), flag); + if (Objects.nonNull(i10)) { + mpSurplusAbnormalD.setIharm10(i10); + useList.add("i_10"); + } + Float i11 = compareToOver(overlimit.getIharm11(), Float.parseFloat(mapData_I.get(0).get("i_11").toString()), flag); + if (Objects.nonNull(i11)) { + mpSurplusAbnormalD.setIharm11(i11); + useList.add("i_11"); + } + Float i12 = compareToOver(overlimit.getIharm12(), Float.parseFloat(mapData_I.get(0).get("i_12").toString()), flag); + if (Objects.nonNull(i12)) { + mpSurplusAbnormalD.setIharm12(i12); + useList.add("i_12"); + } + Float i13 = compareToOver(overlimit.getIharm13(), Float.parseFloat(mapData_I.get(0).get("i_13").toString()), flag); + if (Objects.nonNull(i13)) { + mpSurplusAbnormalD.setIharm13(i13); + useList.add("i_13"); + } + Float i14 = compareToOver(overlimit.getIharm14(), Float.parseFloat(mapData_I.get(0).get("i_14").toString()), flag); + if (Objects.nonNull(i14)) { + mpSurplusAbnormalD.setIharm14(i14); + useList.add("i_14"); + } + Float i15 = compareToOver(overlimit.getIharm15(), Float.parseFloat(mapData_I.get(0).get("i_15").toString()), flag); + if (Objects.nonNull(i15)) { + mpSurplusAbnormalD.setIharm15(i15); + useList.add("i_15"); + } + Float i16 = compareToOver(overlimit.getIharm16(), Float.parseFloat(mapData_I.get(0).get("i_16").toString()), flag); + if (Objects.nonNull(i16)) { + mpSurplusAbnormalD.setIharm16(i16); + useList.add("i_16"); + } + Float i17 = compareToOver(overlimit.getIharm17(), Float.parseFloat(mapData_I.get(0).get("i_17").toString()), flag); + if (Objects.nonNull(i17)) { + mpSurplusAbnormalD.setIharm17(i17); + useList.add("i_17"); + } + Float i18 = compareToOver(overlimit.getIharm18(), Float.parseFloat(mapData_I.get(0).get("i_18").toString()), flag); + if (Objects.nonNull(i18)) { + mpSurplusAbnormalD.setIharm18(i18); + useList.add("i_18"); + } + Float i19 = compareToOver(overlimit.getIharm19(), Float.parseFloat(mapData_I.get(0).get("i_19").toString()), flag); + if (Objects.nonNull(i19)) { + mpSurplusAbnormalD.setIharm19(i19); + useList.add("i_19"); + } + Float i20 = compareToOver(overlimit.getIharm20(), Float.parseFloat(mapData_I.get(0).get("i_20").toString()), flag); + if (Objects.nonNull(i20)) { + mpSurplusAbnormalD.setIharm20(i20); + useList.add("i_20"); + } + Float i21 = compareToOver(overlimit.getIharm21(), Float.parseFloat(mapData_I.get(0).get("i_21").toString()), flag); + if (Objects.nonNull(i21)) { + mpSurplusAbnormalD.setIharm3(i21); + useList.add("i_21"); + } + Float i22 = compareToOver(overlimit.getIharm22(), Float.parseFloat(mapData_I.get(0).get("i_22").toString()), flag); + if (Objects.nonNull(i22)) { + mpSurplusAbnormalD.setIharm22(i22); + useList.add("i_22"); + } + Float i23 = compareToOver(overlimit.getIharm23(), Float.parseFloat(mapData_I.get(0).get("i_23").toString()), flag); + if (Objects.nonNull(i23)) { + mpSurplusAbnormalD.setIharm23(i23); + useList.add("i_23"); + } + Float i24 = compareToOver(overlimit.getIharm24(), Float.parseFloat(mapData_I.get(0).get("i_24").toString()), flag); + if (Objects.nonNull(i24)) { + mpSurplusAbnormalD.setIharm2(i24); + useList.add("i_24"); + } + Float i25 = compareToOver(overlimit.getIharm25(), Float.parseFloat(mapData_I.get(0).get("i_25").toString()), flag); + if (Objects.nonNull(i25)) { + mpSurplusAbnormalD.setIharm25(i25); + useList.add("i_25"); + } + + if (CollUtil.isNotEmpty(useList)) { + assTest(useList,bang,"data_i",2,mpSurplusAbnormalDMax,mpSurplusAbnormalDMin,mpSurplusAbnormalDAvg); + } + } + + + /*0.5-15.5次间谐波电压含有率*/ + StringBuilder tem2 = new StringBuilder(); + for (int i = 1; i < 17; i++) { + if (i == 16) { + tem2.append("MAX(i_").append(i).append(") as ").append("i_").append(i); + } else { + tem2.append("MAX(i_").append(i).append(") as ").append("i_").append(i).append(","); + } + } + + String sqlData_Ih = "select " + tem2 + " from data_inharmrate_v "+bang+ " and value_type = 'CP95'" + InfluxDBPublicParam.TIME_ZONE; + List> mapData_Ih = influxDbUtils.getMapResult(sqlData_Ih); + if (CollUtil.isNotEmpty(mapData_Ih)) { + List useList = new ArrayList<>(); + Float i1 = compareToOver(overlimit.getInuharm2(), Float.parseFloat(mapData_Ih.get(0).get("v_1").toString()), flag); + if (Objects.nonNull(i1)) { + mpSurplusAbnormalD.setInuharm1(i1); + useList.add("v_1"); + } + Float i2 = compareToOver(overlimit.getInuharm2(), Float.parseFloat(mapData_Ih.get(0).get("v_2").toString()), flag); + if (Objects.nonNull(i2)) { + mpSurplusAbnormalD.setInuharm2(i2); + useList.add("v_2"); + } + Float i3 = compareToOver(overlimit.getInuharm3(), Float.parseFloat(mapData_Ih.get(0).get("v_3").toString()), flag); + if (Objects.nonNull(i3)) { + mpSurplusAbnormalD.setInuharm3(i3); + useList.add("v_3"); + } + Float i4 = compareToOver(overlimit.getInuharm4(), Float.parseFloat(mapData_Ih.get(0).get("v_4").toString()), flag); + if (Objects.nonNull(i4)) { + mpSurplusAbnormalD.setInuharm4(i4); + useList.add("v_4"); + } + Float i5 = compareToOver(overlimit.getInuharm5(), Float.parseFloat(mapData_Ih.get(0).get("v_5").toString()), flag); + if (Objects.nonNull(i5)) { + mpSurplusAbnormalD.setInuharm5(i5); + useList.add("v_5"); + } + + Float i6 = compareToOver(overlimit.getInuharm6(), Float.parseFloat(mapData_Ih.get(0).get("v_6").toString()), flag); + if (Objects.nonNull(i6)) { + mpSurplusAbnormalD.setInuharm6(i6); + useList.add("v_6"); + } + Float i7 = compareToOver(overlimit.getInuharm7(), Float.parseFloat(mapData_Ih.get(0).get("v_7").toString()), flag); + if (Objects.nonNull(i7)) { + mpSurplusAbnormalD.setInuharm7(i7); + useList.add("v_7"); + } + Float i8 = compareToOver(overlimit.getInuharm8(), Float.parseFloat(mapData_Ih.get(0).get("v_8").toString()), flag); + if (Objects.nonNull(i8)) { + mpSurplusAbnormalD.setInuharm8(i8); + useList.add("v_8"); + } + Float i9 = compareToOver(overlimit.getInuharm9(), Float.parseFloat(mapData_Ih.get(0).get("v_9").toString()), flag); + if (Objects.nonNull(i9)) { + mpSurplusAbnormalD.setInuharm9(i9); + useList.add("v_9"); + } + Float i10 = compareToOver(overlimit.getInuharm10(), Float.parseFloat(mapData_Ih.get(0).get("v_10").toString()), flag); + if (Objects.nonNull(i10)) { + mpSurplusAbnormalD.setInuharm10(i10); + useList.add("v_10"); + } + Float i11 = compareToOver(overlimit.getInuharm11(), Float.parseFloat(mapData_Ih.get(0).get("v_11").toString()), flag); + if (Objects.nonNull(i11)) { + mpSurplusAbnormalD.setInuharm11(i11); + useList.add("v_11"); + } + Float i12 = compareToOver(overlimit.getInuharm12(), Float.parseFloat(mapData_Ih.get(0).get("v_12").toString()), flag); + if (Objects.nonNull(i12)) { + mpSurplusAbnormalD.setInuharm12(i12); + useList.add("v_12"); + } + Float i13 = compareToOver(overlimit.getInuharm13(), Float.parseFloat(mapData_Ih.get(0).get("v_13").toString()), flag); + if (Objects.nonNull(i13)) { + mpSurplusAbnormalD.setInuharm13(i13); + useList.add("v_13"); + } + Float i14 = compareToOver(overlimit.getInuharm14(), Float.parseFloat(mapData_Ih.get(0).get("v_14").toString()), flag); + if (Objects.nonNull(i14)) { + mpSurplusAbnormalD.setInuharm14(i14); + useList.add("v_14"); + } + Float i15 = compareToOver(overlimit.getInuharm15(), Float.parseFloat(mapData_Ih.get(0).get("v_15").toString()), flag); + if (Objects.nonNull(i15)) { + mpSurplusAbnormalD.setInuharm15(i15); + useList.add("v_15"); + } + Float i16 = compareToOver(overlimit.getInuharm16(), Float.parseFloat(mapData_Ih.get(0).get("v_16").toString()), flag); + if (Objects.nonNull(i16)) { + mpSurplusAbnormalD.setInuharm16(i16); + useList.add("v_16"); + } + + if (CollUtil.isNotEmpty(useList)) { + assTest(useList,bang,"data_inharmrate_v",3,mpSurplusAbnormalDMax,mpSurplusAbnormalDMin,mpSurplusAbnormalDAvg); + } + } + + + /*电压总谐波畸变率*/ + String sqlData_Vthd = "select MAX(v_thd) as v_thd from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'CP95'" + InfluxDBPublicParam.TIME_ZONE; + List> mapData_Vthd = influxDbUtils.getMapResult(sqlData_Vthd); + if (CollUtil.isNotEmpty(mapData_Vthd)) { + float thd = Float.parseFloat(mapData_Vthd.get(0).get("v_thd").toString()); + if (thd > overlimit.getUaberrance()) { + mpSurplusAbnormalD.setUaberrance(thd); + + String vthMax = "select MAX(v_thd) as v_thd from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'MAX'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthMax = influxDbUtils.getMapResult(vthMax); + mpSurplusAbnormalDMax.setUaberrance(Float.parseFloat(map_vthMax.get(0).get("v_thd").toString())); + + String vthMin = "select MIN(v_thd) as v_thd from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'MIN'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthMin = influxDbUtils.getMapResult(vthMin); + mpSurplusAbnormalDMin.setUaberrance(Float.parseFloat(map_vthMin.get(0).get("v_thd").toString())); + + String vthAvg = "select MEAN(v_thd) as v_thd from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'AVG'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthAvg = influxDbUtils.getMapResult(vthAvg); + mpSurplusAbnormalDAvg.setUaberrance(Float.parseFloat(map_vthAvg.get(0).get("v_thd").toString())); + flag = false; + } + } + + /*负序电压不平衡度*/ + String sqlData_Unbalance_Max = "select MAX(v_unbalance) as v_unbalance from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'MAX'" + InfluxDBPublicParam.TIME_ZONE; + String sqlData_Unbalance_CP95 = "select MAX(v_unbalance) as v_unbalance from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'CP95'" + InfluxDBPublicParam.TIME_ZONE; + + List> mapData_Unbalance_Max = influxDbUtils.getMapResult(sqlData_Unbalance_Max); + List> mapData_Unbalance_Cp95 = influxDbUtils.getMapResult(sqlData_Unbalance_CP95); + if (CollUtil.isNotEmpty(mapData_Unbalance_Max) && CollUtil.isNotEmpty(mapData_Unbalance_Cp95)) { + float ubMax = Float.parseFloat(mapData_Unbalance_Max.get(0).get("v_unbalance").toString()); + float ubCp95 = Float.parseFloat(mapData_Unbalance_Cp95.get(0).get("v_unbalance").toString()); + if (ubMax > overlimit.getUbalance() && ubCp95 > overlimit.getUbalance()) { + mpSurplusAbnormalD.setUbalance(ubCp95); + mpSurplusAbnormalDMax.setUbalance(ubMax); + + String vthMin = "select MIN(v_unbalance) as v_unbalance from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'MIN'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthMin = influxDbUtils.getMapResult(vthMin); + mpSurplusAbnormalDMin.setUaberrance(Float.parseFloat(map_vthMin.get(0).get("v_unbalance").toString())); + + String vthAvg = "select MEAN(v_unbalance) as v_unbalance from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'AVG'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthAvg = influxDbUtils.getMapResult(vthAvg); + mpSurplusAbnormalDAvg.setUaberrance(Float.parseFloat(map_vthAvg.get(0).get("v_unbalance").toString())); + flag = false; + } + } + + /*负序电流*/ + String sqlData_Neg_Max = "select MAX(i_neg) as i_neg from data_i where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'MAX'" + InfluxDBPublicParam.TIME_ZONE; + String sqlData_Neg_CP95 = "select MAX(i_neg) as i_neg from data_i where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'CP95'" + InfluxDBPublicParam.TIME_ZONE; + + List> mapData_Neg_Max = influxDbUtils.getMapResult(sqlData_Neg_Max); + List> mapData_Neg_Cp95 = influxDbUtils.getMapResult(sqlData_Neg_CP95); + + if (CollUtil.isNotEmpty(mapData_Neg_Max) && CollUtil.isNotEmpty(mapData_Neg_Cp95)) { + float negMax = Float.parseFloat(mapData_Neg_Max.get(0).get("i_neg").toString()); + float negCp95 = Float.parseFloat(mapData_Neg_Cp95.get(0).get("i_neg").toString()); + if (negMax > overlimit.getINeg() && negCp95 > overlimit.getINeg()) { + mpSurplusAbnormalD.setINeg(negCp95); + mpSurplusAbnormalDMax.setINeg(negMax); + + String vthMin = "select MIN(i_neg) as i_neg from data_i where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'MIN'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthMin = influxDbUtils.getMapResult(vthMin); + mpSurplusAbnormalDMin.setINeg(Float.parseFloat(map_vthMin.get(0).get("i_neg").toString())); + + String vthAvg = "select MEAN(i_neg) as i_neg from data_i where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'AVG'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthAvg = influxDbUtils.getMapResult(vthAvg); + mpSurplusAbnormalDAvg.setINeg(Float.parseFloat(map_vthAvg.get(0).get("i_neg").toString())); + flag = false; + } + } + + /*频率偏差、电压偏差*/ + String sqlData_vu_Max = "select MAX(vu_dev) as vu_dev,MAX(freq_dev) as freq_dev from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'MAX'" + InfluxDBPublicParam.TIME_ZONE; + String sqlData_vl_Min = "select MIN(vl_dev) as vl_dev,MIN(freq_dev) as freq_dev from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'MIN'" + InfluxDBPublicParam.TIME_ZONE; + + List> mapData_vu_Max = influxDbUtils.getMapResult(sqlData_vu_Max); + List> mapData_vl_Min = influxDbUtils.getMapResult(sqlData_vl_Min); + if (CollUtil.isNotEmpty(mapData_vu_Max) && CollUtil.isNotEmpty(mapData_vl_Min)) { + float vuMax = Float.parseFloat(mapData_vu_Max.get(0).get("vu_dev").toString()); + float freqMax = Float.parseFloat(mapData_vu_Max.get(0).get("freq_dev").toString()); + if (vuMax > overlimit.getVoltageDev()) { + mpSurplusAbnormalDMax.setVoltageDev(vuMax); + String vthCp95 = "select MAX(vu_dev) as vu_dev from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'CP95'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthCp95 = influxDbUtils.getMapResult(vthCp95); + mpSurplusAbnormalD.setVoltageDev(Float.parseFloat(map_vthCp95.get(0).get("vu_dev").toString())); + + String vthMin = "select MIN(vu_dev) as vu_dev from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'MIN'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthMin = influxDbUtils.getMapResult(vthMin); + mpSurplusAbnormalDMin.setVoltageDev(Float.parseFloat(map_vthMin.get(0).get("vu_dev").toString())); + + String vthAvg = "select MEAN(vu_dev) as vu_dev from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'AVG'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthAvg = influxDbUtils.getMapResult(vthAvg); + mpSurplusAbnormalDAvg.setVoltageDev(Float.parseFloat(map_vthAvg.get(0).get("vu_dev").toString())); + flag = false; + } + if (Math.abs(freqMax) > overlimit.getFreqDev()) { + mpSurplusAbnormalD.setFreq(freqMax); + String vthCp95 = "select MAX(freq_dev) as freq_dev from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'CP95'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthCp95 = influxDbUtils.getMapResult(vthCp95); + mpSurplusAbnormalD.setFreq(Float.parseFloat(map_vthCp95.get(0).get("freq_dev").toString())); + + String vthMin = "select MIN(freq_dev) as freq_dev from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'MIN'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthMin = influxDbUtils.getMapResult(vthMin); + mpSurplusAbnormalDMin.setFreq(Float.parseFloat(map_vthMin.get(0).get("freq_dev").toString())); + + String vthAvg = "select MEAN(freq_dev) as freq_dev from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'AVG'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthAvg = influxDbUtils.getMapResult(vthAvg); + mpSurplusAbnormalDAvg.setFreq(Float.parseFloat(map_vthAvg.get(0).get("freq_dev").toString())); + flag = false; + } + + float vlMin = Float.parseFloat(mapData_vl_Min.get(0).get("vl_dev").toString()); + float freqMin = Float.parseFloat(mapData_vl_Min.get(0).get("freq_dev").toString()); + if (vlMin < overlimit.getUvoltageDev()) { + mpSurplusAbnormalDMin.setUvoltageDev(vuMax); + + String vthCp95 = "select MAX(vl_dev) as vl_dev from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'CP95'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthCp95 = influxDbUtils.getMapResult(vthCp95); + mpSurplusAbnormalD.setUvoltageDev(Float.parseFloat(map_vthCp95.get(0).get("vl_dev").toString())); + + String vthMin = "select MIN(vl_dev) as vl_dev from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'MAX'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthMin = influxDbUtils.getMapResult(vthMin); + mpSurplusAbnormalDMax.setUvoltageDev(Float.parseFloat(map_vthMin.get(0).get("vl_dev").toString())); + + String vthAvg = "select MEAN(vl_dev) as vl_dev from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'AVG'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthAvg = influxDbUtils.getMapResult(vthAvg); + mpSurplusAbnormalDAvg.setUvoltageDev(Float.parseFloat(map_vthAvg.get(0).get("vl_dev").toString())); + flag = false; + } + if (Math.abs(freqMin) > overlimit.getFreqDev()) { + mpSurplusAbnormalD.setFreq(freqMin); + + String vthCp95 = "select MAX(freq_dev) as freq_dev from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'CP95'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthCp95 = influxDbUtils.getMapResult(vthCp95); + mpSurplusAbnormalD.setFreq(Float.parseFloat(map_vthCp95.get(0).get("freq_dev").toString())); + + String vthMin = "select MIN(freq_dev) as freq_dev from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'MAX'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthMin = influxDbUtils.getMapResult(vthMin); + mpSurplusAbnormalDMax.setFreq(Float.parseFloat(map_vthMin.get(0).get("freq_dev").toString())); + + String vthAvg = "select MEAN(freq_dev) as freq_dev from data_v where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'AVG'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthAvg = influxDbUtils.getMapResult(vthAvg); + mpSurplusAbnormalDAvg.setFreq(Float.parseFloat(map_vthAvg.get(0).get("freq_dev").toString())); + flag = false; + } + } + + /*长时闪变*/ + String sqlData_plt_Max = "select MAX(plt) as plt from data_plt where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'MAX'" + InfluxDBPublicParam.TIME_ZONE; + List> mapData_plt = influxDbUtils.getMapResult(sqlData_plt_Max); + if (CollUtil.isNotEmpty(mapData_plt)) { + float thd = Float.parseFloat(mapData_plt.get(0).get("plt").toString()); + if (thd > overlimit.getFlicker()) { + mpSurplusAbnormalD.setFlicker(thd); + + String vthCp95 = "select MAX(plt) as plt from data_plt where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'CP95'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthCp95 = influxDbUtils.getMapResult(vthCp95); + mpSurplusAbnormalD.setFlicker(Float.parseFloat(map_vthCp95.get(0).get("plt").toString())); + + String vthMin = "select MIN(plt) as plt from data_plt where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'MIN'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthMin = influxDbUtils.getMapResult(vthMin); + mpSurplusAbnormalDMax.setFlicker(Float.parseFloat(map_vthMin.get(0).get("plt").toString())); + + String vthAvg = "select MEAN(plt) as plt from data_plt where line_id ='" + lineIndex + "' " + lastSql + " and phasic_type = '" + phasic + "' and value_type = 'AVG'" + InfluxDBPublicParam.TIME_ZONE; + List> map_vthAvg = influxDbUtils.getMapResult(vthAvg); + mpSurplusAbnormalDAvg.setFlicker(Float.parseFloat(map_vthAvg.get(0).get("plt").toString())); + flag = false; + } + } + + + if (!flag) { + all.add(mpSurplusAbnormalD); + all.add(mpSurplusAbnormalDMax); + all.add(mpSurplusAbnormalDMin); + all.add(mpSurplusAbnormalDAvg); + } + + } + + + } + + + if (CollUtil.isNotEmpty(all)) { + //入库操作 + this.saveBatch(all); + } + + + } + + + return true; + } + + + private Float compareToOver(Float overLimit, Float value, Boolean flag) { + if (value > overLimit) { + flag = false; + return value; + } + return null; + } + + + private void assPojoI(Map map, MpSurplusAbnormalD mpSurplusAbnormalD,Integer type){ + if(type == 1){ + //谐波电压 + map.forEach((key, val) -> { + switch (key) { + case "v_2": + mpSurplusAbnormalD.setUharm2(Float.parseFloat(val.toString())); + break; + case "v_3": + mpSurplusAbnormalD.setUharm3(Float.parseFloat(val.toString())); + break; + case "v_4": + mpSurplusAbnormalD.setUharm4(Float.parseFloat(val.toString())); + break; + case "v_5": + mpSurplusAbnormalD.setUharm5(Float.parseFloat(val.toString())); + break; + case "v_6": + mpSurplusAbnormalD.setUharm6(Float.parseFloat(val.toString())); + break; + case "v_7": + mpSurplusAbnormalD.setUharm7(Float.parseFloat(val.toString())); + break; + case "v_8": + mpSurplusAbnormalD.setUharm8(Float.parseFloat(val.toString())); + break; + case "v_9": + mpSurplusAbnormalD.setUharm9(Float.parseFloat(val.toString())); + break; + case "v_10": + mpSurplusAbnormalD.setUharm10(Float.parseFloat(val.toString())); + break; + case "v_11": + mpSurplusAbnormalD.setUharm11(Float.parseFloat(val.toString())); + break; + case "v_12": + mpSurplusAbnormalD.setUharm12(Float.parseFloat(val.toString())); + break; + case "v_13": + mpSurplusAbnormalD.setUharm13(Float.parseFloat(val.toString())); + break; + case "v_14": + mpSurplusAbnormalD.setUharm14(Float.parseFloat(val.toString())); + break; + case "v_15": + mpSurplusAbnormalD.setUharm15(Float.parseFloat(val.toString())); + break; + case "v_16": + mpSurplusAbnormalD.setUharm16(Float.parseFloat(val.toString())); + break; + case "v_17": + mpSurplusAbnormalD.setUharm17(Float.parseFloat(val.toString())); + break; + case "v_18": + mpSurplusAbnormalD.setUharm18(Float.parseFloat(val.toString())); + break; + case "v_19": + mpSurplusAbnormalD.setUharm19(Float.parseFloat(val.toString())); + break; + case "v_20": + mpSurplusAbnormalD.setUharm20(Float.parseFloat(val.toString())); + break; + case "v_21": + mpSurplusAbnormalD.setUharm21(Float.parseFloat(val.toString())); + break; + case "v_22": + mpSurplusAbnormalD.setUharm22(Float.parseFloat(val.toString())); + break; + case "v_23": + mpSurplusAbnormalD.setUharm23(Float.parseFloat(val.toString())); + break; + case "v_24": + mpSurplusAbnormalD.setUharm24(Float.parseFloat(val.toString())); + break; + case "v_25": + mpSurplusAbnormalD.setUharm25(Float.parseFloat(val.toString())); + break; + case "time": + break; + default: + throw new IllegalStateException("Unexpected value: " + key); + } + + }); + }else if(type == 2){ + //谐波电流 + map.forEach((key, val) -> { + switch (key) { + case "i_2": + mpSurplusAbnormalD.setIharm2(Float.parseFloat(val.toString())); + break; + case "i_3": + mpSurplusAbnormalD.setIharm3(Float.parseFloat(val.toString())); + break; + case "i_4": + mpSurplusAbnormalD.setIharm4(Float.parseFloat(val.toString())); + break; + case "i_5": + mpSurplusAbnormalD.setIharm5(Float.parseFloat(val.toString())); + break; + case "i_6": + mpSurplusAbnormalD.setIharm6(Float.parseFloat(val.toString())); + break; + case "i_7": + mpSurplusAbnormalD.setIharm7(Float.parseFloat(val.toString())); + break; + case "i_8": + mpSurplusAbnormalD.setIharm8(Float.parseFloat(val.toString())); + break; + case "i_9": + mpSurplusAbnormalD.setIharm9(Float.parseFloat(val.toString())); + break; + case "i_10": + mpSurplusAbnormalD.setIharm10(Float.parseFloat(val.toString())); + break; + case "i_11": + mpSurplusAbnormalD.setIharm11(Float.parseFloat(val.toString())); + break; + case "i_12": + mpSurplusAbnormalD.setIharm12(Float.parseFloat(val.toString())); + break; + case "i_13": + mpSurplusAbnormalD.setIharm13(Float.parseFloat(val.toString())); + break; + case "i_14": + mpSurplusAbnormalD.setIharm14(Float.parseFloat(val.toString())); + break; + case "i_15": + mpSurplusAbnormalD.setIharm15(Float.parseFloat(val.toString())); + break; + case "i_16": + mpSurplusAbnormalD.setIharm16(Float.parseFloat(val.toString())); + break; + case "i_17": + mpSurplusAbnormalD.setIharm17(Float.parseFloat(val.toString())); + break; + case "i_18": + mpSurplusAbnormalD.setIharm18(Float.parseFloat(val.toString())); + break; + case "i_19": + mpSurplusAbnormalD.setIharm19(Float.parseFloat(val.toString())); + break; + case "i_20": + mpSurplusAbnormalD.setIharm20(Float.parseFloat(val.toString())); + break; + case "i_21": + mpSurplusAbnormalD.setIharm21(Float.parseFloat(val.toString())); + break; + case "i_22": + mpSurplusAbnormalD.setIharm22(Float.parseFloat(val.toString())); + break; + case "i_23": + mpSurplusAbnormalD.setIharm23(Float.parseFloat(val.toString())); + break; + case "i_24": + mpSurplusAbnormalD.setIharm24(Float.parseFloat(val.toString())); + break; + case "i_25": + mpSurplusAbnormalD.setIharm25(Float.parseFloat(val.toString())); + break; + case "time": + break; + default: + throw new IllegalStateException("Unexpected value: " + key); + } + }); + }else { + //间谐波电流 + map.forEach((key, val) -> { + switch (key) { + case "v_1": + mpSurplusAbnormalD.setInuharm1(Float.parseFloat(val.toString())); + break; + case "v_2": + mpSurplusAbnormalD.setInuharm2(Float.parseFloat(val.toString())); + break; + case "v_3": + mpSurplusAbnormalD.setInuharm3(Float.parseFloat(val.toString())); + break; + case "v_4": + mpSurplusAbnormalD.setInuharm4(Float.parseFloat(val.toString())); + break; + case "v_5": + mpSurplusAbnormalD.setInuharm5(Float.parseFloat(val.toString())); + break; + case "v_6": + mpSurplusAbnormalD.setInuharm6(Float.parseFloat(val.toString())); + break; + case "v_7": + mpSurplusAbnormalD.setInuharm7(Float.parseFloat(val.toString())); + break; + case "v_8": + mpSurplusAbnormalD.setInuharm8(Float.parseFloat(val.toString())); + break; + case "v_9": + mpSurplusAbnormalD.setInuharm9(Float.parseFloat(val.toString())); + break; + case "v_10": + mpSurplusAbnormalD.setInuharm10(Float.parseFloat(val.toString())); + break; + case "v_11": + mpSurplusAbnormalD.setInuharm11(Float.parseFloat(val.toString())); + break; + case "v_12": + mpSurplusAbnormalD.setInuharm12(Float.parseFloat(val.toString())); + break; + case "v_13": + mpSurplusAbnormalD.setInuharm13(Float.parseFloat(val.toString())); + break; + case "v_14": + mpSurplusAbnormalD.setInuharm14(Float.parseFloat(val.toString())); + break; + case "v_15": + mpSurplusAbnormalD.setInuharm15(Float.parseFloat(val.toString())); + break; + case "v_16": + mpSurplusAbnormalD.setInuharm16(Float.parseFloat(val.toString())); + break; + case "time": + break; + default: + throw new IllegalStateException("Unexpected value: " + key); + } + + }); + } + + } + + + + private void assTest(List useList,String bang,String table,Integer type,MpSurplusAbnormalD mpSurplusAbnormalDMax,MpSurplusAbnormalD mpSurplusAbnormalDMin,MpSurplusAbnormalD mpSurplusAbnormalDAvg){ + StringBuilder uMax = new StringBuilder(); + StringBuilder uMin = new StringBuilder(); + for (int i = 0; i < useList.size(); i++) { + if (i == useList.size() - 1) { + uMax.append("MAX(").append(useList.get(i)).append(") as ").append(useList.get(i)); + uMin.append("MIN(").append(useList.get(i)).append(") as ").append(useList.get(i)); + + } else { + uMax.append("MAX(").append(useList.get(i)).append(") as ").append(useList.get(i)).append(","); + uMin.append("MIN(").append(useList.get(i)).append(") as ").append(useList.get(i)).append(","); + + } + } + + String sqlMAX = "select " + uMax + " from "+table+bang +" and value_type = 'MAX'" + InfluxDBPublicParam.TIME_ZONE; + String sqlMIN = "select " + uMin + " from "+table+bang +" and value_type = 'MIN'" + InfluxDBPublicParam.TIME_ZONE; + String sqlAVG = "select " + uMax + " from "+table+bang +" and value_type = 'AVG'" + InfluxDBPublicParam.TIME_ZONE; + + List> map_MAX = influxDbUtils.getMapResult(sqlMAX); + if (CollUtil.isNotEmpty(map_MAX)) { + assPojoI(map_MAX.get(0),mpSurplusAbnormalDMax,type); + } + List> map_MIN = influxDbUtils.getMapResult(sqlMIN); + if (CollUtil.isNotEmpty(map_MIN)) { + assPojoI(map_MIN.get(0),mpSurplusAbnormalDMin,type); + } + + List> map_AVG = influxDbUtils.getMapResult(sqlAVG); + if (CollUtil.isNotEmpty(map_AVG)) { + assPojoI(map_AVG.get(0),mpSurplusAbnormalDAvg,type); + } + } + + } diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/OnlineRateServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/OnlineRateServiceImpl.java index 2f43b5d46..53c04fb89 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/OnlineRateServiceImpl.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/OnlineRateServiceImpl.java @@ -91,6 +91,12 @@ public class OnlineRateServiceImpl implements OnlineRateService { return resultMapper.toPOJO(sqlResult, PqsCommunicatePO.class); } + private List getCommunicateDataOld(String lineId, String date){ + QueryResult sqlResult = influxDbUtils.query("SELECT * FROM pqs_communicate where time <= '" + date + " 23:59:59' and dev_id = '" + lineId +"' order by time desc limit 1 tz('Asia/Shanghai')"); + InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); + return resultMapper.toPOJO(sqlResult, PqsCommunicatePO.class); + } + /** * new的时间和当前统计时间 不是/是 同一天 */ @@ -105,7 +111,7 @@ public class OnlineRateServiceImpl implements OnlineRateService { Date nowDate = new Date(); /*数据补招的情况下*/ if (DateUtil.between(date,nowDate,DateUnit.DAY) > DateUtil.between(newDate,nowDate,DateUnit.DAY)){ - minute = processData(newDate, date, type, lineId, dateStr); + minute = processData(newDate, date, null, lineId, dateStr); }else { if (ModelState.online.equals(type)){ minute = DAY_MINUTE; @@ -151,10 +157,19 @@ public class OnlineRateServiceImpl implements OnlineRateService { minute = (int)onlineTime; } }else { - /*当前统计时间内仅有一条数据*/ - long differ = DateUtil.between(date,newDate,DateUnit.MINUTE); - if (ModelState.online.equals(type)){ - minute = DAY_MINUTE - (int)differ; + if(type != null){ + /*当前统计时间内仅有一条数据*/ + long differ = DateUtil.between(date,newDate,DateUnit.MINUTE); + if (ModelState.online.equals(type)){ + minute = DAY_MINUTE - (int)differ; + } + }else { + List communicateDataOld = getCommunicateDataOld(lineId,dateStr); + if (communicateDataOld.size() > 0){ + if (ModelState.online.equals(communicateDataOld.get(0).getType())){ + minute = DAY_MINUTE; + } + } } } return minute; diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/ReportServiceImpl.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/ReportServiceImpl.java index 164fb9cf1..669611bde 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/ReportServiceImpl.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/ReportServiceImpl.java @@ -281,24 +281,25 @@ public class ReportServiceImpl implements ReportService { */ private void assSql(ReportTemplateDTO data, StringBuilder sql, List endList, String method, String lineId) { //sql拼接示例：select MAX(IHA2) as IHA2 from power_quality_data where Phase = 'A' and LineId='1324564568' and Stat_Method='max' tz('Asia/Shanghai') + //cp95函数特殊处理 PERCENTILE(field_key, N) + if (InfluxDBSqlConstant.CP95.equals(method)){ + sql.append(method).append(InfluxDBSqlConstant.LBK).append(data.getTemplateName()).append(InfluxDBSqlConstant.NUM_95).append(InfluxDBSqlConstant.RBK).append(InfluxDBSqlConstant.AS_VALUE); + }else{ + sql.append(method).append(InfluxDBSqlConstant.LBK).append(data.getTemplateName()).append(InfluxDBSqlConstant.RBK).append(InfluxDBSqlConstant.AS_VALUE); + } + + //相别特殊处理 if (InfluxDBTableConstant.NO_PHASE.equals(data.getPhase())) { - sql.append(method).append(InfluxDBSqlConstant.LBK).append(data.getTemplateName()).append(InfluxDBSqlConstant.RBK).append(InfluxDBSqlConstant.AS_VALUE) - .append(InfluxDBSqlConstant.FROM).append(data.getClassId()) + sql.append(InfluxDBSqlConstant.FROM).append(data.getClassId()) .append(InfluxDBSqlConstant.WHERE).append(InfluxDBTableConstant.LINE_ID).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(lineId).append(InfluxDBSqlConstant.QM) .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.VALUE_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getStatMethod()).append(InfluxDBSqlConstant.QM) .append(InfluxDBSqlConstant.TZ); } else { - //cp95函数特殊处理 PERCENTILE(field_key, N) - if (InfluxDBSqlConstant.CP95.equals(method)){ - sql.append(method).append(InfluxDBSqlConstant.LBK).append(data.getTemplateName()).append(InfluxDBSqlConstant.NUM_95).append(InfluxDBSqlConstant.RBK).append(InfluxDBSqlConstant.AS_VALUE); - }else{ - sql.append(method).append(InfluxDBSqlConstant.LBK).append(data.getTemplateName()).append(InfluxDBSqlConstant.RBK).append(InfluxDBSqlConstant.AS_VALUE); - } sql.append(InfluxDBSqlConstant.FROM).append(data.getClassId()) - .append(InfluxDBSqlConstant.WHERE).append(InfluxDBTableConstant.LINE_ID).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(lineId).append(InfluxDBSqlConstant.QM) - .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.VALUE_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getStatMethod()).append(InfluxDBSqlConstant.QM) - .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.PHASIC_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getPhase()).append(InfluxDBSqlConstant.QM) - .append(InfluxDBSqlConstant.TZ); + .append(InfluxDBSqlConstant.WHERE).append(InfluxDBTableConstant.LINE_ID).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(lineId).append(InfluxDBSqlConstant.QM) + .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.VALUE_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getStatMethod()).append(InfluxDBSqlConstant.QM) + .append(InfluxDBSqlConstant.AND).append(InfluxDBTableConstant.PHASIC_TYPE).append(InfluxDBSqlConstant.EQ).append(InfluxDBSqlConstant.QM).append(data.getPhase()).append(InfluxDBSqlConstant.QM) + .append(InfluxDBSqlConstant.TZ); } //根据不同的库表赋值 diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/NormalLimitService.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/NormalLimitService.java index 3fe6b32a4..f303177bf 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/NormalLimitService.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/line/NormalLimitService.java @@ -1,11 +1,21 @@ package com.njcn.prepare.harmonic.service.line; +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.device.pq.pojo.po.Node; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import com.njcn.prepare.harmonic.pojo.po.MpSurplusAbnormalD; + /** * @author denghuajun * @version 1.0.0 * @date 2022年10月17日 19:58 */ -public interface NormalLimitService { +public interface NormalLimitService extends IService { + + Boolean getNormLimitData(LineParam lineParam); + + + Boolean AbnormalLineData(LineParam lineParam); + - String getNormLimitData(); } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java new file mode 100644 index 000000000..783fef079 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java @@ -0,0 +1,28 @@ +package com.njcn.prepare.harmonic.api.line; + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.line.fallback.DistortionRateFeignClientFallbackFactory; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 稳态综合评估 + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/7 15:11 + */ + +@FeignClient( + value = ServerInfo.HARMONIC_PREPARE, + path = "/general", + fallbackFactory = DistortionRateFeignClientFallbackFactory.class +) +public interface HarmonicGeneralFeignClient { + + @PostMapping("/generalData") + HttpResult generalData(@RequestBody @Validated LineParam lineParam); +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java new file mode 100644 index 000000000..9733f79de --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java @@ -0,0 +1,27 @@ +package com.njcn.prepare.harmonic.api.line; + +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.prepare.harmonic.api.line.fallback.HarmonicMetricFeignClientFallbackFactory; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/7 15:12 + */ + +@FeignClient( + value = ServerInfo.HARMONIC_PREPARE, + path = "/metric", + fallbackFactory = HarmonicMetricFeignClientFallbackFactory.class +) +public interface HarmonicMetricFeignClient { + + @PostMapping("/metricData") + HttpResult metricData(@RequestBody @Validated LineParam lineParam); +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java index 31ecf6cf7..dd3b1a80a 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java @@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; /** - * 自定义报表 - * @author qijian + * + * @author denghaujun * @date 2022/10/20 */ @FeignClient( @@ -22,8 +22,8 @@ import org.springframework.web.bind.annotation.RequestBody; public interface NormalLimitFeignClient { /** - * 批量处理报表 - * @author qijian + * + * @author denghaujun * @date 2022/10/19 */ @PostMapping("/getNormLimitData") diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java index 7c078cdcc..d2e4ef9ed 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java @@ -9,6 +9,7 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestBody; /** * ReportFeignClientFallbackFactory @@ -32,8 +33,8 @@ public class CoustomReportFeignClientFallbackFactory implements FallbackFactory< Enum finalExceptionEnum = exceptionEnum; return new CoustmReportFeignClient() { @Override - public HttpResult batchReport(LineParam reportParam){ - log.error("{}异常，降级处理，异常为：{}", "自定义报表预处理任务: ", throwable.toString()); + public HttpResult batchReport(@RequestBody LineParam reportParam){ + log.error("{}异常，降级处理，异常为：{}", "生成自定义报表: ", throwable.toString()); throw new BusinessException(finalExceptionEnum); } }; diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java index 9e928f2eb..0e772755f 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java @@ -9,6 +9,7 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestBody; /** * ReportFeignClientFallbackFactory @@ -32,7 +33,7 @@ public class DayDataFeignClientFallbackFactory implements FallbackFactory finalExceptionEnum = exceptionEnum; return new DayDataFeignClient() { @Override - public HttpResult dayDataHanlder(LineParam jobParam){ + public HttpResult dayDataHanlder(@RequestBody LineParam jobParam){ log.error("{}异常，降级处理，异常为：{}", "Date数据转Day数据: ", throwable.toString()); throw new BusinessException(finalExceptionEnum); } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java new file mode 100644 index 000000000..01c971378 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java @@ -0,0 +1,40 @@ +package com.njcn.prepare.harmonic.api.line.fallback; + +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.device.pq.utils.DeviceEnumUtil; +import com.njcn.prepare.harmonic.api.line.HarmonicGeneralFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/7 15:17 + */ +@Slf4j +@Component +public class HarmonicGeneralFeignClientFallbackFactory implements FallbackFactory { + @Override + public HarmonicGeneralFeignClient create(Throwable throwable) { + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException)throwable.getCause(); + exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); + } + + Enum finalExceptionEnum = exceptionEnum; + return new HarmonicGeneralFeignClient() { + @Override + public HttpResult generalData(@RequestBody @Validated LineParam lineParam){ + log.error("{}异常，降级处理，异常为：{}", "稳态综合评估: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java new file mode 100644 index 000000000..0acf887c1 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java @@ -0,0 +1,40 @@ +package com.njcn.prepare.harmonic.api.line.fallback; + +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.device.pq.utils.DeviceEnumUtil; +import com.njcn.prepare.harmonic.api.line.HarmonicMetricFeignClient; +import com.njcn.prepare.harmonic.pojo.param.LineParam; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/7 15:14 + */ +@Slf4j +@Component +public class HarmonicMetricFeignClientFallbackFactory implements FallbackFactory { + @Override + public HarmonicMetricFeignClient create(Throwable throwable) { + Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; + if (throwable.getCause() instanceof BusinessException) { + BusinessException businessException = (BusinessException)throwable.getCause(); + exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); + } + + Enum finalExceptionEnum = exceptionEnum; + return new HarmonicMetricFeignClient() { + @Override + public HttpResult metricData(@RequestBody @Validated LineParam lineParam){ + log.error("{}异常，降级处理，异常为：{}", "稳态指标评估: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; + } +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java index 60f37daba..bdd909121 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java @@ -9,6 +9,8 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; /** * IntegrityFeignClientFallbackFactory @@ -28,8 +30,8 @@ public class IntegrityFeignClientFallbackFactory implements FallbackFactory finalExceptionEnum = exceptionEnum; return new IntegrityFeignClient() { @Override - public HttpResult computeDataIntegrity(LineParam lineParam) { - log.error("{}异常，降级处理，异常为：{}", "数据完整性预处理: ", throwable.toString()); + public HttpResult computeDataIntegrity(@RequestBody @Validated LineParam lineParam) { + log.error("{}异常，降级处理，异常为：{}", "数据完整性处理: ", throwable.toString()); throw new BusinessException(finalExceptionEnum); } }; diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java index 29bd9592f..2c6844bd3 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java @@ -9,6 +9,8 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; /** * ReportFeignClientFallbackFactory @@ -32,8 +34,8 @@ public class LimitTargetFeignClientFallbackFactory implements FallbackFactory
  • finalExceptionEnum = exceptionEnum; return new LimitTargetFeignClient() { @Override - public HttpResult getLimitTargetData(LineParam lineParam) { - log.error("{}异常，降级处理，异常为：{}", "越限次数数据预处理: ", throwable.toString()); + public HttpResult getLimitTargetData(@RequestBody @Validated LineParam lineParam) { + log.error("{}异常，降级处理，异常为：{}", "越限数据: ", throwable.toString()); throw new BusinessException(finalExceptionEnum); } }; diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java index cdb375540..93780ce7f 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java @@ -9,6 +9,7 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestBody; /** * ReportFeignClientFallbackFactory @@ -32,8 +33,8 @@ public class LimitrateFeignClientFallbackFactory implements FallbackFactory finalExceptionEnum = exceptionEnum; return new LimitrateFeignClient() { @Override - public HttpResult limitRateHanlder(LineParam limitRateHanlderParam ){ - log.error("{}异常，降级处理，异常为：{}", "越限是否数据预处理: ", throwable.toString()); + public HttpResult limitRateHanlder(@RequestBody LineParam limitRateHanlderParam ){ + log.error("{}异常，降级处理，异常为：{}", "越限数据处理: ", throwable.toString()); throw new BusinessException(finalExceptionEnum); } }; diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java index ca5a84a81..5cef19e96 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java @@ -29,7 +29,7 @@ public class NormalFeignClientFallbackFactory implements FallbackFactory getNormLimitData(LineParam lineParam) { - log.error("{}异常，降级处理，异常为：{}", "告警数据预处理: ", throwable.toString()); + log.error("{}异常，降级处理，异常为：{}", "告警数据: ", throwable.toString()); throw new BusinessException(finalExceptionEnum); } }; diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java index 7ba47233b..b3f509d66 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java @@ -9,6 +9,8 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; /** * OnlineRateFeignClientFallbackFactory @@ -28,8 +30,8 @@ public class OnlineRateFeignClientFallbackFactory implements FallbackFactory finalExceptionEnum = exceptionEnum; return new OnlineRateFeignClient() { @Override - public HttpResult getOnlineRateData(LineParam lineParam){ - log.error("{}异常，降级处理，异常为：{}", "在线率数据预处理: ", throwable.toString()); + public HttpResult getOnlineRateData(@RequestBody @Validated LineParam lineParam){ + log.error("{}异常，降级处理，异常为：{}", "在线率: ", throwable.toString()); throw new BusinessException(finalExceptionEnum); } }; diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java index 9f38f81e0..c7063a0f8 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java @@ -9,6 +9,8 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; /** * PollutionFeignClientFallbackFactory @@ -29,8 +31,8 @@ public class PollutionFeignClientFallbackFactory implements FallbackFactory finalExceptionEnum = exceptionEnum; return new PollutionFeignClient() { @Override - public HttpResult processPollutionData(LineParam lineParam){ - log.error("{}异常，降级处理，异常为：{}", "污区数据预处理: ", throwable.toString()); + public HttpResult processPollutionData(@RequestBody @Validated LineParam lineParam){ + log.error("{}异常，降级处理，异常为：{}", "污区数据: ", throwable.toString()); throw new BusinessException(finalExceptionEnum); } }; diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataFlickerPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataFlickerPO.java index 6516168e4..246e78409 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataFlickerPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataFlickerPO.java @@ -40,4 +40,8 @@ public class DataFlickerPO { @Column(name = "pst") private Double pst; + + //自定义字段 + @Column(name = "count") + private Integer count; } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmVPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmVPO.java index 99e14eda8..a22083b33 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmVPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmVPO.java @@ -182,5 +182,5 @@ public class DataInHarmVPO { @Column(name = "v_50") private Double v50; - + } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataPltPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataPltPO.java index 5a7d9d82c..f8ea7d9df 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataPltPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataPltPO.java @@ -32,4 +32,7 @@ public class DataPltPO { @Column(name = "flicker_all_time") private Integer flickerAllTime; + //自定义字段 + @Column(name = "mean") + private Double mean; } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataPolluctionPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataPolluctionPO.java index e75c41516..b6de9c596 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataPolluctionPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataPolluctionPO.java @@ -12,7 +12,7 @@ import java.time.Instant; * @createTime 2022/10/21 13:45 */ @Data -@Measurement(name = "data_polluction") +@Measurement(name = "harmonic_pollution") public class DataPolluctionPO { @Column(name = "line_id") diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataVPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataVPO.java index 06b9e0007..fff09d0af 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataVPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataVPO.java @@ -211,4 +211,12 @@ public class DataVPO { //自定义字段-总计算次数 @Column(name = "all_time") private Integer allTime; + + //自定义字段 + @Column(name = "mean") + private Double mean; + + //自定义字段 + @Column(name = "count") + private Integer count; } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/MpSurplusAbnormalD.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/MpSurplusAbnormalD.java new file mode 100644 index 000000000..909e8f4a4 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/MpSurplusAbnormalD.java @@ -0,0 +1,464 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.time.LocalDateTime; + + +/** + *

    + * + *

    + * + * @author hongawen + * @since 2022-11-08 + */ +@Data +@TableName("r_mp_surplus_abnormal_d") +public class MpSurplusAbnormalD{ + + private static final long serialVersionUID = 1L; + + /** + * 统计数据时间 + */ + private LocalDateTime timeId; + + /** + * 越限监测点 + */ + private String id; + + /** + * 数据类型,’A’表示A相，’B’表示B相,’C’表示C相,’T’表示总 + */ + private String phasicType; + + /** + * 指标类型，’AVG’代表平均值平均值，‘MAX’代表最大值，‘MIN’代表最小值，‘CP95’代表CP95值 + */ + private String valueType; + + /** + * 电压上偏差数值 + */ + private Float voltageDev = -3.14159f; + + /** + * 电压下偏差数值 + */ + private Float uvoltageDev = -3.14159f; + + /** + * 三相电压不平衡度数值 + */ + private Float ubalance = -3.14159f; + + /** + * 闪变数值 + */ + private Float flicker = -3.14159f; + + /** + * 电压总畸变率数值 + */ + private Float uaberrance = -3.14159f; + + /** + * 负序电流 + */ + private Float iNeg = -3.14159f; + + /** + * 频率 + */ + private Float freq = -3.14159f; + + /** + * 2次谐波电压数值 + */ + @TableField(value = "uharm_2") + private Float uharm2 = -3.14159f; + + /** + * 3次谐波电压数值 + */ + @TableField(value = "uharm_3") + private Float uharm3 = -3.14159f; + + /** + * 4次谐波电压数值 + */ + @TableField(value = "uharm_4") + private Float uharm4 = -3.14159f; + + /** + * 5次谐波电压数值 + */ + @TableField(value = "uharm_5") + private Float uharm5 = -3.14159f; + + /** + * 6次谐波电压数值 + */ + @TableField(value = "uharm_6") + private Float uharm6 = -3.14159f; + + /** + * 7次谐波电压数值 + */ + @TableField(value = "uharm_7") + private Float uharm7 = -3.14159f; + + /** + * 8次谐波电压数值 + */ + @TableField(value = "uharm_8") + private Float uharm8 = -3.14159f; + + /** + * 9次谐波电压数值 + */ + @TableField(value = "uharm_9") + private Float uharm9 = -3.14159f; + + /** + * 10次谐波电压数值 + */ + @TableField(value = "uharm_10") + private Float uharm10 = -3.14159f; + + /** + * 11次谐波电压数值 + */ + @TableField(value = "uharm_11") + private Float uharm11 = -3.14159f; + + /** + * 12次谐波电压数值 + */ + @TableField(value = "uharm_12") + private Float uharm12 = -3.14159f; + + /** + * 13次谐波电压数值 + */ + @TableField(value = "uharm_13") + private Float uharm13 = -3.14159f; + + /** + * 14次谐波电压数值 + */ + @TableField(value = "uharm_14") + private Float uharm14 = -3.14159f; + + /** + * 15次谐波电压数值 + */ + @TableField(value = "uharm_15") + private Float uharm15 = -3.14159f; + + /** + * 16次谐波电压数值 + */ + @TableField(value = "uharm_16") + private Float uharm16 = -3.14159f; + + /** + * 17次谐波电压数值 + */ + @TableField(value = "uharm_17") + private Float uharm17 = -3.14159f; + + /** + * 18次谐波电压数值 + */ + @TableField(value = "uharm_18") + private Float uharm18 = -3.14159f; + + /** + * 19次谐波电压数值 + */ + @TableField(value = "uharm_19") + private Float uharm19 = -3.14159f; + + /** + * 20次谐波电压数值 + */ + @TableField(value = "uharm_20") + private Float uharm20 = -3.14159f; + + /** + * 21次谐波电压数值 + */ + @TableField(value = "uharm_21") + private Float uharm21 = -3.14159f; + + /** + * 22次谐波电压数值 + */ + @TableField(value = "uharm_22") + private Float uharm22 = -3.14159f; + + /** + * 23次谐波电压数值 + */ + @TableField(value = "uharm_23") + private Float uharm23 = -3.14159f; + + /** + * 24次谐波电压数值 + */ + @TableField(value = "uharm_24") + private Float uharm24 = -3.14159f; + + /** + * 25次谐波电压数值 + */ + @TableField(value = "uharm_25") + private Float uharm25 = -3.14159f; + + /** + * 2次谐波电流数值 + */ + @TableField(value = "iharm_2") + private Float iharm2 = -3.14159f; + + /** + * 3次谐波电流数值 + */ + @TableField(value = "iharm_3") + private Float iharm3 = -3.14159f; + + /** + * 4次谐波电流数值 + */ + @TableField(value = "iharm_4") + private Float iharm4 = -3.14159f; + + /** + * 5次谐波电流数值 + */ + @TableField(value = "iharm_5") + private Float iharm5 = -3.14159f; + + /** + * 6次谐波电流数值 + */ + @TableField(value = "iharm_6") + private Float iharm6 = -3.14159f; + + /** + * 7次谐波电流数值 + */ + @TableField(value = "iharm_7") + private Float iharm7 = -3.14159f; + + /** + * 8次谐波电流数值 + */ + @TableField(value = "iharm_8") + private Float iharm8 = -3.14159f; + + /** + * 9次谐波电流数值 + */ + @TableField(value = "iharm_9") + private Float iharm9 = -3.14159f; + + /** + * 10次谐波电流数值 + */ + @TableField(value = "iharm_10") + private Float iharm10 = -3.14159f; + + /** + * 11次谐波电流数值 + */ + @TableField(value = "iharm_11") + private Float iharm11 = -3.14159f; + + /** + * 12次谐波电流数值 + */ + @TableField(value = "iharm_12") + private Float iharm12 = -3.14159f; + + /** + * 13次谐波电流数值 + */ + @TableField(value = "iharm_13") + private Float iharm13 = -3.14159f; + + /** + * 14次谐波电流数值 + */ + @TableField(value = "iharm_14") + private Float iharm14 = -3.14159f; + + /** + * 15次谐波电流数值 + */ + @TableField(value = "iharm_15") + private Float iharm15 = -3.14159f; + + /** + * 16次谐波电流数值 + */ + @TableField(value = "iharm_16") + private Float iharm16 = -3.14159f; + + /** + * 17次谐波电流数值 + */ + @TableField(value = "iharm_17") + private Float iharm17 = -3.14159f; + + /** + * 18次谐波电流数值 + */ + @TableField(value = "iharm_18") + private Float iharm18 = -3.14159f; + + /** + * 19次谐波电流数值 + */ + @TableField(value = "iharm_19") + private Float iharm19 = -3.14159f; + + /** + * 20次谐波电流数值 + */ + @TableField(value = "iharm_20") + private Float iharm20 = -3.14159f; + + /** + * 21次谐波电流数值 + */ + @TableField(value = "iharm_21") + private Float iharm21 = -3.14159f; + + /** + * 22次谐波电流数值 + */ + @TableField(value = "iharm_22") + private Float iharm22 = -3.14159f; + + /** + * 23次谐波电流数值 + */ + @TableField(value = "iharm_23") + private Float iharm23 = -3.14159f; + + /** + * 24次谐波电流数值 + */ + @TableField(value = "iharm_24") + private Float iharm24 = -3.14159f; + + /** + * 25次谐波电流数值 + */ + @TableField(value = "iharm_25") + private Float iharm25 = -3.14159f; + + /** + * 0.5次间谐波电压数值 + */ + @TableField(value = "inuharm_1") + private Float inuharm1 = -3.14159f; + + /** + * 1.5次间谐波电压数值 + */ + @TableField(value = "inuharm_2") + private Float inuharm2 = -3.14159f; + + /** + * 2.5次间谐波电压数值 + */ + @TableField(value = "inuharm_3") + private Float inuharm3 = -3.14159f; + + /** + * 3.5次间谐波电压数值 + */ + @TableField(value = "inuharm_4") + private Float inuharm4 = -3.14159f; + + /** + * 4.5次间谐波电压数值 + */ + @TableField(value = "inuharm_5") + private Float inuharm5 = -3.14159f; + + /** + * 5.5次间谐波电压数值 + */ + @TableField(value = "inuharm_6") + private Float inuharm6 = -3.14159f; + + /** + * 6.5次间谐波电压数值 + */ + @TableField(value = "inuharm_7") + private Float inuharm7 = -3.14159f; + + /** + * 7.5次间谐波电压数值 + */ + @TableField(value = "inuharm_8") + private Float inuharm8 = -3.14159f; + + /** + * 8.5次间谐波电压数值 + */ + @TableField(value = "inuharm_9") + private Float inuharm9 = -3.14159f; + + /** + * 9.5次间谐波电压数值 + */ + @TableField(value = "inuharm_10") + private Float inuharm10 = -3.14159f; + + /** + * 10.5次间谐波电压数值 + */ + @TableField(value = "inuharm_11") + private Float inuharm11 = -3.14159f; + + /** + * 11.5次间谐波电压数值 + */ + @TableField(value = "inuharm_12") + private Float inuharm12 = -3.14159f; + + /** + * 12.5次间谐波电压数值 + */ + @TableField(value = "inuharm_13") + private Float inuharm13 = -3.14159f; + + /** + * 13.5次间谐波电压数值 + */ + @TableField(value = "inuharm_14") + private Float inuharm14 = -3.14159f; + + /** + * 14.5次间谐波电压数值 + */ + @TableField(value = "inuharm_15") + private Float inuharm15 = -3.14159f; + + /** + * 15.5次间谐波电压数值 + */ + @TableField(value = "inuharm_16") + private Float inuharm16 = -3.14159f; + + +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PqsCommunicatePO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PqsCommunicatePO.java index 3611ad983..4d442e0c6 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PqsCommunicatePO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PqsCommunicatePO.java @@ -22,6 +22,9 @@ public class PqsCommunicatePO { @Column(name = "line_id") private String lineId; + @Column(name = "dev_id") + private String devId; + @Column(name = "type") private Integer type; diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RMpPollutionD.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RMpPollutionD.java index c776b5740..3d28c9319 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RMpPollutionD.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RMpPollutionD.java @@ -21,7 +21,7 @@ public class RMpPollutionD implements Serializable { private static final long serialVersionUID = 1L; /** - * 监测点id + * 单位id */ @TableId(value = "line_id", type = IdType.AUTO) private String lineId; @@ -32,44 +32,14 @@ public class RMpPollutionD implements Serializable { private LocalDateTime dataDate; /** - * 频率偏差 + * 污区图统计类型 */ - private Float freqDev; + private String pollutionType; /** - * 电压偏差 + * 统计值 */ - private Float vDev; - - /** - * 三相电压不平衡度 - */ - private Float vUnbalance; - - /** - * 谐波电压(电压总谐波畸变率、各次谐波电压含有率) - */ - private Float vAll; - - /** - * 长时闪变 - */ - private Float plt; - - /** - * 谐波电流 - */ - private Float iAll; - - /** - * 负序电流 - */ - private Float iNeg; - - /** - * 间谐波电压含有率 - */ - private Float vInharm; + private Float value; public String getLineId() { return lineId; @@ -85,76 +55,28 @@ public class RMpPollutionD implements Serializable { public void setDataDate(LocalDateTime dataDate) { this.dataDate = dataDate; } - public Float getFreqDev() { - return freqDev; + public String getPollutionType() { + return pollutionType; } - public void setFreqDev(Float freqDev) { - this.freqDev = freqDev; + public void setPollutionType(String pollutionType) { + this.pollutionType = pollutionType; } - public Float getvDev() { - return vDev; + public Float getValue() { + return value; } - public void setvDev(Float vDev) { - this.vDev = vDev; - } - public Float getvUnbalance() { - return vUnbalance; - } - - public void setvUnbalance(Float vUnbalance) { - this.vUnbalance = vUnbalance; - } - public Float getvAll() { - return vAll; - } - - public void setvAll(Float vAll) { - this.vAll = vAll; - } - public Float getPlt() { - return plt; - } - - public void setPlt(Float plt) { - this.plt = plt; - } - public Float getiAll() { - return iAll; - } - - public void setiAll(Float iAll) { - this.iAll = iAll; - } - public Float getiNeg() { - return iNeg; - } - - public void setiNeg(Float iNeg) { - this.iNeg = iNeg; - } - public Float getvInharm() { - return vInharm; - } - - public void setvInharm(Float vInharm) { - this.vInharm = vInharm; + public void setValue(Float value) { + this.value = value; } @Override public String toString() { - return "RMpPollutionD{" + - "lineId=" + lineId + - ", dataDate=" + dataDate + - ", freqDev=" + freqDev + - ", vDev=" + vDev + - ", vUnbalance=" + vUnbalance + - ", vAll=" + vAll + - ", plt=" + plt + - ", iAll=" + iAll + - ", iNeg=" + iNeg + - ", vInharm=" + vInharm + - "}"; + return "RStatPollutionOrgD{" + + "lineId=" + lineId + + ", dataDate=" + dataDate + + ", pollutionType=" + pollutionType + + ", value=" + value + + "}"; } } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RMpVThd.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RMpVThd.java new file mode 100644 index 000000000..55e934b0c --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RMpVThd.java @@ -0,0 +1,82 @@ +package com.njcn.prepare.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

    + * 谐波畸变率排名 + *

    + * + * @author xiaoyao + * @since 2022-11-07 + */ +@TableName("r_mp_v_thd") +public class RMpVThd implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 监测点ID + */ + @TableId(value = "measurement_point_id", type = IdType.AUTO) + private String measurementPointId; + + /** + * 排名类型,字典表（0日，1月，2季，3年） + */ + private String dataType; + + /** + * 时间 + */ + private LocalDateTime dataDate; + + /** + * 谐波畸变率 + */ + private Float vThd; + + public String getMeasurementPointId() { + return measurementPointId; + } + + public void setMeasurementPointId(String measurementPointId) { + this.measurementPointId = measurementPointId; + } + public String getDataType() { + return dataType; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } + public LocalDateTime getDataDate() { + return dataDate; + } + + public void setDataDate(LocalDateTime dataDate) { + this.dataDate = dataDate; + } + public Float getvThd() { + return vThd; + } + + public void setvThd(Float vThd) { + this.vThd = vThd; + } + + @Override + public String toString() { + return "RMpVThd{" + + "measurementPointId=" + measurementPointId + + ", dataType=" + dataType + + ", dataDate=" + dataDate + + ", vThd=" + vThd + + "}"; + } +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/LimitTargetPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/LimitTargetPO.java index fb663aa61..c797891e5 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/LimitTargetPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/LimitTargetPO.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/10/20 18:26【需求编号】 @@ -475,4 +475,4 @@ public class LimitTargetPO { */ @TableField(value = "inuharm_16_overtime") private Integer inuharm16Overtime; -} +} \ No newline at end of file diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpFlickerReportDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpFlickerReportDPO.java index 7aa7c889b..846244ffd 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpFlickerReportDPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpFlickerReportDPO.java @@ -10,7 +10,7 @@ import lombok.Data; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/10/26 14:15【需求编号】 @@ -98,4 +98,4 @@ public class RMpFlickerReportDPO { @TableField(value = "SHORT_TERM_SEVERITY_95") @ApiModelProperty(value="短时间闪变值-95值") private Double shortTermSeverity95; -} +} \ No newline at end of file diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicPReportDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicPReportDPO.java index 85a3452f5..38094ef11 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicPReportDPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicPReportDPO.java @@ -5195,4 +5195,4 @@ public class RMpHarmonicPReportDPO { public void setHarmonicActivePower5095(Double harmonicActivePower5095) { this.harmonicActivePower5095 = harmonicActivePower5095; } -} +} \ No newline at end of file diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicIMagReportDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicIMagReportDPO.java index 1b5149ed0..c75358bbb 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicIMagReportDPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicIMagReportDPO.java @@ -1441,4 +1441,4 @@ public class RMpInharmonicIMagReportDPO { @TableField(value = "simple_harmonic_current_effective_50_cp95") @ApiModelProperty(value = "49.5次间谐波电流有效值95值") private Double simpleHarmonicCurrentEffective50Cp95; -} +} \ No newline at end of file diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicVRateReportDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicVRateReportDPO.java index 8cfb8c472..048376809 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicVRateReportDPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicVRateReportDPO.java @@ -1441,4 +1441,4 @@ public class RMpInharmonicVRateReportDPO { @TableField(value = "centre_harmonic_voltage_content50_cp95") @ApiModelProperty(value = "49.5次间谐波电压含有率95值") private Double centreHarmonicVoltageContent50Cp95; -} +} \ No newline at end of file diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpMeasurePhaseReportDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpMeasurePhaseReportDPO.java index 11295d4a0..db40a7c61 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpMeasurePhaseReportDPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpMeasurePhaseReportDPO.java @@ -10,7 +10,7 @@ import lombok.Data; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/10/28 10:53【需求编号】 @@ -322,4 +322,4 @@ public class RMpMeasurePhaseReportDPO { @TableField(value = "sp_fundamental_power_factor_95") @ApiModelProperty(value="单相基波功率因数-95值") private Double spFundamentalPowerFactor95; -} +} \ No newline at end of file diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpMeasureReportDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpMeasureReportDPO.java index 3d7dfa54f..cabca7369 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpMeasureReportDPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpMeasureReportDPO.java @@ -10,7 +10,7 @@ import lombok.Data; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/10/28 10:54【需求编号】 @@ -679,4 +679,4 @@ public class RMpMeasureReportDPO { @TableField(value = "unbalanced_apparent_power_95") @ApiModelProperty(value="不平衡视在功率-95值") private Double unbalancedApparentPower95; -} +} \ No newline at end of file diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpPltReportDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpPltReportDPO.java index dad340a7e..1ccb8d156 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpPltReportDPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpPltReportDPO.java @@ -10,7 +10,7 @@ import lombok.Data; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/10/26 15:26【需求编号】 @@ -70,4 +70,4 @@ public class RMpPltReportDPO { @TableField(value = "long_time_flashing_95") @ApiModelProperty(value="长时间闪变值-95值") private Double longTimeFlashing95; -} +} \ No newline at end of file