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/java/com/doumee/core/haikang/service/HKService.java | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 108 insertions(+), 0 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..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 */ -- Gitblit v1.9.3