From f63d3a3be83fea258e7920efccd2567b6a511bb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 16 一月 2025 16:52:46 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java |   39 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 37 insertions(+), 2 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..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
@@ -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 ){
@@ -796,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);
 	}
 	/**
 	 * 瀹夐槻鐪嬫澘-鍥尯瀹夐槻璁惧-鍚勭被鍨嬭澶囩姸鎬佹暟鎹垪琛�
@@ -874,12 +899,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