From cdf778f0b70090357156630b37066226261647e6 Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Tue, 11 Apr 2023 16:45:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=88=E7=AB=AF=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/pq/mapper/mapping/DeviceMapper.xml | 22 +++++++++++++------
 .../pq/service/impl/RunManageServiceImpl.java |  9 ++++++--
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml
index a37dc9b92..528b4b5a8 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml
@@ -197,13 +197,21 @@
             SUM(r.online_min) / (SUM(r.online_min)+SUM(r.offline_min)) AS onlineRate,
             r.dev_index AS devIndex
         FROM r_stat_onlinerate_d r
-        WHERE time_id BETWEEN #{begin} AND #{end}
-        <if test="list.size > 0">
-            AND r.dev_index IN
-            <foreach collection="list" item="item" separator="," open="(" close=")">
-                #{item}
-            </foreach>
-        </if>
+        <where>
+            <if test=" begin != null and begin !=''">
+                AND  time_id >= #{begin}
+            </if>
+            <if test="end != null and end != ''">
+                AND  time_id &lt;= #{end}
+            </if>
+            <if test="list.size > 0">
+                AND r.dev_index IN
+                <foreach collection="list" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
         GROUP BY r.dev_index
     </select>
 </mapper>
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java
index 5bd425928..dc09fe2a3 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java
@@ -3,6 +3,7 @@ package com.njcn.device.pq.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
@@ -91,8 +92,12 @@ public class RunManageServiceImpl implements RunManageService {
         if (!CollectionUtils.isEmpty(generalDeviceDTOList)) {
             List<String> devIndexes = generalDeviceDTOList.stream().flatMap(list->list.getDeviceIndexes().stream()).collect(Collectors.toList());
             DateFormat bf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            runManageParam.setSearchBeginTime(bf.format(DateUtil.beginOfDay(DateUtil.parse(runManageParam.getSearchBeginTime()))));
-            runManageParam.setSearchEndTime(bf.format(DateUtil.beginOfDay(DateUtil.parse(runManageParam.getSearchEndTime()))));
+
+            if(StrUtil.isNotBlank(runManageParam.getSearchBeginTime()) && StrUtil.isNotBlank(runManageParam.getSearchEndTime()) ){
+                runManageParam.setSearchBeginTime(bf.format(DateUtil.beginOfDay(DateUtil.parse(runManageParam.getSearchBeginTime()))));
+                runManageParam.setSearchEndTime(bf.format(DateUtil.beginOfDay(DateUtil.parse(runManageParam.getSearchEndTime()))));
+            }
+
             List<String> manuList = runManageParam.getManufacturer().stream().map(SimpleDTO::getId).collect(Collectors.toList());
             if(CollectionUtil.isNotEmpty(devIndexes)){
                 runManageDevList = deviceMapper.getRunManageDevList(devIndexes, runManageParam.getComFlag(), runManageParam.getRunFlag(),manuList,runManageParam.getSearchValue());