From 7b95d5cd6cb9cb6ce48c0d4667d5e3f2334012b3 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 26 十二月 2025 11:21:56 +0800
Subject: [PATCH] 功能优化

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java |   46 ++++++++++++++++++++++++++++++++--------------
 1 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 3cef32f..84e5359 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -1505,24 +1505,42 @@
     @Override
     public    YearDeviceDataVO yearFightingAdminDeviceData(){
         YearDeviceDataVO data = new YearDeviceDataVO();
-        FireStatisticRequest param = new FireStatisticRequest();
-        param.setIndexCode("api_fire_statistic");
-        BaseResponse<FireStatisticResponse> response = HKService.fireStatistic(param);
-        if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ) {
-            data.setProtectNum(Constants.formatIntegerNum(response.getData().getMaintenanceNum()));
-            data.setPlanProtectTotal(Constants.formatIntegerNum(response.getData().getDeviceTotalNum()));
+//        FireStatisticRequest param = new FireStatisticRequest();
+//        param.setIndexCode("api_fire_statistic");
+//        BaseResponse<FireStatisticResponse> response = HKService.fireStatistic(param);
+//        if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ) {
+//            data.setProtectNum(Constants.formatIntegerNum(response.getData().getMaintenanceNum()));
+//            data.setPlanProtectTotal(Constants.formatIntegerNum(response.getData().getDeviceTotalNum()));
+//        }
+//        param = new FireStatisticRequest();
+//        param.setIndexCode("api_fire_statistic_month");
+//        BaseResponse<FireStatisticResponse> response1 = HKService.fireStatisticMonth(param);
+//        if(response1 != null && StringUtils.equals(response1.getCode(), HKConstants.RESPONSE_SUCCEE)
+//                && response1.getData()!=null ) {
+//            data.setMonthAddNum(Constants.formatIntegerNum(response1.getData().getMaintenanceNumMonth()));
+//            data.setMonthTotalNum(Constants.formatIntegerNum(response1.getData().getDeviceTotalNum()));
+//        }
+
+        data.setProtectNum(Constants.ZERO);
+        data.setPlanProtectTotal(Constants.ZERO);
+        data.setMonthAddNum(Constants.ZERO);
+        data.setMonthTotalNum(Constants.ZERO);
+        BaseResponse<SensorStatusStatisticResponse> response = HKService.sensorStatusStatistic();
+        if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
+                && response.getData()!=null ) {
+            data.setProtectNum(Constants.formatIntegerNum(response.getData().getSensorMainNum()));
+            data.setPlanProtectTotal(Constants.formatIntegerNum(response.getData().getSensorNum()));
+            data.setMonthAddNum(Constants.formatIntegerNum(response.getData().getSensorMainMonthNum()));
+            data.setMonthTotalNum(Constants.formatIntegerNum(response.getData().getSensorNum()));
         }
-        param = new FireStatisticRequest();
-        param.setIndexCode("api_fire_statistic_month");
-        BaseResponse<FireStatisticResponse> response1 = HKService.fireStatisticMonth(param);
-        if(response1 != null && StringUtils.equals(response1.getCode(), HKConstants.RESPONSE_SUCCEE)
-                && response1.getData()!=null ) {
-            data.setMonthAddNum(Constants.formatIntegerNum(response1.getData().getMaintenanceNumMonth()));
-            data.setMonthTotalNum(Constants.formatIntegerNum(response1.getData().getDeviceTotalNum()));
-        }
+
         return data;
     }
 
+
+
+
+
     /**
      * 銆愭秷闃茬鎺с�戠湅鏉�-鍒嗙被鍜屾眹鎬荤殑鍚勭姸鎬佽澶囨暟閲�
      * @return

--
Gitblit v1.9.3