Merge branch 'dev-xym-add-f' of Server/growth-manager into master

api-module/src/main/java/com/tzld/piaoquan/api/dao/mapper/GhDetailMapper.java

@@ -1,16 +1,10 @@
 package com.tzld.piaoquan.api.dao.mapper;
 
-
 import com.tzld.piaoquan.api.model.po.GhDetail;
 import com.tzld.piaoquan.api.model.po.GhDetailExample;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
 import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
-@Mapper
-@Repository
 public interface GhDetailMapper {
     long countByExample(GhDetailExample example);
 
@@ -18,19 +12,19 @@ public interface GhDetailMapper {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(GhDetail row);
+    int insert(GhDetail record);
 
-    int insertSelective(GhDetail row);
+    int insertSelective(GhDetail record);
 
     List<GhDetail> selectByExample(GhDetailExample example);
 
     GhDetail selectByPrimaryKey(Long id);
 
-    int updateByExampleSelective(@Param("row") GhDetail row, @Param("example") GhDetailExample example);
+    int updateByExampleSelective(@Param("record") GhDetail record, @Param("example") GhDetailExample example);
 
-    int updateByExample(@Param("row") GhDetail row, @Param("example") GhDetailExample example);
+    int updateByExample(@Param("record") GhDetail record, @Param("example") GhDetailExample example);
 
-    int updateByPrimaryKeySelective(GhDetail row);
+    int updateByPrimaryKeySelective(GhDetail record);
 
-    int updateByPrimaryKey(GhDetail row);
+    int updateByPrimaryKey(GhDetail record);
 }

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

@@ -27,6 +27,8 @@ public class GhDetail {
 
     private Integer strategyStatus;
 
+    private Integer autoreplySendMinigramNum;
+
     public Long getId() {
         return id;
     }
@@ -40,7 +42,7 @@ public class GhDetail {
     }
 
     public void setGhId(String ghId) {
-        this.ghId = ghId == null ? null : ghId.trim();
+        this.ghId = ghId;
     }
 
     public String getGhName() {
@@ -48,7 +50,7 @@ public class GhDetail {
     }
 
     public void setGhName(String ghName) {
-        this.ghName = ghName == null ? null : ghName.trim();
+        this.ghName = ghName;
     }
 
     public Integer getType() {
@@ -64,7 +66,7 @@ public class GhDetail {
     }
 
     public void setCategory1(String category1) {
-        this.category1 = category1 == null ? null : category1.trim();
+        this.category1 = category1;
     }
 
     public String getCategory2() {
@@ -72,7 +74,7 @@ public class GhDetail {
     }
 
     public void setCategory2(String category2) {
-        this.category2 = category2 == null ? null : category2.trim();
+        this.category2 = category2;
     }
 
     public Integer getIsDelete() {
@@ -104,7 +106,7 @@ public class GhDetail {
     }
 
     public void setChannel(String channel) {
-        this.channel = channel == null ? null : channel.trim();
+        this.channel = channel;
     }
 
     public String getVideoIds() {
@@ -112,7 +114,7 @@ public class GhDetail {
     }
 
     public void setVideoIds(String videoIds) {
-        this.videoIds = videoIds == null ? null : videoIds.trim();
+        this.videoIds = videoIds;
     }
 
     public Integer getStrategyStatus() {
@@ -122,4 +124,35 @@ public class GhDetail {
     public void setStrategyStatus(Integer strategyStatus) {
         this.strategyStatus = strategyStatus;
     }
+
+    public Integer getAutoreplySendMinigramNum() {
+        return autoreplySendMinigramNum;
+    }
+
+    public void setAutoreplySendMinigramNum(Integer autoreplySendMinigramNum) {
+        this.autoreplySendMinigramNum = autoreplySendMinigramNum;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", ghId=").append(ghId);
+        sb.append(", ghName=").append(ghName);
+        sb.append(", type=").append(type);
+        sb.append(", category1=").append(category1);
+        sb.append(", category2=").append(category2);
+        sb.append(", isDelete=").append(isDelete);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", channel=").append(channel);
+        sb.append(", videoIds=").append(videoIds);
+        sb.append(", strategyStatus=").append(strategyStatus);
+        sb.append(", autoreplySendMinigramNum=").append(autoreplySendMinigramNum);
+        sb.append("]");
+        return sb.toString();
+    }
 }

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

@@ -13,10 +13,11 @@ public class GhDetailExample {
     protected boolean distinct;
 
     protected List<Criteria> oredCriteria;
+
     protected Page page;
 
     public GhDetailExample() {
-        oredCriteria = new ArrayList<>();
+        oredCriteria = new ArrayList<Criteria>();
     }
 
     public void setOrderByClause(String orderByClause) {
@@ -81,7 +82,7 @@ public class GhDetailExample {
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<>();
+            criteria = new ArrayList<Criterion>();
         }
 
         public boolean isValid() {
@@ -318,62 +319,62 @@ public class GhDetailExample {
         }
 
         public Criteria andTypeIsNull() {
-            addCriterion("type is null");
+            addCriterion("`type` is null");
             return (Criteria) this;
         }
 
         public Criteria andTypeIsNotNull() {
-            addCriterion("type is not null");
+            addCriterion("`type` is not null");
             return (Criteria) this;
         }
 
         public Criteria andTypeEqualTo(Integer value) {
-            addCriterion("type =", value, "type");
+            addCriterion("`type` =", value, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeNotEqualTo(Integer value) {
-            addCriterion("type <>", value, "type");
+            addCriterion("`type` <>", value, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeGreaterThan(Integer value) {
-            addCriterion("type >", value, "type");
+            addCriterion("`type` >", value, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
-            addCriterion("type >=", value, "type");
+            addCriterion("`type` >=", value, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeLessThan(Integer value) {
-            addCriterion("type <", value, "type");
+            addCriterion("`type` <", value, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeLessThanOrEqualTo(Integer value) {
-            addCriterion("type <=", value, "type");
+            addCriterion("`type` <=", value, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeIn(List<Integer> values) {
-            addCriterion("type in", values, "type");
+            addCriterion("`type` in", values, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeNotIn(List<Integer> values) {
-            addCriterion("type not in", values, "type");
+            addCriterion("`type` not in", values, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeBetween(Integer value1, Integer value2) {
-            addCriterion("type between", value1, value2, "type");
+            addCriterion("`type` between", value1, value2, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeNotBetween(Integer value1, Integer value2) {
-            addCriterion("type not between", value1, value2, "type");
+            addCriterion("`type` not between", value1, value2, "type");
             return (Criteria) this;
         }
 
@@ -783,7 +784,7 @@ public class GhDetailExample {
         }
 
         public Criteria andVideoIdsNotEqualTo(String value) {
-            addCriterion("channel <>", value, "videoIds");
+            addCriterion("video_ids <>", value, "videoIds");
             return (Criteria) this;
         }
 
@@ -897,9 +898,69 @@ public class GhDetailExample {
             return (Criteria) this;
         }
 
+        public Criteria andAutoreplySendMinigramNumIsNull() {
+            addCriterion("autoreply_send_minigram_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAutoreplySendMinigramNumIsNotNull() {
+            addCriterion("autoreply_send_minigram_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAutoreplySendMinigramNumEqualTo(Integer value) {
+            addCriterion("autoreply_send_minigram_num =", value, "autoreplySendMinigramNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAutoreplySendMinigramNumNotEqualTo(Integer value) {
+            addCriterion("autoreply_send_minigram_num <>", value, "autoreplySendMinigramNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAutoreplySendMinigramNumGreaterThan(Integer value) {
+            addCriterion("autoreply_send_minigram_num >", value, "autoreplySendMinigramNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAutoreplySendMinigramNumGreaterThanOrEqualTo(Integer value) {
+            addCriterion("autoreply_send_minigram_num >=", value, "autoreplySendMinigramNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAutoreplySendMinigramNumLessThan(Integer value) {
+            addCriterion("autoreply_send_minigram_num <", value, "autoreplySendMinigramNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAutoreplySendMinigramNumLessThanOrEqualTo(Integer value) {
+            addCriterion("autoreply_send_minigram_num <=", value, "autoreplySendMinigramNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAutoreplySendMinigramNumIn(List<Integer> values) {
+            addCriterion("autoreply_send_minigram_num in", values, "autoreplySendMinigramNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAutoreplySendMinigramNumNotIn(List<Integer> values) {
+            addCriterion("autoreply_send_minigram_num not in", values, "autoreplySendMinigramNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAutoreplySendMinigramNumBetween(Integer value1, Integer value2) {
+            addCriterion("autoreply_send_minigram_num between", value1, value2, "autoreplySendMinigramNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andAutoreplySendMinigramNumNotBetween(Integer value1, Integer value2) {
+            addCriterion("autoreply_send_minigram_num not between", value1, value2, "autoreplySendMinigramNum");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {
+
         protected Criteria() {
             super();
         }

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

@@ -32,4 +32,6 @@ public class GhDetailVo {
     private Integer strategyStatus;
 
     private String strategyStatusName;
+
+    private Integer autoreplySendMinigramNum;
 }

api-module/src/main/resources/mapper/GhDetailMapper.xml

@@ -14,6 +14,7 @@
     <result column="channel" jdbcType="VARCHAR" property="channel" />
     <result column="video_ids" jdbcType="VARCHAR" property="videoIds" />
     <result column="strategy_status" jdbcType="INTEGER" property="strategyStatus" />
+    <result column="autoreply_send_minigram_num" jdbcType="INTEGER" property="autoreplySendMinigramNum" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -74,7 +75,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, gh_id, gh_name, type, category1, category2, is_delete, create_time, update_time, channel, video_ids, strategy_status
+    id, gh_id, gh_name, `type`, category1, category2, is_delete, create_time, update_time, 
+    channel, video_ids, strategy_status, autoreply_send_minigram_num
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.api.model.po.GhDetailExample" resultMap="BaseResultMap">
     select
@@ -110,23 +112,23 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.tzld.piaoquan.api.model.po.GhDetail">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into gh_detail (gh_id, gh_name, `type`,
-      category1, category2,
-      create_time, update_time, channel, video_ids, strategy_status)
-    values (#{ghId,jdbcType=VARCHAR}, #{ghName,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, 
-      #{category1,jdbcType=VARCHAR}, #{category2,jdbcType=VARCHAR},
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{channel,jdbcType=VARCHAR}
-    #{videoIds,jdbcType=VARCHAR}, #{strategyStatus,jdbcType=INTEGER})
+    insert into gh_detail (id, gh_id, gh_name, 
+      `type`, category1, category2, 
+      is_delete, create_time, update_time, 
+      channel, video_ids, strategy_status, 
+      autoreply_send_minigram_num)
+    values (#{id,jdbcType=BIGINT}, #{ghId,jdbcType=VARCHAR}, #{ghName,jdbcType=VARCHAR}, 
+      #{type,jdbcType=INTEGER}, #{category1,jdbcType=VARCHAR}, #{category2,jdbcType=VARCHAR}, 
+      #{isDelete,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{channel,jdbcType=VARCHAR}, #{videoIds,jdbcType=VARCHAR}, #{strategyStatus,jdbcType=INTEGER}, 
+      #{autoreplySendMinigramNum,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.api.model.po.GhDetail">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
     insert into gh_detail
     <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
       <if test="ghId != null">
         gh_id,
       </if>
@@ -134,7 +136,7 @@
         gh_name,
       </if>
       <if test="type != null">
-        type,
+        `type`,
       </if>
       <if test="category1 != null">
         category1,
@@ -160,8 +162,14 @@
       <if test="strategyStatus != null">
         strategy_status,
       </if>
+      <if test="autoreplySendMinigramNum != null">
+        autoreply_send_minigram_num,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
       <if test="ghId != null">
         #{ghId,jdbcType=VARCHAR},
       </if>
@@ -195,6 +203,9 @@
       <if test="strategyStatus != null">
         #{strategyStatus,jdbcType=INTEGER},
       </if>
+      <if test="autoreplySendMinigramNum != null">
+        #{autoreplySendMinigramNum,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.tzld.piaoquan.api.model.po.GhDetailExample" resultType="java.lang.Long">
@@ -206,62 +217,66 @@
   <update id="updateByExampleSelective" parameterType="map">
     update gh_detail
     <set>
-      <if test="row.id != null">
-        id = #{row.id,jdbcType=BIGINT},
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
       </if>
-      <if test="row.ghId != null">
-        gh_id = #{row.ghId,jdbcType=VARCHAR},
+      <if test="record.ghId != null">
+        gh_id = #{record.ghId,jdbcType=VARCHAR},
       </if>
-      <if test="row.ghName != null">
-        gh_name = #{row.ghName,jdbcType=VARCHAR},
+      <if test="record.ghName != null">
+        gh_name = #{record.ghName,jdbcType=VARCHAR},
       </if>
-      <if test="row.type != null">
-        type = #{row.type,jdbcType=INTEGER},
+      <if test="record.type != null">
+        `type` = #{record.type,jdbcType=INTEGER},
       </if>
-      <if test="row.category1 != null">
-        category1 = #{row.category1,jdbcType=VARCHAR},
+      <if test="record.category1 != null">
+        category1 = #{record.category1,jdbcType=VARCHAR},
       </if>
-      <if test="row.category2 != null">
-        category2 = #{row.category2,jdbcType=VARCHAR},
+      <if test="record.category2 != null">
+        category2 = #{record.category2,jdbcType=VARCHAR},
       </if>
-      <if test="row.isDelete != null">
-        is_delete = #{row.isDelete,jdbcType=INTEGER},
+      <if test="record.isDelete != null">
+        is_delete = #{record.isDelete,jdbcType=INTEGER},
       </if>
-      <if test="row.createTime != null">
-        create_time = #{row.createTime,jdbcType=TIMESTAMP},
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="row.updateTime != null">
-        update_time = #{row.updateTime,jdbcType=TIMESTAMP},
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="row.channel != null">
-        channel = #{row.channel,jdbcType=VARCHAR},
+      <if test="record.channel != null">
+        channel = #{record.channel,jdbcType=VARCHAR},
       </if>
-      <if test="row.videoIds != null">
-        video_ids = #{row.videoIds,jdbcType=VARCHAR},
+      <if test="record.videoIds != null">
+        video_ids = #{record.videoIds,jdbcType=VARCHAR},
       </if>
-      <if test="row.strategyStatus != null">
-        strategyStatus = #{row.strategyStatus,jdbcType=INTEGER},
+      <if test="record.strategyStatus != null">
+        strategy_status = #{record.strategyStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.autoreplySendMinigramNum != null">
+        autoreply_send_minigram_num = #{record.autoreplySendMinigramNum,jdbcType=INTEGER},
       </if>
     </set>
-    <if test="example != null">
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
   <update id="updateByExample" parameterType="map">
     update gh_detail
-    set id = #{row.id,jdbcType=BIGINT},
-      gh_id = #{row.ghId,jdbcType=VARCHAR},
-      gh_name = #{row.ghName,jdbcType=VARCHAR},
-      type = #{row.type,jdbcType=INTEGER},
-      category1 = #{row.category1,jdbcType=VARCHAR},
-      category2 = #{row.category2,jdbcType=VARCHAR},
-      is_delete = #{row.isDelete,jdbcType=INTEGER},
-      create_time = #{row.createTime,jdbcType=TIMESTAMP},
-      update_time = #{row.updateTime,jdbcType=TIMESTAMP},
-      channel = #{row.channel,jdbcType=VARCHAR},
-      video_ids = #{row.videoIds,jdbcType=VARCHAR},
-      strategy_status = #{row.strategyStatus,jdbcType=INTEGER}
-    <if test="example != null">
+    set id = #{record.id,jdbcType=BIGINT},
+      gh_id = #{record.ghId,jdbcType=VARCHAR},
+      gh_name = #{record.ghName,jdbcType=VARCHAR},
+      `type` = #{record.type,jdbcType=INTEGER},
+      category1 = #{record.category1,jdbcType=VARCHAR},
+      category2 = #{record.category2,jdbcType=VARCHAR},
+      is_delete = #{record.isDelete,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      channel = #{record.channel,jdbcType=VARCHAR},
+      video_ids = #{record.videoIds,jdbcType=VARCHAR},
+      strategy_status = #{record.strategyStatus,jdbcType=INTEGER},
+      autoreply_send_minigram_num = #{record.autoreplySendMinigramNum,jdbcType=INTEGER}
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
@@ -275,7 +290,7 @@
         gh_name = #{ghName,jdbcType=VARCHAR},
       </if>
       <if test="type != null">
-        type = #{type,jdbcType=INTEGER},
+        `type` = #{type,jdbcType=INTEGER},
       </if>
       <if test="category1 != null">
         category1 = #{category1,jdbcType=VARCHAR},
@@ -301,6 +316,9 @@
       <if test="strategyStatus != null">
         strategy_status = #{strategyStatus,jdbcType=INTEGER},
       </if>
+      <if test="autoreplySendMinigramNum != null">
+        autoreply_send_minigram_num = #{autoreplySendMinigramNum,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -308,7 +326,7 @@
     update gh_detail
     set gh_id = #{ghId,jdbcType=VARCHAR},
       gh_name = #{ghName,jdbcType=VARCHAR},
-      type = #{type,jdbcType=INTEGER},
+      `type` = #{type,jdbcType=INTEGER},
       category1 = #{category1,jdbcType=VARCHAR},
       category2 = #{category2,jdbcType=VARCHAR},
       is_delete = #{isDelete,jdbcType=INTEGER},
@@ -316,7 +334,8 @@
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       channel = #{channel,jdbcType=VARCHAR},
       video_ids = #{videoIds,jdbcType=VARCHAR},
-      strategy_status = #{strategyStatus,jdbcType=INTEGER}
+      strategy_status = #{strategyStatus,jdbcType=INTEGER},
+      autoreply_send_minigram_num = #{autoreplySendMinigramNum,jdbcType=INTEGER}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

api-module/src/main/resources/mybatis-generator-config.xml

@@ -35,7 +35,7 @@
             <property name="forceBigDecimals" value="false"/>
         </javaTypeResolver>
 
-        <javaModelGenerator targetPackage="com.tzld.piaoquan.common.model.po" targetProject="/Users/shimeng/Desktop/project/growth-manager/api-module/src/main/java">
+        <javaModelGenerator targetPackage="com.tzld.piaoquan.api.model.po" targetProject="/Users/shimeng/Desktop/project/growth-manager/api-module/src/main/java">
             <property name="constructorBased" value="false"/>
             <property name="enableSubPackages" value="true"/>
             <property name="immutable" value="false"/>
@@ -51,7 +51,7 @@
         </javaClientGenerator>
 
 <!--        <table tableName="we_com_alert_message" domainObjectName="AlertMessage" alias=""/>-->
-        <table tableName="we_com_history_message_backup" domainObjectName="HistoryMessageBackup" alias=""/>
+        <table tableName="gh_detail" domainObjectName="GhDetail" alias=""/>
 <!--        <table tableName="we_com_guarantees_video" domainObjectName="GuaranteesVideo" alias=""/>-->
 <!--        <table tableName="we_com_staff" domainObjectName="Staff" alias=""/>-->
 <!--        <table tableName="we_com_staff_with_user" domainObjectName="StaffWithUser" alias=""/>-->