From 88cd32dd1064c251f35c71c12bab323cc98a2d85 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Tue, 30 Jun 2026 15:57:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E9=A1=B9=E5=88=86=E6=9E=90=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=8C=E7=BB=BC=E5=90=88=E8=AF=84=E4=BC=B0=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/DataComAssServiceImpl.java | 21 +++++++++++++++++-- .../line/SpecialAnalysisServiceImpl.java | 3 ++- .../dataProcess/api/SpThroughFeignClient.java | 3 --- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataComAssServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataComAssServiceImpl.java index 5bd2119..5d18181 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataComAssServiceImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataComAssServiceImpl.java @@ -51,6 +51,12 @@ public class DataComAssServiceImpl implements IDataComAssService { @Resource private PqDataVerifyFeignClient pqDataVerifyFeignClient; + /** + * 查询配置 辽宁版本比较特殊，没有CP95值，采用平均值进行判断 + */ + @Value("${version.used:master}") + private String versionUsed; + @Override public void dataComAssHandler(CalculatedParam calculatedParam) { List list = new ArrayList<>(); @@ -138,7 +144,7 @@ public class DataComAssServiceImpl implements IDataComAssService { BigDecimal hundred = BigDecimal.valueOf(100); //************************************电压偏差******************************************** lineParam.setPhasicType(Arrays.asList("A", "B", "C")); - lineParam.setValueType(Arrays.asList("AVG")); + lineParam.setValueType(Collections.singletonList("AVG")); lineParam.setColumnName("vu_dev"); lineParam.setGe("10"); Integer vuDev1 = dataVFeignClient.getColumnNameCountRawData(lineParam).getData(); @@ -196,7 +202,13 @@ public class DataComAssServiceImpl implements IDataComAssService { } //************************************谐波畸变率******************************************** lineParam.setColumnName("v_thd"); - lineParam.setValueType(Arrays.asList("CP95")); + + if("liaoning".equals(versionUsed)){ + lineParam.setValueType(Collections.singletonList("AVG")); + }else { + lineParam.setValueType(Collections.singletonList("CP95")); + } + lineParam.setGe("6"); Integer vThd1 = dataVFeignClient.getColumnNameCountRawData(lineParam).getData(); @@ -226,6 +238,10 @@ public class DataComAssServiceImpl implements IDataComAssService { //************************************三相电压不平衡度******************************************** lineParam.setColumnName("v_unbalance"); + if("liaoning".equals(versionUsed)){ + lineParam.setValueType(Collections.singletonList("MAX")); + } + lineParam.setPhasicType(Collections.singletonList("T")); lineParam.setGe("4"); Integer vUnbalance1 = dataVFeignClient.getColumnNameCountRawData(lineParam).getData(); @@ -255,6 +271,7 @@ public class DataComAssServiceImpl implements IDataComAssService { //************************************电压波动（短时闪变）******************************************** lineParam.setColumnName("pst"); lineParam.setValueType(null); + lineParam.setPhasicType(Arrays.asList("A", "B", "C")); lineParam.setGe("0.8"); Integer plt1 = dataFlickerFeignClient.getColumnNameCountRawData(lineParam).getData(); diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/SpecialAnalysisServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/SpecialAnalysisServiceImpl.java index 7bb7e30..9255510 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/SpecialAnalysisServiceImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/SpecialAnalysisServiceImpl.java @@ -21,6 +21,7 @@ import com.njcn.device.biz.commApi.CommLineClient; import com.njcn.device.biz.pojo.dto.LineDTO; import com.njcn.device.pms.pojo.param.MonitorTerminalParam; import com.njcn.device.pq.api.LineFeignClient; +import com.njcn.device.pq.api.UserLedgerFeignClient; import com.njcn.device.pq.pojo.vo.LineDetailDataVO; import com.njcn.event.api.EventDetailFeignClient; import com.njcn.event.api.TransientFeignClient; @@ -84,7 +85,7 @@ public class SpecialAnalysisServiceImpl implements ISpecialAnalysisService { @Resource private CommLineClient commLineClient; @Resource - private UserLedgerOldFeignClient userLedgerFeignClient; + private UserLedgerFeignClient userLedgerFeignClient; @Resource private DataLimitRateDetailFeignClient dataLimitRateDetailFeignClient; diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/SpThroughFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/SpThroughFeignClient.java index d438d19..bcd44e3 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/SpThroughFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/SpThroughFeignClient.java @@ -2,10 +2,7 @@ package com.njcn.dataProcess.api; import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; -import com.njcn.dataProcess.api.fallback.RmpEventFeignClientFallbackFactory; import com.njcn.dataProcess.api.fallback.SpThroughFeignClientFallbackFactory; -import com.njcn.dataProcess.dto.RmpEventDetailDTO; -import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.pojo.dto.RActivePowerRangeDto; import com.njcn.dataProcess.pojo.dto.SpThroughDto; import org.springframework.cloud.openfeign.FeignClient;