diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/PollutionServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/PollutionServiceImpl.java index ed88a93..2cd0526 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/PollutionServiceImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/PollutionServiceImpl.java @@ -420,6 +420,7 @@ public class PollutionServiceImpl implements IPollutionService { */ private Map getHarmonicVoltage(LineCountEvaluateParam lineCountEvaluateParam, Map limitMap) { List list = new ArrayList<>(); + lineCountEvaluateParam.setColumnName(""); lineCountEvaluateParam.setValueType(Stream.of("CP95").collect(Collectors.toList())); lineCountEvaluateParam.setPhasicType(Stream.of("A", "B", "C").collect(Collectors.toList())); Map threePhase = getThreePhaseData(lineCountEvaluateParam, limitMap); @@ -520,6 +521,7 @@ public class PollutionServiceImpl implements IPollutionService { */ private Map getHarmonicCurrent(LineCountEvaluateParam lineCountEvaluateParam, Map limitMap) { Map map = new HashMap(); + lineCountEvaluateParam.setColumnName(""); lineCountEvaluateParam.setValueType(Stream.of("CP95").collect(Collectors.toList())); lineCountEvaluateParam.setPhasicType(Stream.of("A", "B", "C").collect(Collectors.toList())); List list = dataIFeignClient.getDataI(lineCountEvaluateParam).getData(); diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataVController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataVController.java index ebd17fa..096bf39 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataVController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataVController.java @@ -157,9 +157,9 @@ public class DataVController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getDataV") @ApiOperation("获取原始数据") - public HttpResult> getDataV(LineCountEvaluateParam lineParam) { - String methodDescribe = getMethodDescribe("getMeasurementCount"); - List dataV = dataVQuery.getDataV(lineParam); + public HttpResult> getDataV(@RequestBody LineCountEvaluateParam lineParam) { + String methodDescribe = getMethodDescribe("getDataV"); + List dataV = dataVInsert.getDataV(lineParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, dataV, methodDescribe); }