Merge remote-tracking branch 'origin/release-sy-v1.0.0' into release-sy-v1.0.0

shuili-system/src/main/java/com/kms/yg/znjg/domain/SyLayer.java

@@ -159,4 +159,10 @@ public class SyLayer implements Serializable {
      * 扩展字段，主要用来标识关联关系
      */
     private String extendData;
+
+    /**
+     * 字段配置信息
+     */
+    @TableField(exist = false)
+    private List<SyLayerField> fields = new ArrayList<>();
 }

shuili-system/src/main/java/com/kms/yg/znjg/domain/SyLayerField.java

@@ -0,0 +1,56 @@
+package com.kms.yg.znjg.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 图层字段对象
+ * @author huangzhiyong
+ * @TableName bs_sgc_qqjd_layer_field
+ */
+@TableName(value ="bs_sgc_qqjd_layer_field")
+@Data
+public class SyLayerField implements Serializable {
+    /**
+     * 主键id
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 图层id
+     */
+    private String layerId;
+
+    /**
+     * 字段名称
+     */
+    private String field;
+
+    /**
+     * 字段名称
+     */
+    private String fieldName;
+
+    /**
+     * 字段类型
+     */
+    private String fieldType;
+
+    /**
+     * 0：false；1：true
+     */
+    private Integer isShow;
+
+    /**
+     * 排序
+     */
+    private Integer orderNm = 0;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyLayerFieldMapper.java

@@ -0,0 +1,22 @@
+package com.kms.yg.znjg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kms.yg.znjg.domain.SyLayerField;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+* @author Admin
+* @description 针对表【sy_layer_field】的数据库操作Mapper
+* @createDate 2023-09-14 17:34:08
+* @Entity com.sy.servicemanager.domain.SyLayerField
+*/
+@Repository
+@Mapper
+public interface SyLayerFieldMapper extends BaseMapper<SyLayerField> {
+
+}
+
+
+
+

shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerFieldService.java

@@ -0,0 +1,10 @@
+package com.kms.yg.znjg.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kms.yg.znjg.domain.SyLayerField;
+import com.kms.yg.znjg.mapper.SyLayerFieldMapper;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SyLayerFieldService extends ServiceImpl<SyLayerFieldMapper, SyLayerField> {
+}

shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerService.java

@@ -1,5 +1,6 @@
 package com.kms.yg.znjg.service;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,7 +10,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kms.yg.df.domain.BsSgcDfJbxx;
 import com.kms.yg.znjg.domain.SyDirLayer;
 import com.kms.yg.znjg.domain.SyLayer;
+import com.kms.yg.znjg.domain.SyLayerField;
 import com.kms.yg.znjg.mapper.SyDirLayerMapper;
+import com.kms.yg.znjg.mapper.SyLayerFieldMapper;
 import com.kms.yg.znjg.mapper.SyLayerMapper;
 import com.shuili.common.core.domain.SearchParam;
 import org.apache.commons.lang.StringUtils;
@@ -28,6 +31,12 @@ public class SyLayerService extends ServiceImpl<SyLayerMapper, SyLayer> {
     @Autowired
     private SyDirLayerMapper syDirLayerMapper;
 
+    @Autowired
+    private SyLayerFieldMapper syLayerFieldMapper;
+
+    @Autowired
+    private SyLayerFieldService syLayerFieldService;
+
     public Boolean checkNameIsRepeat(String serviceName, String id) {
         Long cnt = syLayerMapper.selectByLayerName(serviceName, id);
         if (cnt > 0) {
@@ -62,7 +71,7 @@ public class SyLayerService extends ServiceImpl<SyLayerMapper, SyLayer> {
         //保存图层目录信息
         saveLayerDir(syLayer);
         //保存图层字段信息
-        //saveLayerField(syLayer.getId(), syLayer.getFields());
+        saveLayerField(syLayer.getId(), syLayer.getFields());
     }
 
     private void saveLayerDir(SyLayer syLayer) {
@@ -104,7 +113,7 @@ public class SyLayerService extends ServiceImpl<SyLayerMapper, SyLayer> {
         //保存图层目录信息
         saveLayerDir(syLayer);
         //保存图层字段信息
-        //saveLayerField(syLayer.getId(), syLayer.getFields());
+        saveLayerField(syLayer.getId(), syLayer.getFields());
     }
 
     public List<SyLayer> findLayerByLayerIds(List<String> idList) {
@@ -145,4 +154,17 @@ public class SyLayerService extends ServiceImpl<SyLayerMapper, SyLayer> {
         syLayerMapper.findSyLayerList(pageQuery, syLayer, orderBy, sortBy);
         return pageQuery;
     }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    public void saveLayerField(String layerId, List<SyLayerField> fields) {
+        if (CollUtil.isNotEmpty(fields)) {
+            //先删除该图层字段，再插入
+            syLayerFieldMapper.delete(new LambdaQueryWrapper<SyLayerField>().eq(SyLayerField::getLayerId, layerId));
+            for (SyLayerField field : fields) {
+                field.setLayerId(layerId);
+            }
+            syLayerFieldService.saveBatch(fields);
+        }
+    }
 }

shuili-system/src/main/resources/mapper/yg/znjg/SyLayerFieldMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kms.yg.znjg.mapper.SyLayerFieldMapper">
+
+    <resultMap id="BaseResultMap" type="com.kms.yg.znjg.domain.SyLayerField">
+        <id property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="layerId" column="layer_id" jdbcType="VARCHAR"/>
+        <result property="field" column="field" jdbcType="VARCHAR"/>
+        <result property="fieldName" column="field_name" jdbcType="VARCHAR"/>
+        <result property="fieldType" column="field_type" jdbcType="VARCHAR"/>
+        <result property="isShow" column="is_show" jdbcType="TINYINT"/>
+        <result property="orderNm" column="order_nm" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,layer_id,field,field_name,
+        field_type,show,order_nm
+    </sql>
+</mapper>