From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 303 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 296 insertions(+), 7 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 edd3631..bf42ef0 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());
@@ -1086,6 +1089,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 +1099,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 +1411,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;
}
@@ -1480,7 +1489,7 @@
TypeReference typeReference =
new TypeReference< BaseResponse<BaseListPageResponse<PageCameraInfoResponse>> >(){};
BaseResponse<BaseListPageResponse<PageCameraInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
- logResult(result,"娴峰悍鍒嗛〉鑾峰彇鐩戞帶鐐硅祫婧�");
+// logResult(result,"娴峰悍鍒嗛〉鑾峰彇鐩戞帶鐐硅祫婧�");
return result;
}catch (Exception e){
log.error("銆愭捣搴峰垎椤佃幏鍙栫洃鎺х偣璧勬簮銆�================澶辫触====锛歕n"+ e.getMessage());
@@ -1527,17 +1536,188 @@
*瀹夐槻鐪嬫澘-浠婃棩鍛婅浜嬩欢-鏍规嵁eventType瀛楁3
* @return
*/
- public static BaseResponse< RuleEventSearchResponse> ruleEventSearch(RuleEventSearchRequest param){
+ public static BaseResponse<BaseListPageResponse<RuleEventSearchDataResponse>> ruleEventSearch(RuleEventSearchRequest param){
log.info("銆愭捣搴峰畨闃茬湅鏉�-浠婃棩鍛婅浜嬩欢-鏍规嵁eventType瀛楁3銆�================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.ruleEventSearch(JSONObject.toJSONString(param));
TypeReference typeReference =
- new TypeReference< BaseResponse<RuleEventSearchResponse> >(){};
- BaseResponse<RuleEventSearchResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ new TypeReference< BaseResponse<BaseListPageResponse<RuleEventSearchDataResponse>> >(){};
+ BaseResponse<BaseListPageResponse<RuleEventSearchDataResponse>> result = JSONObject.parseObject(res, typeReference.getType());
logResult(result,"娴峰悍瀹夐槻鐪嬫澘-浠婃棩鍛婅浜嬩欢-鏍规嵁eventType瀛楁3");
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;
+ }
+ /**
+ *鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁
+ * @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
+ */
+ public static BaseResponse<ParkingStatisticResponse> getParkingStatistics(){
+ log.info("銆愭捣搴峰畨闃茬湅鏉�--鍥尯瀹炴椂杞︽暟閲�4銆�================寮�濮�====");
+ try {
+ String res = HKTools.getParkingStatistics();
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<ParkingStatisticResponse>>(){};
+ BaseResponse<ParkingStatisticResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍瀹夐槻鐪嬫澘--鍥尯瀹炴椂杞︽暟閲�4");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰畨闃茬湅鏉�--鍥尯瀹炴椂杞︽暟閲�4銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+
+ /**
+ * 鑳借�楃湅鏉�-3.鑾峰彇鍚勫尯鍩熺敤鑳藉強鎬昏兘鑰�
+ * @param powerType 鑳芥簮绫诲瀷 鐢�-1 姘�-2 姘�-3 鐑�-4
+ * @return
+ */
+ public static BaseResponse<RegionEnergyListResponse> regionEnergyList(String powerType){
+ log.info("銆愭捣搴疯兘鑰楃湅鏉�-3.鑾峰彇鍚勫尯鍩熺敤鑳藉強鎬昏兘鑰椼��================寮�濮�====");
+ try {
+ Map<String,String> map = new HashMap<>();
+ map.put("powerType",powerType);
+ String res = HKTools.regionEnergyList(map);
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<RegionEnergyListResponse>>(){};
+ BaseResponse<RegionEnergyListResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"銆愭捣搴疯兘鑰楃湅鏉�-3.鑾峰彇鍚勫尯鍩熺敤鑳藉強鎬昏兘鑰椼��");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯兘鑰楃湅鏉�-3.鑾峰彇鍚勫尯鍩熺敤鑳藉強鎬昏兘鑰椼��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ * 鑳借�楃湅鏉�-4.鑾峰彇涓婃湀鐢ㄨ兘璐圭敤锛屼竴澶╁埛鏂帮紝鍑屾櫒鏌愪釜鐐瑰埛
+ * @param powerType 鑳芥簮绫诲瀷 鐢�-1 姘�-2 姘�-3 鐑�-4
+ * @return
+ */
+ public static BaseResponse<LastMonthFeeByMeterTypeResponse> lastMonthFeeByMeterType(String powerType){
+ log.info("銆愭捣搴疯兘鑰楃湅鏉�-4.鑾峰彇涓婃湀鐢ㄨ兘璐圭敤锛屼竴澶╁埛鏂帮紝鍑屾櫒鏌愪釜鐐瑰埛銆�================寮�濮�====");
+ try {
+ Map<String,String> map = new HashMap<>();
+ map.put("powerType",powerType);
+ String res = HKTools.lastMonthFeeByMeterType(map);
+ TypeReference typeReference = new TypeReference< BaseResponse<LastMonthFeeByMeterTypeResponse>>(){};
+ BaseResponse<LastMonthFeeByMeterTypeResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"銆愭捣搴疯兘鑰楃湅鏉�-4.鑾峰彇涓婃湀鐢ㄨ兘璐圭敤锛屼竴澶╁埛鏂帮紝鍑屾櫒鏌愪釜鐐瑰埛銆�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯兘鑰楃湅鏉�-4.鑾峰彇涓婃湀鐢ㄨ兘璐圭敤锛屼竴澶╁埛鏂帮紝鍑屾櫒鏌愪釜鐐瑰埛銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ * 娴峰悍鑳借�楃湅鏉�-5.鍥尯瀹炴椂璐熻嵎鏇茬嚎
+ * @return
+ */
+ public static BaseResponse<List<EnergyTodayLoadDataResponse>> energyTodayLoadData(){
+ log.info("銆愭捣搴疯兘鑰楃湅鏉�-5.鍥尯瀹炴椂璐熻嵎鏇茬嚎銆�================寮�濮�====");
+ try {
+ String res = HKTools.energyTodayLoadData();
+ TypeReference typeReference = new TypeReference< BaseResponse<List<EnergyTodayLoadDataResponse>>>(){};
+ BaseResponse<List<EnergyTodayLoadDataResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"銆愭捣搴疯兘鑰楃湅鏉�-5.鍥尯瀹炴椂璐熻嵎鏇茬嚎銆�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯兘鑰楃湅鏉�-5.鍥尯瀹炴椂璐熻嵎鏇茬嚎銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ * 鑳借�楃湅鏉�-2.鑾峰彇鍖哄煙鐢ㄨ兘鍓峃浣�
+ * @param param
+ * @return
+ */
+ public static BaseResponse<List<RegionTopPowerResponse>> regionTopPower(RegionTopPowerRequest param){
+ log.info("銆愭捣搴疯兘鑰楃湅鏉�-2.鑾峰彇鍖哄煙鐢ㄨ兘鍓峃浣嶃��================寮�濮�====");
+ try {
+ String res = HKTools.regionTopPower(toMap(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<List<RegionTopPowerResponse>>>(){};
+ BaseResponse<List<RegionTopPowerResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鑳借�楃湅鏉�-2.鑾峰彇鍖哄煙鐢ㄨ兘鍓峃浣�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯兘鑰楃湅鏉�-2.鑾峰彇鍖哄煙鐢ㄨ兘鍓峃浣嶃��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ * 鑳借�楃湅鏉�-1.鑾峰彇鏈湀鐢ㄨ兘鎬婚噺-鑷劧鏈�
+ * @param powerType 鑳芥簮绫诲瀷 鐢�-1 姘�-2 姘�-3 鐑�-4
+ * @return
+ */
+ public static BaseResponse<MonthDataByMeterTypeResponse> getCurrentMonthDataByMeterType(String powerType){
+ log.info("銆愯兘鑰楃湅鏉�-1.鑾峰彇鏈湀鐢ㄨ兘鎬婚噺-鑷劧鏈堛��================寮�濮�====");
+ try {
+ Map<String,String> map = new HashMap<>();
+ map.put("powerType",powerType);
+ String res = HKTools.getCurrentMonthDataByMeterType(map);
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<MonthDataByMeterTypeResponse>>(){};
+ BaseResponse<MonthDataByMeterTypeResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"鑳借�楃湅鏉�-1.鑾峰彇鏈湀鐢ㄨ兘鎬婚噺-鑷劧鏈�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愯兘鑰楃湅鏉�-1.鑾峰彇鏈湀鐢ㄨ兘鎬婚噺-鑷劧鏈堛��================澶辫触====锛歕n"+ e.getMessage());
}
return null;
}
@@ -1578,6 +1758,115 @@
return null;
}
/**
+ *鑳借�楃湅鏉�-6鎸夋湀鏌ヨ杩�12涓湀鐨勭敤鐢垫�婚噺鏁版嵁
+ * @return
+ */
+ public static BaseResponse<EnergyTrendResponse> energyTrend(EnergyTrendRequest param){
+ log.info("銆愭捣搴疯兘鑰楃湅鏉�-6鎸夋湀鏌ヨ杩�12涓湀鐨勭敤鐢垫�婚噺鏁版嵁銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.energyTrend(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<EnergyTrendResponse>>(){};
+ BaseResponse<EnergyTrendResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鑳借�楃湅鏉�-6鎸夋湀鏌ヨ杩�12涓湀鐨勭敤鐢垫�婚噺鏁版嵁");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯兘鑰楃湅鏉�-6鎸夋湀鏌ヨ杩�12涓湀鐨勭敤鐢垫�婚噺鏁版嵁銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ 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