From f9e58797921a8c41338cbdea9d32aaecd2861c1e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 九月 2024 15:12:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 157 insertions(+), 13 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 659794a..b230c6a 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()) {
@@ -324,7 +325,7 @@
* @return
*/
public static String acsDeviceTimeRangeList(String body) {
- return startDoPostStringArtemis(HKConstants.InterfacePath.acsDeviceList,body);
+ return startDoPostStringArtemis(HKConstants.InterfacePath.acsDeviceTimeRangeList,body);
}
/**
* 璁垮棰勭害
@@ -333,6 +334,22 @@
*/
public static String visitAppiontment(String body) {
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);
}
/**
* 璁垮鍏嶇櫥璁伴绾�
@@ -352,12 +369,29 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.visitCancel,body);
}
- public static String startDoPostStringArtemis(String pathStr,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);
+ 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;
}
@@ -376,6 +410,9 @@
*/
public static String privilegeGroup(String body) {
return startDoPostStringArtemis(HKConstants.InterfacePath.privilegeGroup,body);
+ }
+ public static String privilegIccmeGroup(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.privilegIccmeGroup,body);
}
/**
* 浜嬩欢璁㈤槄
@@ -492,6 +529,14 @@
}
/**
+ * 鑾峰彇鍏ㄩ噺缁勭粐淇℃伅
+ * @param body
+ * @return
+ */
+ public static String orgAllList(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.orgAllList,body);
+ }
+ /**
* 鑾峰彇璁垮棰勭害璁板綍鍒楄〃
* @param body
* @return
@@ -499,13 +544,23 @@
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,"");
}
/**
* 鑾峰彇鍏ㄩ噺鐢ㄦ埛鍒楄〃
@@ -580,6 +635,73 @@
public static String acsDeviceStatus(String body) {
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);
+ }
/**
* 鏌ヨ鍦哄唴杞﹀仠杞︿俊鎭�
@@ -590,4 +712,26 @@
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);
+ }
+
+ 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