From ab3e95e996bc98354a10957694539753585ba71f Mon Sep 17 00:00:00 2001 From: wangxy <1481820854@qq.com> Date: Fri, 11 Oct 2024 10:08:19 +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 --- .../system/count/SysPropertynumController.java | 14 ++++++++++++++ 1 file changed, 14 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 d21d5d3..ab44938 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 @@ -196,6 +196,7 @@ public class SysPropertynumController extends BaseController { public AjaxResult countMessageMonth() { List recentlySixMonth = ObtainLastSixMonthsUtil.getRecentlySixMonth(); List yAxisData = new ArrayList<>(); + List 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); }