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

---
 .../material/device/mapper/DevInfoMapper.java    |  2 ++
 .../controller/LargeScreenController.java        |  3 +++
 .../material/largeScreen/entity/OrderData.java   |  5 +++++
 .../mapper/material/device/DevInfoMapper.xml     | 16 ++++++++++++++++
 4 files changed, 26 insertions(+)

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 addd2da..296d8db 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
@@ -198,6 +198,8 @@ public interface DevInfoMapper {
 
     Integer getDevUpNum();
 
+    List<DevInfo> getDevUpCountByType();
+
     Integer getDevLeasingNum();
 
     Integer getDevTypeNum();
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 e7b9872..66c5161 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
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @Author：liang.chao
@@ -75,11 +76,13 @@ public class LargeScreenController {
     public AjaxResult devCount() {
         Integer devNum = devInfoMapper.getDevNum();
         Integer devUpNum = devInfoMapper.getDevUpNum();
+        List<DevInfo> devInfos = devInfoMapper.getDevUpCountByType();
         Integer devTypeNum = devInfoMapper.getDevTypeNum();
         Integer devQcWarningNum = devInfoMapper.getDevQcWarningNum();
         OrderData orderData = new OrderData();
         orderData.setDevNum(devNum);
         orderData.setDevUpNum(devUpNum);
+        orderData.setDevInfos(devInfos);
         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 3903ac0..07dfc63 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
@@ -1,8 +1,10 @@
 package com.bonus.material.largeScreen.entity;
 
+import com.bonus.material.device.domain.DevInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @Author：liang.chao
@@ -67,4 +69,7 @@ public class OrderData {
 
     @ApiModelProperty(value = "最需装备")
     private String topPopularTypeName;
+
+    @ApiModelProperty(value = "装备统计列表")
+    private List<DevInfo> devInfos;
 }
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 e22c351..3b173bf 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,6 +909,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND ma_status = '2'
     </select>
 
+    <select id="getDevUpCountByType" resultType="com.bonus.material.device.domain.DevInfo">
+        select b.type_name as typeName, sum(count) as deviceCount from
+            (
+            select mt3.type_name, a.count from (
+            SELECT type_id, count(1) as count FROM ma_dev_info
+            where is_active='1' and ma_status='2'
+            group by type_id
+            order by count(type_id) desc
+            ) a
+            left join ma_type mt4 on mt4.type_id = a.type_id
+            left join ma_type mt3 on mt3.type_id = mt4.parent_id
+            ) b
+        group by type_name
+        order by sum(count) desc
+    </select>
+
     <select id="getDevLeasingNum" resultType="java.lang.Integer">
         SELECT
             COUNT(1)