Middleware/cn-data-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

专项分析调整，综合评估调整

Browse Source
This commit is contained in:
chendaofei
2026-06-30 15:57:50 +08:00
parent c5c4f6e31b
commit 88cd32dd10
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataComAssServiceImpl.java
View File

@@ -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<DataComassesDPO> 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();

3
algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/SpecialAnalysisServiceImpl.java
View File

@@ -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;

3
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/SpThroughFeignClient.java
View File

@@ -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;