Merge pull request '专区资源领域支持标签' (#1022) from wanjia9506/microservices:master into master

microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/ZoneResourceDomain.java

@@ -19,8 +19,14 @@ public class ZoneResourceDomain extends ZoneSort {
     @Excel(name = "资源领域名称")
     private String name;
     /**
-     * 资源领域名称
+     * 资源领域简介
      */
     @Excel(name = "资源领域简介")
     private String introduction;
+
+    /**
+     * 资源标签
+     */
+    @Excel(name = "资源标签")
+    private String keywords;
 }

microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceDomainInputVo.java

@@ -20,6 +20,8 @@ public class ZoneResourceDomainInputVo {
     private String name;
     @ApiModelProperty(value = "资源领域简介")
     private String introduction;
+    @ApiModelProperty(value = "资源标签")
+    private String keywords;
     @ApiModelProperty(value = "所属专区", required = true)
     @NotNull
     private Long zoneId;

microservices-modules/microservices-modules-zone/src/main/java/com/microservices/zone/resource/domain/vo/ZoneResourceDomainUpdateVo.java

@@ -25,6 +25,8 @@ public class ZoneResourceDomainUpdateVo {
     private Integer order;
     @ApiModelProperty(value = "资源领域简介")
     private String introduction;
+    @ApiModelProperty(value = "资源标签")
+    private String keywords;
 
     public ZoneResourceDomain toZoneResourceDomain() {
         ZoneResourceDomain target = new ZoneResourceDomain();

microservices-modules/microservices-modules-zone/src/main/resources/mapper/zone/ZoneResourceDomainMapper.xml

@@ -16,6 +16,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="zoneId" column="zone_id"/>
         <result property="introduction" column="introduction"/>
+        <result property="keyWords" column="keywords"/>
     </resultMap>
 
     <sql id="selectZoneResourceDomainVo">
@@ -29,6 +30,7 @@
                update_by,
                update_time,
                introduction,
+               keywords,
                zone_id
         from zone_resource_domain
     </sql>
@@ -44,6 +46,7 @@
                zrd.update_by,
                zrd.update_time,
                zrd.introduction,
+               zrd.keywords,
                zrd.zone_id
         from zone_resource_domain zrd
     </sql>
@@ -85,6 +88,7 @@
             <if test="updateTime != null">update_time,</if>
             <if test="zoneId != null">zone_id,</if>
             <if test="introduction != null">introduction,</if>
+            <if test="keyWords != null">keywords,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null and name != ''">#{name},</if>
@@ -97,6 +101,7 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="zoneId != null">#{zoneId},</if>
             <if test="introduction != null">#{introduction},</if>
+            <if test="keyWords != null">#{keyWords},</if>
         </trim>
     </insert>
 
@@ -113,6 +118,7 @@
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="zoneId != null">zone_id = #{zoneId},</if>
             <if test="introduction != null">introduction = #{introduction},</if>
+            <if test="keyWords != null">keywords = #{keyWords},</if>
         </trim>
         where id = #{id}
     </update>