From a8c8e4281c0298ce9a946b1d65166a2fe438ce1c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 26 九月 2024 09:04:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 76 insertions(+), 3 deletions(-)
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 4a50aaf..8e39c56 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<>();
@@ -529,6 +538,14 @@
}
/**
+ * 鑾峰彇鍏ㄩ噺缁勭粐淇℃伅
+ * @param body
+ * @return
+ */
+ public static String orgAllList(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.orgAllList,body);
+ }
+ /**
* 鑾峰彇璁垮棰勭害璁板綍鍒楄〃
* @param body
* @return
@@ -546,12 +563,63 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.iccmAppointmentRecords,body);
}
/**
- * 鑾峰彇鍏ㄩ噺缁勭粐鍒楄〃
+ * 鏍规嵁寰俊鍏紬鍙蜂俊鎭幏鍙朅ccessToken
+ * @return
+ */
+ public static String wxAccessToken(String configId,String tagId) {
+ String[] wxAccessToken= HKConstants.InterfacePath.wxAccessToken;
+ wxAccessToken[0] = HKConstants.InterfacePath.wxAccessToken+"?tagId="+tagId+"&configId"+configId;
+ return startDoPostStringArtemis(wxAccessToken,"");
+ }
+ /**
+ * 鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅
* @param body
* @return
*/
- public static String orgAllList(String body) {
- return startDoPostStringArtemis(HKConstants.InterfacePath.orgAllList,body);
+ 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
+ */
+ public static String fireDeviceStatusSearch(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.fireDeviceStatusSearch,body);
+ }
+ /**
+ * 鍒嗛〉鏌ヨ娑堥槻浼犳劅鍣ㄩ儴浠剁姸鎬�
+ * @param body
+ * @return
+ */
+ public static String sensorStatusSearch(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.sensorStatusSearch,body);
+ }
+ /**
+ * 璇㈡秷闃茶澶囧垪琛�
+ * @param body
+ * @return
+ */
+ public static String fireChannelSearch(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.fireChannelSearch,body);
+ }
+
+ /**
+ * 璇㈡秷闃茶澶囧垪琛�
+ * @param body
+ * @return
+ */
+ public static String fireDeviceSearch(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.fireDeviceSearch,body);
}
/**
* 鑾峰彇鍏ㄩ噺鐢ㄦ埛鍒楄〃
@@ -720,4 +788,9 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.applyST,body);
}
+ public static String getMenuUrl(String menuId, String token) {
+ String url = HKConstants.InterfacePath.goMenuUrl[0];
+ url = url.replace("${menuId}", menuId).replace("${token}",token);
+ return url;
+ }
}
--
Gitblit v1.9.3