From 9d6a5875f6110eb6f717562ff0b24c370309140f Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Fri, 25 Apr 2025 15:30:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=BE=BE=E6=A2=A6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=85=A8=E6=99=AF=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/swagger/config/Knife4jSwaggerConfig.java   |  5 ++++-
 .../pq/controller/LineIntegrityDataController.java  | 13 +++++++++----
 .../mapper/mapping/RStatLimitTargetDMapper.xml      |  3 +--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java b/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java
index 1ff31cdd6..aa6dd1df1 100644
--- a/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java
+++ b/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java
@@ -78,7 +78,10 @@ public class Knife4jSwaggerConfig {
                 "com.njcn.cloud.controller",
                 "com.njcn.zlevent.controller",
                 "com.njcn.prepare",
-                "com.njcn.supervision.controller"
+                "com.njcn.supervision.controller",
+                "com.njcn.algorithm",
+                "com.njcn.dataProcess",
+                "com.njcn.migration"
                 )
                 .collect(Collectors.toList());
         List<GrantType> grantTypes = new ArrayList<>();
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineIntegrityDataController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineIntegrityDataController.java
index d6925f053..def286ee9 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineIntegrityDataController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineIntegrityDataController.java
@@ -1,6 +1,7 @@
 package com.njcn.device.pq.controller;
 
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -29,6 +30,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -85,10 +87,13 @@ public class LineIntegrityDataController extends BaseController {
     @ApiIgnore
     public HttpResult<List<RStatIntegrityD>> getIntegrityByLineIds(@RequestBody List<String> lineIds, @RequestParam("startTime")String startTime, @RequestParam("endTime")String endTime) {
         String methodDescribe = getMethodDescribe("getIntegrityByLineIds");
-        QueryWrapper<RStatIntegrityD> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("sum(real_time) as realTime,sum(due_time) as dueTime,sum(real_time)/sum(due_time) as integrityData","line_index").in("line_index",lineIds).between("time_id",startTime,endTime).groupBy("line_index");
-        List<RStatIntegrityD> rStatIntegrityDList = irStatIntegrityDService.list(queryWrapper);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatIntegrityDList, methodDescribe);
+        if(CollUtil.isNotEmpty(lineIds)){
+            QueryWrapper<RStatIntegrityD> queryWrapper = new QueryWrapper<>();
+            queryWrapper.select("sum(real_time) as realTime,sum(due_time) as dueTime,sum(real_time)/sum(due_time) as integrityData","line_index").in("line_index",lineIds).between("time_id",startTime,endTime).groupBy("line_index");
+            List<RStatIntegrityD> rStatIntegrityDList = irStatIntegrityDService.list(queryWrapper);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatIntegrityDList, methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, new ArrayList<>(), methodDescribe);
     }
 
 
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml
index fce807472..177cb6aff 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml
@@ -325,8 +325,7 @@
             </where>
             GROUP BY
                 my_index
-            HAVING
-            allCount >0) a
+           ) a where allCount>0
     </select>
 
     <select id="getSumTarget" resultType="com.njcn.harmonic.pojo.po.day.RStatLimitTargetDPO">