From 8e4eb0d6b742e17d5b9f09bf12d4354e145faddc Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Fri, 18 Jul 2025 16:17:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/module/business/device/domain/vo/VideoItemVO.java | 6 ++++++
 .../module/business/device/service/VideoItemService.java    | 6 +++++-
 .../admin/module/system/village/service/VillageService.java | 2 +-
 .../resources/mapper/business/deivce/VideoItemMapper.xml    | 6 +++++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/device/domain/vo/VideoItemVO.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/device/domain/vo/VideoItemVO.java
index 1f8063b..2293aec 100644
--- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/device/domain/vo/VideoItemVO.java
+++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/device/domain/vo/VideoItemVO.java
@@ -52,9 +52,15 @@ public class VideoItemVO {
     @Schema(description = "分组Id")
     private Long groupId;
 
+    @Schema(description = "分组名称")
+    private String groupName;
+
     @Schema(description = "网格Id")
     private Long gridId;
 
+    @Schema(description = "网格名称")
+    private String gridName;
+
     @Schema(description = "自定义分组Id")
     private Long videoGroupId;
 
diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/device/service/VideoItemService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/device/service/VideoItemService.java
index 51cd4eb..64d40b6 100644
--- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/device/service/VideoItemService.java
+++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/device/service/VideoItemService.java
@@ -195,10 +195,14 @@ public class VideoItemService {
     }
 
     public Map<String, Object> getHikVideoUrl(Map<String, Object> map) {
+        Integer villageId = SmartRequestUtil.getRequestUser().getVillageId();
+        if (MapUtils.getInteger(map, "villageId") != null) {
+            villageId = MapUtils.getInteger(map, "villageId");
+        }
         Map<String, Object> data = new HashMap<>(16);
         String url = "";
         VideoConfigEntity videoConfig = videoConfigDao.selectOne(Wrappers.<VideoConfigEntity>lambdaQuery()
-                .eq(VideoConfigEntity::getVillageId, SmartRequestUtil.getRequestUser().getVillageId())
+                .eq(VideoConfigEntity::getVillageId, villageId)
                 .eq(VideoConfigEntity::getIsEnable, 1));
         if (videoConfig == null) {
             throw new BusinessException("未启用视频配置");
diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/village/service/VillageService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/village/service/VillageService.java
index 0610da8..6747442 100644
--- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/village/service/VillageService.java
+++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/village/service/VillageService.java
@@ -343,7 +343,7 @@ public class VillageService {
         vo.setInsectPestSituationTotal(insectPestSituations.size());
         vo.setInsectPestSituationOffLine((int) insectPestSituations.stream().filter(i -> i.getState() == 0).count());
         vo.setEnvironmentTotal(environmentDevs.size());
-        vo.setEnvironmentTotal((int) environmentDevs.stream().filter(e -> e.getState() == 0).count());
+        vo.setEnvironmentOffLine((int) environmentDevs.stream().filter(e -> e.getState() == 0).count());
         return vo;
     }
 
diff --git a/sa-admin/src/main/resources/mapper/business/deivce/VideoItemMapper.xml b/sa-admin/src/main/resources/mapper/business/deivce/VideoItemMapper.xml
index 3bce48a..551958b 100644
--- a/sa-admin/src/main/resources/mapper/business/deivce/VideoItemMapper.xml
+++ b/sa-admin/src/main/resources/mapper/business/deivce/VideoItemMapper.xml
@@ -24,7 +24,9 @@
         video_item.create_time,
         video_item.create_by,
         video_item.update_time,
-        video_item.village_id
+        video_item.village_id,
+        grid.name gridName,
+        group_info.name groupName
     </sql>
 
     <!-- 分页查询 -->
@@ -32,6 +34,8 @@
         SELECT
         <include refid="base_columns"/>
         FROM video_item
+        left join grid on video_item.grid_id = grid.grid_id
+        left join group_info on video_item.group_id = group_info.group_id
         <where>
             <!--分组类型(1:自定义分组；2：网格分组；3：小组分组)-->
            <!-- <if test="queryForm.groupType != null">