From d2902daad7261ac7d0148dbb9f33f39e52d433f6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 16 八月 2024 18:15:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java |   98 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 97 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 659794a..019195d 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
@@ -10,6 +10,7 @@
 import com.hikvision.artemis.sdk.ArtemisHttpUtil;
 import com.hikvision.artemis.sdk.config.ArtemisConfig;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.tomcat.util.bcel.Const;
@@ -324,7 +325,7 @@
 	 * @return
 	 */
 	public static String acsDeviceTimeRangeList(String body) {
-		return startDoPostStringArtemis(HKConstants.InterfacePath.acsDeviceList,body);
+		return startDoPostStringArtemis(HKConstants.InterfacePath.acsDeviceTimeRangeList,body);
 	}
 	/**
 	 *	璁垮棰勭害
@@ -361,6 +362,14 @@
 		return result;
 
 	}
+	public static String startDoPostStringArtemis(String pathStr,Map<String, String> querys,Map<String, String> header,String body){
+		Map<String, String> path = getPath(pathStr);
+		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);
+		return result;
+
+	}
 	/**
 	 *	绛剧璁垮棰勭害
 	 * @param body
@@ -376,6 +385,9 @@
 	 */
 	public static String privilegeGroup(String body) {
 		return startDoPostStringArtemis(HKConstants.InterfacePath.privilegeGroup,body);
+	}
+	public static String privilegIccmeGroup(String body) {
+		return startDoPostStringArtemis(HKConstants.InterfacePath.privilegIccmeGroup,body);
 	}
 	/**
 	 *	浜嬩欢璁㈤槄
@@ -580,6 +592,73 @@
 	public static String acsDeviceStatus(String body) {
 		return startDoPostStringArtemis(HKConstants.InterfacePath.acsDeviceStatus,body);
 	}
+	/**
+	 * 鍒嗛〉鑾峰彇骞挎挱鐐�
+	 * @param body
+	 * @return
+	 */
+	public static String fetchAudioChannel(String body) {
+		return startDoPostStringArtemis(HKConstants.InterfacePath.fetchAudioChannel,body);
+	}
+	/**
+	 * 鍒嗛〉鑾峰彇骞挎挱璁惧鍒楄〃
+	 * @param body
+	 * @return
+	 */
+	public static String fetchAudioDevice(String body) {
+		return startDoPostStringArtemis(HKConstants.InterfacePath.fetchAudioDevice,body);
+	}
+	/**
+	 * 鏍规嵁璁惧淇℃伅鑾峰彇骞挎挱鐐�
+	 * @param body
+	 * @return
+	 */
+	public static String fetchAudioChannelByDevice(String body) {
+		return startDoPostStringArtemis(HKConstants.InterfacePath.fetchAudioChannelByDevice,body);
+	}
+	/**
+	 * 鑾峰彇鍏ㄩ儴鏈堝彴淇℃伅
+	 * @param body
+	 * @return
+	 */
+	public static String platformsList(String body) {
+		return startDoPostStringArtemis(HKConstants.InterfacePath.platformsList,body);
+	}
+	/**
+	 * 鑾峰彇鏈堝彴鐘舵��
+	 * @return
+	 */
+	public static String platformStatus(String param) {
+		if(StringUtils.isNotBlank(param)){
+			return startDoPostStringArtemis(HKConstants.InterfacePath.platformStatus+"?platformIds="+param,null);
+		}else{
+			return startDoPostStringArtemis(HKConstants.InterfacePath.platformStatus,null);
+		}
+	}
+	/**
+	 * 鑾峰彇鏈堝彴缁勪欢閰嶇疆鐨凩ED璁惧娓呭崟
+	 * @param body
+	 * @return
+	 */
+	public static String ledRecords(String body) {
+		return startDoPostStringArtemis(HKConstants.InterfacePath.ledRecords,body);
+	}
+	/**
+	 * 鐢ㄤ簬璁剧疆骞挎挱鐨勮嚜瀹氭挱鏀惧拰鍋滄
+	 * @param body
+	 * @return
+	 */
+	public static String customBroadcast(String body) {
+		return startDoPostStringArtemis(HKConstants.InterfacePath.customBroadcast,body);
+	}
+	/**
+	 * 鍙戦�佹秷鎭粰LED
+	 * @param body
+	 * @return
+	 */
+	public static String transparentchannel(Map<String,String> header,String body) {
+		return startDoPostStringArtemis(HKConstants.InterfacePath.transparentchannel,null,header,body);
+	}
 
 	/**
 	 * 鏌ヨ鍦哄唴杞﹀仠杞︿俊鎭�
@@ -590,4 +669,21 @@
 		return startDoPostStringArtemis(HKConstants.InterfacePath.tempCarInRecords,body);
 	}
 
+	/**
+	 * 鏍规嵁鐢ㄦ埛鏍囪瘑鑾峰彇瀹㈡埛绔疶GC鎺ュ彛
+	 * @param body
+	 * @return
+	 */
+	public static String applyCTGT(String body) {
+		return startDoPostStringArtemis(HKConstants.InterfacePath.applyCTGT,body);
+	}
+	/**
+	 * 鏍规嵁鐧诲綍鏍囪瘑TGC鐢宠鐧诲綍鍑瘉ST鎺ュ彛
+	 * @param body
+	 * @return
+	 */
+	public static String applyST(String body) {
+		return startDoPostStringArtemis(HKConstants.InterfacePath.applyST,body);
+	}
+
 }

--
Gitblit v1.9.3