From 09bf6ef5a3f5fdec84856e8459426753ce5a21cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Tue, 16 May 2023 11:15:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=80=BC=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commApi/CommTerminalGeneralClient.java | 107 +++++ .../biz/commApi/DeptLineGeneralClient.java | 36 -- ...mTerminalGeneralClientFallbackFactory.java | 85 ++++ .../DeptLineGeneralClientFallbackFactory.java | 43 -- .../njcn/device/biz}/pojo/po/Overlimit.java | 320 ++++++++++++- .../com/njcn/device/biz/utils/COverlimit.java | 8 +- .../njcn/device/biz/utils/COverlimitUtil.java | 449 ++++++++++++++++++ .../njcn/device/pms/api/MonitorClient.java | 2 +- .../MonitorClientFallbackFactory.java | 2 +- .../pojo/po/report/OverLimitInfo.java | 2 +- .../controller/ExportModelController.java | 3 +- .../service/impl/HarmInHarmServiceImpl.java | 2 +- .../impl/HistoryResultServiceImpl.java | 4 +- .../impl/RMpHarmonicReportDServiceImpl.java | 2 +- .../impl/PVOverviewServiceImpl.java | 6 +- 15 files changed, 973 insertions(+), 98 deletions(-) create mode 100644 pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java delete mode 100644 pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/DeptLineGeneralClient.java create mode 100644 pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java delete mode 100644 pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/DeptLineGeneralClientFallbackFactory.java rename pqs-device/{pq-device/pq-device-api/src/main/java/com/njcn/device/pq => common-device-biz/src/main/java/com/njcn/device/biz}/pojo/po/Overlimit.java (65%) create mode 100644 pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java new file mode 100644 index 000000000..24ce5f0e3 --- /dev/null +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java @@ -0,0 +1,107 @@ +package com.njcn.device.biz.commApi; + +import cn.hutool.core.date.TimeInterval; +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.biz.commApi.fallback.CommTerminalGeneralClientFallbackFactory; +import com.njcn.device.biz.pojo.dto.*; +import com.njcn.device.biz.pojo.param.DeptGetLineParam; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +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; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +/** + * + * @author cdf + * @date 2023/4/24 + */ +@FeignClient( + value = ServerInfo.DEVICE, + path = "commTerminal", + fallbackFactory = CommTerminalGeneralClientFallbackFactory.class) +public interface CommTerminalGeneralClient { + + + /** + * 通过部门获取所有子级部门详情 + * @author cdf + * @date 2023/5/15 + */ + @PostMapping("getDeptChildrenByParent") + HttpResult> getDeptChildrenByParent(@RequestBody @Validated DeptGetLineParam deptGetLineParam); + + + /** + * 根据单位获取监测点信息 + * @author cdf + * @date 2023/5/10 + */ + @PostMapping("deptGetLine") + HttpResult> deptGetLine(@RequestBody @Validated DeptGetLineParam deptGetLineParam); + + + + + /** + * 根据单位获取所有变电站 + * @author cdf + * @date 2023/5/10 + */ + @PostMapping("deptGetSubStation") + HttpResult> deptSubStation(@RequestBody @Validated DeptGetLineParam deptGetLineParam); + + /** + * 根据单位获取所有变电站 + * @author cdf + * @date 2023/5/10 + */ + @PostMapping("deptGetBusBar") + HttpResult> deptBusBar(@RequestBody @Validated DeptGetLineParam deptGetLineParam); + + + /** + * 根据单位获取所有装置 + * @author cdf + * @date 2023/5/10 + */ + @PostMapping("deptGetDevice") + HttpResult> deptGetDevice(@RequestBody @Validated DeptGetLineParam deptGetLineParam); + + + /** + * 根据单站id获取监测点信息 + * @author cdf + * @date 2023/5/10 + */ + @PostMapping("substationGetLine") + HttpResult> substationGetLine(@RequestParam("substationId")String substationId); + + + /** + * 根据母线id获取监测点信息 + * @author cdf + * @date 2023/5/10 + */ + @PostMapping("busBarGetLine") + public HttpResult> busBarGetLine(@RequestParam("busBarId")String busBarId); + + + /** + * 通过部门获取所有子集部门所拥有的监测点 + * + * @param deptGetLineParam + * @return 指定的部门监测点信息 + */ + @PostMapping("/deptGetLineIds") + HttpResult> deptGetLineList(@RequestBody DeptGetLineParam deptGetLineParam); + + +} diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/DeptLineGeneralClient.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/DeptLineGeneralClient.java deleted file mode 100644 index 02fae4087..000000000 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/DeptLineGeneralClient.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.njcn.device.biz.commApi; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.device.biz.commApi.fallback.DeptLineGeneralClientFallbackFactory; -import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO; -import com.njcn.device.biz.pojo.param.DeptGetLineParam; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.List; - -/** - * - * @author cdf - * @date 2023/4/24 - */ -@FeignClient( - value = ServerInfo.DEVICE, - path = "commTerminal", - fallbackFactory = DeptLineGeneralClientFallbackFactory.class) -public interface DeptLineGeneralClient { - - /** - * 通过部门获取所有子集部门所拥有的监测点 - * - * @param deptGetLineParam - * @return 指定的部门监测点信息 - */ - @PostMapping("/deptGetLineIds") - HttpResult> deptGetLineList(@RequestBody DeptGetLineParam deptGetLineParam); - - -} diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java new file mode 100644 index 000000000..ce8ec7bba --- /dev/null +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java @@ -0,0 +1,85 @@ +package com.njcn.device.biz.commApi.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.biz.commApi.CommTerminalGeneralClient; +import com.njcn.device.biz.pojo.dto.*; +import com.njcn.device.biz.pojo.param.DeptGetLineParam; +import com.njcn.device.biz.utils.DeviceEnumUtil; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * 告警管理熔断降级 + * @author yzh + * @date 2022/9/19 + */ +@Slf4j +@Component +public class CommTerminalGeneralClientFallbackFactory implements FallbackFactory { + @Override + public CommTerminalGeneralClient 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 CommTerminalGeneralClient() { + @Override + public HttpResult> getDeptChildrenByParent(DeptGetLineParam deptGetLineParam) { + log.error("{}异常，降级处理，异常为：{}", "通过部门获取所有子级部门详情", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult> deptGetLine(DeptGetLineParam deptGetLineParam) { + log.error("{}异常，降级处理，异常为：{}", "根据单位获取监测点信息", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult> deptSubStation(DeptGetLineParam deptGetLineParam) { + log.error("{}异常，降级处理，异常为：{}", "根据单位获取所有变电站", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult> deptBusBar(DeptGetLineParam deptGetLineParam) { + log.error("{}异常，降级处理，异常为：{}", "根据单位获取所有变电站", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult> deptGetDevice(DeptGetLineParam deptGetLineParam) { + log.error("{}异常，降级处理，异常为：{}", "根据单位获取所有装置", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult> substationGetLine(String substationId) { + log.error("{}异常，降级处理，异常为：{}", "根据单站id获取监测点信息", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult> busBarGetLine(String busBarId) { + log.error("{}异常，降级处理，异常为：{}", "根据母线id获取监测点信息", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult> deptGetLineList(DeptGetLineParam deptGetLineParam) { + log.error("{}异常，降级处理，异常为：{}", "通过部门获取所有子集部门所拥有的监测点", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + + }; + } +} + diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/DeptLineGeneralClientFallbackFactory.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/DeptLineGeneralClientFallbackFactory.java deleted file mode 100644 index 35078a0c3..000000000 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/DeptLineGeneralClientFallbackFactory.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.njcn.device.biz.commApi.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.biz.commApi.DeptLineGeneralClient; -import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO; -import com.njcn.device.biz.pojo.param.DeptGetLineParam; -import com.njcn.device.biz.utils.DeviceEnumUtil; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * 告警管理熔断降级 - * @author yzh - * @date 2022/9/19 - */ -@Slf4j -@Component -public class DeptLineGeneralClientFallbackFactory implements FallbackFactory { - @Override - public DeptLineGeneralClient 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 DeptLineGeneralClient() { - @Override - public HttpResult> deptGetLineList(DeptGetLineParam deptGetLineParam) { - log.error("{}异常，降级处理，异常为：{}", "获取终获取告警策略列表", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - - }; - } -} - diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Overlimit.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/po/Overlimit.java similarity index 65% rename from pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Overlimit.java rename to pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/po/Overlimit.java index 66d430282..fc5b400a8 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Overlimit.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/po/Overlimit.java @@ -1,10 +1,12 @@ -package com.njcn.device.pq.pojo.po; +package com.njcn.device.biz.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.device.biz.utils.COverlimit; import lombok.Data; +import java.io.Serializable; + /** *

* @@ -15,7 +17,7 @@ import lombok.Data; */ @Data @TableName("pq_overlimit") -public class Overlimit { +public class Overlimit implements Serializable { private static final long serialVersionUID = 1L; @@ -29,6 +31,11 @@ public class Overlimit { */ private Float freqDev; + /** + * 电压波动 + */ + private Float voltageFluctuation; + /** * 电压上偏差限值 */ @@ -44,6 +51,11 @@ public class Overlimit { */ private Float ubalance; + /** + * 短时电压不平衡度限值 + */ + private Float shortUbalance; + /** * 闪变限值 */ @@ -203,6 +215,158 @@ public class Overlimit { @TableField("uharm_25") private Float uharm25; + /** + * 2次谐波电压限值 + */ + @TableField("uharm_26") + private Float uharm26; + + /** + * 3次谐波电压限值 + */ + @TableField("uharm_27") + private Float uharm27; + + /** + * 4次谐波电压限值 + */ + @TableField("uharm_28") + private Float uharm28; + + /** + * 5次谐波电压限值 + */ + @TableField("uharm_29") + private Float uharm29; + + /** + * 6次谐波电压限值 + */ + @TableField("uharm_30") + private Float uharm30; + + /** + * 7次谐波电压限值 + */ + @TableField("uharm_31") + private Float uharm31; + + /** + * 8次谐波电压限值 + */ + @TableField("uharm_32") + private Float uharm32; + + /** + * 9次谐波电压限值 + */ + @TableField("uharm_33") + private Float uharm33; + + /** + * 10次谐波电压限值 + */ + @TableField("uharm_34") + private Float uharm34; + + /** + * 11次谐波电压限值 + */ + @TableField("uharm_35") + private Float uharm35; + + /** + * 12次谐波电压限值 + */ + @TableField("uharm_36") + private Float uharm36; + + /** + * 13次谐波电压限值 + */ + @TableField("uharm_37") + private Float uharm37; + + /** + * 14次谐波电压限值 + */ + @TableField("uharm_38") + private Float uharm38; + + /** + * 15次谐波电压限值 + */ + @TableField("uharm_39") + private Float uharm39; + + /** + * 16次谐波电压限值 + */ + @TableField("uharm_40") + private Float uharm40; + + /** + * 17次谐波电压限值 + */ + @TableField("uharm_41") + private Float uharm41; + + /** + * 18次谐波电压限值 + */ + @TableField("uharm_42") + private Float uharm42; + + /** + * 19次谐波电压限值 + */ + @TableField("uharm_43") + private Float uharm43; + + /** + * 20次谐波电压限值 + */ + @TableField("uharm_44") + private Float uharm44; + + /** + * 21次谐波电压限值 + */ + @TableField("uharm_45") + private Float uharm45; + + /** + * 22次谐波电压限值 + */ + @TableField("uharm_46") + private Float uharm46; + + /** + * 23次谐波电压限值 + */ + @TableField("uharm_47") + private Float uharm47; + + /** + * 24次谐波电压限值 + */ + @TableField("uharm_48") + private Float uharm48; + + /** + * 25次谐波电压限值 + */ + @TableField("uharm_49") + private Float uharm49; + + /** + * 50次谐波电压限值 + */ + @TableField("uharm_50") + private Float uharm50; + + + /** * 2次谐波电流限值 */ @@ -347,6 +511,158 @@ public class Overlimit { @TableField("iharm_25") private Float iharm25; + /** + * 2次谐波电压限值 + */ + @TableField("iharm_26") + private Float iharm26; + + /** + * 3次谐波电压限值 + */ + @TableField("iharm_27") + private Float iharm27; + + /** + * 4次谐波电压限值 + */ + @TableField("iharm_28") + private Float iharm28; + + /** + * 5次谐波电压限值 + */ + @TableField("iharm_29") + private Float iharm29; + + /** + * 6次谐波电压限值 + */ + @TableField("iharm_30") + private Float iharm30; + + /** + * 7次谐波电压限值 + */ + @TableField("iharm_31") + private Float iharm31; + + /** + * 8次谐波电压限值 + */ + @TableField("iharm_32") + private Float iharm32; + + /** + * 9次谐波电压限值 + */ + @TableField("iharm_33") + private Float iharm33; + + /** + * 10次谐波电压限值 + */ + @TableField("iharm_34") + private Float iharm34; + + /** + * 11次谐波电压限值 + */ + @TableField("iharm_35") + private Float iharm35; + + /** + * 12次谐波电压限值 + */ + @TableField("iharm_36") + private Float iharm36; + + /** + * 13次谐波电压限值 + */ + @TableField("iharm_37") + private Float iharm37; + + /** + * 14次谐波电压限值 + */ + @TableField("iharm_38") + private Float iharm38; + + /** + * 15次谐波电压限值 + */ + @TableField("iharm_39") + private Float iharm39; + + /** + * 16次谐波电压限值 + */ + @TableField("iharm_40") + private Float iharm40; + + /** + * 17次谐波电压限值 + */ + @TableField("iharm_41") + private Float iharm41; + + /** + * 18次谐波电压限值 + */ + @TableField("iharm_42") + private Float iharm42; + + /** + * 19次谐波电压限值 + */ + @TableField("iharm_43") + private Float iharm43; + + /** + * 20次谐波电压限值 + */ + @TableField("iharm_44") + private Float iharm44; + + /** + * 21次谐波电压限值 + */ + @TableField("iharm_45") + private Float iharm45; + + /** + * 22次谐波电压限值 + */ + @TableField("iharm_46") + private Float iharm46; + + /** + * 23次谐波电压限值 + */ + @TableField("iharm_47") + private Float iharm47; + + /** + * 24次谐波电压限值 + */ + @TableField("iharm_48") + private Float iharm48; + + /** + * 25次谐波电压限值 + */ + @TableField("iharm_49") + private Float iharm49; + + /** + * 50次谐波电压限值 + */ + @TableField("iharm_50") + private Float iharm50; + + + /** * 0.5次间谐波电压限值 */ diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java index f754790aa..c60c43b5f 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java @@ -342,13 +342,13 @@ public class COverlimit { //处理基准容量 public static float getStandShortCap(String voltageLevel){ - if(DicDataEnum.KV01.getCode().equalsIgnoreCase(voltageLevel)){ + if(DicDataEnum.V100.getCode().equalsIgnoreCase(voltageLevel)){ return 10; - } else if(DicDataEnum.KV038.getCode().equalsIgnoreCase(voltageLevel)){ + } else if(DicDataEnum.V380.getCode().equalsIgnoreCase(voltageLevel)){ return 10; - }else if(DicDataEnum.V380.getCode().equalsIgnoreCase(voltageLevel)){ + }else if(DicDataEnum.KV038.getCode().equalsIgnoreCase(voltageLevel)){ return 10; - }else if(DicDataEnum.V022.getCode().equalsIgnoreCase(voltageLevel)){ + }else if(DicDataEnum.V220.getCode().equalsIgnoreCase(voltageLevel)){ return 10; }else if(DicDataEnum.KV04.getCode().equalsIgnoreCase(voltageLevel)){ return 100; diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java new file mode 100644 index 000000000..c78058dfa --- /dev/null +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java @@ -0,0 +1,449 @@ +package com.njcn.device.biz.utils; + +import com.njcn.device.biz.pojo.po.Overlimit; +import com.njcn.system.enums.DicDataEnum; +import com.njcn.system.pojo.po.Dic; + +import java.math.BigDecimal; +import java.math.RoundingMode; + +/** + * pqs + * 限值计算工具类 + * + * @author cdf + * @date 2023/5/15 + */ +public class COverlimitUtil { + + + /** + * 谐波电流系数 + */ + private static final double[][] ARR = { + {78, 62, 39, 62, 26, 44, 19, 21, 16, 28, 13, 24, 11, 12, 9.7, 18, 8.6, 16, 7.8, 8.9, 7.1, 14, 6.5, 12, 6.0, 6.9, 5.6, 11, 5.2, 10, 4.9, 5.6, 4.6, 8.9, 4.3, 8.4, 4.1, 4.8, 3.9, 7.6, 3.7, 7.2, 3.5, 4.1, 3.4, 6.6, 3.3, 6.3, 3.1}, + {43, 34, 21, 34, 14, 24, 11, 11, 8.5, 16, 7.1, 13, 6.1, 6.8, 5.3, 10, 4.7, 9, 4.3, 4.9, 3.9, 7.4, 3.6, 6.8, 3.3, 3.8, 3.1, 5.9, 2.9, 5.5, 2.7, 3.1, 2.5, 4.9, 2.4, 4.6, 2.3, 2.6, 2.2, 4.1, 2.0, 4.0, 2.0, 2.3, 1.9, 3.6, 1.8, 3.5, 1.7}, + {26, 20, 13, 20, 8.5, 15, 6.4, 6.8, 5.1, 9.3, 4.3, 7.9, 3.7, 4.1, 3.2, 6, 2.8, 5.4, 2.6, 2.9, 2.3, 4.5, 2.1, 4.1, 2.0, 2.2, 1.9, 3.4, 1.7, 3.2, 1.6, 1.8, 1.5, 2.9, 1.4, 2.7, 1.4, 1.5, 1.3, 2.4, 1.2, 2.3, 1.2, 1.3, 1.1, 2.1, 1.1, 2.0, 1.0}, + {15, 12, 7.7, 12, 5.1, 8.8, 3.8, 4.1, 3.1, 5.6, 2.6, 4.7, 2.2, 2.5, 1.9, 3.6, 1.7, 3.2, 1.5, 1.8, 1.4, 2.7, 1.3, 2.5, 1.2, 1.3, 1.1, 2.1, 1.0, 1.9, 0.9, 1.1, 0.9, 1.7, 0.8, 1.6, 0.8, 0.9, 0.8, 1.5, 0.7, 1.4, 0.7, 0.8, 0.7, 1.3, 0.6, 1.2, 0.6}, + {16, 13, 8.1, 13, 5.4, 9.3, 4.1, 4.3, 3.3, 5.9, 2.7, 5, 2.3, 2.6, 2, 3.8, 1.8, 3.4, 1.6, 1.9, 1.5, 2.8, 1.4, 2.6, 1.2, 1.4, 1.1, 2.2, 1.1, 2.1, 1.0, 1.2, 0.9, 1.9, 0.9, 1.8, 0.8, 1.0, 0.8, 1.6, 0.8, 1.5, 0.7, 0.9, 0.7, 1.4, 0.7, 1.3, 0.6}, + {12, 9.6, 6, 9.6, 4, 6.8, 3, 3.2, 2.4, 4.3, 2, 3.7, 1.7, 1.9, 1.5, 2.8, 1.3, 2.5, 1.2, 1.4, 1.1, 2.1, 1, 1.9, 0.9, 1.1, 0.9, 1.7, 0.8, 1.5, 0.8, 0.9, 0.7, 1.4, 0.7, 1.3, 0.6, 0.7, 0.6, 1.2, 0.6, 1.1, 0.5, 0.6, 0.5, 1.0, 0.5, 1.0, 0.5} + }; + + + public static Overlimit globalAssemble(Float voltageLevel,Float protocolCapacity,Float devCapacity,Float shortCapacity) { + Overlimit overlimit = new Overlimit(); + voltageDeviation(overlimit,voltageLevel); + frequency(overlimit); + voltageFluctuation(overlimit,voltageLevel); + voltageFlicker(overlimit,voltageLevel); + totalHarmonicDistortion(overlimit,voltageLevel); + uHarm(overlimit,voltageLevel); + threeVoltageUnbalance(overlimit); + iHarm(overlimit,voltageLevel,protocolCapacity,devCapacity); + negativeSequenceCurrent(overlimit,voltageLevel,shortCapacity); + interharmonicCurrent(overlimit,voltageLevel); + return overlimit; + } + + + /** + * 电压限值 + * + */ + public static void voltageDeviation(Overlimit overlimit,Float voltageLevel) { + float voltageDev = 3.14159f,uvoltageDev = 3.14159f; + if(voltageLevel <= Float.parseFloat(DicDataEnum.V220.getCode())){ + voltageDev = 7.0f; + uvoltageDev=-10.0f; + }else if(voltageLevel>Float.parseFloat(DicDataEnum.V220.getCode())&&voltageLevel=Float.parseFloat(DicDataEnum.KV20.getCode())&&voltageLevel=Float.parseFloat(DicDataEnum.KV35.getCode())&&voltageLevel=Float.parseFloat(DicDataEnum.KV66.getCode())&&voltageLevel<=Float.parseFloat(DicDataEnum.KV110.getCode())){ + voltageDev = 7.0f; + uvoltageDev=-3.0f; + }else if(voltageLevel>Float.parseFloat(DicDataEnum.KV110.getCode())){ + voltageDev = 10.0f; + uvoltageDev=-10.0f; + } + overlimit.setVoltageDev(voltageDev); + overlimit.setUvoltageDev(uvoltageDev); + } + + + /** + * 频率偏差 + * 默认限值：±0.2Hz（即：-0.2 Hz≤限值≤0.2 Hz） + */ + public static void frequency(Overlimit overlimit) { + overlimit.setFreqDev(0.2f); + } + + + /** + * 电压波动 + * 对LV、MV：0≤限值≤3%；对HV：0≤限值≤2.5%。 + * LV、MV、HV的定义： + * 低压（LV） UN≤1kV + * 中压（MV） 1kV＜UN≤35kV + * 高压（HV） 35kV＜UN≤220kV + * 超高压（EHV），220kV＜UN，参照HV执行 + */ + public static void voltageFluctuation(Overlimit overlimit, Float voltageLevel) { + if (voltageLevel < Float.parseFloat(DicDataEnum.KV35.getCode())) { + overlimit.setVoltageFluctuation(3.0f); + } else { + overlimit.setVoltageFluctuation(2.5f); + } + } + + + + /** + * 电压闪变 + * ≤110kV 1 + * ＞110kV 0.8 + */ + public static void voltageFlicker(Overlimit overlimit, Float voltageLevel) { + if (voltageLevel <= Float.parseFloat(DicDataEnum.KV110.getCode())) { + overlimit.setFlicker(1.0f); + } else { + overlimit.setFlicker(0.8f); + } + } + + + /** + * 总谐波电压畸变率 + * + * + */ + public static void totalHarmonicDistortion(Overlimit overlimit, Float voltageLevel) { + float result = 3.14159f; + if (voltageLevel < Float.parseFloat(DicDataEnum.KV6.getCode())) { + result = 5.0f; + } else if(voltageLevel >= Float.parseFloat(DicDataEnum.KV6.getCode()) && voltageLevel <= Float.parseFloat(DicDataEnum.KV20.getCode())){ + result = 4.0f; + } else if(voltageLevel >= Float.parseFloat(DicDataEnum.KV35.getCode()) && voltageLevel <= Float.parseFloat(DicDataEnum.KV66.getCode())){ + result = 3.0f; + } else if(voltageLevel >= Float.parseFloat(DicDataEnum.KV110.getCode()) && voltageLevel <= Float.parseFloat(DicDataEnum.KV1000.getCode())){ + result = 2.0f; + } + overlimit.setUaberrance(result); + } + + + + /** + * 谐波电压含有率 + */ + public static void uHarm(Overlimit overlimit, Float voltageLevel) { + float resultOdd = 3.14159f,resultEven = 3.14159f; + if (voltageLevel < Float.parseFloat(DicDataEnum.KV6.getCode())) { + resultOdd = 4.0f; + resultEven = 2.0f; + } else if(voltageLevel >= Float.parseFloat(DicDataEnum.KV6.getCode()) && voltageLevel <= Float.parseFloat(DicDataEnum.KV20.getCode())){ + resultOdd = 3.2f; + resultEven = 1.6f; + } else if(voltageLevel >= Float.parseFloat(DicDataEnum.KV35.getCode()) && voltageLevel <= Float.parseFloat(DicDataEnum.KV66.getCode())){ + resultOdd = 2.4f; + resultEven = 1.2f; + } else if(voltageLevel >= Float.parseFloat(DicDataEnum.KV110.getCode()) && voltageLevel <= Float.parseFloat(DicDataEnum.KV1000.getCode())){ + resultOdd = 1.6f; + resultEven = 0.8f; + } + overlimit.setUharm2(resultEven); + overlimit.setUharm4(resultEven); + overlimit.setUharm6(resultEven); + overlimit.setUharm8(resultEven); + overlimit.setUharm10(resultEven); + overlimit.setUharm12(resultEven); + overlimit.setUharm14(resultEven); + overlimit.setUharm16(resultEven); + overlimit.setUharm18(resultEven); + overlimit.setUharm20(resultEven); + overlimit.setUharm22(resultEven); + overlimit.setUharm24(resultEven); + overlimit.setUharm26(resultEven); + overlimit.setUharm28(resultEven); + overlimit.setUharm30(resultEven); + overlimit.setUharm32(resultEven); + overlimit.setUharm34(resultEven); + overlimit.setUharm36(resultEven); + overlimit.setUharm38(resultEven); + overlimit.setUharm40(resultEven); + overlimit.setUharm42(resultEven); + overlimit.setUharm44(resultEven); + overlimit.setUharm46(resultEven); + overlimit.setUharm48(resultEven); + overlimit.setUharm50(resultEven); + + + + overlimit.setUharm3(resultOdd); + overlimit.setUharm5(resultOdd); + overlimit.setUharm7(resultOdd); + overlimit.setUharm9(resultOdd); + overlimit.setUharm11(resultOdd); + overlimit.setUharm13(resultOdd); + overlimit.setUharm15(resultOdd); + overlimit.setUharm17(resultOdd); + overlimit.setUharm19(resultOdd); + overlimit.setUharm21(resultOdd); + overlimit.setUharm23(resultOdd); + overlimit.setUharm25(resultOdd); + overlimit.setUharm27(resultOdd); + overlimit.setUharm29(resultOdd); + overlimit.setUharm31(resultOdd); + overlimit.setUharm33(resultOdd); + overlimit.setUharm35(resultOdd); + overlimit.setUharm37(resultOdd); + overlimit.setUharm39(resultOdd); + overlimit.setUharm41(resultOdd); + overlimit.setUharm43(resultOdd); + overlimit.setUharm45(resultOdd); + overlimit.setUharm47(resultOdd); + overlimit.setUharm49(resultOdd); + + } + + + /** + * 负序电压不平衡（三相电压不平衡度） + * + */ + public static void threeVoltageUnbalance(Overlimit overlimit) { + overlimit.setUbalance(2.0f); + overlimit.setShortUbalance(4.0f); + } + + + /*---------------------------------谐波电流限值start-----------------------------------*/ + + /** + * 谐波电流限值 + */ + public static void iHarm(Overlimit overlimit, Float voltageLevel,Float protocolCapacity,Float devCapacity) { + float calCap = getDlCapByVoltageLevel(voltageLevel); + //24谐波电流幅值 + Float[] iHarmTem = new Float[49]; + for (int i = 0; i <= 48; i++) { + float v = iHarmCalculate(i+2,voltageLevel,protocolCapacity,devCapacity,calCap); + iHarmTem[i] = v; + } + + + overlimit.setIharm2(iHarmTem[0]); + overlimit.setIharm4(iHarmTem[2]); + overlimit.setIharm6(iHarmTem[4]); + overlimit.setIharm8(iHarmTem[6]); + overlimit.setIharm10(iHarmTem[8]); + overlimit.setIharm12(iHarmTem[10]); + overlimit.setIharm14(iHarmTem[12]); + overlimit.setIharm16(iHarmTem[14]); + overlimit.setIharm18(iHarmTem[16]); + overlimit.setIharm20(iHarmTem[18]); + overlimit.setIharm22(iHarmTem[20]); + overlimit.setIharm24(iHarmTem[22]); + overlimit.setIharm26(iHarmTem[24]); + overlimit.setIharm28(iHarmTem[26]); + overlimit.setIharm30(iHarmTem[28]); + overlimit.setIharm32(iHarmTem[30]); + overlimit.setIharm34(iHarmTem[32]); + overlimit.setIharm36(iHarmTem[34]); + overlimit.setIharm38(iHarmTem[36]); + overlimit.setIharm40(iHarmTem[38]); + overlimit.setIharm42(iHarmTem[40]); + overlimit.setIharm44(iHarmTem[42]); + overlimit.setIharm46(iHarmTem[44]); + overlimit.setIharm48(iHarmTem[46]); + overlimit.setIharm50(iHarmTem[48]); + + + + overlimit.setIharm3(iHarmTem[1]); + overlimit.setIharm5(iHarmTem[3]); + overlimit.setIharm7(iHarmTem[5]); + overlimit.setIharm9(iHarmTem[7]); + overlimit.setIharm11(iHarmTem[9]); + overlimit.setIharm13(iHarmTem[11]); + overlimit.setIharm15(iHarmTem[13]); + overlimit.setIharm17(iHarmTem[15]); + overlimit.setIharm19(iHarmTem[17]); + overlimit.setIharm21(iHarmTem[19]); + overlimit.setIharm23(iHarmTem[21]); + overlimit.setIharm25(iHarmTem[23]); + overlimit.setIharm27(iHarmTem[25]); + overlimit.setIharm29(iHarmTem[27]); + overlimit.setIharm31(iHarmTem[29]); + overlimit.setIharm33(iHarmTem[31]); + overlimit.setIharm35(iHarmTem[33]); + overlimit.setIharm37(iHarmTem[35]); + overlimit.setIharm39(iHarmTem[37]); + overlimit.setIharm41(iHarmTem[39]); + overlimit.setIharm43(iHarmTem[41]); + overlimit.setIharm45(iHarmTem[43]); + overlimit.setIharm47(iHarmTem[45]); + overlimit.setIharm49(iHarmTem[47]); + + + + + + } + + private static float iHarmCalculate(int nHarm, Float voltageLevel,float protocolCapacity, float devCapacity,float calCap) { + double tag = calCap*getHarmTag(nHarm,voltageLevel); + Double limit = getHarmonicLimit(nHarm,tag,new BigDecimal(String.valueOf(devCapacity)).doubleValue(),new BigDecimal(String.valueOf(protocolCapacity)).doubleValue()); + BigDecimal bigDecimal = new BigDecimal(limit).setScale(4,RoundingMode.HALF_UP); + return bigDecimal.floatValue(); + } + + //电流谐波限值 + private static Double getHarmTag(Integer iCount, Float voltageLevel) { + int x, y; + if (voltageLevel < DicDataEnum.KV6.getValue()) { + x = 0; + } else if (voltageLevel>=DicDataEnum.KV6.getValue()&&voltageLevel=DicDataEnum.KV10.getValue()&& voltageLevel=DicDataEnum.KV35.getValue()&&voltageLevel=DicDataEnum.KV66.getValue()&&voltageLevel=DicDataEnum.KV06.getValue() && voltageLevel=DicDataEnum.KV20.getValue() && voltageLevel=DicDataEnum.KV35.getValue() && voltageLevel=DicDataEnum.KV66.getValue() && voltageLevel=DicDataEnum.KV110.getValue() && voltageLevel=DicDataEnum.KV220.getValue() && voltageLevel=DicDataEnum.KV330.getValue() && voltageLevel=DicDataEnum.KV500.getValue() && voltageLevel=DicDataEnum.KV750.getValue() && voltageLevel=DicDataEnum.KV6.getValue()&&voltageLevel=DicDataEnum.KV10.getValue()&&voltageLevel=DicDataEnum.KV20.getValue()&&voltageLevel=DicDataEnum.KV35.getValue()&&voltageLevel=DicDataEnum.KV66.getValue()&&voltageLevel=DicDataEnum.KV110.getValue()&&voltageLevel=DicDataEnum.KV220.getValue()&&voltageLevel=DicDataEnum.KV330.getValue()){ + value = 345.0f; + } + return value; + } +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java index 2c226f05d..e3da81920 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java @@ -10,7 +10,7 @@ import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam; import com.njcn.device.pms.pojo.param.PmsMonitorParam; import com.njcn.device.pms.pojo.po.Monitor; import com.njcn.device.pms.pojo.vo.MonitorVO; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java index 31634f564..6eda1b0fd 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java @@ -12,7 +12,7 @@ import com.njcn.device.pms.pojo.param.PmsMonitorParam; import com.njcn.device.pms.pojo.po.Monitor; import com.njcn.device.pms.pojo.vo.MonitorVO; import com.njcn.device.pms.utils.PmsDeviceEnumUtil; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/report/OverLimitInfo.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/report/OverLimitInfo.java index 21b73c54e..effa410aa 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/report/OverLimitInfo.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/report/OverLimitInfo.java @@ -1,7 +1,7 @@ package com.njcn.harmonic.pojo.po.report; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import lombok.Data; import java.io.Serializable; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java index dfeaa98d0..07cd4ef0b 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java @@ -9,7 +9,7 @@ import com.njcn.common.utils.PubUtils; import com.njcn.device.pms.api.MonitorClient; import com.njcn.device.pms.pojo.po.Monitor; import com.njcn.device.pq.api.LineFeignClient; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.pq.pojo.vo.LineDetailDataVO; import com.njcn.event.enums.EventResponseEnum; import com.njcn.harmonic.pojo.param.ReportQueryParam; @@ -36,7 +36,6 @@ import sun.misc.BASE64Encoder; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.text.SimpleDateFormat; -import java.time.LocalDateTime; import java.util.*; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmInHarmServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmInHarmServiceImpl.java index 041d52808..9ea7fbc14 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmInHarmServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmInHarmServiceImpl.java @@ -2,7 +2,7 @@ package com.njcn.harmonic.service.impl; import com.njcn.common.utils.PubUtils; import com.njcn.device.pq.api.LineFeignClient; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.harmonic.constant.Param; import com.njcn.harmonic.pojo.param.HarmInHarmParam; import com.njcn.harmonic.pojo.vo.HarmInHarmVO; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java index b896f4ce1..b862a3d63 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java @@ -6,7 +6,7 @@ import com.njcn.common.pojo.constant.BizParamConstant; import com.njcn.common.pojo.param.StatisticsBizBaseParam; import com.njcn.common.utils.PubUtils; import com.njcn.device.pq.api.LineFeignClient; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.pq.pojo.vo.LineDetailDataVO; import com.njcn.event.api.EventDetailFeignClient; import com.njcn.event.pojo.po.EventDetail; @@ -36,10 +36,8 @@ import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.text.DateFormat; import java.text.SimpleDateFormat; -import java.time.Instant; import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; /** diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicReportDServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicReportDServiceImpl.java index d0ff5c0f5..8f0e2f9f3 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicReportDServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpHarmonicReportDServiceImpl.java @@ -6,7 +6,7 @@ import com.njcn.device.pms.pojo.dto.PmsMonitorDTO; import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO; import com.njcn.device.pms.pojo.param.PmsMonitorParam; import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.harmonic.pojo.param.RMpHarmonicReportDParam; import com.njcn.harmonic.pojo.po.*; import com.njcn.harmonic.pojo.vo.RMpHarmonicReportDVO; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/PVOverviewServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/PVOverviewServiceImpl.java index a6e20cd45..b770a51ca 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/PVOverviewServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/PVOverviewServiceImpl.java @@ -6,7 +6,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.common.pojo.param.StatisticsBizBaseParam; -import com.njcn.device.biz.commApi.DeptLineGeneralClient; +import com.njcn.device.biz.commApi.CommTerminalGeneralClient; import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO; import com.njcn.device.biz.pojo.param.DeptGetLineParam; import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient; @@ -40,7 +40,7 @@ import java.util.stream.Collectors; public class PVOverviewServiceImpl implements PVOverviewService { private final PVOverviewMapper pvOverviewMapper; - private final DeptLineGeneralClient deptLineGeneralClient; + private final CommTerminalGeneralClient commTerminalGeneralClient; private final RStatPollutionSubstationDPOMapper pollutionSubstationDPOMapper; private final StatationStatClient statationStatClient; @@ -50,7 +50,7 @@ public class PVOverviewServiceImpl implements PVOverviewService { public List getPVSynthesisCount(StatisticsBizBaseParam param) { DeptGetLineParam deptGetLineParam=new DeptGetLineParam(); deptGetLineParam.setDeptId(param.getId()); - List data = deptLineGeneralClient.deptGetLineList(deptGetLineParam).getData(); + List data = commTerminalGeneralClient.deptGetLineList(deptGetLineParam).getData(); if(CollUtil.isNotEmpty(data)){ List monitorIds = data.stream().flatMap(dto -> dto.getLineIds().stream()).collect(Collectors.toList()); return pvOverviewMapper.selectPVSynthesisCount(param, monitorIds);