From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 3 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 b61accf..bdbe7c6 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
@@ -480,6 +480,24 @@
return null;
}
/**
+ *璁垮鏉冮檺缁勫垪琛ㄦ煡璇紙鍒嗛〉锛�
+ * @return
+ */
+ public static BaseResponse<PrivilegeGroupListResponse> privilegIccmeGroup(PrivilegeGroupRequest param){
+ log.info("銆愭捣搴疯瀹㈡潈闄愮粍鍒楄〃鏌ヨ銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.privilegIccmeGroup(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<PrivilegeGroupListResponse> >(){};
+ BaseResponse<PrivilegeGroupListResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍璁垮鏉冮檺缁勫垪琛ㄦ煡璇�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯瀹㈡潈闄愮粍鍒楄〃鏌ヨ銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
*娴峰悍闂ㄧ鐐规煡璇紙鍒嗛〉锛�
* @return
*/
@@ -950,16 +968,16 @@
* @return
*/
public static BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> vehicleTimeRangeList(TimeRangeListRequest param){
- log.info("銆愭捣搴峰閲忎汉鍛樻煡璇€��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴峰閲忚溅杈嗘煡璇€��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.vehicleTimeRangeList(JSONObject.toJSONString(param));
TypeReference typeReference =
new TypeReference< BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> >(){};
BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
- logResult(result,"娴峰悍澧為噺浜哄憳鏌ヨ");
+ logResult(result,"娴峰悍澧為噺杞﹁締鏌ヨ");
return result;
}catch (Exception e){
- log.error("銆愭捣搴峰閲忎汉鍛樻煡璇€��================澶辫触====锛歕n"+ e.getMessage());
+ log.error("銆愭捣搴峰閲忚溅杈嗘煡璇€��================澶辫触====锛歕n"+ e.getMessage());
}
return null;
}
@@ -1017,6 +1035,42 @@
}
return null;
}
+ /**
+ *鏍规嵁鐢ㄦ埛鏍囪瘑鑾峰彇瀹㈡埛绔疶GC鎺ュ彛
+ * @return
+ */
+ public static BaseResponse<ApplyCTGTResponse> applyCTGT(ApplyCTGTRequest param){
+ log.info("銆愭捣搴锋牴鎹敤鎴锋爣璇嗚幏鍙栧鎴风TGC鎺ュ彛銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.applyCTGT(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<ApplyCTGTResponse>>(){};
+ BaseResponse<ApplyCTGTResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鏍规嵁鐢ㄦ埛鏍囪瘑鑾峰彇瀹㈡埛绔疶GC鎺ュ彛");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋牴鎹敤鎴锋爣璇嗚幏鍙栧鎴风TGC鎺ュ彛鎭��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鏍规嵁鐧诲綍鏍囪瘑TGC鐢宠鐧诲綍鍑瘉ST鎺ュ彛
+ * @return
+ */
+ public static BaseResponse<ApplySTResponse> applyST(ApplySTequest param){
+ log.info("銆愭捣搴锋牴鎹櫥褰曟爣璇員GC鐢宠鐧诲綍鍑瘉ST鎺ュ彛銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.applyST(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<ApplySTResponse>>(){};
+ BaseResponse<ApplySTResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鏍规嵁鐧诲綍鏍囪瘑TGC鐢宠鐧诲綍鍑瘉ST鎺ュ彛鍙�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋牴鎹櫥褰曟爣璇員GC鐢宠鐧诲綍鍑瘉ST鎺ュ彛鎭��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ 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