feat:图层目录管理增加字段

shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java

@@ -138,7 +138,4 @@ public class SyLayerController {
         Map<String, Object> params = spLayer.getParams();
         return syLayerService.selectPage(page,syLayerInfo,params);
     }
-
-
-
 }

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

@@ -3,9 +3,12 @@ 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 com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @TableName sy_dir
@@ -44,6 +47,18 @@ public class SyDir implements Serializable {
      */
     private Integer orderNm;
 
+    /**
+     * 发布日期
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date pubDate;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

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

@@ -154,9 +154,4 @@ public class SyLayer implements Serializable {
      * 关联图层样式名称
      */
     private String relationStyleName;
-
-    /**
-     * 关联场景数量
-     */
-    private Integer relationSceneCount;
 }

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

@@ -3,10 +3,12 @@ package com.kms.yg.znjg.service;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kms.common.utils.UserUtils;
 import com.kms.yg.znjg.domain.SyDir;
 import com.kms.yg.znjg.mapper.SyDirMapper;
 import com.kms.yg.znjg.vo.SyDirVo;
 import com.kms.yxgh.base.Response;
+import com.shuili.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +32,8 @@ public class SyDirService extends ServiceImpl<SyDirMapper, SyDir> {
 
     public Response saveSyDir(SyDir syDir) throws Exception {
         String rootStr = "root";
+        SysUser user = UserUtils.getUser();
+        syDir.setCreateUser(user.getNickName());
         boolean insert = false;
         if (StringUtils.isBlank(syDir.getName())) {
             return new Response() {{
@@ -54,6 +58,7 @@ public class SyDirService extends ServiceImpl<SyDirMapper, SyDir> {
             String prefix = "TCZYML";
             String layerResourceDirectoryNumber = generateLayerResourceDirectoryNumber(prefix);
             syDir.setId(layerResourceDirectoryNumber);
+            syDir.setPubDate(new Date());
             insert = true;
         }
         if (rootStr.equals(syDir.getParentId())) {

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

@@ -11,12 +11,15 @@
         <result property="xpath" column="xpath" jdbcType="VARCHAR"/>
         <result property="dirSeq" column="dir_seq" jdbcType="VARCHAR"/>
         <result property="orderNm" column="order_nm" jdbcType="DECIMAL"/>
+        <result property="pubDate" column="pub_date" jdbcType="TIMESTAMP"/>
+        <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         id
         ,name,parent_id,
-        xpath,dir_seq,order_nm
+        xpath,dir_seq,order_nm,pub_date,
+        create_user
     </sql>
 
     <!--获取指定场景指定类型所有的目录-->
@@ -51,9 +54,9 @@
     <!--新增实体对象-->
     <insert id="insertAll">
         insert into sy_dir
-            (id, name, parent_id, xpath, dir_seq, order_nm, is_valid)
+            (id, name, parent_id, xpath, dir_seq, order_nm, pub_date, create_user, is_valid)
         values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR},
-                #{xpath,jdbcType=VARCHAR}, #{dirSeq,jdbcType=VARCHAR}, #{orderNm,jdbcType=NUMERIC}, 1)
+                #{xpath,jdbcType=VARCHAR}, #{dirSeq,jdbcType=VARCHAR}, #{orderNm,jdbcType=NUMERIC}, #{pubDate}, #{createUser,jdbcType=VARCHAR}, 1)
     </insert>
 
     <!--更新实体对象-->
@@ -65,6 +68,8 @@
             <if test="xpath != null">xpath=#{xpath,jdbcType=VARCHAR},</if>
             <if test="dirSeq != null">dir_seq=#{dirSeq,jdbcType=VARCHAR},</if>
             <if test="orderNm != null">order_nm=#{orderNm,jdbcType=NUMERIC},</if>
+            <if test="pubDate != null">pub_date=#{pubDate},</if>
+            <if test="createUser != null">create_user=#{createUser,jdbcType=VARCHAR},</if>
         </set>
         where is_valid = 1
         and

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

@@ -177,7 +177,7 @@
         select *
         from sy_layer sl
         where is_valid = 1
-          and sl.id = #{id,jdbcType=VARCHAR}
+        and sl.id = #{id,jdbcType=VARCHAR}
     </select>
 
     <select id="findLayerByLayerIds" resultMap="BaseResultMap">