feat:

getLayerTree接口增加字段配置信息

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) {

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<>();
+
 }