From c6a96d1162cb60d1bd30c8f5fde7a93985b79276 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 09 十月 2024 16:31:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 62 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 24 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 8e39c56..0d7e426 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
@@ -1,10 +1,8 @@
package com.doumee.core.haikang.model;
import com.alibaba.fastjson.JSONObject;
-import com.doumee.config.SpringContextUtil;
import com.doumee.core.haikang.model.param.request.CarPictureRequest;
import com.doumee.core.haikang.service.HKService;
-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;
@@ -13,18 +11,14 @@
import org.apache.commons.lang3.StringUtils;
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.*;
-import java.net.HttpURLConnection;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.URL;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
@Slf4j
@@ -79,9 +73,9 @@
private static Map<String, String> getPath(String str) {
final String getCamsApi = HKConstants.ARTEMIS_PATH + str;
Map<String, String> path = new HashMap<String, String>(2) {
- {
- put(HKConstants.https, getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
+ {
+ put(HKConstants.https, getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
+ }
};
return path;
}
@@ -240,14 +234,26 @@
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()) {
- HttpEntity entity = resp.getEntity();
- InputStream in = entity.getContent();
- return in;
- }else{
- throw new Exception("浜鸿劯涓嬭浇鍑洪敊");
+ log.error("=========================ArtemisConfig.host***********************************"+ ArtemisConfig.host);
+ log.error("=========================ArtemisConfig.key********************************"+ArtemisConfig.appKey);
+ try {
+ log.error("-------------------------ArtemisConfig.host***********************************"+ ArtemisConfig.host);
+ log.error("-------------------------ArtemisConfig.key********************************"+ArtemisConfig.appKey);
+ 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{
+ log.error("浜鸿劯涓嬭浇鍑洪敊");
+ throw new Exception("浜鸿劯涓嬭浇鍑洪敊");
+ }
+ }catch (Exception e){
+ e.printStackTrace();
}
+ log.error("+++++++++++++++++++++++++ArtemisConfig.host***********************************"+ ArtemisConfig.host);
+ log.error("+++++++++++++++++++++++++ArtemisConfig.key********************************"+ArtemisConfig.appKey);
+ return null;
}
/**
* 鑾峰彇璁垮璁板綍涓殑鍥剧墖
@@ -597,7 +603,7 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.fireDeviceStatusSearch,body);
}
/**
- * 鍒嗛〉鏌ヨ娑堥槻浼犳劅鍣ㄩ儴浠剁姸鎬�
+ * 鍒嗛〉鏌ヨ娑堥槻浼犳劅鍣ㄩ儴浠剁姸鎬�
* @param body
* @return
*/
@@ -605,6 +611,14 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.sensorStatusSearch,body);
}
/**
+ * 鍒嗛〉鏌ヨ璁惧涓嬬殑鎵�鏈夋姤璀﹁褰�
+ * @param body
+ * @return
+ */
+ public static String findDeviceAlarmPage(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.findDeviceAlarmPage,body);
+ }
+ /**
* 璇㈡秷闃茶澶囧垪琛�
* @param body
* @return
--
Gitblit v1.9.3