From 6c5165f73c90fbd4e22e4f9a39497b5a25ee37f9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十二月 2024 09:53:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 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 aad1de4..21db23c 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
@@ -322,6 +322,23 @@
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);
+ }
/**
* 鑾峰彇闂ㄧ鐐瑰垪琛�
@@ -415,6 +432,12 @@
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 ){
@@ -874,12 +897,22 @@
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