From 97b74f99421ae0af00b3dcfa5c875a15ec287e6d Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期四, 25 十一月 2021 13:35:38 +0800
Subject: [PATCH] 修改
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/PreviewURLsVo.java | 49 ++++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java | 4
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/TalkURLsVo.java | 31 +++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/HaiKangPost.java | 123 ++++++++++++++++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/FindHistoryGpsRequest.java | 49 ++++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/PlaybackURLsVo.java | 77 ++++++++++++
xboot-modules/xboot-your/pom.xml | 8 +
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Car.java | 3
8 files changed, 343 insertions(+), 1 deletions(-)
diff --git a/xboot-modules/xboot-your/pom.xml b/xboot-modules/xboot-your/pom.xml
index a8a42fd..907f247 100644
--- a/xboot-modules/xboot-your/pom.xml
+++ b/xboot-modules/xboot-your/pom.xml
@@ -11,5 +11,11 @@
<artifactId>xboot-your</artifactId>
-
+ <dependencies>
+ <dependency>
+ <groupId>com.hikvision.ga</groupId>
+ <artifactId>artemis-http-client</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
index f2773d2..0d8db24 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
@@ -135,6 +135,10 @@
fingerprint.setPassword(user.getDescription());
fingerprint.setType(user.getType2());
}
+ if(StrUtil.isNotEmpty(fingerprint.getCustomerId())){
+ Customer byId = iCustomerService.getById(fingerprint.getCustomerId());
+ fingerprint.setAreaId(byId.getAreaId());
+ }
if (iFingerprintService.saveOrUpdate(fingerprint)) {
return new ResultUtil<Fingerprint>().setData(fingerprint);
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Car.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Car.java
index 02888a0..8f99b63 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Car.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Car.java
@@ -30,6 +30,9 @@
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "杞﹁締缂栧彿")
+ private String code;
+
@ApiModelProperty(value = "鍝佺墝")
private String brand;
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/HaiKangPost.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/HaiKangPost.java
new file mode 100644
index 0000000..4dee7b7
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/util/HaiKangPost.java
@@ -0,0 +1,123 @@
+package cn.exrick.xboot.your.util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import cn.exrick.xboot.your.vo.FindHistoryGpsRequest;
+import cn.exrick.xboot.your.vo.PlaybackURLsVo;
+import cn.exrick.xboot.your.vo.PreviewURLsVo;
+import cn.exrick.xboot.your.vo.TalkURLsVo;
+import cn.hutool.json.JSONUtil;
+import com.hikvision.artemis.sdk.ArtemisHttpUtil;
+import com.hikvision.artemis.sdk.config.ArtemisConfig;
+
+
+/**
+ * 娴峰悍杞︽満鎺ュ彛
+ */
+public class HaiKangPost {
+ /**
+ * STEP1锛氳缃钩鍙板弬鏁帮紝鏍规嵁瀹為檯鎯呭喌,璁剧疆host appkey appsecret 涓変釜鍙傛暟.
+ */
+ static {
+ ArtemisConfig.host = "111.63.178.115:1443";// 骞冲彴闂ㄦ埛/nginx鐨処P鍜岀鍙ｏ紙蹇呴』浣跨敤https鍗忚锛宧ttps绔彛榛樿涓�443锛�
+ ArtemisConfig.appKey = "28156526"; // 绉橀挜appkey
+ ArtemisConfig.appSecret = "MNkyjHuids4XxFONSOaL";// 绉橀挜appSecret
+ }
+ /**
+ * STEP2锛氳缃甇penAPI鎺ュ彛鐨勪笂涓嬫枃
+ */
+ private static final String ARTEMIS_PATH = "/artemis";
+
+ //鏍规嵁杞﹁締缂栧彿鍙婃椂娈佃幏鍙栧巻鍙插畾浣嶄俊鎭�
+ public static String findHistoryGps(FindHistoryGpsRequest findHistoryGpsRequest){
+ String findHistoryGpsDataApi = ARTEMIS_PATH +"/api/rtsm/v1/gps/findHistoryGps";
+ Map<String,String> path = new HashMap<String,String>(2){
+ {
+ put("https://",findHistoryGpsDataApi);
+ }
+ };
+ String body= JSONUtil.toJsonStr(findHistoryGpsRequest);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path,body,null,null,"application/json");
+ return result;
+ }
+
+ //鏌ヨ鎸囧畾杞﹁締缂栧彿鐨勬渶鏂板畾浣�
+ public static String findLatestGps(String[] code){
+ String findHistoryGpsDataApi = ARTEMIS_PATH +"/api/rtsm/v1/gps/findLatestGps";
+ Map<String,String> path = new HashMap<String,String>(2){
+ {
+ put("https://",findHistoryGpsDataApi);
+ }
+ };
+ String body= JSONUtil.toJsonStr(code);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path,body,null,null,"application/json");
+ return result;
+ }
+
+ //鑾峰彇鐩戞帶鐐归瑙堝彇娴乁RL
+ public static String previewURLs(PreviewURLsVo previewURLsVo){
+ String findHistoryGpsDataApi = ARTEMIS_PATH +"/api/video/v1/cameras/previewURLs";
+ Map<String,String> path = new HashMap<String,String>(2){
+ {
+ put("https://",findHistoryGpsDataApi);
+ }
+ };
+ String body= JSONUtil.toJsonStr(previewURLsVo);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path,body,null,null,"application/json");
+ return result;
+ }
+
+ //鑾峰彇鐩戞帶鐐瑰洖鏀惧彇娴乁RL
+ public static String playbackURLs(PlaybackURLsVo playbackURLsVo){
+ String findHistoryGpsDataApi = ARTEMIS_PATH +"/api/video/v1/cameras/playbackURLs";
+ Map<String,String> path = new HashMap<String,String>(2){
+ {
+ put("https://",findHistoryGpsDataApi);
+ }
+ };
+ String body= JSONUtil.toJsonStr(playbackURLsVo);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path,body,null,null,"application/json");
+ return result;
+ }
+
+ //璇煶瀵硅
+ public static String talkURLs(TalkURLsVo talkURLsVo){
+ String findHistoryGpsDataApi = ARTEMIS_PATH +"/api/video/v1/cameras/talkURLs";
+ Map<String,String> path = new HashMap<String,String>(2){
+ {
+ put("https://",findHistoryGpsDataApi);
+ }
+ };
+ String body= JSONUtil.toJsonStr(talkURLsVo);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path,body,null,null,"application/json");
+ return result;
+ }
+
+ //鎸変簨浠剁被鍨嬭幏鍙栦簨浠惰闃呬俊鎭�
+ public static String getTopicInfo(){
+ String findHistoryGpsDataApi = ARTEMIS_PATH +"/api/common/v1/event/getTopicInfo";
+ Map<String,String> path = new HashMap<String,String>(2){
+ {
+ put("https://",findHistoryGpsDataApi);
+ }
+ };
+ String eventTypes[] = {"5201154049"};
+ String body= JSONUtil.toJsonStr(eventTypes);
+ String result = ArtemisHttpUtil.doPostStringArtemis(path,body,null,null,"application/json");
+ return result;
+ }
+
+ public static void main(String[] args) {
+// FindHistoryGpsRequest findHistoryGpsRequest = new FindHistoryGpsRequest();
+// findHistoryGpsRequest.setVehicleIndexCode("b279d865eabe497db465eb2f4d2cc87d");
+// findHistoryGpsRequest.setPageNo(1);
+// findHistoryGpsRequest.setPageSize(20);
+// findHistoryGpsRequest.setBeginTime("2021-11-25T03:10:01.000+08:00");
+// findHistoryGpsRequest.setEndTime("2021-11-25T12:10:01.000+08:00");
+// System.out.println(findHistoryGps(findHistoryGpsRequest));
+
+// String code[] = {"b279d865eabe497db465eb2f4d2cc87d"};
+// System.out.println(findLatestGps(code));
+ }
+}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/FindHistoryGpsRequest.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/FindHistoryGpsRequest.java
new file mode 100755
index 0000000..dd1f0dc
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/FindHistoryGpsRequest.java
@@ -0,0 +1,49 @@
+package cn.exrick.xboot.your.vo;
+
+public class FindHistoryGpsRequest {
+ private String beginTime;
+ private String endTime;
+ private String vehicleIndexCode;
+ private Integer pageNo;
+ private Integer pageSize;
+
+ public String getBeginTime() {
+ return beginTime;
+ }
+
+ public void setBeginTime(String beginTime) {
+ this.beginTime = beginTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
+ public String getVehicleIndexCode() {
+ return vehicleIndexCode;
+ }
+
+ public void setVehicleIndexCode(String vehicleIndexCode) {
+ this.vehicleIndexCode = vehicleIndexCode;
+ }
+
+ public Integer getPageNo() {
+ return pageNo;
+ }
+
+ public void setPageNo(Integer pageNo) {
+ this.pageNo = pageNo;
+ }
+
+ public Integer getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(Integer pageSize) {
+ this.pageSize = pageSize;
+ }
+}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/PlaybackURLsVo.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/PlaybackURLsVo.java
new file mode 100755
index 0000000..c731e06
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/PlaybackURLsVo.java
@@ -0,0 +1,77 @@
+package cn.exrick.xboot.your.vo;
+
+
+public class PlaybackURLsVo {
+ private String beginTime;
+ private String endTime;
+ private String cameraIndexCode;
+ private String recordLocation="0";//褰曞儚瀛樺偍浣嶇疆锛�0-涓績瀛樺偍锛�1-璁惧瀛樺偍锛�,榛樿涓績瀛樺偍
+ private String protocol;//鍗忚绫诲瀷锛坮tsp-rtsp鍗忚,rtmp-rtmp鍗忚,hLS-hLS鍗忚锛岄粯璁や负rtsp锛�
+ private Boolean needReturnClipInfo=true;//鏄惁杩斿洖褰曞儚鐗囨璇︾粏淇℃伅锛堥粯璁alse銆傚綋闇�瑕佸睍绀鸿鏃堕棿娈电殑褰曞儚鐗囨淇℃伅鏃讹紝闇�瑕佸～鍐檛rue锛�
+ private String uuid;//涓婁竴娆℃煡璇㈣繑鍥炵殑uuid锛岀敤浜庣户缁煡璇㈠墿浣欑墖娈碉紝榛樿涓虹┖瀛楃涓�
+ private String expand="transCode=0";
+
+ public String getBeginTime() {
+ return beginTime;
+ }
+
+ public void setBeginTime(String beginTime) {
+ this.beginTime = beginTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
+ public String getCameraIndexCode() {
+ return cameraIndexCode;
+ }
+
+ public void setCameraIndexCode(String cameraIndexCode) {
+ this.cameraIndexCode = cameraIndexCode;
+ }
+
+ public String getRecordLocation() {
+ return recordLocation;
+ }
+
+ public void setRecordLocation(String recordLocation) {
+ this.recordLocation = recordLocation;
+ }
+
+ public String getProtocol() {
+ return protocol;
+ }
+
+ public void setProtocol(String protocol) {
+ this.protocol = protocol;
+ }
+
+ public Boolean getNeedReturnClipInfo() {
+ return needReturnClipInfo;
+ }
+
+ public void setNeedReturnClipInfo(Boolean needReturnClipInfo) {
+ this.needReturnClipInfo = needReturnClipInfo;
+ }
+
+ public String getUuid() {
+ return uuid;
+ }
+
+ public void setUuid(String uuid) {
+ this.uuid = uuid;
+ }
+
+ public String getExpand() {
+ return expand;
+ }
+
+ public void setExpand(String expand) {
+ this.expand = expand;
+ }
+}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/PreviewURLsVo.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/PreviewURLsVo.java
new file mode 100755
index 0000000..a7bf6a0
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/PreviewURLsVo.java
@@ -0,0 +1,49 @@
+package cn.exrick.xboot.your.vo;
+
+public class PreviewURLsVo {
+ private String protocol;//鍗忚绫诲瀷锛坮tsp-rtsp鍗忚,rtmp-rtmp鍗忚,hls-hLS鍗忚锛夛紝鏈～鍐欎负rtsp鍗忚
+ private String cameraIndexCode;
+ private Integer streamType=0;//鐮佹祦绫诲瀷(0-涓荤爜娴�,1-瀛愮爜娴�),鏈～榛樿涓轰富鐮佹祦
+ private Integer transmode=0;//鍗忚绫诲瀷( 0-udp锛�1-tcp),榛樿涓簍cp锛屽湪protocol璁剧疆涓簉tsp鎴栬�卹tmp鏃舵湁鏁�
+ private String expand="transcode=0";//
+
+ public String getProtocol() {
+ return protocol;
+ }
+
+ public void setProtocol(String protocol) {
+ this.protocol = protocol;
+ }
+
+ public String getCameraIndexCode() {
+ return cameraIndexCode;
+ }
+
+ public void setCameraIndexCode(String cameraIndexCode) {
+ this.cameraIndexCode = cameraIndexCode;
+ }
+
+ public Integer getStreamType() {
+ return streamType;
+ }
+
+ public void setStreamType(Integer streamType) {
+ this.streamType = streamType;
+ }
+
+ public Integer getTransmode() {
+ return transmode;
+ }
+
+ public void setTransmode(Integer transmode) {
+ this.transmode = transmode;
+ }
+
+ public String getExpand() {
+ return expand;
+ }
+
+ public void setExpand(String expand) {
+ this.expand = expand;
+ }
+}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/TalkURLsVo.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/TalkURLsVo.java
new file mode 100755
index 0000000..ec68d76
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/vo/TalkURLsVo.java
@@ -0,0 +1,31 @@
+package cn.exrick.xboot.your.vo;
+
+public class TalkURLsVo {
+ private String cameraIndexCode;
+ private Integer transmode=0;//鍗忚绫诲瀷, 0: UDP 1: TCP 鏈～榛樿涓篢CP
+ private String expand="streamform=ps";
+
+ public String getCameraIndexCode() {
+ return cameraIndexCode;
+ }
+
+ public void setCameraIndexCode(String cameraIndexCode) {
+ this.cameraIndexCode = cameraIndexCode;
+ }
+
+ public Integer getTransmode() {
+ return transmode;
+ }
+
+ public void setTransmode(Integer transmode) {
+ this.transmode = transmode;
+ }
+
+ public String getExpand() {
+ return expand;
+ }
+
+ public void setExpand(String expand) {
+ this.expand = expand;
+ }
+}
--
Gitblit v1.9.1