From 96a2b1c68aa545abbf8245b0b2859b342fa6e63d Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期四, 19 十二月 2024 10:18:19 +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 | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 42 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 88e2aa9..f05520f 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,6 +415,17 @@ 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<>(); @@ -409,15 +448,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; - } /** * 绛剧璁垮棰勭害 @@ -832,6 +871,7 @@ public static String findAlarmBaseDataStatistic(String body) { return startDoPostStringArtemis(HKConstants.InterfacePath.findAlarmBaseDataStatistic,body); } + /** *瀹夐槻鐪嬫澘-- b * @param body -- Gitblit v1.9.3