From 1eacd9fed884e1e2473b88b52b66d5e1598f2f5a Mon Sep 17 00:00:00 2001
From: caoqi <cq@datametatech.com>
Date: Fri, 22 Mar 2024 17:58:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20getLayerTree=E6=8E=A5=E5=8F=A3=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kms/yg/znjg/controller/SySceneController.java    | 12 ++++++++++++
 .../src/main/java/com/kms/yg/znjg/vo/LayerForm.java  |  9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

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 ecc29c65..ef045bdb 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
@@ -58,6 +58,9 @@ public class SySceneController {
     @Autowired
     private SyLayerMapper syLayerMapper;
 
+    @Autowired
+    private SyLayerFieldMapper syLayerFieldMapper;
+
     /**
      * 分页查询所有的地图场景信息
      *
@@ -362,6 +365,15 @@ public class SySceneController {
                     try {
                         LayerForm layerForm = layerFormMap.get(xd.getLayerId());
                         if (layerForm != null) {
+                            //根据图层id，查询出isShow=ture的图层字段,并正序
+                            List<SyLayerField> fields = syLayerFieldMapper.selectList(
+                                    new LambdaQueryWrapper<SyLayerField>()
+                                            .eq(SyLayerField::getLayerId, layerForm.getId())
+                                            .eq(SyLayerField::getIsShow, 1)
+                                            .orderByAsc(SyLayerField::getOrderNm));
+                            if (CollUtil.isNotEmpty(fields)) {
+                                layerForm.setFields(fields);
+                            }
                             layers.add(layerForm);
                         }
                     } catch (Exception e) {
diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/vo/LayerForm.java b/shuili-system/src/main/java/com/kms/yg/znjg/vo/LayerForm.java
index 0111fd1d..ffb6da11 100644
--- a/shuili-system/src/main/java/com/kms/yg/znjg/vo/LayerForm.java
+++ b/shuili-system/src/main/java/com/kms/yg/znjg/vo/LayerForm.java
@@ -3,6 +3,7 @@ package com.kms.yg.znjg.vo;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kms.yg.znjg.domain.SyLayer;
+import com.kms.yg.znjg.domain.SyLayerField;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -78,7 +79,7 @@ public class LayerForm implements Serializable, Comparable<LayerForm> {
         //layerForm.setDataSource(syLayer.getDataSource());
         layerForm.setPubDate(syLayer.getPubDate());
         //layerForm.setCollectDate(syLayer.getCollectDate());
-//        layerForm.setFields(syLayer.getFields());
+        layerForm.setFields(syLayer.getFields());
         return layerForm;
     }
 
@@ -213,4 +214,10 @@ public class LayerForm implements Serializable, Comparable<LayerForm> {
      */
     private String extendData;
 
+    /**
+     * 字段配置信息
+     */
+    @TableField(exist = false)
+    private List<SyLayerField> fields = new ArrayList<>();
+
 }