From 03758082ab6735b6ec5a258259bfc82ae7658ddc Mon Sep 17 00:00:00 2001
From: zzc <1278921369@qq.com>
Date: Fri, 23 Aug 2024 01:25:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/show/EqShowEquipmentLogController.java  |  9 ++++++++-
 .../main/resources/mapper/device/EqEquipmentMapper.xml | 10 +++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/show/EqShowEquipmentLogController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/show/EqShowEquipmentLogController.java
index aea14391d..0af7270f8 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/show/EqShowEquipmentLogController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/show/EqShowEquipmentLogController.java
@@ -2,6 +2,7 @@ package org.dromara.web.controller.show;
 
 import lombok.RequiredArgsConstructor;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.web.domain.bo.EqEquipmentBo;
 import org.dromara.web.domain.vo.EqEquipmentStatisticsVo;
 import org.dromara.web.service.IEqEquipmentService;
 import org.springframework.web.bind.annotation.*;
@@ -14,6 +15,8 @@ import org.dromara.web.domain.bo.EqEquipmentLogBo;
 import org.dromara.web.service.IEqEquipmentLogService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
+import java.util.Map;
+
 /**
  * web端 统计分析
  *
@@ -45,7 +48,11 @@ public class EqShowEquipmentLogController extends BaseController {
      */
 //    @SaCheckPermission("device:showEquipmentLog:list")
     @GetMapping("/selectEquipmentStatistic")
-    public R<EqEquipmentStatisticsVo> selectEquipmentStatistic(Integer type, String startTime, String endTime) {
+    public R<EqEquipmentStatisticsVo> selectEquipmentStatistic(EqEquipmentBo bo) {
+        Map<String, Object> params = bo.getParams();
+        Integer type = bo.getType();
+        String startTime = params.get("beginCreateTime") == null?null:params.get("beginCreateTime").toString();
+        String endTime = params.get("endCreateTime") == null?null:params.get("endCreateTime").toString();
         return R.ok(eqEquipmentService.selectEquipmentStatistic(type,startTime,endTime));
     }
 
diff --git a/ruoyi-admin/src/main/resources/mapper/device/EqEquipmentMapper.xml b/ruoyi-admin/src/main/resources/mapper/device/EqEquipmentMapper.xml
index c350dcb01..a28102342 100644
--- a/ruoyi-admin/src/main/resources/mapper/device/EqEquipmentMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/device/EqEquipmentMapper.xml
@@ -50,10 +50,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectEquipmentStatistic" resultType="org.dromara.web.domain.vo.EqEquipmentStatisticsVo">
         SELECT
         COUNT(*) AS bind_num, -- 设备总数
-        SUM(CASE WHEN line_status = 0 THEN 1 ELSE 0 END) AS offline_num, -- 离线个数
-        SUM(CASE WHEN line_status = 1 THEN 1 ELSE 0 END) AS online_num, -- 在线个数
-        SUM(CASE WHEN fault_status > 0 THEN 1 ELSE 0 END) AS fault_num -- 故障个数
+        COALESCE(SUM(CASE WHEN line_status = 0 THEN 1 ELSE 0 END), 0) AS offline_num, -- 离线个数
+        COALESCE(SUM(CASE WHEN line_status = 1 THEN 1 ELSE 0 END), 0) AS online_num, -- 在线个数
+        COALESCE(SUM(CASE WHEN fault_status > 0 THEN 1 ELSE 0 END), 0) AS fault_num -- 故障个数
         FROM eq_equipment
+--         SUM(CASE WHEN line_status = 0 THEN 1 ELSE 0 END) AS offline_num, -- 离线个数
+--         SUM(CASE WHEN line_status = 1 THEN 1 ELSE 0 END) AS online_num, -- 在线个数
+--         SUM(CASE WHEN fault_status > 0 THEN 1 ELSE 0 END) AS fault_num -- 故障个数
+--         FROM eq_equipment
         <where>
             <if test="type != null and type != ''">
                 AND 'type' like