From 1a3a322d6f55d0f812001984d41010524cda69e0 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 06 十二月 2024 15:29:37 +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/model/HKTools.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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 349e5ff..dc5e088 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
@@ -395,6 +395,13 @@
saveInterfaceLog(JSONObject.toJSONString(body),result,path,pathStr[1]);
return result;
}
+ public static String startDoGetStringArtemisJson(String[] pathStr,Map<String,String> body ){
+ Map<String, String> path = getPath(pathStr[0]);
+ Map<String, String> header = new HashMap<>();
+ String result = ArtemisHttpUtil.doGetArtemis(path, body, null, "application/json", header);
+ saveInterfaceLog(JSONObject.toJSONString(body),result,path,pathStr[1]);
+ return result;
+ }
public static String startDoPostStringArtemis(String[] pathStr,String param,String body ){
Map<String, String> path = getPath(pathStr[0]+StringUtils.defaultString(param,""));
Map<String, String> header = new HashMap<>();
@@ -574,10 +581,13 @@
* 鏍规嵁寰俊鍏紬鍙蜂俊鎭幏鍙朅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,"");
+ public static String wxAccessToken(HashMap<String,String> params ) {
+// String[] wxAccessToken= new String[2];
+// String url = HKConstants.InterfacePath.wxAccessToken[0]+"?tagId="+tagId+"&configId="+configId;
+// String t = HKConstants.InterfacePath.wxAccessToken[1];
+// wxAccessToken[0] = url;
+// wxAccessToken[1] = t;
+ return startDoGetStringArtemisJson(HKConstants.InterfacePath.wxAccessToken,params);
}
/**
* 鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅
@@ -791,6 +801,14 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.fireStatistic,body);
}
/**
+ * 娑堥槻缁翠繚姣忔湀鏂板缁熻
+ * @param body
+ * @return
+ */
+ public static String fireStatisticMonth(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.fireStatisticMonth,body);
+ }
+ /**
* 娑堥槻鐪嬫澘-娑堥槻璁惧鍦ㄧ绾�1
* @param body
* @return
@@ -986,9 +1004,9 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.applyST,body);
}
- public static String getMenuUrl(String menuId, String token) {
+ public static String getMenuUrl(String componentId,String menuId, String token) {
String url = HKConstants.InterfacePath.goMenuUrl[0];
- url = url.replace("${menuId}", menuId).replace("${token}",token);
+ url = url.replace("${componentId}",componentId).replace("${menuId}", menuId).replace("${token}",token);
return url;
}
}
--
Gitblit v1.9.3