From 70577a6d6cf2bded29e71dcad11a0c2605193d20 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 10:32:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 143 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 137 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 19e86dc..9a2cae0 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);
}
}
@@ -291,6 +292,60 @@
}
}
/**
+ * 鑾峰彇璁垮璁板綍涓殑鍥剧墖
+ * @param body
+ * @return
+ */
+ public static InputStream getVisitPicture(String body) throws Exception{
+
+ Map<String, String> path = getPath(HKConstants.InterfacePath.visitPicture);
+ //鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆
+ HttpResponse resp = ArtemisHttpUtil.doPostStringImgArtemis( path, body, null, null,"application/json",null);
+ if (200==resp.getStatusLine().getStatusCode()) {
+ HttpEntity entity = resp.getEntity();
+ InputStream in = entity.getContent();
+ return in;
+ }else{
+ throw new Exception("鑾峰彇璁垮璁板綍涓殑鍥剧墖涓嬭浇鍑洪敊");
+ }
+ }
+ /**
+ * 鑾峰彇闂ㄧ浜嬩欢鐨勫浘鐗�
+ * @param body
+ * @return
+ */
+ public static InputStream getDevicePicture(String body) throws Exception{
+
+ Map<String, String> path = getPath(HKConstants.InterfacePath.devicePicture);
+ //鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆
+ HttpResponse resp = ArtemisHttpUtil.doPostStringImgArtemis( path, body, null, null,"application/json",null);
+ if (200==resp.getStatusLine().getStatusCode()) {
+ HttpEntity entity = resp.getEntity();
+ InputStream in = entity.getContent();
+ return in;
+ }else{
+ throw new Exception("鑾峰彇闂ㄧ浜嬩欢鐨勫浘鐗囦笅杞藉嚭閿�");
+ }
+ }
+ /**
+ * 鏌ヨ杞﹁締鎶撴媿鍥剧墖
+ * @param body
+ * @return
+ */
+ public static InputStream getCarPicture(String body) throws Exception{
+
+ Map<String, String> path = getPath(HKConstants.InterfacePath.carPicture);
+ //鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆
+ HttpResponse resp = ArtemisHttpUtil.doPostStringImgArtemis( path, body, null, null,"application/json",null);
+ if (200==resp.getStatusLine().getStatusCode()) {
+ HttpEntity entity = resp.getEntity();
+ InputStream in = entity.getContent();
+ return in;
+ }else{
+ throw new Exception("鏌ヨ杞﹁締鎶撴媿鍥剧墖涓嬭浇鍑洪敊");
+ }
+ }
+ /**
* 鑾峰彇闂ㄧ鐐瑰垪琛�
* @param body
* @return
@@ -390,8 +445,84 @@
saveInterfaceLog(body,result,path);
return result;
}
-
-
-
+ /**
+ * 鍙栨秷浜嬩欢璁㈤槄
+ * @param body
+ * @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;
+ }
+ /**
+ * 鍒涘缓涓�鍗￠�氭潈闄愪笅杞戒换鍔�
+ * @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("-", ""));
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
+ saveInterfaceLog(body,result,path);
+ return result;
+ }
}
--
Gitblit v1.9.3