From dafb9afc287d23552df32ead534d2fbe6be81a08 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 13 Dec 2023 09:09:19 +0800
Subject: [PATCH] 海康视频修复
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java
index f9fbc86..af0922e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/controller/HkController.java
@@ -329,6 +329,7 @@
public R syncVideo(@RequestBody HkVO hk) {
// 通过水库编号获取区域(区县)名称
AttResAdVO info = attResBaseService.getWaterRegionInfoByResGuid(hk.getRegionIndexCode());
+ String resName = hk.getRegionName();
hk.setRegionName(info.getCountyName());
// 通过区域名称查询对应的区域编号
String rootRegionId = hkService.regionNodesByParams(hk);
@@ -339,7 +340,7 @@
*/
List<VideoVO> list = new ArrayList<>();
VideoVO video = new VideoVO();
- video.setRegionName(hk.getRegionName());
+ video.setRegionName(resName);
video.setRegionIndexCode(hk.getRegionIndexCode());
video.setParentIndexCode(rootRegionId);
video.setRegionType(10);
@@ -355,7 +356,7 @@
return R.data(200,jsonObject,null);
}else {
// 当前水库行政区域不匹配
- return R.data(400,null,"当前水库行政区域不匹配");
+ return R.data(400,"当前水库行政区域不匹配","当前水库行政区域不匹配");
}
}
--
Gitblit v1.9.3