From f9c24ba3d5eba45afef222dcd72b6383893efc76 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 07 一月 2025 17:23:32 +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 | 96 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 87 insertions(+), 9 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 0762b6a..fcc9683 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
@@ -312,6 +312,34 @@
public static String getTodoListPage(Map<String, String> body) throws Exception{
return startDoGetStringArtemis(HKConstants.InterfacePath.getTodoListPage,body);
}
+
+ /**
+ *娑堥槻鐪嬫澘-4娓╂箍搴︽暟鎹�
+ * @param body
+ * @return
+ */
+ public static String temperatureHumidityDataStatistic(String body) {
+ return startDoPostStringArtemisAdmin(HKConstants.InterfacePath.temperatureHumidityDataStatistic,body);
+ }
+
+ /**
+ *娑堥槻鐪嬫澘-4鑾峰彇鍖哄煙鐢ㄩ噺鎺掑悕-鑳借�楃湅鏉�
+ * @param body
+ * @return
+ */
+ public static String regionDataRanking(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.regionDataRanking,body);
+ }
+
+ /**
+ *娑堥槻鐪嬫澘-4鏍规嵁鏃堕棿鍜屾椂闂寸淮搴﹁幏鍙栧洯鍖鸿兘鑰楁暟鎹�
+ * @param body
+ * @return
+ */
+ public static String energyTotal(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.energyTotal,body);
+ }
+
/**
* 鑾峰彇闂ㄧ鐐瑰垪琛�
* @param body
@@ -387,11 +415,35 @@
saveInterfaceLog(body,result,path,pathStr[1]);
return result;
}
+
+
+ public static String startDoPostStringArtemisAdmin(String[] pathStr,String body){
+ Map<String, String> path = getPath(pathStr[0]);
+ Map<String, String> header = new HashMap<>();
+ header.put("userId", "admin");
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
+ saveInterfaceLog(body,result,path,pathStr[1]);
+ return result;
+ }
+
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, null, header);
+ saveInterfaceLog(JSONObject.toJSONString(body),result,path,pathStr[1]);
+ return result;
+ }
+ public static String startDoGetStringArtemis(String[] pathStr,Map<String,String> querys ,Map<String, String> header ){
+ Map<String, String> path = getPath(pathStr[0]);
+ String result = ArtemisHttpUtil.doGetArtemis(path, querys, null, null, header);
+ saveInterfaceLog(JSONObject.toJSONString(querys),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;
}
@@ -402,15 +454,15 @@
String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
saveInterfaceLog(body,result,path,pathStr[1]);
return result;
-
}
+
+
public static String startDoPostStringArtemis(String[] pathStr,Map<String, String> querys,Map<String, String> header,String body){
Map<String, String> path = getPath(pathStr[0]);
header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
String result = ArtemisHttpUtil.doPostStringArtemis(path, body, querys, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
saveInterfaceLog(body,result,path,pathStr[1]);
return result;
-
}
/**
* 绛剧璁垮棰勭害
@@ -574,10 +626,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);
}
/**
* 鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅
@@ -764,7 +819,9 @@
* @return
*/
public static String ruleEventSearch(String body) {
- return startDoPostStringArtemis(HKConstants.InterfacePath.ruleEventSearch,body);
+ Map<String,String> header = new HashMap<>();
+ header.put("User-Id","admin");
+ return startDoPostStringArtemis(HKConstants.InterfacePath.ruleEventSearch,null,header,body);
}
/**
* 瀹夐槻鐪嬫澘-鍥尯瀹夐槻璁惧-鍚勭被鍨嬭澶囩姸鎬佹暟鎹垪琛�
@@ -822,8 +879,9 @@
public static String findAlarmBaseDataStatistic(String body) {
return startDoPostStringArtemis(HKConstants.InterfacePath.findAlarmBaseDataStatistic,body);
}
+
/**
- *瀹夐槻鐪嬫澘-- 鍒嗛〉鏌ヨ鏈鐞嗘姤璀︿俊鎭�6
+ *瀹夐槻鐪嬫澘-- b
* @param body
* @return
*/
@@ -831,12 +889,32 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.findHomeAlarmInfoPage,body);
}
/**
+ *淇濆瓨鐢ㄦ埛鍙妎penId缁戝畾淇℃伅寰俊鍏紬鍙�
+ * @param body
+ * @return
+ */
+ public static String userOpenidSave(String body) {
+ Map<String,String> header = new HashMap<>();
+ header.put("userId","admin");
+ return startDoPostStringArtemis(HKConstants.InterfacePath.userOpenidSave,null,header,body);
+ }
+ /**
+ *閫氳繃openId鎴杣serName绛夊垹闄ょ粦瀹氫俊鎭�
+ * @param param
+ * @return
+ */
+ public static String userOpenidDel(Map<String,String> param) {
+ Map<String,String> header = new HashMap<>();
+ header.put("userId","admin");
+ return startDoGetStringArtemis(HKConstants.InterfacePath.userOpenidDel,param,header);
+ }
+ /**
*鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁
* @param body
* @return
*/
public static String minitorDataSearch(String body) {
- return startDoPostStringArtemis(HKConstants.InterfacePath.minitorDataSearch,body);
+ return startDoPostStringArtemis(HKConstants.InterfacePath.minitorDataSearchV1,body);
}
/**
* 缁熻鍥尯鎬讳綋鐨勫畨闃茶澶囨暟閲忥紝鍦ㄧ嚎鏁般�佸湪绾跨巼銆佺绾挎暟銆佺绾跨巼
--
Gitblit v1.9.3