From e23a1db0b60437f17d09d65c65f8fd0c8a5d88c7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 26 八月 2024 18:11:07 +0800
Subject: [PATCH] 最新版本

---
 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java |  418 ++++++++++++++++++++++++++++-------------------------------
 1 files changed, 198 insertions(+), 220 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 383da4e..4a50aaf 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;
@@ -60,7 +61,7 @@
 
 	}
 	public static InterfaceLogService interfaceLogService = null;
-	private static void saveInterfaceLog(String s, String result,Map<String, String> path) {
+	private static void saveInterfaceLog(String s, String result,Map<String, String> path,String name) {
 //		InterfaceLogService bean = SpringContextUtil.getBean(InterfaceLogService.class);
 		if(interfaceLogService !=null){
 			InterfaceLog hkMonitoryLogDO=new InterfaceLog();
@@ -69,7 +70,7 @@
 			hkMonitoryLogDO.setIsdeleted(0);
 			hkMonitoryLogDO.setRequest(s);
 			hkMonitoryLogDO.setRepose(result);
-			hkMonitoryLogDO.setName(path.get(HKConstants.https));
+			hkMonitoryLogDO.setName("銆愬畨闃插钩鍙般��"+name);
 			hkMonitoryLogDO.setUrl(HKConstants.https + ArtemisConfig.host+path.get(HKConstants.https));
 			interfaceLogService.create(hkMonitoryLogDO);
 		}
@@ -90,10 +91,7 @@
 	 * @return
 	 */
 	public static String getRootOrg() {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.rootOrg);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, "", null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog("",result,path);
-		return  result;
+		return  startDoPostStringArtemis(HKConstants.InterfacePath.rootOrg,null);
 	}
 
 
@@ -103,10 +101,7 @@
 	 * @return
 	 */
 	public static String editOrg(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.editOrg);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return   startDoPostStringArtemis(HKConstants.InterfacePath.editOrg,body);
 	}
 
 	/**
@@ -115,10 +110,7 @@
 	 * @return
 	 */
 	public static String addBatchOrg(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.addBatchOrg);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.addBatchOrg,body);
 	}
 	/**
 	 * 鍒犻櫎缁勭粐淇℃伅
@@ -126,10 +118,7 @@
 	 * @return
 	 */
 	public static String delOrg(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.delBatchOrg);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.delBatchOrg,body);
 	}
 
 	/**
@@ -138,10 +127,7 @@
 	 * @return
 	 */
 	public static String addUser(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.addUser);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.addUser,body);
 	}
 
 
@@ -151,10 +137,7 @@
 	 * @return
 	 */
 	public static String addBatchUser(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.addBatchUser);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.addBatchUser,body);
 	}
 
 	/**
@@ -163,10 +146,7 @@
 	 * @return
 	 */
 	public static String delBatchUser(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.delBatchUser);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.delBatchUser,body);
 	}
 
 	/**
@@ -175,10 +155,7 @@
 	 * @return
 	 */
 	public static String editUser(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.editUser);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.editUser,body);
 	}
 	/**
 	 *	娣诲姞浜鸿劯淇℃伅
@@ -186,10 +163,7 @@
 	 * @return
 	 */
 	public static String addFace(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.addFace);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.addFace,body);
 	}
 	/**
 	 *	缂栬緫浜鸿劯淇℃伅
@@ -197,10 +171,7 @@
 	 * @return
 	 */
 	public static String editFace(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.editFace);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.editFace,body);
 	}
 	/**
 	 *	鍒犻櫎浜鸿劯淇℃伅
@@ -208,10 +179,7 @@
 	 * @return
 	 */
 	public static String delFace(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.delFace);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.delFace,body);
 	}
 	/**
 	 *	鍏ㄩ噺鑾峰彇杞﹀簱淇℃伅
@@ -219,10 +187,7 @@
 	 * @return
 	 */
 	public static String parkList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.getParkList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.getParkList,body);
 	}
 	/**
 	 *	鏍规嵁杞﹀簱缂栫爜鏌ヨ鍑哄叆鍙e垪琛�
@@ -230,10 +195,7 @@
 	 * @return
 	 */
 	public static String entranceList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.getEntranceList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.getEntranceList,body);
 	}
 	/**
 	 *	杞﹁締棰勭害
@@ -241,10 +203,7 @@
 	 * @return
 	 */
 	public static String parkAddition(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.parkAddition);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.parkAddition,body);
 	}
 	/**
 	 *	杞﹁締鍙栨秷棰勭害
@@ -252,10 +211,7 @@
 	 * @return
 	 */
 	public static String parkDeletion(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.parkDeletion);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.parkDeletion,body);
 	}
 	/**
 	 *	鍥哄畾杞﹁締鍏呭�硷紙鍖呮湡锛�
@@ -263,10 +219,7 @@
 	 * @return
 	 */
 	public static String carChargeAddtion(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.carChargeAddtion);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.carChargeAddtion,body);
 	}
 	/**
 	 *	鍥哄畾杞﹁締鍙栨秷鍖呮湡
@@ -274,10 +227,7 @@
 	 * @return
 	 */
 	public static String carChargeDeletion(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.carChargeDeletion);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.carChargeDeletion,body);
 	}
 
 
@@ -288,7 +238,7 @@
 	 */
 	public static InputStream getFaceInputStream(String body)  throws  Exception{
 
-		Map<String, String> path = getPath(HKConstants.InterfacePath.facePicture);
+		Map<String, String> path = getPath(HKConstants.InterfacePath.facePicture[0]);
 		//鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆
 		HttpResponse resp = ArtemisHttpUtil.doPostStringImgArtemis( path, body, null, null,"application/json",null);
 		if (200==resp.getStatusLine().getStatusCode()) {
@@ -305,8 +255,7 @@
 	 * @return
 	 */
 	public static InputStream getVisitPicture(String body)  throws  Exception{
-
-		Map<String, String> path = getPath(HKConstants.InterfacePath.visitPicture);
+		Map<String, String> path = getPath(HKConstants.InterfacePath.visitPicture[0]);
 		//鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆
 		HttpResponse resp = ArtemisHttpUtil.doPostStringImgArtemis( path, body, null, null,"application/json",null);
 		if (200==resp.getStatusLine().getStatusCode()) {
@@ -324,7 +273,7 @@
 	 */
 	public static InputStream getDevicePicture(String body)  throws  Exception{
 
-		Map<String, String> path = getPath(HKConstants.InterfacePath.devicePicture);
+		Map<String, String> path = getPath(HKConstants.InterfacePath.devicePicture[0]);
 		//鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆
 		HttpResponse resp = ArtemisHttpUtil.doPostStringImgArtemis( path, body, null, null,"application/json",null);
 		if (200==resp.getStatusLine().getStatusCode()) {
@@ -343,7 +292,7 @@
 	 */
 	public static InputStream getCarPicture(String body)  throws  Exception{
 
-		Map<String, String> path = getPath(HKConstants.InterfacePath.carPicture);
+		Map<String, String> path = getPath(HKConstants.InterfacePath.carPicture[0]);
 		//鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆
 		HttpResponse resp = ArtemisHttpUtil.doPostStringImgArtemis( path, body, null, null,"application/json",null);
 		if (200==resp.getStatusLine().getStatusCode()) {
@@ -360,10 +309,7 @@
 	 * @return
 	 */
 	public static String doorSearch(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.doorSearch);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.doorSearch,body);
 	}
 	/**
 	 *	鑾峰彇闂ㄧ璁惧鍒楄〃
@@ -371,10 +317,7 @@
 	 * @return
 	 */
 	public static String acsDeviceList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.acsDeviceList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.acsDeviceList,body);
 	}
 	/**
 	 *	澧為噺鑾峰彇闂ㄧ璁惧鍒楄〃
@@ -382,10 +325,7 @@
 	 * @return
 	 */
 	public static String acsDeviceTimeRangeList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.acsDeviceList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.acsDeviceTimeRangeList,body);
 	}
 	/**
 	 *	璁垮棰勭害
@@ -393,10 +333,23 @@
 	 * @return
 	 */
 	public static String visitAppiontment(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.visitAppiontment);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.visitAppiontment,body);
+	}
+	/**
+	 *	璁垮棰勭害
+	 * @param body
+	 * @return
+	 */
+	public static String iccmAppointment(String body) {
+		return startDoPostStringArtemis(HKConstants.InterfacePath.iccmAppointment,body);
+	}
+	/**
+	 *	璁垮鍏嶇櫥璁伴绾�
+	 * @param body
+	 * @return
+	 */
+	public static String iccmAppointmentMDJ(String body) {
+		return startDoPostStringArtemis(HKConstants.InterfacePath.iccmAppointmentMDJ,body);
 	}
 	/**
 	 *	璁垮鍏嶇櫥璁伴绾�
@@ -404,10 +357,7 @@
 	 * @return
 	 */
 	public static String visitAppiontmentMDJ(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.visitAppiontmentMDJ);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.visitAppiontmentMDJ,body);
 	}
 
 	/**
@@ -416,10 +366,34 @@
 	 * @return
 	 */
 	public static String visitCancel(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.visitCancel);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return  startDoPostStringArtemis(HKConstants.InterfacePath.visitCancel,body);
+	}
+
+	public static String startDoPostStringArtemis(String[] pathStr,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.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,String param,String body ){
+		Map<String, String> path = getPath(pathStr[0]+StringUtils.defaultString(param,""));
+		Map<String, String> header = new HashMap<>();
+		header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
+		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;
+
 	}
 	/**
 	 *	绛剧璁垮棰勭害
@@ -427,10 +401,7 @@
 	 * @return
 	 */
 	public static String visitOut(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.visitOut);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.visitOut,body);
 	}
 	/**
 	 *	璁垮鏉冮檺缁�
@@ -438,10 +409,10 @@
 	 * @return
 	 */
 	public static String privilegeGroup(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.privilegeGroup);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.privilegeGroup,body);
+	}
+	public static String privilegIccmeGroup(String body) {
+		return startDoPostStringArtemis(HKConstants.InterfacePath.privilegIccmeGroup,body);
 	}
 	/**
 	 *	浜嬩欢璁㈤槄
@@ -449,10 +420,7 @@
 	 * @return
 	 */
 	public static String eventSub(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.eventSub);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.eventSub,body);
 	}
 	/**
 	 *	鍙栨秷浜嬩欢璁㈤槄
@@ -460,10 +428,7 @@
 	 * @return
 	 */
 	public static String cancelEventSub(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.cancelEventSub);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.cancelEventSub,body);
 	}
 	/**
 	 *	鍒涘缓涓�鍗¢�氭潈闄愪笅杞戒换鍔�
@@ -471,10 +436,7 @@
 	 * @return
 	 */
 	public static String taskAddition(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.taskAddition);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.taskAddition,body);
 	}
 	/**
 	 *	鏌ヨ涓�鍗¢�氭潈闄愭煡璇㈣澶囬�氶亾鐨勪汉鍛樻潈闄愪笅杞借鎯呮�绘暟v2
@@ -482,10 +444,7 @@
 	 * @return
 	 */
 	public static String taskProgress(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.taskProgress);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.taskProgress,body);
 	}
 	/**
 	 *	鏌ヨ涓�鍗¢�氭潈闄愪笅杞戒换鍔¤繘搴�
@@ -493,10 +452,7 @@
 	 * @return
 	 */
 	public static String taskProgressNum(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.taskProgressNum);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.taskProgressNum,body);
 	}
 	/**
 	 *	涓�鍗¢�氭潈闄愪笅杞戒换鍔′腑娣诲姞鏁版嵁_鏍规嵁浜哄憳涓庤澶囬�氶亾鎸囧畾涓嬭浇
@@ -504,10 +460,7 @@
 	 * @return
 	 */
 	public static String taskDataAddition(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.taskDataAddition);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.taskDataAddition,body);
 	}
 	/**
 	 *	涓�鍗¢�氬紑濮嬩笅杞戒换鍔�
@@ -515,10 +468,7 @@
 	 * @return
 	 */
 	public static String taskStart(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.taskStart);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.taskStart,body);
 	}
 	/**
 	 * 鏌ヨ鏉冮檺鏉$洰鍒楄〃
@@ -526,13 +476,7 @@
 	 * @return
 	 */
 	public static String authItemList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.authItemList);
-		Map<String, String> header = new HashMap<>();
-		header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
-//		header.put("tagId", "frs");
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.authItemList,body);
 	}
 	/**
 	 * 鎵归噺寮�鍗�
@@ -540,11 +484,7 @@
 	 * @return
 	 */
 	public static String cardBingding(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.cardBingding);
-		Map<String, String> header = new HashMap<>();
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.cardBingding,body);
 	}
 	/**
 	 * 閫�鍗�
@@ -552,11 +492,7 @@
 	 * @return
 	 */
 	public static String cardDeletion(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.cardDeletion);
-		Map<String, String> header = new HashMap<>();
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.cardDeletion,body);
 	}
 	/**
 	 * 鎵归噺鎸傚け
@@ -564,11 +500,7 @@
 	 * @return
 	 */
 	public static String cardLoss(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.cardLoss);
-		Map<String, String> header = new HashMap<>();
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.cardLoss,body);
 	}
 	/**
 	 * 鎵归噺瑙f寕
@@ -576,11 +508,7 @@
 	 * @return
 	 */
 	public static String cardUnloss(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.cardUnloss);
-		Map<String, String> header = new HashMap<>();
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.cardUnloss,body);
 	}
 	/**
 	 * 鏌ヨ璁惧閫氶亾鐨勪汉鍛樻潈闄愪笅杞借鎯�
@@ -588,11 +516,7 @@
 	 * @return
 	 */
 	public static String taskPersoDetail(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.taskPersoDetail);
-		Map<String, String> header = new HashMap<>();
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.taskPersoDetail,body);
 	}
 
 	/**
@@ -601,10 +525,7 @@
 	 * @return
 	 */
 	public static String visitingRecords(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.visitingRecords);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.visitingRecords,body);
 	}
 
 	/**
@@ -613,10 +534,16 @@
 	 * @return
 	 */
 	public static String appointmentRecords(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.appointmentRecords);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.appointmentRecords,body);
+	}
+
+	/**
+	 *	鑾峰彇璁垮棰勭害璁板綍鍒楄〃 iccm
+	 * @param body
+	 * @return
+	 */
+	public static String iccmAppointmentRecords(String body) {
+		return startDoPostStringArtemis(HKConstants.InterfacePath.iccmAppointmentRecords,body);
 	}
 	/**
 	 *	鑾峰彇鍏ㄩ噺缁勭粐鍒楄〃
@@ -624,10 +551,7 @@
 	 * @return
 	 */
 	public static String orgAllList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.orgAllList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.orgAllList,body);
 	}
 	/**
 	 *	鑾峰彇鍏ㄩ噺鐢ㄦ埛鍒楄〃
@@ -635,10 +559,7 @@
 	 * @return
 	 */
 	public static String userAllList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.userAllList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.userAllList,body);
 	}
 	/**
 	 *	鑾峰彇鍏ㄩ噺鐢ㄦ埛鍒楄〃2(鏍规嵁鏉′欢鍒嗛〉鏌ヨ锛�
@@ -646,10 +567,7 @@
 	 * @return
 	 */
 	public static String personList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.personList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.personList,body);
 	}
 	/**
 	 *	澧為噺鑾峰彇缁勭粐鍒楄〃
@@ -657,10 +575,7 @@
 	 * @return
 	 */
 	public static String orgTimeRangeList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.orgTimeRangeList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.orgTimeRangeList,body);
 	}
 	/**
 	 *	澧為噺鑾峰彇鐢ㄦ埛鍒楄〃
@@ -668,10 +583,7 @@
 	 * @return
 	 */
 	public static String userTimeRangeList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.userTimeRangeList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.userTimeRangeList,body);
 	}
 	/**
 	 *	澧為噺鑾峰彇杞﹁締鍒楄〃
@@ -679,10 +591,7 @@
 	 * @return
 	 */
 	public static String vehicleTimeRangeList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.vehicleTimeRangeList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.vehicleTimeRangeList,body);
 	}
 	/**
 	 *	鍏ㄩ噺鑾峰彇杞﹁締鍒楄〃
@@ -690,10 +599,7 @@
 	 * @return
 	 */
 	public static String vehicleList(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.vehicleList);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.vehicleList,body);
 	}
 	/**
 	 *	鍋滆溅鍦鸿繃杞﹁褰曟煡璇�
@@ -701,21 +607,15 @@
 	 * @return
 	 */
 	public static String parkCrossRecords(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.parkCrossRecords);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.parkCrossRecords,body);
 	}
 	/**
-	 *	鍋滆溅鍦鸿繃杞﹁褰曟煡璇�
+	 *	浜鸿劯璇勫垎
 	 * @param body
 	 * @return
 	 */
 	public static String facePictureCheck(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.facePictureCheck);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		return startDoPostStringArtemis(HKConstants.InterfacePath.facePictureCheck,body);
 	}
 
 	/**
@@ -724,10 +624,74 @@
 	 * @return
 	 */
 	public static String acsDeviceStatus(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.acsDeviceStatus);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		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);
 	}
 
 	/**
@@ -736,10 +700,24 @@
 	 * @return
 	 */
 	public static String tempCarInRecords(String body) {
-		Map<String, String> path = getPath(HKConstants.InterfacePath.tempCarInRecords);
-		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", null);// post璇锋眰application/json绫诲瀷鍙傛暟
-		saveInterfaceLog(body,result,path);
-		return  result;
+		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