From c32c1c3621011ed6dd55f207356aee281f62e1ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 23 十二月 2024 18:06:57 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 238 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 235 insertions(+), 3 deletions(-)
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..e69d2c0 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
@@ -888,7 +888,10 @@
public static BaseResponse<String> wxAccessToken(String configId,String tagId){
log.info("銆愭捣搴锋牴鎹井淇″叕浼楀彿淇℃伅鑾峰彇AccessToken銆�================寮�濮�====configId:"+configId+" && tagId:"+tagId);
try {
- String res = HKTools.wxAccessToken(configId,tagId);
+ HashMap<String,String> params = new HashMap<>();
+ params.put("tagId",tagId);
+ params.put("configId",configId);
+ String res = HKTools.wxAccessToken(params);
TypeReference typeReference =
new TypeReference<BaseResponse<String>>(){};
BaseResponse<String> result = JSONObject.parseObject(res, typeReference.getType());
@@ -935,6 +938,65 @@
}
return null;
}
+
+ /**
+ *娑堥槻鐪嬫澘-4娓╂箍搴︾粺璁�
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<TemperatureHumidityDataResponse>> temperatureHumidityDataStatistic(TemperatureHumidityDataRequest param){
+ log.info("銆愭捣搴锋秷闃茬湅鏉�-4娓╂箍搴︾粺璁°��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.temperatureHumidityDataStatistic(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<TemperatureHumidityDataResponse> >>(){};
+ BaseResponse<BaseListPageResponse<TemperatureHumidityDataResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍娑堥槻鐪嬫澘-4娓╂箍搴︾粺璁�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋秷闃茬湅鏉�-4娓╂箍搴︾粺璁°��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+
+ /**
+ *娑堥槻鐪嬫澘-4鑾峰彇鍖哄煙鐢ㄩ噺鎺掑悕-鑳借�楃湅鏉�
+ * @return
+ */
+ public static BaseResponse<List<RegionDataRankingDataResponse>> regionDataRanking(RegionDataRankingDataRequest param){
+ log.info("銆愭捣搴锋秷闃茬湅鏉�-4鑾峰彇鍖哄煙鐢ㄩ噺鎺掑悕-鑳借�楃湅鏉裤��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.regionDataRanking(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<List<RegionDataRankingDataResponse> >>(){};
+ BaseResponse<List<RegionDataRankingDataResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍娑堥槻鐪嬫澘-4鑾峰彇鍖哄煙鐢ㄩ噺鎺掑悕-鑳借�楃湅鏉�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋秷闃茬湅鏉�-4鑾峰彇鍖哄煙鐢ㄩ噺鎺掑悕-鑳借�楃湅鏉裤��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+
+
+ /**
+ *娑堥槻鐪嬫澘-4鑾峰彇鍖哄煙鐢ㄩ噺鎺掑悕-鑳借�楃湅鏉�
+ * @return
+ */
+ public static BaseResponse<EnergyTotalDataResponse> energyTotal(EnergyTotalDataRequest param){
+ log.info("銆愭捣搴锋秷闃茬湅鏉�-4鏍规嵁鏃堕棿鍜屾椂闂寸淮搴﹁幏鍙栧洯鍖鸿兘鑰楁暟鎹��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.energyTotal(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<EnergyTotalDataResponse >>(){};
+ BaseResponse<EnergyTotalDataResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍娑堥槻鐪嬫澘-4鏍规嵁鏃堕棿鍜屾椂闂寸淮搴﹁幏鍙栧洯鍖鸿兘鑰楁暟鎹�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋秷闃茬湅鏉�-4鏍规嵁鏃堕棿鍜屾椂闂寸淮搴﹁幏鍙栧洯鍖鸿兘鑰楁暟鎹��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+
/**
*鍒嗛〉鏌ヨ娑堥槻璁惧閮ㄤ欢鐘舵��
@@ -1086,6 +1148,7 @@
* @return
*/
public static String getMenuUrl(Integer type,String token){
+ String componentId = HKConstants.MenuPageId.componentIds[0];
String menuId = HKConstants.MenuPageId.afzx;
if(Constants.equalsInteger(type,Constants.ONE)){
menuId = HKConstants.MenuPageId.xkzx;
@@ -1095,10 +1158,13 @@
menuId = HKConstants.MenuPageId.jsc;
}else if(Constants.equalsInteger(type,Constants.FOUR)){
menuId = HKConstants.MenuPageId.kqgzt;
+ }else if(Constants.equalsInteger(type,Constants.FIVE)){
+ componentId = HKConstants.MenuPageId.componentIds[1];
+ menuId = HKConstants.MenuPageId.kqdbcl;
}
log.info("銆愭捣搴疯幏鍙栧伐浣滃彴鑿滃崟鍏嶅瘑鐧婚檰璋冩暣鍦板潃銆�================寮�濮�====menuId:"+menuId+"==token:"+token);
try {
- String res = HKTools.getMenuUrl(menuId,token);
+ String res = HKTools.getMenuUrl(componentId,menuId,token);
return res;
}catch (Exception e){
log.error("銆愭捣搴疯幏鍙栧伐浣滃彴鑿滃崟鍏嶅瘑鐧婚檰璋冩暣鍦板潃銆�================澶辫触====锛歕n"+ e.getMessage());
@@ -1404,7 +1470,9 @@
Class<?> clazz = obj.getClass();
for (Field field : clazz.getDeclaredFields()) {
field.setAccessible(true); // 浣垮緱绉佹湁瀛楁涔熷彲浠ヨ闂�
- map.put(field.getName(), (String) field.get(obj));
+ if(field.get(obj)!=null){
+ map.put(field.getName(), String.valueOf( field.get(obj)));
+ }
}
return map;
}
@@ -1538,6 +1606,78 @@
return result;
}catch (Exception e){
log.error("銆愭捣搴峰畨闃茬湅鏉�-浠婃棩鍛婅浜嬩欢-鏍规嵁eventType瀛楁3銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ 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;
+ }
+ /**
+ *淇濆瓨鐢ㄦ埛鍙妎penId缁戝畾淇℃伅寰俊鍏紬鍙�
+ * @return
+ */
+ public static BaseResponse<Integer> userOpenidSave(UserOpenidSaveRequest param){
+ log.info("銆愭捣搴蜂繚瀛樼敤鎴峰強openId缁戝畾淇℃伅寰俊鍏紬鍙枫��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.userOpenidSave(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<Integer>>(){};
+ BaseResponse<Integer> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍淇濆瓨鐢ㄦ埛鍙妎penId缁戝畾淇℃伅寰俊鍏紬鍙�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴蜂繚瀛樼敤鎴峰強openId缁戝畾淇℃伅寰俊鍏紬鍙枫��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *閫氳繃openId鎴杣serName绛夊垹闄ょ粦瀹氫俊鎭�
+ * @return
+ */
+ public static BaseResponse userOpenidDel(UserOpenidSaveRequest param){
+ log.info("銆愭捣搴烽�氳繃openId鎴杣serName绛夊垹闄ょ粦瀹氫俊鎭��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.userOpenidDel(toMap(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse >(){};
+ BaseResponse<Integer> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍閫氳繃openId鎴杣serName绛夊垹闄ょ粦瀹氫俊鎭�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴烽�氳繃openId鎴杣serName绛夊垹闄ょ粦瀹氫俊鎭��================澶辫触====锛歕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;
}
@@ -1713,6 +1853,98 @@
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;
+ }
+ /**
+ *鏈湀鏂板缁翠繚璁惧鏁�
+ * api_fire_statistic_month
+ * @return
+ */
+ public static BaseResponse<FireStatisticResponse> fireStatisticMonth(FireStatisticRequest param){
+ log.info("銆愭捣搴锋秷闃茬淮淇濈粺璁℃瘡鏈堟柊澧炪��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.fireStatisticMonth(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
*/
--
Gitblit v1.9.3