From 6a2689a44840490a64cf66b37eb09e45eb1da244 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 24 九月 2024 16:03:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 149 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 130 insertions(+), 19 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 b1ea5b6..8e39c56 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);
}
@@ -237,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()) {
@@ -254,7 +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()) {
@@ -272,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()) {
@@ -291,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()) {
@@ -335,6 +336,22 @@
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);
+ }
+ /**
* 璁垮鍏嶇櫥璁伴绾�
* @param body
* @return
@@ -352,20 +369,38 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.visitCancel,body);
}
- public static String startDoPostStringArtemis(String pathStr,String body){
- Map<String, String> path = getPath(pathStr);
+ public static String startDoGetStringArtemis(String[] pathStr,Map<String,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);
+ String result = ArtemisHttpUtil.doGetArtemis(path, body, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
+ saveInterfaceLog(JSONObject.toJSONString(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);
+ 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);
+ saveInterfaceLog(body,result,path,pathStr[1]);
return result;
}
@@ -503,6 +538,14 @@
}
/**
+ * 鑾峰彇鍏ㄩ噺缁勭粐淇℃伅
+ * @param body
+ * @return
+ */
+ public static String orgAllList(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.orgAllList,body);
+ }
+ /**
* 鑾峰彇璁垮棰勭害璁板綍鍒楄〃
* @param body
* @return
@@ -510,13 +553,73 @@
public static String appointmentRecords(String body) {
return startDoPostStringArtemis(HKConstants.InterfacePath.appointmentRecords,body);
}
+
/**
- * 鑾峰彇鍏ㄩ噺缁勭粐鍒楄〃
+ * 鑾峰彇璁垮棰勭害璁板綍鍒楄〃 iccm
* @param body
* @return
*/
- public static String orgAllList(String body) {
- return startDoPostStringArtemis(HKConstants.InterfacePath.orgAllList,body);
+ public static String iccmAppointmentRecords(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.iccmAppointmentRecords,body);
+ }
+ /**
+ * 鏍规嵁寰俊鍏紬鍙蜂俊鎭幏鍙朅ccessToken
+ * @return
+ */
+ public static String wxAccessToken(String configId,String tagId) {
+ String[] wxAccessToken= HKConstants.InterfacePath.wxAccessToken;
+ wxAccessToken[0] = HKConstants.InterfacePath.wxAccessToken+"?tagId="+tagId+"&configId"+configId;
+ return startDoPostStringArtemis(wxAccessToken,"");
+ }
+ /**
+ * 鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅
+ * @param body
+ * @return
+ */
+ public static String getWxConfig(Map<String,String> body) {
+ return startDoGetStringArtemis(HKConstants.InterfacePath.getWxConfig,body);
+ }
+ /**
+ * 鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅
+ * @param body
+ * @return
+ */
+ public static String nhEventPageList(Map<String,String> body) {
+ return startDoGetStringArtemis(HKConstants.InterfacePath.nhEventPageList,body);
+ }
+
+ /**
+ * 鏌ヨ娑堥槻璁惧閮ㄤ欢鐘舵��
+ * @param body
+ * @return
+ */
+ public static String fireDeviceStatusSearch(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.fireDeviceStatusSearch,body);
+ }
+ /**
+ * 鍒嗛〉鏌ヨ娑堥槻浼犳劅鍣ㄩ儴浠剁姸鎬�
+ * @param body
+ * @return
+ */
+ public static String sensorStatusSearch(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.sensorStatusSearch,body);
+ }
+ /**
+ * 璇㈡秷闃茶澶囧垪琛�
+ * @param body
+ * @return
+ */
+ public static String fireChannelSearch(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.fireChannelSearch,body);
+ }
+
+ /**
+ * 璇㈡秷闃茶澶囧垪琛�
+ * @param body
+ * @return
+ */
+ public static String fireDeviceSearch(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.fireDeviceSearch,body);
}
/**
* 鑾峰彇鍏ㄩ噺鐢ㄦ埛鍒楄〃
@@ -625,11 +728,14 @@
}
/**
* 鑾峰彇鏈堝彴鐘舵��
- * @param body
* @return
*/
- public static String platformStatus(String body) {
- return startDoPostStringArtemis(HKConstants.InterfacePath.platformStatus,body);
+ 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璁惧娓呭崟
@@ -682,4 +788,9 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.applyST,body);
}
+ public static String getMenuUrl(String menuId, String token) {
+ String url = HKConstants.InterfacePath.goMenuUrl[0];
+ url = url.replace("${menuId}", menuId).replace("${token}",token);
+ return url;
+ }
}
--
Gitblit v1.9.3