Revert "资源目录 新增、修改接口更改"

This reverts commit 5cff84692caea1f5271baf9a186d9b3545880a15.

onemap-modules/onemap-system/src/main/java/com/onemap/system/domain/TYztZyml.java

@@ -1,191 +1,116 @@
 package com.onemap.system.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.onemap.common.core.annotation.Excel;
 import com.onemap.common.core.web.domain.TreeEntity;
 
-import java.util.Date;
-
 /**
  * 数据资源目录对象 t_yzt_zyml
- *
+ * 
  * @author onemap
  * @date 2022-12-01
  */
-public class TYztZyml extends TreeEntity {
+public class TYztZyml extends TreeEntity
+{
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 标识码
-     */
+    /** 标识码 */
     @Excel(name = "标识码")
     private String bsm;
 
-    /**
-     * 名称
-     */
+    /** 名称 */
     @Excel(name = "名称")
     private String name;
 
-    /**
-     * 类型(Point、Line、Polygon、WMTS)
-     */
+    /** 类型(Point、Line、Polygon、WMTS) */
     @Excel(name = "类型(Point、Line、Polygon、WMTS)")
     private String type;
 
-    /**
-     * 父标识码
-     */
+    /** 父标识码 */
     @Excel(name = "父标识码")
     private String pbsm;
 
-    /**
-     * 图标
-     */
+    /** 图标 */
     @Excel(name = "图标")
     private String icon;
 
-    /**
-     * URL
-     */
+    /** URL */
     @Excel(name = "URL")
     private String url;
 
-    /**
-     * 级别
-     */
+    /** 级别 */
     @Excel(name = "级别")
     private Long lev;
 
-    /**
-     * 排序
-     */
+    /** 排序 */
     @Excel(name = "排序")
     private Long sort;
 
-    /**
-     * 状态
-     */
+    /** 状态 */
     @Excel(name = "状态")
     private Long state;
 
-    /**
-     * 是否父节点(0否 1是)
-     */
+    /** 是否父节点(0否 1是) */
     @Excel(name = "是否父节点(0否 1是)")
     private Long parent;
 
-    /**
-     * 服务器类型(arcgis geoserver)
-     */
+    /** 服务器类型(arcgis geoserver) */
     @Excel(name = "服务器类型(arcgis geoserver)")
     private String serverType;
 
-    /**
-     * 是否历史数据(0否 1是)
-     */
+    /** 是否历史数据(0否 1是) */
     @Excel(name = "是否历史数据(0否 1是)")
     private Long sflssj;
 
-    /**
-     * 是否对比分析(0否 1是)
-     */
+    /** 是否对比分析(0否 1是) */
     @Excel(name = "是否对比分析(0否 1是)")
     private Long sfdbfx;
 
-    /**
-     * 是否卷帘(0否 1是)
-     */
+    /** 是否卷帘(0否 1是) */
     @Excel(name = "是否卷帘(0否 1是)")
     private Long sfjl;
 
-    /**
-     * 是否查询(0否 1是)
-     */
+    /** 是否查询(0否 1是) */
     @Excel(name = "是否查询(0否 1是)")
     private Long sfcx;
 
-    /**
-     * 是否统计(0否 1是)
-     */
+    /** 是否统计(0否 1是) */
     @Excel(name = "是否统计(0否 1是)")
     private Long sftj;
 
-    /**
-     * 数据坐标系
-     */
+    /** 数据坐标系 */
     @Excel(name = "数据坐标系")
     private String epsg;
 
-    /**
-     * 数据年份
-     */
+    /** 数据年份 */
     @Excel(name = "数据年份")
     private String year;
 
-    /**
-     * 数据类型(point、line、polyon、img、pdf)
-     */
+    /** 数据类型(point、line、polyon、img、pdf) */
     @Excel(name = "数据类型(point、line、polyon、img、pdf)")
     private String sjlx;
 
-    /**
-     * SDE表
-     */
+    /** SDE表 */
     @Excel(name = "SDE表")
     private String sde;
 
-    /**
-     * 过滤条件
-     */
+    /** 过滤条件 */
     @Excel(name = "过滤条件")
     private String gltj;
 
-    /**
-     * 数据来源
-     */
+    /** 数据来源 */
     @Excel(name = "数据来源")
     private String sjly;
 
-    /**
-     * 图例
-     */
+    /** 图例 */
     @Excel(name = "图例")
     private String legend;
 
-    /**
-     * 业务类型
-     */
+    /** 业务类型 */
     @Excel(name = "业务类型")
     private String ywlx;
 
-    @Excel(name = "服务名称")
-    private String fwmc;
-    @Excel(name = "服务工作空间")
-    private String fwgzkj;
-    @Excel(name = "服务样式")
-    private String fwys;
-    @Excel(name = "切片方案")
-    private String qpfa;
-    @Excel(name = "图层组名称")
-    private String layergroup;
-    @Excel(name = "格式")
-    private String format;
-    @Excel(name = "最大等级")
-    private Integer maximumlevel;
-    @Excel(name = "最小等级")
-    private Integer minimumlevel;
-    @Excel(name = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @Excel(name = "创建人")
-    private String createBy;
-    @Excel(name = "共享状态")
-    private String sharestate;
-
-
     public String getYwlx() {
         return ywlx;
     }
@@ -194,308 +119,240 @@ public class TYztZyml extends TreeEntity {
         this.ywlx = ywlx;
     }
 
-    public void setBsm(String bsm) {
+    public void setBsm(String bsm)
+    {
         this.bsm = bsm;
     }
 
-    public String getBsm() {
+    public String getBsm() 
+    {
         return bsm;
     }
-
-    public void setName(String name) {
+    public void setName(String name) 
+    {
         this.name = name;
     }
 
-    public String getName() {
+    public String getName() 
+    {
         return name;
     }
-
-    public void setType(String type) {
+    public void setType(String type) 
+    {
         this.type = type;
     }
 
-    public String getType() {
+    public String getType() 
+    {
         return type;
     }
-
-    public void setPbsm(String pbsm) {
+    public void setPbsm(String pbsm) 
+    {
         this.pbsm = pbsm;
     }
 
-    public String getPbsm() {
+    public String getPbsm() 
+    {
         return pbsm;
     }
-
-    public void setIcon(String icon) {
+    public void setIcon(String icon) 
+    {
         this.icon = icon;
     }
 
-    public String getIcon() {
+    public String getIcon() 
+    {
         return icon;
     }
-
-    public void setUrl(String url) {
+    public void setUrl(String url) 
+    {
         this.url = url;
     }
 
-    public String getUrl() {
+    public String getUrl() 
+    {
         return url;
     }
-
-    public void setLev(Long lev) {
+    public void setLev(Long lev) 
+    {
         this.lev = lev;
     }
 
-    public Long getLev() {
+    public Long getLev() 
+    {
         return lev;
     }
-
-    public void setSort(Long sort) {
+    public void setSort(Long sort) 
+    {
         this.sort = sort;
     }
 
-    public Long getSort() {
+    public Long getSort() 
+    {
         return sort;
     }
-
-    public void setState(Long state) {
+    public void setState(Long state) 
+    {
         this.state = state;
     }
 
-    public Long getState() {
+    public Long getState() 
+    {
         return state;
     }
-
-    public void setParent(Long parent) {
+    public void setParent(Long parent) 
+    {
         this.parent = parent;
     }
 
-    public Long getParent() {
+    public Long getParent() 
+    {
         return parent;
     }
-
-    public void setServerType(String serverType) {
+    public void setServerType(String serverType) 
+    {
         this.serverType = serverType;
     }
 
-    public String getServerType() {
+    public String getServerType() 
+    {
         return serverType;
     }
-
-    public void setSflssj(Long sflssj) {
+    public void setSflssj(Long sflssj) 
+    {
         this.sflssj = sflssj;
     }
 
-    public Long getSflssj() {
+    public Long getSflssj() 
+    {
         return sflssj;
     }
-
-    public void setSfdbfx(Long sfdbfx) {
+    public void setSfdbfx(Long sfdbfx) 
+    {
         this.sfdbfx = sfdbfx;
     }
 
-    public Long getSfdbfx() {
+    public Long getSfdbfx() 
+    {
         return sfdbfx;
     }
-
-    public void setSfjl(Long sfjl) {
+    public void setSfjl(Long sfjl) 
+    {
         this.sfjl = sfjl;
     }
 
-    public Long getSfjl() {
+    public Long getSfjl() 
+    {
         return sfjl;
     }
-
-    public void setSfcx(Long sfcx) {
+    public void setSfcx(Long sfcx) 
+    {
         this.sfcx = sfcx;
     }
 
-    public Long getSfcx() {
+    public Long getSfcx() 
+    {
         return sfcx;
     }
-
-    public void setSftj(Long sftj) {
+    public void setSftj(Long sftj) 
+    {
         this.sftj = sftj;
     }
 
-    public Long getSftj() {
+    public Long getSftj() 
+    {
         return sftj;
     }
-
-    public void setEpsg(String epsg) {
+    public void setEpsg(String epsg) 
+    {
         this.epsg = epsg;
     }
 
-    public String getEpsg() {
+    public String getEpsg() 
+    {
         return epsg;
     }
-
-    public void setYear(String year) {
+    public void setYear(String year) 
+    {
         this.year = year;
     }
 
-    public String getYear() {
+    public String getYear() 
+    {
         return year;
     }
-
-    public void setSjlx(String sjlx) {
+    public void setSjlx(String sjlx) 
+    {
         this.sjlx = sjlx;
     }
 
-    public String getSjlx() {
+    public String getSjlx() 
+    {
         return sjlx;
     }
-
-    public void setSde(String sde) {
+    public void setSde(String sde) 
+    {
         this.sde = sde;
     }
 
-    public String getSde() {
+    public String getSde() 
+    {
         return sde;
     }
-
-    public void setGltj(String gltj) {
+    public void setGltj(String gltj) 
+    {
         this.gltj = gltj;
     }
 
-    public String getGltj() {
+    public String getGltj() 
+    {
         return gltj;
     }
-
-    public void setSjly(String sjly) {
+    public void setSjly(String sjly) 
+    {
         this.sjly = sjly;
     }
 
-    public String getSjly() {
+    public String getSjly() 
+    {
         return sjly;
     }
-
-    public void setLegend(String legend) {
+    public void setLegend(String legend) 
+    {
         this.legend = legend;
     }
 
-    public String getLegend() {
+    public String getLegend() 
+    {
         return legend;
     }
 
-    public String getFwmc() {
-        return fwmc;
-    }
-
-    public void setFwmc(String fwmc) {
-        this.fwmc = fwmc;
-    }
-
-    public String getFwgzkj() {
-        return fwgzkj;
-    }
-
-    public void setFwgzkj(String fwgzkj) {
-        this.fwgzkj = fwgzkj;
-    }
-
-    public String getFwys() {
-        return fwys;
-    }
-
-    public void setFwys(String fwys) {
-        this.fwys = fwys;
-    }
-
-    public String getQpfa() {
-        return qpfa;
-    }
-
-    public void setQpfa(String qpfa) {
-        this.qpfa = qpfa;
-    }
-
-    public String getLayergroup() {
-        return layergroup;
-    }
-
-    public void setLayergroup(String layergroup) {
-        this.layergroup = layergroup;
-    }
-
-    public String getFormat() {
-        return format;
-    }
-
-    public void setFormat(String format) {
-        this.format = format;
-    }
-
-    public Integer getMaximumlevel() {
-        return maximumlevel;
-    }
-
-    public void setMaximumlevel(Integer maximumlevel) {
-        this.maximumlevel = maximumlevel;
-    }
-
-    public Integer getMinimumlevel() {
-        return minimumlevel;
-    }
-
-    public void setMinimumlevel(Integer minimumlevel) {
-        this.minimumlevel = minimumlevel;
-    }
-
-    @Override
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    @Override
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    @Override
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    @Override
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    public String getSharestate() {
-        return sharestate;
-    }
-
-    public void setSharestate(String sharestate) {
-        this.sharestate = sharestate;
-    }
-
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("bsm", getBsm())
-                .append("name", getName())
-                .append("type", getType())
-                .append("pbsm", getPbsm())
-                .append("icon", getIcon())
-                .append("url", getUrl())
-                .append("lev", getLev())
-                .append("sort", getSort())
-                .append("state", getState())
-                .append("parent", getParent())
-                .append("serverType", getServerType())
-                .append("sflssj", getSflssj())
-                .append("sfdbfx", getSfdbfx())
-                .append("sfjl", getSfjl())
-                .append("sfcx", getSfcx())
-                .append("sftj", getSftj())
-                .append("epsg", getEpsg())
-                .append("year", getYear())
-                .append("sjlx", getSjlx())
-                .append("sde", getSde())
-                .append("gltj", getGltj())
-                .append("sjly", getSjly())
-                .append("legend", getLegend())
-                .toString();
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("bsm", getBsm())
+            .append("name", getName())
+            .append("type", getType())
+            .append("pbsm", getPbsm())
+            .append("icon", getIcon())
+            .append("url", getUrl())
+            .append("lev", getLev())
+            .append("sort", getSort())
+            .append("state", getState())
+            .append("parent", getParent())
+            .append("serverType", getServerType())
+            .append("sflssj", getSflssj())
+            .append("sfdbfx", getSfdbfx())
+            .append("sfjl", getSfjl())
+            .append("sfcx", getSfcx())
+            .append("sftj", getSftj())
+            .append("epsg", getEpsg())
+            .append("year", getYear())
+            .append("sjlx", getSjlx())
+            .append("sde", getSde())
+            .append("gltj", getGltj())
+            .append("sjly", getSjly())
+            .append("legend", getLegend())
+            .toString();
     }
 }

onemap-modules/onemap-system/src/main/java/com/onemap/system/service/impl/TYztZymlServiceImpl.java

@@ -1,10 +1,8 @@
 package com.onemap.system.service.impl;
 
-import java.util.Date;
 import java.util.List;
 
 import com.onemap.common.core.utils.StringUtils;
-import com.onemap.common.security.utils.SecurityUtils;
 import com.onemap.system.api.domain.SysDictData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -12,8 +10,6 @@ import com.onemap.system.mapper.TYztZymlMapper;
 import com.onemap.system.domain.TYztZyml;
 import com.onemap.system.service.ITYztZymlService;
 
-import javax.annotation.Resource;
-
 /**
  * 数据资源目录Service业务层处理
  *
@@ -22,8 +18,7 @@ import javax.annotation.Resource;
  */
 @Service
 public class TYztZymlServiceImpl implements ITYztZymlService {
-
-    @Resource
+    @Autowired
     private TYztZymlMapper tYztZymlMapper;
 
     /**
@@ -57,8 +52,6 @@ public class TYztZymlServiceImpl implements ITYztZymlService {
     @Override
     public int insertTYztZyml(TYztZyml tYztZyml) {
         tYztZyml = filterZymlPbsm(tYztZyml);
-        tYztZyml.setCreateTime(new Date());
-        tYztZyml.setCreateBy(SecurityUtils.getUsername());
         if (!StringUtils.isEmpty(tYztZyml.getSde())) {
             String[] dblayers = tYztZyml.getSde().split(",");
             if (dblayers.length == 1) {

onemap-modules/onemap-system/src/main/resources/mapper/postgresql/system/TYztZymlMapper.xml

@@ -29,23 +29,10 @@
         <result property="sjly" column="sjly"/>
         <result property="legend" column="legend"/>
         <result property="ywlx" column="ywlx"/>
-        <result property="fwmc" column="fwmc"/>
-        <result property="fwgzkj" column="fwgzkj"/>
-        <result property="fwys" column="fwys"/>
-        <result property="qpfa" column="qpfa"/>
-        <result property="layergroup" column="layergroup"/>
-        <result property="format" column="format"/>
-        <result property="maximumlevel" column="maximumlevel"/>
-        <result property="minimumlevel" column="minimumlevel"/>
-        <result property="createTime" column="create_time"/>
-        <result property="createBy" column="create_by"/>
-        <result property="sharestate" column="sharestate"/>
     </resultMap>
 
     <sql id="selectTYztZymlVo">
-        select bsm, name, type, pbsm, icon, url, lev, sort, state, parent, server_type, sflssj, sfdbfx, sfjl, sfcx, sftj, epsg,
-            year, sjlx, sde, gltj, sjly, legend, ywlx,
-            fwmc,fwgzkj,fwys,qpfa,layergroup,format,maximumlevel,minimumlevel,create_time,create_by,sharestate from t_yzt_zyml
+        select bsm, name, type, pbsm, icon, url, lev, sort, state, parent, server_type, sflssj, sfdbfx, sfjl, sfcx, sftj, epsg, year, sjlx, sde, gltj, sjly, legend, ywlx from t_yzt_zyml
     </sql>
 
     <select id="getDbLayersMSN" parameterType="java.lang.String" resultType="com.onemap.system.api.domain.SysDictData">
@@ -130,17 +117,6 @@ SELECT t.layeralias
             <if test="sjly != null">sjly,</if>
             <if test="legend != null">legend,</if>
             <if test="ywlx != null">ywlx,</if>
-            <if test="fwmc != null">fwmc,</if>
-            <if test="fwgzkj != null">fwgzkj,</if>
-            <if test="fwys != null">fwys,</if>
-            <if test="qpfa != null">qpfa,</if>
-            <if test="layergroup != null">layergroup,</if>
-            <if test="format != null">format,</if>
-            <if test="maximumlevel != null">maximumlevel,</if>
-            <if test="minimumlevel != null">minimumlevel,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="sharestate != null">sharestate,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="bsm != null and bsm != ''">#{bsm},</if>
@@ -167,17 +143,6 @@ SELECT t.layeralias
             <if test="sjly != null">#{sjly},</if>
             <if test="legend != null">#{legend},</if>
             <if test="ywlx != null">#{ywlx},</if>
-            <if test="fwmc != null">#{fwmc},</if>
-            <if test="fwgzkj != null">#{fwgzkj},</if>
-            <if test="fwys != null">#{fwys},</if>
-            <if test="qpfa != null">#{qpfa},</if>
-            <if test="layergroup != null">#{layergroup},</if>
-            <if test="format != null">#{format},</if>
-            <if test="maximumlevel != null">#{maximumlevel},</if>
-            <if test="minimumlevel != null">#{minimumlevel},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="sharestate != null">#{sharestate},</if>
         </trim>
     </insert>
 
@@ -207,15 +172,6 @@ SELECT t.layeralias
             <if test="sjly != null">sjly = #{sjly},</if>
             <if test="legend != null">legend = #{legend},</if>
             <if test="ywlx != null">ywlx = #{ywlx},</if>
-            <if test="fwmc != null">fwmc = #{fwmc},</if>
-            <if test="fwgzkj != null">fwgzkj = #{fwgzkj},</if>
-            <if test="fwys != null">fwys = #{fwys},</if>
-            <if test="qpfa != null">qpfa = #{qpfa},</if>
-            <if test="layergroup != null">layergroup = #{layergroup},</if>
-            <if test="format != null">format = #{format},</if>
-            <if test="maximumlevel != null">maximumlevel = #{maximumlevel},</if>
-            <if test="minimumlevel != null">minimumlevel = #{minimumlevel},</if>
-            <if test="sharestate != null">sharestate = #{sharestate},</if>
         </trim>
         where bsm = #{bsm}
     </update>