From c83b89c318a3c35b715e3ff3b94d27e169c277b6 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Mon, 25 Dec 2023 09:05:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AE=8C=E6=95=B4=E6=80=A7?=
 =?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

---
 .../controller/line/IntegrityController.java  | 22 ++++++++++---------
 .../mysql/Impl/line/IntegrityServiceImpl.java |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java
index 6eec84de5..3ebda0863 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java
@@ -1,11 +1,14 @@
 package com.njcn.prepare.harmonic.controller.line;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.NjcnDateUtils;
+import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
+import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
 import com.njcn.prepare.harmonic.pojo.param.LineParam;
 import com.njcn.prepare.harmonic.service.mysql.line.IntegrityService;
 import com.njcn.prepare.harmonic.utils.PublicUtil;
@@ -15,6 +18,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -40,6 +44,8 @@ public class IntegrityController extends BaseController {
 
     private final IntegrityService integrityService;
 
+    private final CommTerminalGeneralClient commTerminalGeneralClient;
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/dataIntegrity")
     @ApiOperation("数据完整性统计(MySQL库)")
@@ -47,18 +53,14 @@ public class IntegrityController extends BaseController {
     public HttpResult<String> dataIntegrity(@RequestBody @Validated LineParam lineParam){
         log.info(LocalDateTime.now()+"dataIntegrity开始执行");
         String methodDescribe = getMethodDescribe("dataIntegrity");
-        String startTime,endTime;
-        if (Objects.nonNull(lineParam.getRepairFlag()) && lineParam.getRepairFlag()){
-            List<String> timeRange = NjcnDateUtils.findEveryDay(lineParam.getBeginTime(),lineParam.getEndTime());
-            for (String item : timeRange) {
-                log.info(item+"-->开始执行");
-                startTime = item+" "+"00:00:00";
-                endTime = item+" "+"23:59:59";
-//                integrityService.dataIntegrity(lineParam,startTime,endTime);
-            }
+        CalculatedParam calculatedParam = new CalculatedParam();
+        calculatedParam.setDataDate(lineParam.getDataDate());
+        if (CollectionUtil.isNotEmpty(lineParam.getLineIds())){
+            calculatedParam.setIdList(lineParam.getLineIds());
         } else {
-//            integrityService.dataIntegrity(lineParam,lineParam.getBeginTime(),lineParam.getEndTime());
+            calculatedParam.setIdList(commTerminalGeneralClient.getRunMonitorIds().getData());
         }
+        integrityService.dataIntegrity(calculatedParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, CommonResponseEnum.SUCCESS.getMessage(), methodDescribe);
     }
 }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java
index 81dbb86e5..e11378c35 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java
@@ -135,7 +135,7 @@ public class IntegrityServiceImpl extends MppServiceImpl<RStatIntegrityDMapper,
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class,MeasurementCount.class);
         influxQueryWrapper.regular(DataV::getLineId, lineIndex)
                 .eq(DataV::getValueType, InfluxDbSqlConstant.MAX)
-                .eq(DataV::getPhasicType, InfluxDBTableConstant.PHASE_TYPE_T)
+                .eq(DataV::getPhasicType, InfluxDBTableConstant.PHASE_TYPE_A)
                 .count(DataV::getFreq)
                 .groupBy(DataV::getLineId)
                 .between(DataV::getTime, startTime, endTime);