From e3895f634e85098fac4b9c017c65d662f14e9f2f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 九月 2024 14:22:55 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/WxConfigInfoRequest.java | 9 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 10 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 39 +++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/AuthItemListDetailResponse.java | 26 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/WxConfigInfoResponse.java | 20 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 25 +++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java | 76 +++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/NhEventPageListRequest.java | 17 +++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/NhEventPageListResponse.java | 24 ++++
9 files changed, 229 insertions(+), 17 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
new file mode 100644
index 0000000..2b09d07
--- /dev/null
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
@@ -0,0 +1,76 @@
+package com.doumee.cloud.admin;
+
+import com.doumee.api.BaseController;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.annotation.CloudRequiredPermission;
+import com.doumee.config.annotation.LoginNoRequired;
+import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.request.*;
+import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
+import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest;
+import com.doumee.core.haikang.model.param.request.event.parks.EventPlatformCarsRequest;
+import com.doumee.core.haikang.model.param.request.event.parks.EventPlatformRequest;
+import com.doumee.core.haikang.model.param.request.event.visit.EventVisitIccmRequest;
+import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest;
+import com.doumee.core.haikang.service.HKService;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DESUtil;
+import com.doumee.dao.business.model.Device;
+import com.doumee.service.business.impl.hksync.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+@Api(tags = "娴峰悍鏁版嵁鍚屾鎺ュ彛")
+@RestController
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/hktest")
+public class HkInterfaceTestCloudController extends BaseController {
+
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
+ @ApiOperation("銆愭捣搴枫�戞祴璇昄ED鏄剧ず灞�")
+ @PostMapping("/testLed")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse> testLed(@RequestBody TransparentChannelBodyRequest request, HttpServletResponse response) {
+ TransparentChannelHeadRequest head = new TransparentChannelHeadRequest();
+ head.setAbility("cld");//鍥哄畾鍊�
+ head.setTreatyType("haixuan_led_net");//鍥哄畾鍊�
+ head.setDeviceIndexCode("6a5498e9df924befbb9530e467e5e809");
+ return ApiResponse.success(HKService.transparentchannel(head,request));
+ }
+ @ApiOperation("銆愭捣搴枫�戞祴璇曞箍鎾挱鎶�")
+ @PostMapping("/testBroadcast")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse> testBroadcast(@RequestBody CustomBroadcastRequest request, HttpServletResponse response) {
+ return ApiResponse.success( HKService.customBroadcast(request));
+ }
+ @ApiOperation("銆愭捣搴枫�戞祴璇曡幏鍙栧井淇″叕浼楀彿")
+ @GetMapping("/testWxToken")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse> testWxToken(@RequestParam String configId,@RequestParam String tageId, HttpServletResponse response) {
+ return ApiResponse.success( HKService.wxAccessToken(configId,tageId));
+ }
+ @ApiOperation("銆愭捣搴枫�戞祴璇曞垎椤佃幏鍙栧憡璀︿簨浠�")
+ @GetMapping("/testWxToken")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse> nhEventPageList(@RequestBody NhEventPageListRequest param, HttpServletResponse response) {
+ return ApiResponse.success( HKService.nhEventPageList(param));
+ }
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index 2844c21..62d9596c7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -117,11 +117,14 @@
String[] iccmUpdateAppointment= new String[]{"/api/iccm/v2/appointment/update","iccm璁垮鐧昏淇敼"};//iccm璁垮鐧昏淇敼
String[] iccmCancelAppointment= new String[]{"/api/iccm/v1/appointment/cancel","iccm璁垮鐧昏淇敼"};//iccm璁垮鐧昏淇敼
String[] iccmAppointmentMDJ= new String[]{"/api/iccm/v1/appointment/free/registration","iccm璁垮棰勭害鍏嶇櫥璁�"};//iccm璁垮棰勭害鍏嶇櫥璁�
-
String[] privilegIccmeGroup= new String[]{"/api/iccm/v1/privilege/groups","鏌ヨ璁垮鏉冮檺缁�"};//鏌ヨ璁垮鏉冮檺缁�
String[] iccmAppointmentRecords= new String[]{"/api/iccm/v2/appointment/records","iccm鏌ヨ宸查绾︾櫥璁�"};//iccm鏌ヨ宸查绾︾櫥璁�
- String[] wxAccessToken= new String[]{"/api/wx/v1/oa/get/accessToken","iccm鏌ヨ宸查绾︾櫥璁�"};//1.9.1鏍规嵁寰俊鍏紬鍙蜂俊鎭幏鍙朅ccessToken
+ String[] wxAccessToken= new String[]{"/api/wx/v1/oa/get/accessToken","鏍规嵁寰俊鍏紬鍙蜂俊鎭幏鍙朅ccessToken"};//1.9.1鏍规嵁寰俊鍏紬鍙蜂俊鎭幏鍙朅ccessToken
+ String[] getWxConfig= new String[]{"/api/wx/v1/oa/get/config","鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅"};//鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅
String[] goMenuUrl= new String[]{"/xauthplus-plugin/thirdLogin?type=third&componentId=Infovision iPark Platform&componentMenuId=${menuId}&token=${token}","宸ヤ綔鍙拌彍鍗曡烦杞湴鍧�"};
+ String[] nhEventPageList= new String[]{"/api/ecm/warning/event/v1/pageList","鍒嗛〉鑾峰彇鍛婅浜嬩欢"};//鍒嗛〉鑾峰彇鍛婅浜嬩欢
+ String[] nhRegionDataRanking= new String[]{"/api/ecm/v1/energy/regionDataRanking","鏍规嵁鏃堕棿缁村害鑾峰彇鍖哄煙鐢ㄩ噺鎺掑悕"};//1.8.5鏍规嵁鏃堕棿缁村害鑾峰彇鍖哄煙鐢ㄩ噺鎺掑悕
+ String[] nhEnergyDistribution= new String[]{"/api/ecm/v1/energy/energyDistribution","鏍规嵁鏃堕棿缁村害鑾峰彇鑳借�楀垎甯�"};// 鏍规嵁鏃堕棿缁村害鑾峰彇鑳借�楀垎甯�
}
/**
@@ -139,8 +142,7 @@
// 鏋勯�犳柟娉�
TASK_TYPE(int key, String name ) {
- this.name = name;
- this.key = key;
+ this.name = name;this.key = key;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index b230c6a..bb99bbb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -369,6 +369,15 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.visitCancel,body);
}
+ public static String startDoGetStringArtemis(String[] pathStr,Map<String,String> body ){
+ Map<String, String> path = getPath(pathStr[0]);
+ Map<String, String> header = new HashMap<>();
+ header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
+ String result = ArtemisHttpUtil.doGetArtemis(path, body, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
+ saveInterfaceLog(JSONObject.toJSONString(body),result,path,pathStr[1]);
+ return result;
+
+ }
public static String startDoPostStringArtemis(String[] pathStr,String body ){
Map<String, String> path = getPath(pathStr[0]);
Map<String, String> header = new HashMap<>();
@@ -563,6 +572,22 @@
return startDoPostStringArtemis(wxAccessToken,"");
}
/**
+ * 鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅
+ * @param body
+ * @return
+ */
+ public static String getWxConfig(Map<String,String> body) {
+ return startDoGetStringArtemis(HKConstants.InterfacePath.getWxConfig,body);
+ }
+ /**
+ * 鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅
+ * @param body
+ * @return
+ */
+ public static String nhEventPageList(Map<String,String> body) {
+ return startDoGetStringArtemis(HKConstants.InterfacePath.nhEventPageList,body);
+ }
+ /**
* 鑾峰彇鍏ㄩ噺鐢ㄦ埛鍒楄〃
* @param body
* @return
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/NhEventPageListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/NhEventPageListRequest.java
new file mode 100644
index 0000000..39161f4
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/NhEventPageListRequest.java
@@ -0,0 +1,17 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class NhEventPageListRequest {
+
+ private String warningName ;//Query String false 棰勫憡璀﹀悕绉�
+ private String nodeName ;//Query String false 鐩戞祴瀵硅薄
+ private String warningLevel ;//Query Number true 棰勫憡璀︾瓑绾э紝0锛氬叏閮紝1锛氫竴鑸紝2锛氫弗閲嶏紝3锛氭晠闅�
+ private String ruleTypeId ;//Query String false 棰勫憡璀︾被鍨婭D锛屼负绌烘椂琛ㄧず鎵�鏈�
+ private String startDate ;//Query String false 鍙戠敓鏃堕棿寮�濮嬫椂闂�
+ private String endDate;// Query String false 鍙戠敓鏃堕棿缁撴潫鏃堕棿
+ private String handleStatus;// Query String false 澶勭悊鐘舵�侊細0锛氬叏閮紝1锛氭湭澶勭悊锛�2锛氬凡澶勭悊
+ private String pageNo;// Query Number false 椤电爜
+ private String pageSize;// Query Number false 椤靛ぇ灏�
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/WxConfigInfoRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/WxConfigInfoRequest.java
new file mode 100644
index 0000000..d19cb31
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/WxConfigInfoRequest.java
@@ -0,0 +1,9 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class WxConfigInfoRequest {
+ private String tagId;// Query String false 鏍囩
+ private String oaId;// Query String false 寰俊鍏紬鍙烽厤缃紪鍙�
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/AuthItemListDetailResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/AuthItemListDetailResponse.java
index 74dfa23..d57516f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/AuthItemListDetailResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/AuthItemListDetailResponse.java
@@ -6,18 +6,18 @@
@Data
public class AuthItemListDetailResponse {
- private String personId ;//string False 浜哄憳ID
- private String resourceIndexCode;// string False 璧勬簮鐨勫敮涓�鏍囪瘑
- private Integer channelNo;// number False 閫氶亾鍙�
- private String channelIndexCode ;//string False 璧勬簮閫氶亾鍞竴鏍囪瘑锛堝湪鏉冮檺涓嬭浇鍜岄厤缃帴鍙ｅ叆鍙傛椂瀵瑰簲鏌ヨ鎺ュ彛浼氳繑鍥烇紝涓嶄綔涓烘煡璇㈡帴鍙ｇ殑鏌ヨ鏉′欢锛�
- private TimeRangeRequest templateConfigInfos;// Object[] False 璁″垝妯℃澘淇℃伅
- private Integer personStatus;// number False 浜哄憳鐘舵��,0锛氬凡閰嶇疆鏈笅杞�1锛氭洿鏂板緟涓嬭浇2锛氭洿鏂板緟鍒犻櫎3锛氬凡涓嬭浇4锛氭湭閰嶇疆
- private Integer cardStatus ;//number False 鍗＄墖鐘舵��,0锛氬凡閰嶇疆鏈笅杞�1锛氭洿鏂板緟涓嬭浇2锛氭洿鏂板緟鍒犻櫎3锛氬凡涓嬭浇4锛氭湭閰嶇疆
- private Integer faceStatus ;//number False 浜鸿劯鐘舵��,0锛氬凡閰嶇疆鏈笅杞�1锛氭洿鏂板緟涓嬭浇2锛氭洿鏂板緟鍒犻櫎3锛氬凡涓嬭浇4锛氭湭閰嶇疆
- private String cardJson ;//string False 璁板綍宸蹭笅杞藉埌璁惧鐨勫崱鍙凤紙Map鏍煎紡锛堝崱鍙凤細鐘舵�侊級锛屽叾涓姸鎬�(0鏀瑰彉琛ㄧず涓嬭浇鍚庡崱鐗囩殑淇℃伅鍙堝彉鍖栦簡锛�1宸蹭笅杞�)锛�
- private String configTime ;//string False 閰嶇疆鏃堕棿,閲囩敤ISO8601鏃堕棿鏍煎紡锛屾渶澶ч暱搴�32涓瓧绗︼紝濡�2018-09-03T17:30:08.000+08:00
- private String startTime;// string False 浜哄憳鏉冮檺鏈夋晥鏈燂紙浠ヤ汉涓轰腑蹇冭澶囨椂浣跨敤锛�,寮�濮嬫椂闂�,閲囩敤ISO8601鏃堕棿鏍煎紡锛屾渶澶ч暱搴�32涓瓧绗︼紝濡�2018-09-03T17:30:08.000+08:00
- private String endTime ;//string False 浜哄憳鏉冮檺鏈夋晥鏈燂紙浠ヤ汉涓轰腑蹇冭澶囨椂浣跨敤锛�,寮�濮嬫棩鏈�,閲囩敤ISO8601鏃堕棿鏍煎紡锛屾渶澶ч暱搴�32涓瓧绗︼紝濡�2018-09-03T17:30:08.000+08:00
- private String personExtendJson;// body string 鍚�
+ private String personId ;//string False 浜哄憳ID
+ private String resourceIndexCode;// string False 璧勬簮鐨勫敮涓�鏍囪瘑
+ private Integer channelNo;// number False 閫氶亾鍙�
+ private String channelIndexCode ;//string False 璧勬簮閫氶亾鍞竴鏍囪瘑锛堝湪鏉冮檺涓嬭浇鍜岄厤缃帴鍙ｅ叆鍙傛椂瀵瑰簲鏌ヨ鎺ュ彛浼氳繑鍥烇紝涓嶄綔涓烘煡璇㈡帴鍙ｇ殑鏌ヨ鏉′欢锛�
+ private TimeRangeRequest templateConfigInfos;// Object[] False 璁″垝妯℃澘淇℃伅
+ private Integer personStatus;// number False 浜哄憳鐘舵��,0锛氬凡閰嶇疆鏈笅杞�1锛氭洿鏂板緟涓嬭浇2锛氭洿鏂板緟鍒犻櫎3锛氬凡涓嬭浇4锛氭湭閰嶇疆
+ private Integer cardStatus ;//number False 鍗＄墖鐘舵��,0锛氬凡閰嶇疆鏈笅杞�1锛氭洿鏂板緟涓嬭浇2锛氭洿鏂板緟鍒犻櫎3锛氬凡涓嬭浇4锛氭湭閰嶇疆
+ private Integer faceStatus ;//number False 浜鸿劯鐘舵��,0锛氬凡閰嶇疆鏈笅杞�1锛氭洿鏂板緟涓嬭浇2锛氭洿鏂板緟鍒犻櫎3锛氬凡涓嬭浇4锛氭湭閰嶇疆
+ private String cardJson ;//string False 璁板綍宸蹭笅杞藉埌璁惧鐨勫崱鍙凤紙Map鏍煎紡锛堝崱鍙凤細鐘舵�侊級锛屽叾涓姸鎬�(0鏀瑰彉琛ㄧず涓嬭浇鍚庡崱鐗囩殑淇℃伅鍙堝彉鍖栦簡锛�1宸蹭笅杞�)锛�
+ private String configTime ;//string False 閰嶇疆鏃堕棿,閲囩敤ISO8601鏃堕棿鏍煎紡锛屾渶澶ч暱搴�32涓瓧绗︼紝濡�2018-09-03T17:30:08.000+08:00
+ private String startTime;// string False 浜哄憳鏉冮檺鏈夋晥鏈燂紙浠ヤ汉涓轰腑蹇冭澶囨椂浣跨敤锛�,寮�濮嬫椂闂�,閲囩敤ISO8601鏃堕棿鏍煎紡锛屾渶澶ч暱搴�32涓瓧绗︼紝濡�2018-09-03T17:30:08.000+08:00
+ private String endTime ;//string False 浜哄憳鏉冮檺鏈夋晥鏈燂紙浠ヤ汉涓轰腑蹇冭澶囨椂浣跨敤锛�,寮�濮嬫棩鏈�,閲囩敤ISO8601鏃堕棿鏍煎紡锛屾渶澶ч暱搴�32涓瓧绗︼紝濡�2018-09-03T17:30:08.000+08:00
+ private String personExtendJson;// body string 鍚�
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/NhEventPageListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/NhEventPageListResponse.java
new file mode 100644
index 0000000..36af1b9
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/NhEventPageListResponse.java
@@ -0,0 +1,24 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class NhEventPageListResponse {
+ private String id ;//String false 棰勫憡璀︿簨浠跺敮涓�鏍囪瘑
+ private String warningName ;//String false 棰勫憡璀﹀悕绉�
+ private String nodeType ;//Number false 鑺傜偣绫诲瀷
+ private String nodeId ;//String false 鑺傜偣ID
+ private String nodeName;// String false 鑺傜偣鍚嶇О
+ private String nodePath;// String false 鑺傜偣璺緞
+ private String ruleType ;//String false 棰勫憡璀︾被鍨�
+ private String warningLevel ;//Number false 棰勫憡璀︾瓑绾э紝1锛氫竴鑸紝2锛氫弗閲嶏紝3锛氭晠闅�
+ private String warningValue ;//String false 鏁版嵁椤瑰綋鍓嶅��
+ private String warningEventTip;// String false 寮傚父鍘熷洜
+ private String createTime;// String false 鍙戠敓鏃堕棿
+ private String benchmark;// String false 鍩哄噯鏁版嵁
+ private String handleStatus;// Number false 澶勭悊鐘舵�侊細1锛氭湭澶勭悊锛�2锛氬凡澶勭悊
+ private String note;// String false 澶勭悊鎰忚
+ private String handleTime;// String false 澶勭悊鏃堕棿
+ private String normal;// Boolean false 棰勫憡璀︽槸鍚︽甯�
+ private String deviceId;// String false 璁惧id
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/WxConfigInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/WxConfigInfoResponse.java
new file mode 100644
index 0000000..0fe805d
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/WxConfigInfoResponse.java
@@ -0,0 +1,20 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class WxConfigInfoResponse {
+ private String id;// String false 寰俊鍏紬鍙烽厤缃甶d
+ private String appKey;// String false 寰俊鍏紬鍙穉pp_key
+ private String appSecret ;//String false 寰俊鍏紬鍙穉pp_secret
+ private String oaName;// String false 寰俊鍏紬鍙峰悕绉�
+ private String modelDataId ;//String false pdms鏁版嵁涓婚敭
+ private String domainId ;//String false 鎵�灞炵綉缁渋d
+ private String netProtocol;// String false 缃戠粶鍗忚
+ private String port;// String false 绔彛鍙�
+ private String tagId;// String false 缁勫缓鏍囪瘑
+ private String templateUrl;// String false 妯℃澘娑堟伅鍦板潃閰嶇疆
+ private String proxySwitch;// String false 鏄惁寮�鍚唬鐞� 1 寮� 0 鍏�
+}
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 68ecacd..53f02d8 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
@@ -1,5 +1,6 @@
package com.doumee.core.haikang.service;
+import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.doumee.core.haikang.model.HKConstants;
@@ -15,6 +16,7 @@
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
import java.io.InputStream;
import java.lang.reflect.Field;
@@ -897,6 +899,43 @@
return null;
}
/**
+ *鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<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());
+ logResult(result,"娴峰悍鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋牴鎹厤缃井淇″叕浼楀彿缂栧彿鏌ヨ寰俊鍏紬鍙蜂俊鎭��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+
+ /**
+ *鍒嗛〉鑾峰彇鍛婅浜嬩欢
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<NhEventPageListResponse>> nhEventPageList(NhEventPageListRequest param){
+ log.info("銆愭捣搴峰垎椤佃幏鍙栧憡璀︿簨浠躲��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.nhEventPageList(toMap(param));
+ TypeReference typeReference =
+ new TypeReference<BaseResponse<BaseListPageResponse<NhEventPageListResponse>>>(){};
+ BaseResponse<BaseListPageResponse<NhEventPageListResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鍒嗛〉鑾峰彇鍛婅浜嬩欢");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰垎椤佃幏鍙栧憡璀︿簨浠躲��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
*鏌ヨ璁垮鏉ヨ璁板綍锛堝凡鐧昏锛夛紙鍒嗛〉锛�
* @return
*/
--
Gitblit v1.9.3