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

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

@@ -196,6 +196,7 @@ public class SysPropertynumController extends BaseController {
     public AjaxResult countMessageMonth() {
         List<String> recentlySixMonth = ObtainLastSixMonthsUtil.getRecentlySixMonth();
         List<Long> yAxisData = new ArrayList<>();
+        List<Long> yAxisDataSb = new ArrayList<>();
         recentlySixMonth.forEach(month -> {
             // 获取指定月份的最大日期
             String lastDayOfMonth = ObtainLastSixMonthsUtil.getLastDayOfMonth(month);
@@ -216,10 +217,23 @@ public class SysPropertynumController extends BaseController {
             }
             yAxis.set(Long.valueOf(count));
             yAxisData.add(yAxis.get());
+            PropertyManagerDTO tdPropertManager = new PropertyManagerDTO();
+            tdPropertManager.setMinDayTime(minDayTime);
+            tdPropertManager.setMaxDayTime(maxDayTime);
+            tdPropertManager.setSecretsType("2");
+            Integer countSecrets = tdPropertyManagerService.countSecretsMonth(tdPropertManager);
+            if(Objects.isNull(countSecrets)){
+                countSecrets = 0;
+            }
+            yAxis.set(Long.valueOf(countSecrets));
+            yAxisDataSb.add(yAxis.get());
         });
         JSONObject obj = new JSONObject();
         obj.put("xAxisData", recentlySixMonth.toArray());
+        //涉密信息设备
         obj.put("yAxisData", yAxisData);
+        //涉密设备
+        obj.put("yAxisDataSb", yAxisDataSb);
         return AjaxResult.success(obj);
     }