From 79480409604b4a899f317fb8feaa0febf2a0153b Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Fri, 11 Oct 2024 11:14:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=BF=916=E4=B8=AA=E6=9C=88=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=B6=89=E5=AF=86=E7=BD=91=E7=BB=9C=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/SysPropertynumController.java       | 33 +++++++++++++++++++
 .../mapper/TdPropertyManagerMapper.java       |  5 +++
 .../service/ITdPropertyManagerService.java    |  4 +++
 .../impl/TdPropertyManagerServiceImpl.java    | 11 +++++++
 .../mapper/system/TdPropertyManagerMapper.xml | 18 ++++++++++
 5 files changed, 71 insertions(+)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java
index c74f50a..fa1c6bd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java
@@ -249,6 +249,8 @@ public class SysPropertynumController extends BaseController {
         List<String> recentlySixMonth = ObtainLastSixMonthsUtil.getRecentlySixMonth();
         List<Long> yAxisData = new ArrayList<>();
         List<Long> yAxisDataWx = new ArrayList<>();
+        List<Long> yAxisDataSb = new ArrayList<>();
+        List<Long> yAxisDataWxSb = new ArrayList<>();
         recentlySixMonth.forEach(month -> {
             // 获取指定月份的最大日期
             String lastDayOfMonth = ObtainLastSixMonthsUtil.getLastDayOfMonth(month);
@@ -282,6 +284,33 @@ public class SysPropertynumController extends BaseController {
             }
             yAxisWx.set(Long.valueOf(countWx));
             yAxisDataWx.add(yAxisWx.get());
+
+
+            AtomicReference<Long> yAxisSb = new AtomicReference<>(0L);
+            PropertyManagerDTO tdProperty = new PropertyManagerDTO();
+            tdProperty.setMinDayTime(minDayTime);
+            tdProperty.setMaxDayTime(maxDayTime);
+            tdProperty.setSecretsType("2");
+            tdProperty.setDestoryState("1");
+            Integer countSb = tdPropertyManagerService.countSecretsDestoryMonth(tdProperty);
+            if(Objects.isNull(countSb)){
+                countSb = 0;
+            }
+            yAxisSb.set(Long.valueOf(countSb));
+            yAxisDataSb.add(yAxisSb.get());
+
+            AtomicReference<Long> yAxisSbWx = new AtomicReference<>(0L);
+            PropertyManagerDTO tdPropertwx = new PropertyManagerDTO();
+            tdPropertwx.setMinDayTime(minDayTime);
+            tdPropertwx.setMaxDayTime(maxDayTime);
+            tdPropertwx.setSecretsType("1");
+            Integer countSbWx = tdPropertyManagerService.countSecretsWxMonth(tdPropertwx);
+            if(Objects.isNull(countSbWx)){
+                countSbWx = 0;
+            }
+            yAxisSbWx.set(Long.valueOf(countSbWx));
+            yAxisDataWxSb.add(yAxisSbWx.get());
+
         });
         JSONObject obj = new JSONObject();
         obj.put("xAxisData", recentlySixMonth.toArray());
@@ -289,6 +318,10 @@ public class SysPropertynumController extends BaseController {
         obj.put("yAxisData", yAxisData);
         //未销毁
         obj.put("yAxisDataWx", yAxisDataWx);
+        //设备销毁
+        obj.put("yAxisDataSb", yAxisDataSb);
+        //设备未销毁
+        obj.put("yAxisDataWxSb", yAxisDataWxSb);
         return AjaxResult.success(obj);
     }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdPropertyManagerMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdPropertyManagerMapper.java
index fdf8272..2a13a59 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdPropertyManagerMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdPropertyManagerMapper.java
@@ -73,4 +73,9 @@ public interface TdPropertyManagerMapper extends BaseMapper<TdPropertyManager>
     public Integer countDestoryMonth(PropertyManagerDTO propertyManagerDTO);
 
     public Integer countMessageWxMonth(PropertyManagerDTO propertyManagerDTO);
+
+    public Integer countSecretsDestoryMonth(PropertyManagerDTO propertyManagerDTO);
+
+    public Integer countSecretsWxMonth(PropertyManagerDTO propertyManagerDTO);
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdPropertyManagerService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdPropertyManagerService.java
index af82df3..42b276e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdPropertyManagerService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITdPropertyManagerService.java
@@ -76,4 +76,8 @@ public interface ITdPropertyManagerService extends IService<TdPropertyManager>
 
 
     public Integer countMessageWxMonth(PropertyManagerDTO propertyManagerDTO);
+
+    public Integer countSecretsDestoryMonth(PropertyManagerDTO propertyManagerDTO);
+
+    public Integer countSecretsWxMonth(PropertyManagerDTO propertyManagerDTO);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdPropertyManagerServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdPropertyManagerServiceImpl.java
index 9fddfe8..bb6b4be 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdPropertyManagerServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdPropertyManagerServiceImpl.java
@@ -118,4 +118,15 @@ public class TdPropertyManagerServiceImpl extends ServiceImpl<TdPropertyManagerM
     public Integer countMessageWxMonth(PropertyManagerDTO propertyManagerDTO) {
         return tdPropertyManagerMapper.countMessageWxMonth(propertyManagerDTO);
     }
+
+
+    @Override
+    public Integer countSecretsDestoryMonth(PropertyManagerDTO propertyManagerDTO) {
+        return tdPropertyManagerMapper.countSecretsDestoryMonth(propertyManagerDTO);
+    }
+
+    @Override
+    public Integer countSecretsWxMonth(PropertyManagerDTO propertyManagerDTO) {
+        return tdPropertyManagerMapper.countSecretsWxMonth(propertyManagerDTO);
+    }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdPropertyManagerMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdPropertyManagerMapper.xml
index a396115..59a49e0 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdPropertyManagerMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdPropertyManagerMapper.xml
@@ -141,4 +141,22 @@
              and d.destory_state is null
     </select>
 
+
+    <select id="countSecretsDestoryMonth" resultType="java.lang.Integer" parameterType="PropertyManagerDTO">
+        SELECT COUNT(t.*) from td_property_manager  t  RIGHT  JOIN  td_property_ement  d
+            on t.use_id = d.use_id  where t.secrets_type=#{secretsType}
+                                      AND d.destory_date &gt;= #{minDayTime}
+                                      AND d.destory_date &lt;= #{maxDayTime}
+                                      and d.destory_state =#{destoryState}
+    </select>
+
+    <select id="countSecretsWxMonth" resultType="java.lang.Integer" parameterType="PropertyManagerDTO">
+        SELECT COUNT(t.*) from td_property_manager  t  RIGHT  JOIN  td_property_ement  d
+            on t.use_id = d.use_id  where t.secrets_type=#{secretsType}
+                                      AND t.recover_date &gt;= #{minDayTime}
+                                      AND t.recover_date &lt;= #{maxDayTime}
+                                      and d.destory_state is null
+    </select>
+
+
 </mapper>
\ No newline at end of file