From 59fb524d6b081f0faba177ffd13a0132d314dbae Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 19 十一月 2024 14:15:49 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/resources/application-dev.yml | 12
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWarnEvent.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java | 2
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FindHomeAlarmInfoPageResponse.java | 26 +++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FindHomeAlarmInfoPageRequest.java | 19 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 108 +++++++++++++
server/system_gateway/src/main/resources/application-dev.yml | 12
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireDevStatusTotalRequest.java | 18 ++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/MonitorDataValResponse.java | 13 +
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/MonitorDataSearchResponse.java | 16 ++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java | 2
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 7
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/MinitorDataSearchRequest.java | 17 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FindAlarmBaseDataStatisticRequest.java | 18 ++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FindAlarmBaseDataStatisticResponse.java | 12 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 67 +++++---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 48 ++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDevStatusListResponse.java | 15 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireStatisticResponse.java | 12 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireStatisticRequest.java | 8 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/SecureDevStatusTotalResponse.java | 2
28 files changed, 406 insertions(+), 49 deletions(-)
diff --git a/server/system_gateway/src/main/resources/application-dev.yml b/server/system_gateway/src/main/resources/application-dev.yml
index 413edec..e702b3b 100644
--- a/server/system_gateway/src/main/resources/application-dev.yml
+++ b/server/system_gateway/src/main/resources/application-dev.yml
@@ -1,12 +1,12 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
-# url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
-# username: doumee
-# password: rtjgfEr@&0c0m
- url: jdbc:mysql://10.50.250.253:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
- username: root
- password: Atwl@2024
+ url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ username: doumee
+ password: rtjgfEr@&0c0m
+# url: jdbc:mysql://10.50.250.253:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+# username: root
+# password: Atwl@2024
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
index f1d341b..a879505 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -1638,6 +1638,13 @@
return "";
}
}
+ public static String getFirstDayCurrentMonth() {
+ try {
+ return getDateLong(new Date()).substring(0, 7) + "-01";
+ } catch (Exception e) {
+ return "";
+ }
+ }
/**
* 灏唝yyyMM鍚勫紡杞崲鎴恲yyy骞碝M鏈堟牸寮�
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java
index 9530021..d33fcc9 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ChangNeiDiaoduController.java
@@ -35,7 +35,7 @@
* @create 2024/10/28 13:42
*/
-@Api(tags = "鍦哄唴璋冨害鐪嬫澘")
+@Api(tags = "銆愮湅鏉垮ぇ灞忋�戝満鍐呰皟搴︾湅鏉�")
@RestController
@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/onSitDispatch")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
index e103374..2e38c37 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/EnergyController.java
@@ -28,7 +28,7 @@
* @create 2024/10/28 13:42
*/
-@Api(tags = "鑳借�楃湅鏉�")
+@Api(tags = "銆愮湅鏉垮ぇ灞忋�戣兘鑰楃湅鏉�")
@RestController
@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/energy")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
index 7591eee..f580103 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/FightingAdminController.java
@@ -28,7 +28,7 @@
* @create 2024/10/28 13:42
*/
-@Api(tags = "娑堥槻绠℃帶澶у睆")
+@Api(tags = "銆愮湅鏉垮ぇ灞忋�戞秷闃茬鎺уぇ灞�")
@RestController
@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/fightingAdmin")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java
index 59cb126..131ee88 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunController.java
@@ -37,7 +37,7 @@
* @create 2024/10/28 13:42
*/
-@Api(tags = "鍥尯鐗╂祦杩愯璋冨害鐪嬫澘")
+@Api(tags = "銆愮湅鏉垮ぇ灞忋�戝洯鍖虹墿娴佽繍琛岃皟搴︾湅鏉�")
@RestController
@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/platformJobRun")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
index 64ebdac..0ecd418 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/SecurityController.java
@@ -35,7 +35,7 @@
* @create 2024/10/28 13:42
*/
-@Api(tags = "瀹夐槻绠℃帶澶у睆")
+@Api(tags = "銆愮湅鏉垮ぇ灞忋�戝畨闃茬鎺уぇ灞�")
@RestController
@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/security")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java
index 738f7cf..fa3115e 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java
@@ -27,7 +27,7 @@
* @create 2024/10/28 13:42
*/
-@Api(tags = "鍏ㄧ渷涓�搴撳埗绠＄悊鐪嬫澘")
+@Api(tags = "銆愮湅鏉垮ぇ灞忋�戝叏鐪佷竴搴撳埗绠＄悊鐪嬫澘")
@RestController
@Slf4j
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/board/api/wholeProvince")
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
index 2df12af..9dc10e9 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: pro
+ active: dev
application:
name: visitsAdmin
# 瀹夊叏閰嶇疆
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 dad2856..532b31e 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
@@ -156,6 +156,12 @@
String[] lastMonthFeeByMeterType= new String[]{"/api/board/v1/getLastMonthFeeByMeterType","鑳借�楃湅鏉�-4.鑾峰彇涓婃湀鐢ㄨ兘璐圭敤锛屼竴澶╁埛鏂帮紝鍑屾櫒鏌愪釜鐐瑰埛"};//鑳借�楃湅鏉�-4.鑾峰彇涓婃湀鐢ㄨ兘璐圭敤锛屼竴澶╁埛鏂帮紝鍑屾櫒鏌愪釜鐐瑰埛
String[] energyTodayLoadData= new String[]{"/api/v1/exhibition/energy/getTodayLoadData","鑳借�楃湅鏉�-5.鍥尯瀹炴椂璐熻嵎鏇茬嚎"};//鑳借�楃湅鏉�-5.鍥尯瀹炴椂璐熻嵎鏇茬嚎
String[] energyTrend= new String[]{"/api/v1/report/energyTrend","鑳借�楃湅鏉�-6鎸夋湀鏌ヨ杩�12涓湀鐨勭敤鐢垫�婚噺鏁版嵁"};//鑳借�楃湅鏉�-6鎸夋湀鏌ヨ杩�12涓湀鐨勭敤鐢垫�婚噺鏁版嵁
+ String[] fireStatistic= new String[]{"/api/v1/fireStatistic","娑堥槻缁翠繚缁熻"};//娑堥槻缁翠繚缁熻
+ String[] getFireDevStatusTotal= new String[]{"/api/dataBoardService/v2/getFireDevStatusTotal","娑堥槻鐪嬫澘-娑堥槻璁惧鍦ㄧ绾�1"};//娑堥槻鐪嬫澘-娑堥槻璁惧鍦ㄧ绾�1
+ String[] getFireDevStatusList= new String[]{"/api/dataBoardService/v2/getFireDevStatusList","娑堥槻鐪嬫澘-鍚勭被鍨嬭澶囧湪绾跨巼2"};//娑堥槻鐪嬫澘-鍚勭被鍨嬭澶囧湪绾跨巼2
+ String[] findAlarmBaseDataStatistic= new String[]{"/api/v1/alarm/findAlarmBaseDataStatistic","娑堥槻鐪嬫澘-4鎶ヨ淇℃伅缁熻"};//娑堥槻鐪嬫澘-4鎶ヨ淇℃伅缁熻
+ String[] findHomeAlarmInfoPage= new String[]{"/api/v1/alarm/findHomeAlarmInfoPage","瀹夐槻鐪嬫澘-- 鍒嗛〉鏌ヨ鏈鐞嗘姤璀︿俊鎭�6"};//瀹夐槻鐪嬫澘-- 鍒嗛〉鏌ヨ鏈鐞嗘姤璀︿俊鎭�6
+ String[] minitorDataSearch= new String[]{"/api/fem/v1/minitor/data/search","鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁"};//鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁
}
/**
* 闄勫綍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 b3c333a..349e5ff 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
@@ -783,6 +783,54 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.energyTrend,body);
}
/**
+ * 娑堥槻缁翠繚缁熻
+ * @param body
+ * @return
+ */
+ public static String fireStatistic(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.fireStatistic,body);
+ }
+ /**
+ * 娑堥槻鐪嬫澘-娑堥槻璁惧鍦ㄧ绾�1
+ * @param body
+ * @return
+ */
+ public static String getFireDevStatusTotal(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.getFireDevStatusTotal,body);
+ }
+ /**
+ * 娑堥槻鐪嬫澘-鍚勭被鍨嬭澶囧湪绾跨巼2
+ * @param body
+ * @return
+ */
+ public static String getFireDevStatusList(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.getFireDevStatusList,body);
+ }
+ /**
+ *娑堥槻鐪嬫澘-4鎶ヨ淇℃伅缁熻
+ * @param body
+ * @return
+ */
+ public static String findAlarmBaseDataStatistic(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.findAlarmBaseDataStatistic,body);
+ }
+ /**
+ *瀹夐槻鐪嬫澘-- 鍒嗛〉鏌ヨ鏈鐞嗘姤璀︿俊鎭�6
+ * @param body
+ * @return
+ */
+ public static String findHomeAlarmInfoPage(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.findHomeAlarmInfoPage,body);
+ }
+ /**
+ *鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁
+ * @param body
+ * @return
+ */
+ public static String minitorDataSearch(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.minitorDataSearch,body);
+ }
+ /**
* 缁熻鍥尯鎬讳綋鐨勫畨闃茶澶囨暟閲忥紝鍦ㄧ嚎鏁般�佸湪绾跨巼銆佺绾挎暟銆佺绾跨巼
* @param body
* @return
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java
index 3823fba..16e95c5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java
@@ -12,6 +12,9 @@
private int pageSize;// number False 姣忛〉璁板綍鎬绘暟
private int pageNo ;// number False 褰撳墠椤电爜
private int totalPage;// number False 鎬婚〉鏁�
+ private Boolean mergeSwitchBool ;//Boolean false 鍚堝苟寮�鍚姸鎬�
+ private int count;// Number false count
+ private Boolean lastPage;// Boolean false 鏄惁鏄渶鍚庝竴椤�
@JSONField(name="list",alternateNames = {"rows","list"})
private List<T> list ;// object[] False 鏉冮檺缁勫璞″垪琛�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FindAlarmBaseDataStatisticRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FindAlarmBaseDataStatisticRequest.java
new file mode 100644
index 0000000..b81b7eb
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FindAlarmBaseDataStatisticRequest.java
@@ -0,0 +1,18 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class FindAlarmBaseDataStatisticRequest {
+ /**
+ *
+ {
+ "alarmStartTime" : "2024-01-01 00:00:00",
+ "alarmEndTime" : "2024-12-01 00:00:00",
+ "userId" : "admin"
+ }
+ */
+ private String alarmStartTime;// String true 寮�濮嬫椂闂�
+ private String alarmEndTime ;// String true 缁撴潫鏃堕棿
+ private String userId;// String true admin
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FindHomeAlarmInfoPageRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FindHomeAlarmInfoPageRequest.java
new file mode 100644
index 0000000..636a6ee
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FindHomeAlarmInfoPageRequest.java
@@ -0,0 +1,19 @@
+package com.doumee.core.haikang.model.param.request;
+
+import com.doumee.core.haikang.model.param.BaseListPageRequest;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FindHomeAlarmInfoPageRequest extends BaseListPageRequest {
+ private String regionIndexCodes ;//String true 鎵�灞炲尯鍩熼泦鍚�
+private String searchContent ;//String false 鎼滅储鍐呭
+private String alarmLevel ;//Number false 鎶ヨ绛夌骇
+private String alarmType ;//String false 鎶ヨ绫诲瀷(杩斿洖鍊煎弬鐓ф姤璀︾被鍨嬫帴鍙�)
+private String userId;// String true 鐢ㄦ埛
+private String handleStatusList;// String false 鎶ヨ澶勭悊鐘舵�侊紝1宸叉牳瀹烇紝2鏈牳瀹烇紝3鏍稿疄涓�
+private Integer hour;// Number false 鏃堕棿闂撮殧锛屽崟浣嶅皬鏃�
+private String alarmStartTime;// String true 鎶ヨ寮�濮嬫椂闂� 鏃堕棿鏍煎紡yyyy-MM-dd HH:mm:ss
+private String alarmEndTime ;//String true 鎶ヨ缁撴潫鏃堕棿 鏃堕棿鏍煎紡yyyy-MM-dd HH:mm:ss
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireDevStatusTotalRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireDevStatusTotalRequest.java
new file mode 100644
index 0000000..b73f15c
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireDevStatusTotalRequest.java
@@ -0,0 +1,18 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class FireDevStatusTotalRequest {
+ /**
+ *
+ {
+ "regionIds": [
+ "root000000"
+ ],
+ "includeBool":1
+ }
+ */
+ private String[] regionIds;// Array true 鍖哄煙缂栧彿
+ private Integer includeBool;// Number false 鏄惁鍖呭惈涓嬬骇瀛愯妭鐐�,0-涓嶅寘鍚�,1-鍖呭惈
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireStatisticRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireStatisticRequest.java
new file mode 100644
index 0000000..cbf541e
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireStatisticRequest.java
@@ -0,0 +1,8 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class FireStatisticRequest {
+ private String indexCode;// String false 鍥哄畾鍊硷細api_fire_statistic
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/MinitorDataSearchRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/MinitorDataSearchRequest.java
new file mode 100644
index 0000000..8b865bb
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/MinitorDataSearchRequest.java
@@ -0,0 +1,17 @@
+package com.doumee.core.haikang.model.param.request;
+
+import com.doumee.core.haikang.model.param.BaseListPageRequest;
+import lombok.Data;
+
+@Data
+public class MinitorDataSearchRequest extends BaseListPageRequest {
+private String regionIndexCode;// String true 鎵�灞炲尯鍩焛ndexCode锛屾牴鎹甗鏌ヨ鍖哄煙鍒楄〃v2]@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-API鍒楄〃-璧勬簮鐩綍-鍖哄煙淇℃伅鎺ュ彛#鏌ヨ鍖哄煙鍒楄〃v2]鎺ュ彛鑾峰彇杩斿洖鎶ユ枃涓殑indexCode瀛楁
+private String includeDown;// Number true 鏄惁鍖呭惈涓嬬骇 (1-鍖呭惈,0-
+ /**
+ * // 绫诲瀷鎴栦紶鎰熷櫒绫诲瀷锛屽弬鑰僛闄勫綍A.55 娑堥槻璁惧绫诲瀷]@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.55 娑堥槻璁惧绫诲瀷]锛�
+ * 鍙傝�僛闄勫綍A.57 娑堥槻浼犳劅鍣ㄥぇ绫诲瀷]@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.57 娑堥槻浼犳劅鍣ㄥぇ绫诲瀷]
+ * 璁惧绫诲瀷鎴栦紶鎰熷櫒绫诲瀷锛屽弬鑰僛闄勫綍A.55 娑堥槻璁惧绫诲瀷]@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-闄勫綍-
+ * 鏁版嵁瀛楀吀#闄勫綍A.55 娑堥槻璁惧绫诲瀷]锛屽弬鑰僛闄勫綍A.57 娑堥槻浼犳劅鍣ㄥぇ绫诲瀷]@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.57 娑堥槻浼犳劅鍣ㄥぇ绫诲瀷]
+ */
+ private String[] resourceTypeCodes;// Array false 璁惧
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FindAlarmBaseDataStatisticResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FindAlarmBaseDataStatisticResponse.java
new file mode 100644
index 0000000..4733d75
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FindAlarmBaseDataStatisticResponse.java
@@ -0,0 +1,12 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class FindAlarmBaseDataStatisticResponse {
+private Integer totalAlarmNum ;//Number false 鎬绘姤璀︽暟
+private Integer handledAlarmNum ;//Number false 宸插鐞嗘姤璀︽暟
+private Integer unHandedAlarmNum ;//Number false 鏈鐞嗘姤璀�
+private Integer misReportAlarmNum ;// Number false 璇姤鏁�
+private Integer averageHandleTime ;// Number false 骞冲潎澶勭悊鏃堕棿
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FindHomeAlarmInfoPageResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FindHomeAlarmInfoPageResponse.java
new file mode 100644
index 0000000..91fcea8
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FindHomeAlarmInfoPageResponse.java
@@ -0,0 +1,26 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class FindHomeAlarmInfoPageResponse {
+ private String id ;//String false 鎶ヨid
+ private Integer alarmType;// Number false 鎶ヨ绫诲瀷
+ private String alarmName;// String false 鎶ヨ婧愬悕绉�
+ private String regionIndexCode;// String false 鍖哄煙缂栫爜
+ private String regionName;// String false 鍖哄煙鍚嶇О
+ private String location;// String false 鎶ヨ婧愯缁嗗湴鍧�
+ private String alarmTime;// String false 鎶ヨ鏃堕棿 鏃堕棿鏍煎紡yyyy-MM-dd HH:mm:ss
+ private Integer alarmLevel;// Number false 鎶ヨ绛夌骇
+ private String resourceId;// String false 鎶ヨ婧愭墍灞炶祫婧恑d
+ private String resourceName;// String false 鎶ヨ婧愯祫婧愬悕绉�
+ private String userName;// String false 褰撳墠澶勭悊浜�
+ private String parentResourceName;// String false 鎶ヨ婧愭墍灞炶澶囧悕绉�
+ private String resourceCode ;//String false 鎶ヨ婧愯祫婧愮紪鍙�
+ private Integer ownSystem ;//Number false 鎵�灞炵郴缁�
+ private Integer handleStatus;// Number false 鎶ヨ鐘舵��
+ private String alarmTypeName ;//String false 鎶ヨ绫诲瀷鍚嶇О
+ private String ownSystemName;// String false 鎵�灞炵郴缁熷悕绉�
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDevStatusListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDevStatusListResponse.java
new file mode 100644
index 0000000..6e4496a
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDevStatusListResponse.java
@@ -0,0 +1,15 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class FireDevStatusListResponse {
+private Integer totalFireDevCount ;//Number false 娑堥槻璁惧鎬绘暟閲�
+private Integer alarmFireDevCount ;//Number false 鍙戠敓鎶ヨ鐨勬秷闃茶澶囨暟閲�
+private Integer faultFireDevCount ;//Number false 鍙戠敓鏁呴殰鐨勬秷闃茶澶囨暟閲�
+private Integer onlineFireDevCount ;//Number false 鍦ㄧ嚎娑堥槻璁惧鏁伴噺
+private Integer offlineFireDevCount ;//Number false 绂荤嚎娑堥槻璁惧鏁伴噺
+private String rate ;//String false rate
+private String devType ;//String false 璁惧绫诲瀷
+private String devTypeName;// String false 璁惧绫诲瀷鍚嶇О
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireStatisticResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireStatisticResponse.java
new file mode 100644
index 0000000..d0dde64
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireStatisticResponse.java
@@ -0,0 +1,12 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FireStatisticResponse {
+
+private Integer maintenanceNum ;// Number false 宸茬淮淇濈殑娑堥槻璁惧鏁�
+ private Integer deviceTotalNum ;// Number false 娑堥槻璁惧鎬绘暟
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/MonitorDataSearchResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/MonitorDataSearchResponse.java
new file mode 100644
index 0000000..a239722
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/MonitorDataSearchResponse.java
@@ -0,0 +1,16 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MonitorDataSearchResponse {
+private String indexCode ;//String false 閫氱敤璧勬簮缂栫爜
+private String resourceIndexCode ;//String false 璁惧鎴栬�呬紶鎰熷櫒鐪熷疄缂栧彿
+private String name ;// String false 璁惧鎴栬�呬紶鎰熷櫒鍚嶇О
+private Integer resourceType ;//Number false 璧勬簮绫诲瀷锛�1浠ｈ〃浼犳劅鍣紝2浠ｈ〃璁惧
+private Integer type ;//Number false 浼犳劅鍣ㄦ垨鑰呰澶囧叿浣撶被鍨嬶紝鍙傝�僛闄勫綍A.55 娑堥槻璁惧绫诲瀷]@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.55 娑堥槻璁惧绫诲瀷]锛屽弬鑰僛闄勫綍A.57 娑堥槻浼犳劅鍣ㄥぇ绫诲瀷]@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.57 娑堥槻浼犳劅鍣ㄥぇ绫诲瀷]
+ private String updateTime ;// String false 鏇存柊鏃堕棿锛孖SO8601鏍煎紡
+ private List<MonitorDataValResponse> values ;//Array false 鐩戞祴鏁版嵁闆�
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/MonitorDataValResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/MonitorDataValResponse.java
new file mode 100644
index 0000000..e4ac458
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/MonitorDataValResponse.java
@@ -0,0 +1,13 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class MonitorDataValResponse {
+private String monitorTypeCode ;//String false 鐩戞祴绫诲瀷锛屽弬鑰僛闄勫綍A.70 娑堥槻鐩戞祴绫诲瀷]@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.70 娑堥槻鐩戞祴绫诲瀷]涓被鍨嬪ぇ绫�
+private String monitorTypeName ;//String false 鐩戞祴鍚嶇О
+private String monitorValue;// String false 鐩戞祴鍊�
+private String monitorChannelId ;//String false 鐩戞祴鍊兼墍灞為�氶亾Id
+private String monitorSpecificName;// String false 鐩戞祴灏忕被鍚嶇О
+private String monitorTypeKey;// String false 鐩戞祴灏忕被key锛岋紝鍙傝�僛闄勫綍A.70 娑堥槻鐩戞祴绫诲瀷]@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.70 娑堥槻鐩戞祴绫诲瀷]涓被鍨嬪皬绫籯ey
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/SecureDevStatusTotalResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/SecureDevStatusTotalResponse.java
index 8202ccd..73fe2ef 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/SecureDevStatusTotalResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/SecureDevStatusTotalResponse.java
@@ -4,7 +4,7 @@
@Data
public class SecureDevStatusTotalResponse {
- private String name ;//String false 鍦ㄧ嚎/绂荤嚎
+ private String name ;//String false 鍚嶇О
private String value ;// String false 鏁伴噺
private String valueColor ;// String 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 351ff86..6bc3a8d 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
@@ -1542,6 +1542,42 @@
return null;
}
/**
+ *瀹夐槻鐪嬫澘-- 鍒嗛〉鏌ヨ鏈鐞嗘姤璀︿俊鎭�6
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<FindHomeAlarmInfoPageResponse>> findHomeAlarmInfoPage(FindHomeAlarmInfoPageRequest param){
+ log.info("銆愭捣搴峰畨闃茬湅鏉�-- 鍒嗛〉鏌ヨ鏈鐞嗘姤璀︿俊鎭�6銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.findHomeAlarmInfoPage(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<FindHomeAlarmInfoPageResponse>> >(){};
+ BaseResponse<BaseListPageResponse<FindHomeAlarmInfoPageResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍瀹夐槻鐪嬫澘-- 鍒嗛〉鏌ヨ鏈鐞嗘姤璀︿俊鎭�6");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰畨闃茬湅鏉�-- 鍒嗛〉鏌ヨ鏈鐞嗘姤璀︿俊鎭�6銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<MonitorDataSearchResponse>> minitorDataSearch(MinitorDataSearchRequest param){
+ log.info("銆愭捣搴峰垎椤垫煡璇㈣澶囩洃娴嬪巻鍙叉暟鎹��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.minitorDataSearch(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<MonitorDataSearchResponse>> >(){};
+ BaseResponse<BaseListPageResponse<MonitorDataSearchResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰垎椤垫煡璇㈣澶囩洃娴嬪巻鍙叉暟鎹��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
*缁熻缁熷畨闃茬湅鏉�--鍥尯瀹炴椂杞︽暟閲�4
* @return
*/
@@ -1713,6 +1749,78 @@
return null;
}
/**
+ *娑堥槻缁翠繚缁熻
+ * @return
+ */
+ public static BaseResponse<FireStatisticResponse> fireStatistic(FireStatisticRequest param){
+ log.info("銆愭捣搴锋秷闃茬淮淇濈粺璁°��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.fireStatistic(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<FireStatisticResponse>>(){};
+ BaseResponse<FireStatisticResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍娑堥槻缁翠繚缁熻");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋秷闃茬淮淇濈粺璁°��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *娑堥槻鐪嬫澘-娑堥槻璁惧鍦ㄧ绾�1
+ * @return
+ */
+ public static BaseResponse<List<SecureDevStatusTotalResponse> > getFireDevStatusTotal(FireDevStatusTotalRequest param){
+ log.info("銆愭捣搴锋秷闃茬湅鏉�-娑堥槻璁惧鍦ㄧ绾�1銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.getFireDevStatusTotal(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<List<SecureDevStatusTotalResponse> >>(){};
+ BaseResponse<List<SecureDevStatusTotalResponse> > result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍娑堥槻鐪嬫澘-娑堥槻璁惧鍦ㄧ绾�1");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋秷闃茬湅鏉�-娑堥槻璁惧鍦ㄧ绾�1銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *娑堥槻鐪嬫澘-鍚勭被鍨嬭澶囧湪绾跨巼2
+ * @return
+ */
+ public static BaseResponse<List<FireDevStatusListResponse> > getFireDevStatusList(FireDevStatusTotalRequest param){
+ log.info("銆愭捣搴锋秷闃茬湅鏉�-鍚勭被鍨嬭澶囧湪绾跨巼2銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.getFireDevStatusList(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<List<FireDevStatusListResponse> >>(){};
+ BaseResponse<List<FireDevStatusListResponse> > result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍娑堥槻鐪嬫澘-鍚勭被鍨嬭澶囧湪绾跨巼2");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋秷闃茬湅鏉�-鍚勭被鍨嬭澶囧湪绾跨巼2銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *娑堥槻鐪嬫澘-4鎶ヨ淇℃伅缁熻
+ * @return
+ */
+ public static BaseResponse<FindAlarmBaseDataStatisticResponse> findAlarmBaseDataStatistic(FindAlarmBaseDataStatisticRequest param){
+ log.info("銆愭捣搴锋秷闃茬湅鏉�-4鎶ヨ淇℃伅缁熻銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.findAlarmBaseDataStatistic(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<FindAlarmBaseDataStatisticResponse >>(){};
+ BaseResponse<FindAlarmBaseDataStatisticResponse > result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍娑堥槻鐪嬫澘-4鎶ヨ淇℃伅缁熻");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋秷闃茬湅鏉�-4鎶ヨ淇℃伅缁熻銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
*鏍规嵁鐢ㄦ埛鏍囪瘑鑾峰彇瀹㈡埛绔疶GC鎺ュ彛
* @return
*/
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWarnEvent.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWarnEvent.java
index 37132e4..8b0086d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWarnEvent.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWarnEvent.java
@@ -29,7 +29,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -38,7 +37,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
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 05fef7f..dcabfe6 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
@@ -464,10 +464,12 @@
data.setGasQuantity(getDefaultData());//涓婃湀鐢ㄦ皵
data.setMonthElectricity(getDefaultData());//鏈湀鐢ㄧ數
data.setYesterdayElectricity(getDefaultData());//鏄ㄦ棩鐢ㄧ數
- getMonthElectricityData(data.getMonthElectricity());//閫氳繃瀹夐槻骞宠幏鍙栨湰鏈堟暟鎹�
+ getMonthElectricityData(data.getMonthElectricity());//閫氳繃瀹夐槻骞宠幏鍙栨湰鏈堢敤鐢甸噺鏁版嵁
carbonElec = new BigDecimal(StringUtils.defaultString(data.getMonthElectricity().getTotal(), "0"));
- getLastMonthElectricityData(data.getElectricityQuantity());//閫氳繃瀹夐槻骞宠幏鍙栦笂鏈堟暟鎹�
- String firstDate = DateUtil.getFirstDayOfThisMonth() +" 00:00:00";
+ getLastMonthElectricityData(data.getElectricityQuantity());//閫氳繃瀹夐槻骞宠幏鍙栦笂鏈堢敤鐢甸噺鏁版嵁
+ getCurrentDateElectircityData(data.getTodayElectricity(),0);//閫氳繃瀹夐槻骞宠幏鍙栦粖鏃ョ敤鐢甸噺鏁版嵁
+ getCurrentDateElectircityData(data.getYesterdayElectricity(),-1);//閫氳繃瀹夐槻骞宠幏鍙栨槰鏃ョ敤鐢甸噺鏁版嵁
+ String firstDate = DateUtil.getFirstDayCurrentMonth() +" 00:00:00";
Date month0 = DateUtil.getDateFromString(firstDate);
Date month1 = DateUtil.increaseMonth(month0,-1);//涓婃湀
Date month2 = DateUtil.increaseMonth(month0,-2);//涓婁笂鏈�
@@ -517,13 +519,13 @@
}
if( data.getGasQuantity().getTotalNum().compareTo(new BigDecimal(0)) !=0){
//璁＄畻鐢ㄦ皵鍚屾瘮鐜瘮
- data.getGasQuantity().setSameRate(Constants.formatBigdecimal4Float(data.getGasQuantity().getSameNum().divide(data.getGasQuantity().getTotalNum())).doubleValue()*100 +"");
- data.getGasQuantity().setRingRate(Constants.formatBigdecimal4Float(data.getGasQuantity().getRingNum().divide(data.getGasQuantity().getTotalNum())).doubleValue()*100 +"");
+ data.getGasQuantity().setSameRate(Constants.formatBigdecimal4Float(data.getGasQuantity().getSameNum().divide(data.getGasQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +"");
+ data.getGasQuantity().setRingRate(Constants.formatBigdecimal4Float(data.getGasQuantity().getRingNum().divide(data.getGasQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +"");
}
if( data.getWaterQuantity().getTotalNum().compareTo(new BigDecimal(0)) !=0){
// //璁＄畻鐢ㄦ按鍚屾瘮鐜瘮
- data.getWaterQuantity().setSameRate(Constants.formatBigdecimal4Float(data.getWaterQuantity().getSameNum().divide(data.getWaterQuantity().getTotalNum())).doubleValue()*100 +"");
- data.getWaterQuantity().setRingRate(Constants.formatBigdecimal4Float(data.getWaterQuantity().getRingNum().divide(data.getWaterQuantity().getTotalNum())).doubleValue()*100 +"");
+ data.getWaterQuantity().setSameRate(Constants.formatBigdecimal4Float(data.getWaterQuantity().getSameNum().divide(data.getWaterQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +"");
+ data.getWaterQuantity().setRingRate(Constants.formatBigdecimal4Float(data.getWaterQuantity().getRingNum().divide(data.getWaterQuantity().getTotalNum(),4,BigDecimal.ROUND_HALF_UP)).doubleValue()*100 +"");
}
/*璁＄畻纰虫帓閲忥紝浠ヤ笅涓変釜鍥犵礌涔嬪拰
@@ -543,7 +545,7 @@
*/
private void getMonthElectricityData(EnergyModelDataVO data) {
BaseResponse<MonthDataByMeterTypeResponse> response = HKService.getCurrentMonthDataByMeterType("1");
- if(response != null && !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
data.setRingRate(StringUtils.defaultString(response.getData().getRingPercent(),"0"));
data.setSameRate(StringUtils.defaultString(response.getData().getSamePercent(),"0"));
data.setTotal(StringUtils.defaultString(response.getData().getValue(),"0"));
@@ -556,11 +558,34 @@
*/
private void getLastMonthElectricityData(EnergyModelDataVO data) {
BaseResponse<LastMonthFeeByMeterTypeResponse> response = HKService.lastMonthFeeByMeterType("1");
- if(response != null && !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
data.setRingRate(StringUtils.defaultString(response.getData().getRingPercent(),"0"));
data.setSameRate(StringUtils.defaultString(response.getData().getSamePercent(),"0"));
data.setTotal(StringUtils.defaultString(response.getData().getValue(),"0"));
}
+ }
+
+ /**
+ * 閫氳繃瀹夐槻骞宠幏鍙栦粖鏃ョ敤鐢甸噺
+ * @param data
+ */
+ private void getCurrentDateElectircityData(EnergyModelDataVO data,int days) {
+ EnergyTrendRequest param = new EnergyTrendRequest();
+ param.setDate(DateUtil.getFomartDate(DateUtil.addDaysToDate(new Date(),days),"yyyy-MM-dd"));//鏃ユ湡
+ param.setMeterType(1);
+ param.setShowType("4");
+ param.setNodeType(2);
+ param.setNodeId("root000000");
+ param.setPeriodType("day");
+ BigDecimal total = new BigDecimal(0);
+ BaseResponse<EnergyTrendResponse> response = HKService.energyTrend(param);
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null&& response.getData().getYvalues()!=null ){
+ for (int i = 0; i < response.getData().getYvalues().get(0).getValue().length; i++) {
+ total = total.add(new BigDecimal(StringUtils.defaultString( response.getData().getYvalues().get(0).getValue()[i],"0")));
+ }
+
+ }
+ data.setTotal(Constants.formatBigdecimal2Float(total).toString());
}
private EnergyModelDataVO getDefaultData() {
@@ -582,7 +607,7 @@
public RegionEnergyListResponse energyRegionData(){
RegionEnergyListResponse data = null;
BaseResponse<RegionEnergyListResponse> response = HKService.regionEnergyList("1");
- if(response != null && !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null ){
data = response.getData();
}
if(data == null){
@@ -609,12 +634,12 @@
if(type >=0 && type <=2){
//鐢ㄦ按鐢ㄧ數鐢ㄦ皵
List<PlatformWaterGas> list = platformWaterGasMapper.selectList(new QueryWrapper<PlatformWaterGas>()
- .select("DATE_FORMAT(TIME_INFO,'yyyy-MM') as time_info_str,sum(num) as num")
+ .select("DATE_FORMAT(TIME_INFO,'%Y-%m') as time_info_str,sum(num) as num")
.lambda()
.eq(PlatformWaterGas::getIsdeleted,Constants.ZERO)
.eq(PlatformWaterGas::getType,type)
.apply("time_info BETWEEN DATE_SUB(CURDATE(), INTERVAL 12 MONTH) AND CURDATE()")//杩�12涓湀
- .last(" groupby DATE_FORMAT(TIME_INFO,'yyyy-MM')")
+ .last(" group by DATE_FORMAT(TIME_INFO,'%Y-%m')")
);
for (int i = 0; i < 12; i++) {
Date tempDate = DateUtil.increaseMonth(lastMonth,i);
@@ -646,11 +671,11 @@
param.setNodeId("root000000");
param.setPeriodType("year");
BaseResponse<EnergyTrendResponse> response = HKService.energyTrend(param);
- if(response != null && !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null&& response.getData().getYvalues()!=null ){
+ if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) && response.getData()!=null&& response.getData().getYvalues()!=null ){
for (int i = 0; i < 12; i++) {
if(response.getData().getYvalues().size()>0 &&response.getData().getYvalues().get(0).getValue().length>i){
//鍙栫浉搴旂殑鍙傛暟鍊�
- energyDataVOList.get(0).setEnergy(new BigDecimal(response.getData().getYvalues().get(0).getValue()[i]));
+ energyDataVOList.get(i).setEnergy(new BigDecimal(StringUtils.defaultString(response.getData().getYvalues().get(0).getValue()[i],"0")));
}
}
@@ -863,19 +888,6 @@
if(jobList==null || jobList.size()==0){
return workEfficiencyVOList;
}
- /* List<PlatformWmsDetail> jobList = platformWmsDetailMapper.selectJoinList(PlatformWmsDetail.class, new MPJLambdaWrapper<PlatformWmsDetail>()
- .selectAll( PlatformWmsDetail.class)
- .selectAs( PlatformJob::getDoneDate,PlatformWmsDetail::getDoneDate)
- .leftJoin(PlatformJob.class,PlatformJob::getId,PlatformWmsDetail::getJobId)
- .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO)
- .eq(PlatformJob::getIsdeleted, Constants.ZERO)
- .in(Constants.equalsInteger(type,Constants.ZERO),PlatformJob::getType,new Integer[]{0,2,4})
- .in(Constants.equalsInteger(type,Constants.ONE),PlatformJob::getType,new Integer[]{1,3})
- .in(PlatformJob::getStatus, Constants.PlatformJobStatus.DONE.getKey()
- , Constants.PlatformJobStatus.AUTHED_LEAVE.getKey()
- , Constants.PlatformJobStatus.LEAVED.getKey())
- .apply("to_days(t1.create_date) = to_days(now())")
- );*/
int curtotalNum = 0;
Date today = Utils.Date.getStart(new Date());
long curTime=0, lastTime=0;
@@ -936,6 +948,7 @@
public List<PlatformWarnEvent> warningList(int limit){
List<PlatformWarnEvent> platformLogList = platformWarnEventMapper.selectList(new QueryWrapper<PlatformWarnEvent>().lambda()
.eq(PlatformWarnEvent::getIsdeleted,Constants.ZERO)
+ .apply("to_days(create_date) = to_days(now())")
.orderByDesc(PlatformWarnEvent::getCreateDate)
.last(" limit "+limit)
);
diff --git a/server/visits/dmvisit_service/src/main/resources/application-dev.yml b/server/visits/dmvisit_service/src/main/resources/application-dev.yml
index 0221f4a..98d9c9a 100644
--- a/server/visits/dmvisit_service/src/main/resources/application-dev.yml
+++ b/server/visits/dmvisit_service/src/main/resources/application-dev.yml
@@ -1,12 +1,12 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
-# url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
-# username: doumee
-# password: rtjgfEr@&0c0m
- url: jdbc:mysql://10.50.250.253:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
- username: root
- password: Atwl@2024
+ url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ username: doumee
+ password: rtjgfEr@&0c0m
+# url: jdbc:mysql://10.50.250.253:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+# username: root
+# password: Atwl@2024
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
redis:
--
Gitblit v1.9.3