From c2462e9fc36a709abcb94aae2a31c4656a349daa Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期三, 05 三月 2025 15:08:25 +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 | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 111 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 d610bbf..b7bcb04 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 @@ -470,6 +470,42 @@ return null; } /** + *iccm璁垮棰勭害绛剧 + * @return + */ + public static BaseResponse iccmSignoff(VisitAppointmentOutRequest param){ + log.info("銆愭捣搴穒ccm璁垮棰勭害绛剧銆�================寮�濮�===="+JSONObject.toJSONString(param)); + try { + String res = HKTools.iccmSignoff(JSONObject.toJSONString(param)); + TypeReference typeReference = + new TypeReference< BaseResponse>(){}; + BaseResponse result = JSONObject.parseObject(res, typeReference.getType()); + logResult(result,"娴峰悍iccm璁垮棰勭害绛剧"); + return result; + }catch (Exception e){ + log.error("銆愭捣搴穒ccm璁垮棰勭害绛剧銆�================澶辫触====锛歕n"+ e.getMessage()); + } + return null; + } + /** + *iccm璁垮棰勭害鍙栨秷 + * @return + */ + public static BaseResponse iccmCancelAppointment(VisitAppointmentCancelRequest param){ + log.info("銆愭捣搴穒ccm璁垮棰勭害鍙栨秷銆�================寮�濮�===="+JSONObject.toJSONString(param)); + try { + String res = HKTools.iccmCancelAppointment(JSONObject.toJSONString(param)); + TypeReference typeReference = + new TypeReference< BaseResponse>(){}; + BaseResponse result = JSONObject.parseObject(res, typeReference.getType()); + logResult(result,"娴峰悍iccm璁垮棰勭害鍙栨秷"); + return result; + }catch (Exception e){ + log.error("銆愭捣搴穒ccm璁垮棰勭害鍙栨秷銆�================澶辫触====锛歕n"+ e.getMessage()); + } + return null; + } + /** *璁垮鍏嶇櫥璁伴绾� * @return */ @@ -954,6 +990,45 @@ 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; } @@ -1607,6 +1682,24 @@ 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 */ @@ -1869,6 +1962,24 @@ return null; } /** + *鍒嗛〉鏌ヨ璁惧鐨勪互鍙婁笅灞炰紶鎰熷櫒鏁版嵁鐨勭姸鎬佺粺璁� + * @return + */ + public static BaseResponse<List<FindDeviceStatisticsResponse> > findDeviceStatistics(FindDeviceStatisticsRequest param){ + log.info("銆愬垎椤垫煡璇㈣澶囩殑浠ュ強涓嬪睘浼犳劅鍣ㄦ暟鎹殑鐘舵�佺粺璁°��================寮�濮�===="+JSONObject.toJSONString(param)); + try { + String res = HKTools.findDeviceStatistics(JSONObject.toJSONString(param)); + TypeReference typeReference = + new TypeReference< BaseResponse<List<FindDeviceStatisticsResponse> >>(){}; + BaseResponse<List<FindDeviceStatisticsResponse> > result = JSONObject.parseObject(res, typeReference.getType()); + logResult(result,"鍒嗛〉鏌ヨ璁惧鐨勪互鍙婁笅灞炰紶鎰熷櫒鏁版嵁鐨勭姸鎬佺粺璁�"); + return result; + }catch (Exception e){ + log.error("銆愬垎椤垫煡璇㈣澶囩殑浠ュ強涓嬪睘浼犳劅鍣ㄦ暟鎹殑鐘舵�佺粺璁°��================澶辫触====锛歕n"+ e.getMessage()); + } + return null; + } + /** *娑堥槻鐪嬫澘-4鎶ヨ淇℃伅缁熻 * @return */ -- Gitblit v1.9.3