From 01ff142a8e4325792758d37928ccbbe852212b73 Mon Sep 17 00:00:00 2001
From: caoqi <cq@datametatech.com>
Date: Tue, 12 Mar 2024 14:17:21 +0800
Subject: [PATCH] =?UTF-8?q?feat:=201.=E6=A0=B9=E6=8D=AE=E5=9C=BA=E6=99=AFi?=
 =?UTF-8?q?d=E6=9F=A5=E8=AF=A2=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=AF=B9?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E7=9B=AE=E5=BD=95=E5=85=B3=E8=81=94=E7=9A=84?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5=E8=B5=8B=E5=80=BC=202.?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=9B=BE=E5=B1=82=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E6=A0=91=E6=97=B6=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AEid=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yg/znjg/controller/SySceneController.java  | 18 +++++++++++++++---
 .../resources/mapper/yg/znjg/SyDirMapper.xml   |  3 +++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneController.java b/shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneController.java
index 7875452d..ecc29c65 100644
--- a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneController.java
+++ b/shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneController.java
@@ -22,6 +22,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -188,8 +189,8 @@ public class SySceneController {
      */
     @GetMapping(value = "/findSceneById/{id}")
     @ApiOperation("根据id查询场景实体对象")
-    public Response<SyScene> findSceneById(@PathVariable(value = "id") String id) throws Exception {
-        Response<SyScene> responseInfo = new Response<>();
+    public Response<SySceneVo> findSceneById(@PathVariable(value = "id") String id) throws Exception {
+        Response<SySceneVo> responseInfo = new Response<>();
         try {
             QueryWrapper<SyScene> wrapper = new QueryWrapper<>();
             Map<String, Object> map = new HashMap();
@@ -198,8 +199,19 @@ public class SySceneController {
             wrapper.allEq(map);
             List<SyScene> syScenes = sySceneMapper.selectList(wrapper);
             if (syScenes != null && syScenes.size() > 0) {
+                SyScene syScene = syScenes.get(0);
+                String relateSceneId = syScene.getId();
+                // 使用MyBatisPlus查询场景关联的图层目录个数
+                Integer dirCount = sySceneDirRelationMapper.selectCount(new QueryWrapper<SySceneDirRelation>() {{
+                    eq("scene_id", relateSceneId);
+                    eq("is_valid", 1);
+                }});
+                // 创建SySceneVo对象,并将查询到的数据封装到SySceneVo对象中
+                SySceneVo sySceneVo = new SySceneVo();
+                BeanUtils.copyProperties(syScene, sySceneVo);
+                sySceneVo.setRelationDirCount(dirCount);
                 responseInfo.setCode("200");
-                responseInfo.setData(syScenes.get(0));
+                responseInfo.setData(sySceneVo);
             } else {
                 throw new Exception("未查询到数据");
             }
diff --git a/shuili-system/src/main/resources/mapper/yg/znjg/SyDirMapper.xml b/shuili-system/src/main/resources/mapper/yg/znjg/SyDirMapper.xml
index 33b82955..f685e0f6 100644
--- a/shuili-system/src/main/resources/mapper/yg/znjg/SyDirMapper.xml
+++ b/shuili-system/src/main/resources/mapper/yg/znjg/SyDirMapper.xml
@@ -43,6 +43,9 @@
         where x.dir_id=y.id and x.is_valid=1) as relation_scene_count
         FROM bs_sgc_qqjd_dir y
         where y.is_valid = 1
+        <if test="syDir.id != null and syDir.id != ''">
+            AND y.id = #{syDir.id,jdbcType=VARCHAR}
+        </if>
         <if test="syDir.name != null and syDir.name != ''">
             AND y.name LIKE CONCAT(CONCAT('%', TRIM(#{syDir.name,jdbcType=VARCHAR})), '%')
         </if>