From 9e95130f43ac7bcd6772849825e43aec4928e1c9 Mon Sep 17 00:00:00 2001 From: wangxy <1481820854@qq.com> Date: Fri, 11 Oct 2024 10:35:16 +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 | 27 ++++++++++++++++--- .../domain/count/PropertyManagerDTO.java | 2 ++ .../mapper/TdPropertyManagerMapper.java | 2 ++ .../service/ITdPropertyManagerService.java | 3 +++ .../impl/TdPropertyManagerServiceImpl.java | 5 ++++ .../mapper/system/TdPropertyManagerMapper.xml | 8 ++++++ 6 files changed, 43 insertions(+), 4 deletions(-) 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 ab44938..38b7a2f 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 @@ -217,6 +217,7 @@ public class SysPropertynumController extends BaseController { } yAxis.set(Long.valueOf(count)); yAxisData.add(yAxis.get()); + AtomicReference 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 recentlySixMonth = ObtainLastSixMonthsUtil.getRecentlySixMonth(); List yAxisData = new ArrayList<>(); + List 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 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); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/count/PropertyManagerDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/count/PropertyManagerDTO.java index a681558..6de65d6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/count/PropertyManagerDTO.java +++ b/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; + } 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 1b3cee4..aff396f 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 @@ -69,4 +69,6 @@ public interface TdPropertyManagerMapper extends BaseMapper public Integer countMessageMonth(PropertyManagerDTO propertyManagerDTO); public Integer countSecretsMonth(PropertyManagerDTO propertyManagerDTO); + + public Integer countDestoryMonth(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 d37d9a2..cc47f2b 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 @@ -70,4 +70,7 @@ public interface ITdPropertyManagerService extends IService public Integer countSecretsMonth(PropertyManagerDTO propertyManagerDTO); + + + public Integer countDestoryMonth(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 0ad6f36..2d76f81 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 @@ -108,4 +108,9 @@ public class TdPropertyManagerServiceImpl extends ServiceImpl + + \ No newline at end of file