From cb6874174975a370cb60f1557704c9d49a05f9e6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 05 一月 2024 08:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java |   79 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 73 insertions(+), 6 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 c639633..3a9f27e 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
@@ -51,9 +51,10 @@
 		System.out.println(content.toString());
 
 	}
+	public static InterfaceLogService interfaceLogService = null;
 	private static void saveInterfaceLog(String s, String result,Map<String, String> path) {
-		InterfaceLogService bean = SpringContextUtil.getBean(InterfaceLogService.class);
-		if(bean !=null){
+//		InterfaceLogService bean = SpringContextUtil.getBean(InterfaceLogService.class);
+		if(interfaceLogService !=null){
 			InterfaceLog hkMonitoryLogDO=new InterfaceLog();
 			hkMonitoryLogDO.setType(0);
 			hkMonitoryLogDO.setCreateDate(new Date());
@@ -62,7 +63,7 @@
 			hkMonitoryLogDO.setRepose(result);
 			hkMonitoryLogDO.setName(path.get(HKConstants.https));
 			hkMonitoryLogDO.setUrl(HKConstants.https + ArtemisConfig.host+path.get(HKConstants.https));
-			bean.create(hkMonitoryLogDO);
+			interfaceLogService.create(hkMonitoryLogDO);
 		}
 	}
 
@@ -455,8 +456,74 @@
 		saveInterfaceLog(body,result,path);
 		return  result;
 	}
-
-
-
+	/**
+	 *	鍒涘缓涓�鍗￠�氭潈闄愪笅杞戒换鍔�
+	 * @param body
+	 * @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;
+	}
+	/**
+	 *	鏌ヨ涓�鍗￠�氭潈闄愭煡璇㈣澶囬�氶亾鐨勪汉鍛樻潈闄愪笅杞借鎯呮�绘暟v2
+	 * @param body
+	 * @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;
+	}
+	/**
+	 *	鏌ヨ涓�鍗￠�氭潈闄愪笅杞戒换鍔¤繘搴�
+	 * @param body
+	 * @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;
+	}
+	/**
+	 *	涓�鍗￠�氭潈闄愪笅杞戒换鍔′腑娣诲姞鏁版嵁_鏍规嵁浜哄憳涓庤澶囬�氶亾鎸囧畾涓嬭浇
+	 * @param body
+	 * @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;
+	}
+	/**
+	 *	涓�鍗￠�氬紑濮嬩笅杞戒换鍔�
+	 * @param body
+	 * @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;
+	}
+	/**
+	 * 鏌ヨ鏉冮檺鏉＄洰鍒楄〃
+	 * @param body
+	 * @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;
+	}
 
 }

--
Gitblit v1.9.3