增加traceId

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/GroupSendResult.java

@@ -23,6 +23,10 @@ public class GroupSendResult {
 
     private Date updateTime;
 
+    private Integer recycleStatus;
+
+    private String traceId;
+
     private String url;
 
     public Long getId() {
@@ -105,6 +109,22 @@ public class GroupSendResult {
         this.updateTime = updateTime;
     }
 
+    public Integer getRecycleStatus() {
+        return recycleStatus;
+    }
+
+    public void setRecycleStatus(Integer recycleStatus) {
+        this.recycleStatus = recycleStatus;
+    }
+
+    public String getTraceId() {
+        return traceId;
+    }
+
+    public void setTraceId(String traceId) {
+        this.traceId = traceId;
+    }
+
     public String getUrl() {
         return url;
     }
@@ -129,6 +149,8 @@ public class GroupSendResult {
         sb.append(", status=").append(status);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
+        sb.append(", recycleStatus=").append(recycleStatus);
+        sb.append(", traceId=").append(traceId);
         sb.append(", url=").append(url);
         sb.append("]");
         return sb.toString();

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/GroupSendResultExample.java

@@ -765,6 +765,136 @@ public class GroupSendResultExample {
             addCriterion("update_time not between", value1, value2, "updateTime");
             return (Criteria) this;
         }
+
+        public Criteria andRecycleStatusIsNull() {
+            addCriterion("recycle_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecycleStatusIsNotNull() {
+            addCriterion("recycle_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecycleStatusEqualTo(Integer value) {
+            addCriterion("recycle_status =", value, "recycleStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecycleStatusNotEqualTo(Integer value) {
+            addCriterion("recycle_status <>", value, "recycleStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecycleStatusGreaterThan(Integer value) {
+            addCriterion("recycle_status >", value, "recycleStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecycleStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("recycle_status >=", value, "recycleStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecycleStatusLessThan(Integer value) {
+            addCriterion("recycle_status <", value, "recycleStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecycleStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("recycle_status <=", value, "recycleStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecycleStatusIn(List<Integer> values) {
+            addCriterion("recycle_status in", values, "recycleStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecycleStatusNotIn(List<Integer> values) {
+            addCriterion("recycle_status not in", values, "recycleStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecycleStatusBetween(Integer value1, Integer value2) {
+            addCriterion("recycle_status between", value1, value2, "recycleStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecycleStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("recycle_status not between", value1, value2, "recycleStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andTraceIdIsNull() {
+            addCriterion("trace_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTraceIdIsNotNull() {
+            addCriterion("trace_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTraceIdEqualTo(String value) {
+            addCriterion("trace_id =", value, "traceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTraceIdNotEqualTo(String value) {
+            addCriterion("trace_id <>", value, "traceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTraceIdGreaterThan(String value) {
+            addCriterion("trace_id >", value, "traceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTraceIdGreaterThanOrEqualTo(String value) {
+            addCriterion("trace_id >=", value, "traceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTraceIdLessThan(String value) {
+            addCriterion("trace_id <", value, "traceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTraceIdLessThanOrEqualTo(String value) {
+            addCriterion("trace_id <=", value, "traceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTraceIdLike(String value) {
+            addCriterion("trace_id like", value, "traceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTraceIdNotLike(String value) {
+            addCriterion("trace_id not like", value, "traceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTraceIdIn(List<String> values) {
+            addCriterion("trace_id in", values, "traceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTraceIdNotIn(List<String> values) {
+            addCriterion("trace_id not in", values, "traceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTraceIdBetween(String value1, String value2) {
+            addCriterion("trace_id between", value1, value2, "traceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTraceIdNotBetween(String value1, String value2) {
+            addCriterion("trace_id not between", value1, value2, "traceId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CoreServiceImpl.java

@@ -825,6 +825,7 @@ public class CoreServiceImpl implements CoreService {
                 groupSendResult.setUserGroupId(entry.getKey());
                 groupSendResult.setContentId(publishContent.getSourceId());
                 groupSendResult.setPushId(pushId);
+                groupSendResult.setTraceId(publishContent.getTraceId());
                 groupSendResult.setPublishDate(DateUtil.getThatDayDateString());
                 groupSendResultMapper.insertSelective(groupSendResult);
             }

long-article-server/src/main/resources/mapper/longarticle/GroupSendResultMapper.xml

@@ -12,6 +12,8 @@
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="recycle_status" jdbcType="INTEGER" property="recycleStatus" />
+    <result column="trace_id" jdbcType="VARCHAR" property="traceId" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.tzld.piaoquan.longarticle.model.po.longarticle.GroupSendResult">
     <result column="url" jdbcType="LONGVARCHAR" property="url" />
@@ -76,7 +78,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, account_name, gh_id, publish_date, user_group_id, content_id, push_id, `status`, 
-    create_time, update_time
+    create_time, update_time, recycle_status, trace_id
   </sql>
   <sql id="Blob_Column_List">
     url
@@ -139,11 +141,13 @@
     insert into long_articles_group_send_result (id, account_name, gh_id, 
       publish_date, user_group_id, content_id, 
       push_id, `status`, create_time, 
-      update_time, url)
+      update_time, recycle_status, trace_id, 
+      url)
     values (#{id,jdbcType=BIGINT}, #{accountName,jdbcType=VARCHAR}, #{ghId,jdbcType=VARCHAR}, 
       #{publishDate,jdbcType=VARCHAR}, #{userGroupId,jdbcType=INTEGER}, #{contentId,jdbcType=VARCHAR}, 
       #{pushId,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{url,jdbcType=LONGVARCHAR})
+      #{updateTime,jdbcType=TIMESTAMP}, #{recycleStatus,jdbcType=INTEGER}, #{traceId,jdbcType=VARCHAR}, 
+      #{url,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.GroupSendResult">
     insert into long_articles_group_send_result
@@ -178,6 +182,12 @@
       <if test="updateTime != null">
         update_time,
       </if>
+      <if test="recycleStatus != null">
+        recycle_status,
+      </if>
+      <if test="traceId != null">
+        trace_id,
+      </if>
       <if test="url != null">
         url,
       </if>
@@ -213,6 +223,12 @@
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="recycleStatus != null">
+        #{recycleStatus,jdbcType=INTEGER},
+      </if>
+      <if test="traceId != null">
+        #{traceId,jdbcType=VARCHAR},
+      </if>
       <if test="url != null">
         #{url,jdbcType=LONGVARCHAR},
       </if>
@@ -257,6 +273,12 @@
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.recycleStatus != null">
+        recycle_status = #{record.recycleStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.traceId != null">
+        trace_id = #{record.traceId,jdbcType=VARCHAR},
+      </if>
       <if test="record.url != null">
         url = #{record.url,jdbcType=LONGVARCHAR},
       </if>
@@ -277,6 +299,8 @@
       `status` = #{record.status,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      recycle_status = #{record.recycleStatus,jdbcType=INTEGER},
+      trace_id = #{record.traceId,jdbcType=VARCHAR},
       url = #{record.url,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -293,7 +317,9 @@
       push_id = #{record.pushId,jdbcType=VARCHAR},
       `status` = #{record.status,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      recycle_status = #{record.recycleStatus,jdbcType=INTEGER},
+      trace_id = #{record.traceId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -328,6 +354,12 @@
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="recycleStatus != null">
+        recycle_status = #{recycleStatus,jdbcType=INTEGER},
+      </if>
+      <if test="traceId != null">
+        trace_id = #{traceId,jdbcType=VARCHAR},
+      </if>
       <if test="url != null">
         url = #{url,jdbcType=LONGVARCHAR},
       </if>
@@ -345,6 +377,8 @@
       `status` = #{status,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
+      recycle_status = #{recycleStatus,jdbcType=INTEGER},
+      trace_id = #{traceId,jdbcType=VARCHAR},
       url = #{url,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -358,7 +392,9 @@
       push_id = #{pushId,jdbcType=VARCHAR},
       `status` = #{status,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      recycle_status = #{recycleStatus,jdbcType=INTEGER},
+      trace_id = #{traceId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>