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

算法调整

Browse Source
This commit is contained in:
chendaofei
2025-04-22 13:44:53 +08:00
parent c4a349b672
commit 9048f916c2
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/PollutionServiceImpl.java
View File

@@ -420,6 +420,7 @@ public class PollutionServiceImpl implements IPollutionService {
*/ */
private Map<String, DataPollutionD> getHarmonicVoltage(LineCountEvaluateParam lineCountEvaluateParam, Map<String, Overlimit> limitMap) { private Map<String, DataPollutionD> getHarmonicVoltage(LineCountEvaluateParam lineCountEvaluateParam, Map<String, Overlimit> limitMap) {
List<DataPollutionD> list = new ArrayList<>(); List<DataPollutionD> list = new ArrayList<>();
lineCountEvaluateParam.setColumnName("");
lineCountEvaluateParam.setValueType(Stream.of("CP95").collect(Collectors.toList())); lineCountEvaluateParam.setValueType(Stream.of("CP95").collect(Collectors.toList()));
lineCountEvaluateParam.setPhasicType(Stream.of("A", "B", "C").collect(Collectors.toList())); lineCountEvaluateParam.setPhasicType(Stream.of("A", "B", "C").collect(Collectors.toList()));
Map<String, DataPollutionD> threePhase = getThreePhaseData(lineCountEvaluateParam, limitMap); Map<String, DataPollutionD> threePhase = getThreePhaseData(lineCountEvaluateParam, limitMap);
@@ -520,6 +521,7 @@ public class PollutionServiceImpl implements IPollutionService {
*/ */
private Map<String, DataPollutionD> getHarmonicCurrent(LineCountEvaluateParam lineCountEvaluateParam, Map<String, Overlimit> limitMap) { private Map<String, DataPollutionD> getHarmonicCurrent(LineCountEvaluateParam lineCountEvaluateParam, Map<String, Overlimit> limitMap) {
Map<String, DataPollutionD> map = new HashMap(); Map<String, DataPollutionD> map = new HashMap();
lineCountEvaluateParam.setColumnName("");
lineCountEvaluateParam.setValueType(Stream.of("CP95").collect(Collectors.toList())); lineCountEvaluateParam.setValueType(Stream.of("CP95").collect(Collectors.toList()));
lineCountEvaluateParam.setPhasicType(Stream.of("A", "B", "C").collect(Collectors.toList())); lineCountEvaluateParam.setPhasicType(Stream.of("A", "B", "C").collect(Collectors.toList()));
List<DataIDto> list = dataIFeignClient.getDataI(lineCountEvaluateParam).getData(); List<DataIDto> list = dataIFeignClient.getDataI(lineCountEvaluateParam).getData();

6
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataVController.java
View File

@@ -157,9 +157,9 @@ public class DataVController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON) @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getDataV") @PostMapping("/getDataV")
@ApiOperation("获取原始数据") @ApiOperation("获取原始数据")
public HttpResult<List<DataVDto>> getDataV(LineCountEvaluateParam lineParam) { public HttpResult<List<DataVDto>> getDataV(@RequestBody LineCountEvaluateParam lineParam) {
String methodDescribe = getMethodDescribe("getMeasurementCount"); String methodDescribe = getMethodDescribe("getDataV");
List<DataVDto> dataV = dataVQuery.getDataV(lineParam); List<DataVDto> dataV = dataVInsert.getDataV(lineParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, dataV, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, dataV, methodDescribe);
} }