Merge branch 'dev-xym-update-match' of Server/long-article-manage into master

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

@@ -15,6 +15,8 @@ public class GroupSendResult {
 
     private String contentId;
 
+    private String publishContentId;
+
     private String pushId;
 
     private Integer status;
@@ -77,6 +79,14 @@ public class GroupSendResult {
         this.contentId = contentId;
     }
 
+    public String getPublishContentId() {
+        return publishContentId;
+    }
+
+    public void setPublishContentId(String publishContentId) {
+        this.publishContentId = publishContentId;
+    }
+
     public String getPushId() {
         return pushId;
     }
@@ -145,6 +155,7 @@ public class GroupSendResult {
         sb.append(", publishDate=").append(publishDate);
         sb.append(", userGroupId=").append(userGroupId);
         sb.append(", contentId=").append(contentId);
+        sb.append(", publishContentId=").append(publishContentId);
         sb.append(", pushId=").append(pushId);
         sb.append(", status=").append(status);
         sb.append(", createTime=").append(createTime);

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

@@ -516,6 +516,76 @@ public class GroupSendResultExample {
             return (Criteria) this;
         }
 
+        public Criteria andPublishContentIdIsNull() {
+            addCriterion("publish_content_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishContentIdIsNotNull() {
+            addCriterion("publish_content_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishContentIdEqualTo(String value) {
+            addCriterion("publish_content_id =", value, "publishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishContentIdNotEqualTo(String value) {
+            addCriterion("publish_content_id <>", value, "publishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishContentIdGreaterThan(String value) {
+            addCriterion("publish_content_id >", value, "publishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishContentIdGreaterThanOrEqualTo(String value) {
+            addCriterion("publish_content_id >=", value, "publishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishContentIdLessThan(String value) {
+            addCriterion("publish_content_id <", value, "publishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishContentIdLessThanOrEqualTo(String value) {
+            addCriterion("publish_content_id <=", value, "publishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishContentIdLike(String value) {
+            addCriterion("publish_content_id like", value, "publishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishContentIdNotLike(String value) {
+            addCriterion("publish_content_id not like", value, "publishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishContentIdIn(List<String> values) {
+            addCriterion("publish_content_id in", values, "publishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishContentIdNotIn(List<String> values) {
+            addCriterion("publish_content_id not in", values, "publishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishContentIdBetween(String value1, String value2) {
+            addCriterion("publish_content_id between", value1, value2, "publishContentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishContentIdNotBetween(String value1, String value2) {
+            addCriterion("publish_content_id not between", value1, value2, "publishContentId");
+            return (Criteria) this;
+        }
+
         public Criteria andPushIdIsNull() {
             addCriterion("push_id is null");
             return (Criteria) this;

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

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

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

@@ -8,6 +8,7 @@
     <result column="publish_date" jdbcType="VARCHAR" property="publishDate" />
     <result column="user_group_id" jdbcType="INTEGER" property="userGroupId" />
     <result column="content_id" jdbcType="VARCHAR" property="contentId" />
+    <result column="publish_content_id" jdbcType="VARCHAR" property="publishContentId" />
     <result column="push_id" jdbcType="VARCHAR" property="pushId" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -77,8 +78,8 @@
     </where>
   </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, recycle_status, trace_id
+    id, account_name, gh_id, publish_date, user_group_id, content_id, publish_content_id, 
+    push_id, `status`, create_time, update_time, recycle_status, trace_id
   </sql>
   <sql id="Blob_Column_List">
     url
@@ -140,14 +141,14 @@
   <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.GroupSendResult">
     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, recycle_status, trace_id, 
-      url)
+      publish_content_id, push_id, `status`, 
+      create_time, 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}, #{recycleStatus,jdbcType=INTEGER}, #{traceId,jdbcType=VARCHAR}, 
-      #{url,jdbcType=LONGVARCHAR})
+      #{publishContentId,jdbcType=VARCHAR}, #{pushId,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{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
@@ -170,6 +171,9 @@
       <if test="contentId != null">
         content_id,
       </if>
+      <if test="publishContentId != null">
+        publish_content_id,
+      </if>
       <if test="pushId != null">
         push_id,
       </if>
@@ -211,6 +215,9 @@
       <if test="contentId != null">
         #{contentId,jdbcType=VARCHAR},
       </if>
+      <if test="publishContentId != null">
+        #{publishContentId,jdbcType=VARCHAR},
+      </if>
       <if test="pushId != null">
         #{pushId,jdbcType=VARCHAR},
       </if>
@@ -261,6 +268,9 @@
       <if test="record.contentId != null">
         content_id = #{record.contentId,jdbcType=VARCHAR},
       </if>
+      <if test="record.publishContentId != null">
+        publish_content_id = #{record.publishContentId,jdbcType=VARCHAR},
+      </if>
       <if test="record.pushId != null">
         push_id = #{record.pushId,jdbcType=VARCHAR},
       </if>
@@ -295,6 +305,7 @@
       publish_date = #{record.publishDate,jdbcType=VARCHAR},
       user_group_id = #{record.userGroupId,jdbcType=INTEGER},
       content_id = #{record.contentId,jdbcType=VARCHAR},
+      publish_content_id = #{record.publishContentId,jdbcType=VARCHAR},
       push_id = #{record.pushId,jdbcType=VARCHAR},
       `status` = #{record.status,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
@@ -314,6 +325,7 @@
       publish_date = #{record.publishDate,jdbcType=VARCHAR},
       user_group_id = #{record.userGroupId,jdbcType=INTEGER},
       content_id = #{record.contentId,jdbcType=VARCHAR},
+      publish_content_id = #{record.publishContentId,jdbcType=VARCHAR},
       push_id = #{record.pushId,jdbcType=VARCHAR},
       `status` = #{record.status,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
@@ -342,6 +354,9 @@
       <if test="contentId != null">
         content_id = #{contentId,jdbcType=VARCHAR},
       </if>
+      <if test="publishContentId != null">
+        publish_content_id = #{publishContentId,jdbcType=VARCHAR},
+      </if>
       <if test="pushId != null">
         push_id = #{pushId,jdbcType=VARCHAR},
       </if>
@@ -373,6 +388,7 @@
       publish_date = #{publishDate,jdbcType=VARCHAR},
       user_group_id = #{userGroupId,jdbcType=INTEGER},
       content_id = #{contentId,jdbcType=VARCHAR},
+      publish_content_id = #{publishContentId,jdbcType=VARCHAR},
       push_id = #{pushId,jdbcType=VARCHAR},
       `status` = #{status,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -389,6 +405,7 @@
       publish_date = #{publishDate,jdbcType=VARCHAR},
       user_group_id = #{userGroupId,jdbcType=INTEGER},
       content_id = #{contentId,jdbcType=VARCHAR},
+      publish_content_id = #{publishContentId,jdbcType=VARCHAR},
       push_id = #{pushId,jdbcType=VARCHAR},
       `status` = #{status,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},