From 50353c2ae43cdddb8433358f4ba66bef30c5d628 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 05 十一月 2024 14:00:12 +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 | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 169 insertions(+), 11 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 470fd3e..69c2337 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
@@ -7,6 +7,7 @@
import com.doumee.core.haikang.model.param.BaseListPageResponse;
import com.doumee.core.haikang.model.param.BaseRequst;
import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.BaseListPageRequest;
import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.utils.Constants;
@@ -902,17 +903,35 @@
*鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅
* @return
*/
- public static BaseResponse<BaseListPageResponse<WxConfigInfoResponse>> getWxConfig(WxConfigInfoRequest param){
+ public static BaseResponse< WxConfigInfoResponse> getWxConfig(WxConfigInfoRequest param){
log.info("銆愭捣搴锋牴鎹厤缃井淇″叕浼楀彿缂栧彿鏌ヨ寰俊鍏紬鍙蜂俊鎭��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.getWxConfig(toMap(param));
TypeReference typeReference =
- new TypeReference<BaseResponse<BaseListPageResponse<WxConfigInfoResponse>>>(){};
- BaseResponse<BaseListPageResponse<WxConfigInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ new TypeReference<BaseResponse<WxConfigInfoResponse>>(){};
+ BaseResponse<WxConfigInfoResponse> result = JSONObject.parseObject(res, typeReference.getType());
logResult(result,"娴峰悍鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅");
return result;
}catch (Exception e){
log.error("銆愭捣搴锋牴鎹厤缃井淇″叕浼楀彿缂栧彿鏌ヨ寰俊鍏紬鍙蜂俊鎭��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鍒嗛〉鑾峰彇寰呭姙鍒楄〃
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<GetTodoListResponse>> getTodoListPage(GetTodoListRequest param){
+ log.info("銆愭捣搴峰垎椤佃幏鍙栧緟鍔炲垪琛ㄣ��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.getTodoListPage(toMap(param));
+ TypeReference typeReference =
+ new TypeReference<BaseResponse<BaseListPageResponse<GetTodoListResponse>>>(){};
+ BaseResponse<BaseListPageResponse<GetTodoListResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鍒嗛〉鑾峰彇寰呭姙鍒楄〃");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰垎椤佃幏鍙栧緟鍔炲垪琛ㄣ��================澶辫触====锛歕n"+ e.getMessage());
}
return null;
}
@@ -1075,7 +1094,7 @@
}else if(Constants.equalsInteger(type,Constants.THREE)){
menuId = HKConstants.MenuPageId.jsc;
}else if(Constants.equalsInteger(type,Constants.FOUR)){
- menuId = HKConstants.MenuPageId.kqgl;
+ menuId = HKConstants.MenuPageId.kqgzt;
}
log.info("銆愭捣搴疯幏鍙栧伐浣滃彴鑿滃崟鍏嶅瘑鐧婚檰璋冩暣鍦板潃銆�================寮�濮�====menuId:"+menuId+"==token:"+token);
try {
@@ -1213,20 +1232,20 @@
return null;
}
/**
- *澧為噺杞﹁締鏌ヨ锛堝垎椤碉級
+ *浜鸿劯璇勫垎
* @return
*/
- public static BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> facePictureCheck(TimeRangeListRequest param){
- log.info("銆愭捣搴峰閲忎汉鍛樻煡璇€��================寮�濮�===="+JSONObject.toJSONString(param));
+ public static BaseResponse<FacePictureCheckResponse> facePictureCheck(FacePictureCheckRequest param){
+ log.info("銆愪汉鑴歌瘎鍒嗐��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.facePictureCheck(JSONObject.toJSONString(param));
TypeReference typeReference =
- new TypeReference< BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> >(){};
- BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
- logResult(result,"娴峰悍澧為噺浜哄憳鏌ヨ");
+ new TypeReference<BaseResponse<FacePictureCheckResponse>>(){};
+ BaseResponse<FacePictureCheckResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"浜鸿劯璇勫垎");
return result;
}catch (Exception e){
- log.error("銆愭捣搴峰閲忎汉鍛樻煡璇€��================澶辫触====锛歕n"+ e.getMessage());
+ log.error("銆愪汉鑴歌瘎鍒嗐��================澶辫触====锛歕n"+ e.getMessage());
}
return null;
}
@@ -1302,6 +1321,10 @@
}
return null;
}
+
+
+
+
/**
*鑾峰彇鏈堝彴缁勪欢閰嶇疆鐨凩ED璁惧娓呭崟
* @return
@@ -1404,6 +1427,103 @@
return null;
}
/**
+ *鍒嗛〉鑾峰彇鍖哄煙鍒楄〃锛堝垎椤碉級
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<PageRegionInfoResponse>> pageRegions(BaseListPageRequest param){
+ log.info("銆愭捣搴峰垎椤佃幏鍙栧尯鍩熷垪琛ㄣ��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ Map<String ,String> header = new HashMap<>();
+// header.put("userId",param.getUserId());
+ String res = HKTools.pageRegions(header,JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<PageRegionInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<PageRegionInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鍒嗛〉鑾峰彇鍖哄煙鍒楄〃");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰垎椤佃幏鍙栧尯鍩熷垪琛ㄣ��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鑾峰彇鐩戞帶鐐归瑙堝彇娴乁RL
+ * @return
+ */
+ public static BaseResponse<CamerasPreviewURLsResponse> cameraPreviewURLs(CameraPreviewURLsRequest param){
+ log.info("銆愭捣搴疯幏鍙栫洃鎺х偣棰勮鍙栨祦URL銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ Map<String ,String> header = new HashMap<>();
+// header.put("userId",param.getUserId());
+// header.put("domainId ",param.getDomainId());
+ String res = HKTools.cameraPreviewURLs(header,JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<CamerasPreviewURLsResponse> >(){};
+ BaseResponse<CamerasPreviewURLsResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鑾峰彇鐩戞帶鐐归瑙堝彇娴乁RL");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯幏鍙栫洃鎺х偣棰勮鍙栨祦URL銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鍒嗛〉鑾峰彇鐩戞帶鐐硅祫婧愶紙鍒嗛〉锛�
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<PageCameraInfoResponse>> pageCameras(BaseListPageRequest param){
+ log.info("銆愭捣搴峰垎椤佃幏鍙栫洃鎺х偣璧勬簮銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ Map<String ,String> header = new HashMap<>();
+ header.put("userId",param.getUserId());
+ String res = HKTools.pageCameras(header,JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<PageCameraInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<PageCameraInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鍒嗛〉鑾峰彇鐩戞帶鐐硅祫婧�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰垎椤佃幏鍙栫洃鎺х偣璧勬簮銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鑾峰彇娑堥槻浼犳劅鍣ㄥ垪琛紙鍒嗛〉锛�
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<PageFireChannelInfoResponse>> pageFireChannel(BaseListPageRequest param){
+ log.info("銆愭捣搴峰垎椤佃幏鍙栨秷闃蹭紶鎰熷櫒鍒楄〃銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.pageFireChannel(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<PageFireChannelInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<PageFireChannelInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鍒嗛〉鑾峰彇娑堥槻浼犳劅鍣ㄥ垪琛�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰垎椤佃幏鍙栨秷闃蹭紶鎰熷櫒鍒楄〃銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鏌ヨ娑堥槻浼犳劅鍣ㄩ儴浠剁姸鎬乿2锛堝垎椤碉級
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<PageSensorStatusResponse>> pageSensorStatus(SensorStatusListRequest param){
+ log.info("銆愭捣搴峰垎椤垫煡璇㈡秷闃蹭紶鎰熷櫒閮ㄤ欢鐘舵�乿2銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.pageSensorStatus(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<PageSensorStatusResponse>> >(){};
+ BaseResponse<BaseListPageResponse<PageSensorStatusResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鍒嗛〉鏌ヨ娑堥槻浼犳劅鍣ㄩ儴浠剁姸鎬乿2");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰垎椤垫煡璇㈡秷闃蹭紶鎰熷櫒閮ㄤ欢鐘舵�乿2銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
*鏍规嵁鐢ㄦ埛鏍囪瘑鑾峰彇瀹㈡埛绔疶GC鎺ュ彛
* @return
*/
@@ -1439,6 +1559,44 @@
}
return null;
}
+
+
+
+
+ public static BaseResponse<MenuDataResponse> getMenuConfig(Map<String,String> param){
+ log.info("銆愯幏鍙栬彍鍗曞姛鑳介厤缃」銆�================寮�濮�===="+ JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.getHkMenu(param);
+ TypeReference typeReference =
+ new TypeReference<BaseResponse<MenuDataResponse>>(){};
+ BaseResponse<MenuDataResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"鑾峰彇鑿滃崟鍔熻兘閰嶇疆椤�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愯幏鍙栬彍鍗曞姛鑳介厤缃」銆�================澶辫触====锛歕n"+ e.getMessage());
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
+ public static BaseResponse sendSms(Map<String,Object> param){
+ log.info("銆愬彂閫佺煭淇′俊鎭��================寮�濮�===="+ JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.sendSms(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference<BaseResponse>(){};
+ BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"鍙戦�佺煭淇′俊鎭�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愬彂閫佺煭淇′俊鎭��================澶辫触====锛歕n"+ e.getMessage());
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
private static void logResult(BaseResponse res,String name) {
if(StringUtils.equals(res.getCode(),HKConstants.RESPONSE_SUCCEE)){
log.info("銆�"+name+"銆�================鎴愬姛====\n"+res);
--
Gitblit v1.9.3