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/core/haikang/model/param/respose/SensorStatusStatisticResponse.java | 12 ++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 46 ++++++++++++++++-------
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 17 ++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 6 +++
5 files changed, 68 insertions(+), 14 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index ba8352e..7036551 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -430,6 +430,7 @@
String[] resourcesByParams= new String[]{"/api/irds/v2/resource/resourcesByParams","銆愭捣搴锋秷闃茬湅鏉裤�戞牴鎹潯浠舵煡璇㈢洰褰曚笅鏈夋潈闄愮殑璧勬簮鍒楄〃"};// 銆愭捣搴锋秷闃茬湅鏉裤�戞牴鎹潯浠舵煡璇㈢洰褰曚笅鏈夋潈闄愮殑璧勬簮鍒楄〃
String[] iccmSignoff= new String[]{"/api/iccm/v1/signoff","iccm璁垮绛剧"};// iccm璁垮绛剧
String[] wxAuthUrl= new String[]{"dps/web/wxAuth/loginV2?oaId=atwl&redirectUrl=","寰呭姙鑰冨嫟璺宠浆鍦板潃"};// 寰呭姙鑰冨嫟璺宠浆鍦板潃
+ String[] sensorStatusStatistic= new String[]{"/api/v1/sensorStatusStatistic","娑堥槻缁翠繚瀹氬埗-璁惧缁翠繚鎯呭喌"};//娑堥槻缁翠繚瀹氬埗-璁惧缁翠繚鎯呭喌
}
/**
* 闄勫綍A.55娑堥槻璁惧绫诲瀷
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index d305617..526bb04 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -874,6 +874,12 @@
public static String fireStatistic(String body) {
return startDoPostStringArtemis(HKConstants.InterfacePath.fireStatistic,body);
}
+
+
+ public static String sensorStatusStatistic(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.sensorStatusStatistic,body);
+ }
+
/**
* 娑堥槻缁翠繚姣忔湀鏂板缁熻
* @param body
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/SensorStatusStatisticResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/SensorStatusStatisticResponse.java
new file mode 100644
index 0000000..d1c83ae
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/SensorStatusStatisticResponse.java
@@ -0,0 +1,12 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class SensorStatusStatisticResponse {
+
+private Integer sensorNum ;// Number false 浼犳劅鍣ㄦ�绘暟
+ private Integer sensorMainNum ;// Number false 浼犳劅鍣ㄧ淮淇濇暟
+ private Integer sensorMainRate ;// Number false 浼犳劅鍣ㄧ淮淇濈巼
+ private Integer sensorMainMonthNum ;// Number false 浼犳劅鍣ㄦ湰鏈堟柊澧炵淮淇濇暟
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index 246722c..4bcd2eb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -1916,6 +1916,23 @@
}
return null;
}
+
+ public static BaseResponse<SensorStatusStatisticResponse> sensorStatusStatistic(){
+ log.info("銆愭秷闃茬淮淇濆畾鍒�-璁惧缁翠繚鎯呭喌銆�================寮�濮�====");
+ try {
+ String res = HKTools.sensorStatusStatistic(null);
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<SensorStatusStatisticResponse>>(){};
+ BaseResponse<SensorStatusStatisticResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍娑堥槻缁翠繚缁熻");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭秷闃茬淮淇濆畾鍒�-璁惧缁翠繚鎯呭喌銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+
+
/**
*鏈湀鏂板缁翠繚璁惧鏁�
* api_fire_statistic_month
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