Merge branch '20251125-fjy-fristLevelMark' into test

api-module/src/main/java/com/tzld/piaoquan/api/model/param/contentplatform/AccountSaveParam.java

@@ -22,6 +22,8 @@ public class AccountSaveParam {
     private String price;
     @ApiModelProperty(value = "密码")
     private String password;
+    @ApiModelProperty(value = "层级类型：特殊首层/非特殊首层")
+    private String layerType;
 
     @ApiModelProperty(value = "操作人")
     private String operator;

api-module/src/main/java/com/tzld/piaoquan/api/model/po/contentplatform/ContentPlatformAccount.java

@@ -31,6 +31,8 @@ public class ContentPlatformAccount {
 
     private Long updateTimestamp;
 
+    private String layerType;
+
     public Long getId() {
         return id;
     }
@@ -151,6 +153,14 @@ public class ContentPlatformAccount {
         this.updateTimestamp = updateTimestamp;
     }
 
+    public String getLayerType() {
+        return layerType;
+    }
+
+    public void setLayerType(String layerType) {
+        this.layerType = layerType;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -172,6 +182,7 @@ public class ContentPlatformAccount {
         sb.append(", createTimestamp=").append(createTimestamp);
         sb.append(", updateAccount=").append(updateAccount);
         sb.append(", updateTimestamp=").append(updateTimestamp);
+        sb.append(", layerType=").append(layerType);
         sb.append("]");
         return sb.toString();
     }

api-module/src/main/java/com/tzld/piaoquan/api/model/po/contentplatform/ContentPlatformAccountExample.java

@@ -1104,6 +1104,76 @@ public class ContentPlatformAccountExample {
             addCriterion("update_timestamp not between", value1, value2, "updateTimestamp");
             return (Criteria) this;
         }
+
+        public Criteria andLayerTypeIsNull() {
+            addCriterion("layer_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerTypeIsNotNull() {
+            addCriterion("layer_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerTypeEqualTo(String value) {
+            addCriterion("layer_type =", value, "layerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerTypeNotEqualTo(String value) {
+            addCriterion("layer_type <>", value, "layerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerTypeGreaterThan(String value) {
+            addCriterion("layer_type >", value, "layerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("layer_type >=", value, "layerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerTypeLessThan(String value) {
+            addCriterion("layer_type <", value, "layerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerTypeLessThanOrEqualTo(String value) {
+            addCriterion("layer_type <=", value, "layerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerTypeLike(String value) {
+            addCriterion("layer_type like", value, "layerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerTypeNotLike(String value) {
+            addCriterion("layer_type not like", value, "layerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerTypeIn(List<String> values) {
+            addCriterion("layer_type in", values, "layerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerTypeNotIn(List<String> values) {
+            addCriterion("layer_type not in", values, "layerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerTypeBetween(String value1, String value2) {
+            addCriterion("layer_type between", value1, value2, "layerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLayerTypeNotBetween(String value1, String value2) {
+            addCriterion("layer_type not between", value1, value2, "layerType");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

api-module/src/main/java/com/tzld/piaoquan/api/model/vo/contentplatform/AccountLoginVO.java

@@ -24,5 +24,7 @@ public class AccountLoginVO {
     private Long createTimestamp;
     @ApiModelProperty(value = "token")
     private String token;
+    @ApiModelProperty(value = "层级类型：特殊首层/非特殊首层")
+    private String layerType;
 
 }

api-module/src/main/java/com/tzld/piaoquan/api/model/vo/contentplatform/AccountVO.java

@@ -24,5 +24,7 @@ public class AccountVO {
 	private Integer status;
 	@ApiModelProperty(value = "创建时间")
 	private Long createTimestamp;
+	@ApiModelProperty(value = "层级类型：特殊首层/非特殊首层")
+	private String layerType;
 
 }

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformAccountServiceImpl.java

@@ -157,6 +157,7 @@ public class ContentPlatformAccountServiceImpl implements ContentPlatformAccount
             accountVO.setPrice(account.getPrice());
             accountVO.setStatus(account.getStatus());
             accountVO.setCreateTimestamp(account.getCreateTimestamp());
+            accountVO.setLayerType(account.getLayerType());
             result.add(accountVO);
         }
         return result;
@@ -212,6 +213,7 @@ public class ContentPlatformAccountServiceImpl implements ContentPlatformAccount
         account.setContactName(param.getContactName());
         account.setTelNum(param.getTelNum());
         account.setPrice(param.getPrice());
+        account.setLayerType(param.getLayerType());
         if (StringUtils.hasText(param.getPassword())) {
             String password = new String(Base64.getDecoder().decode(param.getPassword()));
             account.setPassword(Md5Util.encoderByMd5(password));

api-module/src/main/resources/mapper/contentplatform/ContentPlatformAccountMapper.xml

@@ -17,6 +17,7 @@
     <result column="create_timestamp" jdbcType="BIGINT" property="createTimestamp" />
     <result column="update_account" jdbcType="VARCHAR" property="updateAccount" />
     <result column="update_timestamp" jdbcType="BIGINT" property="updateTimestamp" />
+    <result column="layer_type" jdbcType="VARCHAR" property="layerType" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -77,9 +78,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, `name`, `identity`, channel, contact_name, tel_num, price, `password`, token, 
-    token_expire_timestamp, `status`, create_account, create_timestamp, update_account, 
-    update_timestamp
+    id, `name`, `identity`, channel, contact_name, tel_num, price, `password`, token,
+    token_expire_timestamp, `status`, create_account, create_timestamp, update_account,
+    update_timestamp, layer_type
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformAccountExample" resultMap="BaseResultMap">
     select
@@ -115,17 +116,19 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformAccount">
-    insert into content_platform_account (id, `name`, `identity`, 
-      channel, contact_name, tel_num, 
-      price, `password`, token, 
-      token_expire_timestamp, `status`, create_account, 
-      create_timestamp, update_account, update_timestamp
+    insert into content_platform_account (id, `name`, `identity`,
+      channel, contact_name, tel_num,
+      price, `password`, token,
+      token_expire_timestamp, `status`, create_account,
+      create_timestamp, update_account, update_timestamp,
+      layer_type
       )
-    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{identity,jdbcType=INTEGER}, 
-      #{channel,jdbcType=VARCHAR}, #{contactName,jdbcType=VARCHAR}, #{telNum,jdbcType=VARCHAR}, 
-      #{price,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{token,jdbcType=VARCHAR}, 
-      #{tokenExpireTimestamp,jdbcType=BIGINT}, #{status,jdbcType=INTEGER}, #{createAccount,jdbcType=VARCHAR}, 
-      #{createTimestamp,jdbcType=BIGINT}, #{updateAccount,jdbcType=VARCHAR}, #{updateTimestamp,jdbcType=BIGINT}
+    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{identity,jdbcType=INTEGER},
+      #{channel,jdbcType=VARCHAR}, #{contactName,jdbcType=VARCHAR}, #{telNum,jdbcType=VARCHAR},
+      #{price,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{token,jdbcType=VARCHAR},
+      #{tokenExpireTimestamp,jdbcType=BIGINT}, #{status,jdbcType=INTEGER}, #{createAccount,jdbcType=VARCHAR},
+      #{createTimestamp,jdbcType=BIGINT}, #{updateAccount,jdbcType=VARCHAR}, #{updateTimestamp,jdbcType=BIGINT},
+      #{layerType,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformAccount">
@@ -176,6 +179,9 @@
       <if test="updateTimestamp != null">
         update_timestamp,
       </if>
+      <if test="layerType != null">
+        layer_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -223,6 +229,9 @@
       <if test="updateTimestamp != null">
         #{updateTimestamp,jdbcType=BIGINT},
       </if>
+      <if test="layerType != null">
+        #{layerType,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformAccountExample" resultType="java.lang.Long">
@@ -279,6 +288,9 @@
       <if test="record.updateTimestamp != null">
         update_timestamp = #{record.updateTimestamp,jdbcType=BIGINT},
       </if>
+      <if test="record.layerType != null">
+        layer_type = #{record.layerType,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -300,7 +312,8 @@
       create_account = #{record.createAccount,jdbcType=VARCHAR},
       create_timestamp = #{record.createTimestamp,jdbcType=BIGINT},
       update_account = #{record.updateAccount,jdbcType=VARCHAR},
-      update_timestamp = #{record.updateTimestamp,jdbcType=BIGINT}
+      update_timestamp = #{record.updateTimestamp,jdbcType=BIGINT},
+      layer_type = #{record.layerType,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -350,6 +363,9 @@
       <if test="updateTimestamp != null">
         update_timestamp = #{updateTimestamp,jdbcType=BIGINT},
       </if>
+      <if test="layerType != null">
+        layer_type = #{layerType,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -368,7 +384,8 @@
       create_account = #{createAccount,jdbcType=VARCHAR},
       create_timestamp = #{createTimestamp,jdbcType=BIGINT},
       update_account = #{updateAccount,jdbcType=VARCHAR},
-      update_timestamp = #{updateTimestamp,jdbcType=BIGINT}
+      update_timestamp = #{updateTimestamp,jdbcType=BIGINT},
+      layer_type = #{layerType,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>