From ec7b4d21f1de3c8d0e1838bb15b9b395f8055e36 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 24 Apr 2024 15:41:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/EventVO.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkEventController.java | 2 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java | 3 +++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java | 4 ++--
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java b/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java
index 7d1ed70..32e1499 100644
--- a/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java
+++ b/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java
@@ -40,7 +40,7 @@
/**
* nacos dev 地址
*/
- String NACOS_DEV_ADDR = "127.0.0.1:8848";
+ String NACOS_DEV_ADDR = "127.0.0.1:8849";
/**
* nacos prod 地址
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java
index 83b2efe..ad50578 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/constant/HkConstant.java
@@ -11,11 +11,14 @@
* post
*/
public static final String HOST = "36.134.79.80:1443";
+// public static final String HOST = "v.hubeishuiyi.cn:1443";
+
/**
* newPost
*/
public static final String NEW_HOST = "223.76.234.232:1443";
+// public static final String NEW_HOST = "v.hubeishuiyi.cn:1443";
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkEventController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkEventController.java
index 969ee48..57f782d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkEventController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkEventController.java
@@ -44,6 +44,7 @@
@GetMapping(value = "/eventSubscriptionByEventTypes")
public R eventSubscriptionByEventTypes(EventVO eventVO) {
String result = addEventSubscriptionByEventTypes(eventVO, HkConstant.eventSubscriptionByEventTypesURLs);
+ log.info("事件订阅返回信息：" + result);
JSONObject jsonObject1 = JSONObject.parseObject(result);
// 查询海康设备列表并返回
return R.data(jsonObject1);
@@ -89,6 +90,7 @@
String prettyData = JSON.toJSONString(jsonObject, SerializerFeature.PrettyFormat,
SerializerFeature.WriteMapNullValue);
System.out.println(simpleDateFormat.format(date) + "收到数据:" + System.lineSeparator() + prettyData);
+ log.info(simpleDateFormat.format(date) + "收到数据:" + System.lineSeparator() + prettyData);
JSONObject jsonBody = new JSONObject();
jsonBody.put("code", "200");
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java
index f0208dd..0f31906 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/util/GetCameraUtils.java
@@ -295,7 +295,7 @@
* 组装请求参数
*/
JSONObject jsonBody = new JSONObject();
- jsonBody.put("eventTypes", Arrays.stream(eventVO.getEventTypes().split(",")).mapToInt(Integer::parseInt).toArray());
+ jsonBody.put("eventTypes", Arrays.stream(eventVO.getEventTypes().split(",")).mapToLong(Long::parseLong).toArray());
jsonBody.put("eventDest", eventVO.getEventDest());
if (null!=eventVO.getSubType()){
jsonBody.put("subType", eventVO.getSubType());
@@ -319,7 +319,7 @@
* @return
*/
public static String removeEventSubscriptionByEventTypes(EventVO eventVO, String url) {
- int[] eventTypes = Arrays.stream(eventVO.getEventTypes().split(",")).mapToInt(Integer::parseInt).toArray();
+ long[] eventTypes = Arrays.stream(eventVO.getEventTypes().split(",")).mapToLong(Long::parseLong).toArray();
/**
* 组装请求参数
*/
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/EventVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/EventVO.java
index 1170b61..bd445fd 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/EventVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/EventVO.java
@@ -13,7 +13,7 @@
private Integer type;
/**
- * 事件类型 区域入侵：131588，徘徊侦测：131590 视频丢失：131329 折线警戒面：131611
+ * 事件类型 视频丢失：131329，视频遮挡：131330，移动侦测：131331，越界侦测：131585，区域入侵：131588，徘徊侦测：131590，人员聚集：131593
*/
private String eventTypes;
--
Gitblit v1.9.3