fix:近6个月统计涉密网络统计

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysPropertynumController.java

@@ -217,6 +217,7 @@ public class SysPropertynumController extends BaseController {
             }
             yAxis.set(Long.valueOf(count));
             yAxisData.add(yAxis.get());
+            AtomicReference<Long> yAxisSb = new AtomicReference<>(0L);
             PropertyManagerDTO tdPropertManager = new PropertyManagerDTO();
             tdPropertManager.setMinDayTime(minDayTime);
             tdPropertManager.setMaxDayTime(maxDayTime);
@@ -225,8 +226,8 @@ public class SysPropertynumController extends BaseController {
             if(Objects.isNull(countSecrets)){
                 countSecrets = 0;
             }
-            yAxis.set(Long.valueOf(countSecrets));
-            yAxisDataSb.add(yAxis.get());
+            yAxisSb.set(Long.valueOf(countSecrets));
+            yAxisDataSb.add(yAxisSb.get());
         });
         JSONObject obj = new JSONObject();
         obj.put("xAxisData", recentlySixMonth.toArray());
@@ -247,6 +248,7 @@ public class SysPropertynumController extends BaseController {
     public AjaxResult countSecretsMonth() {
         List<String> recentlySixMonth = ObtainLastSixMonthsUtil.getRecentlySixMonth();
         List<Long> yAxisData = new ArrayList<>();
+        List<Long> yAxisDataWx = new ArrayList<>();
         recentlySixMonth.forEach(month -> {
             // 获取指定月份的最大日期
             String lastDayOfMonth = ObtainLastSixMonthsUtil.getLastDayOfMonth(month);
@@ -260,17 +262,34 @@ public class SysPropertynumController extends BaseController {
             PropertyManagerDTO tdPropertyManager = new PropertyManagerDTO();
             tdPropertyManager.setMinDayTime(minDayTime);
             tdPropertyManager.setMaxDayTime(maxDayTime);
-            tdPropertyManager.setSecretsType("2");
-            Integer count = tdPropertyManagerService.countSecretsMonth(tdPropertyManager);
+            tdPropertyManager.setSecretsType("1");
+            tdPropertyManager.setDestoryState("1");
+            Integer count = tdPropertyManagerService.countDestoryMonth(tdPropertyManager);
             if(Objects.isNull(count)){
                 count = 0;
             }
             yAxis.set(Long.valueOf(count));
             yAxisData.add(yAxis.get());
+
+            AtomicReference<Long> yAxisWx = new AtomicReference<>(0L);
+            PropertyManagerDTO tdPropertManager = new PropertyManagerDTO();
+            tdPropertManager.setMinDayTime(minDayTime);
+            tdPropertManager.setMaxDayTime(maxDayTime);
+            tdPropertManager.setSecretsType("1");
+            tdPropertManager.setDestoryState(" ");
+            Integer countWx = tdPropertyManagerService.countDestoryMonth(tdPropertManager);
+            if(Objects.isNull(countWx)){
+                countWx = 0;
+            }
+            yAxisWx.set(Long.valueOf(countWx));
+            yAxisDataWx.add(yAxisWx.get());
         });
         JSONObject obj = new JSONObject();
         obj.put("xAxisData", recentlySixMonth.toArray());
+        //已销毁
         obj.put("yAxisData", yAxisData);
+        //未销毁
+        obj.put("yAxisDataWx", yAxisDataWx);
         return AjaxResult.success(obj);
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/count/PropertyManagerDTO.java

@@ -27,4 +27,6 @@ public class PropertyManagerDTO implements Serializable {
 
     private  String secretsType;
 
+    private  String destoryState;
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/TdPropertyManagerMapper.java

@@ -69,4 +69,6 @@ public interface TdPropertyManagerMapper extends BaseMapper<TdPropertyManager>
     public Integer countMessageMonth(PropertyManagerDTO propertyManagerDTO);
 
     public Integer countSecretsMonth(PropertyManagerDTO propertyManagerDTO);
+
+    public Integer countDestoryMonth(PropertyManagerDTO propertyManagerDTO);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ITdPropertyManagerService.java

@@ -70,4 +70,7 @@ public interface ITdPropertyManagerService extends IService<TdPropertyManager>
 
 
     public Integer countSecretsMonth(PropertyManagerDTO propertyManagerDTO);
+
+
+    public Integer countDestoryMonth(PropertyManagerDTO propertyManagerDTO);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdPropertyManagerServiceImpl.java

@@ -108,4 +108,9 @@ public class TdPropertyManagerServiceImpl extends ServiceImpl<TdPropertyManagerM
     public Integer countSecretsMonth(PropertyManagerDTO propertyManagerDTO) {
         return tdPropertyManagerMapper.countSecretsMonth(propertyManagerDTO);
     }
+
+    @Override
+    public Integer countDestoryMonth(PropertyManagerDTO propertyManagerDTO) {
+        return tdPropertyManagerMapper.countDestoryMonth(propertyManagerDTO);
+    }
 }

ruoyi-system/src/main/resources/mapper/system/TdPropertyManagerMapper.xml

@@ -127,4 +127,12 @@
           and d.destory_state is null
     </select>
 
+    <select id="countDestoryMonth" resultType="java.lang.Integer" parameterType="PropertyManagerDTO">
+        SELECT COUNT(t.*) from td_property_manager  t  RIGHT  JOIN  td_property_info  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>
+
 </mapper>