From e057cdcd1132081abd02eae587850349d14fb2f7 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 07 十二月 2023 11:44:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 57 insertions(+), 1 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index 49aa419..c9177c5 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -1,10 +1,17 @@
 package com.doumee.core.haikang.model;
 
 import com.alibaba.fastjson.JSONObject;
+import com.doumee.config.SpringContextUtil;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.InterfaceLog;
+import com.doumee.service.business.InterfaceLogService;
 import com.hikvision.artemis.sdk.ArtemisHttpUtil;
+import com.hikvision.artemis.sdk.config.ArtemisConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
+import org.apache.tomcat.util.bcel.Const;
+import org.yaml.snakeyaml.scanner.Constant;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -19,10 +26,24 @@
 
 //	private static final Logger logger = LoggerFactory.getLogger(HKUtil.class);
 
-
 	public static void main(String[] args) throws ParseException {
 
 	}
+	private static void saveInterfaceLog(String s, String result,Map<String, String> path) {
+		InterfaceLogService bean = SpringContextUtil.getBean(InterfaceLogService.class);
+		if(bean !=null){
+			InterfaceLog hkMonitoryLogDO=new InterfaceLog();
+			hkMonitoryLogDO.setType(0);
+			hkMonitoryLogDO.setCreateDate(new Date());
+			hkMonitoryLogDO.setIsdeleted(0);
+			hkMonitoryLogDO.setRequest(s);
+			hkMonitoryLogDO.setRemark(result);
+			hkMonitoryLogDO.setName(path.get(HKConstants.https));
+			hkMonitoryLogDO.setUrl(HKConstants.https + ArtemisConfig.host+path.get(HKConstants.https));
+			bean.create(hkMonitoryLogDO);
+		}
+	}
+
 	private static Map<String, String> getPath(String str) {
 		final String getCamsApi = HKConstants.ARTEMIS_PATH  + str;
 		Map<String, String> path = new HashMap<String, String>(2) {
@@ -40,8 +61,10 @@
 	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;
 	}
+
 
 	/**
 	 * 鏇存柊缁勭粐淇℃伅
@@ -51,6 +74,7 @@
 	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;
 	}
 
@@ -62,6 +86,7 @@
 	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;
 	}
 	/**
@@ -72,6 +97,7 @@
 	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;
 	}
 
@@ -83,6 +109,7 @@
 	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;
 	}
 
@@ -95,6 +122,7 @@
 	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;
 	}
 
@@ -106,6 +134,7 @@
 	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;
 	}
 
@@ -117,6 +146,7 @@
 	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;
 	}
 	/**
@@ -127,6 +157,7 @@
 	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;
 	}
 	/**
@@ -137,6 +168,7 @@
 	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;
 	}
 	/**
@@ -147,6 +179,7 @@
 	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;
 	}
 	/**
@@ -157,6 +190,7 @@
 	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;
 	}
 	/**
@@ -167,6 +201,7 @@
 	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;
 	}
 	/**
@@ -177,6 +212,7 @@
 	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;
 	}
 	/**
@@ -187,6 +223,7 @@
 	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;
 	}
 	/**
@@ -197,6 +234,7 @@
 	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;
 	}
 	/**
@@ -207,6 +245,7 @@
 	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;
 	}
 
@@ -237,6 +276,7 @@
 	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;
 	}
 	/**
@@ -247,6 +287,7 @@
 	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;
 	}
 	/**
@@ -257,6 +298,7 @@
 	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;
 	}
 	/**
@@ -267,6 +309,7 @@
 	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;
 	}
 
@@ -278,6 +321,7 @@
 	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;
 	}
 	/**
@@ -288,6 +332,18 @@
 	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;
+	}
+	/**
+	 *	浜嬩欢璁㈤槄
+	 * @param body
+	 * @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;
 	}
 

--
Gitblit v1.9.3