From db0f521bf51f96029090ebc01dfa96fc163127a1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 15 十一月 2024 18:29:03 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 143 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 139 insertions(+), 4 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..351ff86 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
@@ -1480,7 +1480,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 +1527,134 @@
*瀹夐槻鐪嬫澘-浠婃棩鍛婅浜嬩欢-鏍规嵁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;
+ }
+ /**
+ *缁熻缁熷畨闃茬湅鏉�--鍥尯瀹炴椂杞︽暟閲�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 +1695,24 @@
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;
+ }
+ /**
*鏍规嵁鐢ㄦ埛鏍囪瘑鑾峰彇瀹㈡埛绔疶GC鎺ュ彛
* @return
*/
--
Gitblit v1.9.3