From 9b007d4a0a387fe32cf3d165d09380918ebc66a0 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 31 Dec 2024 11:15:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E4=B8=8A=E6=9E=B6=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/device/mapper/DevInfoMapper.java |  4 ++++
 .../controller/LargeScreenController.java     |  7 +++++--
 .../largeScreen/entity/OrderData.java         |  9 +++++++++
 .../mapper/material/device/DevInfoMapper.xml  | 19 +++++++++++++++++++
 4 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java
index 22f897b..dd7c7f9 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java
@@ -197,5 +197,9 @@ public interface DevInfoMapper {
     Integer getDevNum();
 
     Integer getDevUpNum();
+
+    Integer getDevTypeNum();
+
+    Integer getDevQcWarningNum();
 }
 
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java
index a861d13..786b4dd 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java
@@ -69,15 +69,18 @@ public class LargeScreenController {
         return AjaxResult.success(orderData);
     }
 
-    @ApiOperation("装备上架")
+    @ApiOperation("装备上架统计")
     @GetMapping("/devCount")
     public AjaxResult devCount() {
-        //今日装备入驻数
         Integer devNum = devInfoMapper.getDevNum();
         Integer devUpNum = devInfoMapper.getDevUpNum();
+        Integer devTypeNum = devInfoMapper.getDevTypeNum();
+        Integer devQcWarningNum = devInfoMapper.getDevQcWarningNum();
         OrderData orderData = new OrderData();
         orderData.setDevNum(devNum);
         orderData.setDevUpNum(devUpNum);
+        orderData.setDevTypeNum(devTypeNum);
+        orderData.setDevQcWaningNum(devQcWarningNum);
         return AjaxResult.success(orderData);
     }
 }
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/OrderData.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/OrderData.java
index 3c3ca7a..a7056a7 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/OrderData.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/OrderData.java
@@ -41,4 +41,13 @@ public class OrderData {
 
     @ApiModelProperty(value = "装备总上架数")
     private Integer devUpNum;
+
+    @ApiModelProperty(value = "装备总类型数")
+    private Integer devTypeNum;
+
+    @ApiModelProperty(value = "装备总报警数")
+    private Integer devQcWaningNum;
+
+
+
 }
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
index f14969b..f6f700c 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
@@ -909,4 +909,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND ma_status = '2'
     </select>
 
+    <select id="getDevTypeNum" resultType="java.lang.Integer">
+        SELECT
+            count(distinct(type_id))
+        FROM
+            ma_dev_info
+        WHERE
+            is_active = '1'
+          AND ma_status != 0
+    </select>
+
+    <select id="getDevQcWarningNum" resultType="java.lang.Integer">
+        SELECT
+            COUNT(1)
+        FROM
+            bm_message
+        WHERE
+            message_type = '3'
+    </select>
+
 </mapper>