From cbc0ca91b14dc3f95226ce6a32d34e2178e7e62c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Fri, 17 Nov 2023 17:59:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8C=BA=E5=9F=9F=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/service/IRegionService.java         |  4 +++-
 .../iot/vmp/service/impl/PlayServiceImpl.java   |  3 ++-
 .../iot/vmp/service/impl/RegionServiceImpl.java |  7 ++++++-
 .../iot/vmp/storager/dao/RegionMapper.java      |  3 +++
 .../vmp/vmanager/region/RegionController.java   | 17 +++++++++++++++--
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/IRegionService.java b/src/main/java/com/genersoft/iot/vmp/service/IRegionService.java
index b61c31b73..875dd89b3 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IRegionService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IRegionService.java
@@ -20,7 +20,7 @@ public interface IRegionService {
     /**
      * 查询子区划列表
      */
-    PageInfo<Region> queryChildGroupList(String regionParentId, int page, int count);
+    PageInfo<Region> queryChildRegionList(String regionParentId, int page, int count);
 
     /**
      * 更新区域
@@ -28,4 +28,6 @@ public interface IRegionService {
     void update(Region region);
 
     List<Region> getAllChild(String parent);
+
+    Region queryRegionByDeviceId(String regionDeviceId);
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
index f2653f70c..0f735f248 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -445,7 +445,8 @@ public class PlayServiceImpl implements IPlayService {
                                                           String endTime, ErrorCallback<Object> callback) {
         Device device = storager.queryVideoDevice(deviceId);
         if (device == null) {
-            logger.warn("[录像回放] 未找到设备 deviceId: {},channelId:{}", deviceId, channelId);
+            logger.warn("[录像回放] 未找到设备 deviceId: {}, channelId:{},startTime:{}, endTime:{}",
+                    deviceId, channelId, startTime, endTime);
             throw new ControllerException(ErrorCode.ERROR100.getCode(), "未找到设备：" + deviceId);
         }
 
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/RegionServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/RegionServiceImpl.java
index 420ab6696..45100ae3e 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/RegionServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/RegionServiceImpl.java
@@ -87,7 +87,7 @@ public class RegionServiceImpl implements IRegionService {
     }
 
     @Override
-    public PageInfo<Region> queryChildGroupList(String regionParentId, int page, int count) {
+    public PageInfo<Region> queryChildRegionList(String regionParentId, int page, int count) {
         assert regionParentId != null;
         PageHelper.startPage(page, count);
         List<Region> all = regionMapper.getChildren(regionParentId);
@@ -130,4 +130,9 @@ public class RegionServiceImpl implements IRegionService {
         Collections.sort(allChild);
         return allChild;
     }
+
+    @Override
+    public Region queryRegionByDeviceId(String regionDeviceId) {
+        return regionMapper.queryRegionByDeviceId(regionDeviceId);
+    }
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/RegionMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/RegionMapper.java
index a02ea3c8c..3cf4938b4 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/RegionMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/RegionMapper.java
@@ -116,4 +116,7 @@ public interface RegionMapper {
             "<foreach collection='regionList'  item='item'  open='(' separator=',' close=')' > #{item.commonRegionId}</foreach>" +
             "</script>")
     void removeRegionByList(@Param("regionList") List<Region> regionList);
+
+    @Select("select * from wvp_common_region where common_region_device_id = #{regionDeviceId}")
+    Region queryRegionByDeviceId(@Param("regionDeviceId") String regionDeviceId);
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/region/RegionController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/region/RegionController.java
index e58814f57..c3d3105fd 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/region/RegionController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/region/RegionController.java
@@ -75,7 +75,7 @@ public class RegionController {
     @Parameter(name = "count", description = "每页查询数量", required = true)
     @ResponseBody
     @GetMapping("/child/list")
-    public PageInfo<Region> queryChildGroupList(
+    public PageInfo<Region> queryChildRegionList(
             @RequestParam(required = true) String regionParentId,
             @RequestParam(required = true) int page,
             @RequestParam(required = true) int count
@@ -83,7 +83,20 @@ public class RegionController {
         if (ObjectUtils.isEmpty(regionParentId.trim())) {
             regionParentId = null;
         }
-        return regionService.queryChildGroupList(regionParentId, page, count);
+        return regionService.queryChildRegionList(regionParentId, page, count);
+    }
+
+    @Operation(summary = "根据区域Id查询区域")
+    @Parameter(name = "regionDeviceId", description = "行政区划节点编号", required = true)
+    @ResponseBody
+    @GetMapping("/one")
+    public Region queryRegionByDeviceId(
+            @RequestParam(required = true) String regionDeviceId
+    ){
+        if (ObjectUtils.isEmpty(regionDeviceId.trim())) {
+            throw new ControllerException(ErrorCode.ERROR400);
+        }
+        return regionService.queryRegionByDeviceId(regionDeviceId);
     }
 
     @Operation(summary = "获取所属的行政区划下的行政区划")