From 9048f916c27517a379180e3ae3f25b95dc8774ee Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Tue, 22 Apr 2025 13:44:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=97=E6=B3=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../algorithm/serviceimpl/line/PollutionServiceImpl.java    | 2 ++
 .../com/njcn/dataProcess/controller/DataVController.java    | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

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<String, DataPollutionD> getHarmonicVoltage(LineCountEvaluateParam lineCountEvaluateParam, Map<String, Overlimit> limitMap) {
         List<DataPollutionD> list = new ArrayList<>();
+        lineCountEvaluateParam.setColumnName("");
         lineCountEvaluateParam.setValueType(Stream.of("CP95").collect(Collectors.toList()));
         lineCountEvaluateParam.setPhasicType(Stream.of("A", "B", "C").collect(Collectors.toList()));
         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) {
         Map<String, DataPollutionD> map = new HashMap();
+        lineCountEvaluateParam.setColumnName("");
         lineCountEvaluateParam.setValueType(Stream.of("CP95").collect(Collectors.toList()));
         lineCountEvaluateParam.setPhasicType(Stream.of("A", "B", "C").collect(Collectors.toList()));
         List<DataIDto> 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<List<DataVDto>> getDataV(LineCountEvaluateParam lineParam) {
-        String methodDescribe = getMethodDescribe("getMeasurementCount");
-        List<DataVDto> dataV = dataVQuery.getDataV(lineParam);
+    public HttpResult<List<DataVDto>> getDataV(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getDataV");
+        List<DataVDto> dataV = dataVInsert.getDataV(lineParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, dataV, methodDescribe);
     }