增加记录

long-article-server/pom.xml

@@ -29,6 +29,14 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>10</source>
+                    <target>10</target>
+                </configuration>
+            </plugin>
         </plugins>
 
     </build>

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/common/enums/PublishGzhPushTypeEnum.java

@@ -0,0 +1,35 @@
+package com.tzld.piaoquan.longarticle.common.enums;
+
+import lombok.Getter;
+
+import java.util.Objects;
+
+@Getter
+public enum PublishGzhPushTypeEnum {
+    manual_push(1, "手动推送"),
+    auto_group_publish(2, "自动群发"),
+    auto_publish(3, "自动发表"),
+    robopost(4, "自动发布"),
+    batch_group_publish(5, "分组群发"),
+    trigger_push(6, "触发推送"),
+
+    other(999, "其他"),
+    ;
+
+    private final Integer val;
+    private final String description;
+
+    PublishGzhPushTypeEnum(Integer val, String description) {
+        this.val = val;
+        this.description = description;
+    }
+
+    public static PublishGzhPushTypeEnum from(Integer val) {
+        for (PublishGzhPushTypeEnum typeEnum : PublishGzhPushTypeEnum.values()) {
+            if (Objects.equals(typeEnum.val, val)) {
+                return typeEnum;
+            }
+        }
+        return other;
+    }
+}

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/dao/mapper/PublishContentMapper.java

@@ -0,0 +1,30 @@
+package com.tzld.piaoquan.longarticle.dao.mapper;
+
+import com.tzld.piaoquan.longarticle.model.po.PublishContent;
+import com.tzld.piaoquan.longarticle.model.po.PublishContentExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PublishContentMapper {
+    long countByExample(PublishContentExample example);
+
+    int deleteByExample(PublishContentExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(PublishContent record);
+
+    int insertSelective(PublishContent record);
+
+    List<PublishContent> selectByExample(PublishContentExample example);
+
+    PublishContent selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") PublishContent record, @Param("example") PublishContentExample example);
+
+    int updateByExample(@Param("record") PublishContent record, @Param("example") PublishContentExample example);
+
+    int updateByPrimaryKeySelective(PublishContent record);
+
+    int updateByPrimaryKey(PublishContent record);
+}

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

@@ -15,23 +15,41 @@ public class PlanAccount {
 
     private String ghId;
 
+    private Integer publishRate;
+
+    private String publishDate;
+
+    private String publishWindowStart;
+
+    private String publishWindowEnd;
+
+    private Integer publishTimeInterval;
+
     private Integer publishNum;
 
+    private Integer publishPreNum;
+
     private Integer publishPreMinNum;
 
     private String publishPushTime;
 
+    private Integer pushType;
+
+    private Integer miniprogramInsertFlag;
+
     private String miniStrategy;
 
     private Integer miniprogramUseType;
 
     private String sortStrategy;
 
-    private Integer pushType;
-
     private Integer status;
 
-    private String pushId;
+    private Integer matchStatus;
+
+    private Integer retryCount;
+
+    private Integer sendCount;
 
     private Date createTime;
 
@@ -85,6 +103,46 @@ public class PlanAccount {
         this.ghId = ghId;
     }
 
+    public Integer getPublishRate() {
+        return publishRate;
+    }
+
+    public void setPublishRate(Integer publishRate) {
+        this.publishRate = publishRate;
+    }
+
+    public String getPublishDate() {
+        return publishDate;
+    }
+
+    public void setPublishDate(String publishDate) {
+        this.publishDate = publishDate;
+    }
+
+    public String getPublishWindowStart() {
+        return publishWindowStart;
+    }
+
+    public void setPublishWindowStart(String publishWindowStart) {
+        this.publishWindowStart = publishWindowStart;
+    }
+
+    public String getPublishWindowEnd() {
+        return publishWindowEnd;
+    }
+
+    public void setPublishWindowEnd(String publishWindowEnd) {
+        this.publishWindowEnd = publishWindowEnd;
+    }
+
+    public Integer getPublishTimeInterval() {
+        return publishTimeInterval;
+    }
+
+    public void setPublishTimeInterval(Integer publishTimeInterval) {
+        this.publishTimeInterval = publishTimeInterval;
+    }
+
     public Integer getPublishNum() {
         return publishNum;
     }
@@ -93,6 +151,14 @@ public class PlanAccount {
         this.publishNum = publishNum;
     }
 
+    public Integer getPublishPreNum() {
+        return publishPreNum;
+    }
+
+    public void setPublishPreNum(Integer publishPreNum) {
+        this.publishPreNum = publishPreNum;
+    }
+
     public Integer getPublishPreMinNum() {
         return publishPreMinNum;
     }
@@ -109,6 +175,22 @@ public class PlanAccount {
         this.publishPushTime = publishPushTime;
     }
 
+    public Integer getPushType() {
+        return pushType;
+    }
+
+    public void setPushType(Integer pushType) {
+        this.pushType = pushType;
+    }
+
+    public Integer getMiniprogramInsertFlag() {
+        return miniprogramInsertFlag;
+    }
+
+    public void setMiniprogramInsertFlag(Integer miniprogramInsertFlag) {
+        this.miniprogramInsertFlag = miniprogramInsertFlag;
+    }
+
     public String getMiniStrategy() {
         return miniStrategy;
     }
@@ -133,14 +215,6 @@ public class PlanAccount {
         this.sortStrategy = sortStrategy;
     }
 
-    public Integer getPushType() {
-        return pushType;
-    }
-
-    public void setPushType(Integer pushType) {
-        this.pushType = pushType;
-    }
-
     public Integer getStatus() {
         return status;
     }
@@ -149,12 +223,28 @@ public class PlanAccount {
         this.status = status;
     }
 
-    public String getPushId() {
-        return pushId;
+    public Integer getMatchStatus() {
+        return matchStatus;
+    }
+
+    public void setMatchStatus(Integer matchStatus) {
+        this.matchStatus = matchStatus;
     }
 
-    public void setPushId(String pushId) {
-        this.pushId = pushId;
+    public Integer getRetryCount() {
+        return retryCount;
+    }
+
+    public void setRetryCount(Integer retryCount) {
+        this.retryCount = retryCount;
+    }
+
+    public Integer getSendCount() {
+        return sendCount;
+    }
+
+    public void setSendCount(Integer sendCount) {
+        this.sendCount = sendCount;
     }
 
     public Date getCreateTime() {
@@ -185,15 +275,24 @@ public class PlanAccount {
         sb.append(", accountId=").append(accountId);
         sb.append(", accountName=").append(accountName);
         sb.append(", ghId=").append(ghId);
+        sb.append(", publishRate=").append(publishRate);
+        sb.append(", publishDate=").append(publishDate);
+        sb.append(", publishWindowStart=").append(publishWindowStart);
+        sb.append(", publishWindowEnd=").append(publishWindowEnd);
+        sb.append(", publishTimeInterval=").append(publishTimeInterval);
         sb.append(", publishNum=").append(publishNum);
+        sb.append(", publishPreNum=").append(publishPreNum);
         sb.append(", publishPreMinNum=").append(publishPreMinNum);
         sb.append(", publishPushTime=").append(publishPushTime);
+        sb.append(", pushType=").append(pushType);
+        sb.append(", miniprogramInsertFlag=").append(miniprogramInsertFlag);
         sb.append(", miniStrategy=").append(miniStrategy);
         sb.append(", miniprogramUseType=").append(miniprogramUseType);
         sb.append(", sortStrategy=").append(sortStrategy);
-        sb.append(", pushType=").append(pushType);
         sb.append(", status=").append(status);
-        sb.append(", pushId=").append(pushId);
+        sb.append(", matchStatus=").append(matchStatus);
+        sb.append(", retryCount=").append(retryCount);
+        sb.append(", sendCount=").append(sendCount);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
         sb.append("]");

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

@@ -526,6 +526,336 @@ public class PlanAccountExample {
             return (Criteria) this;
         }
 
+        public Criteria andPublishRateIsNull() {
+            addCriterion("publish_rate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRateIsNotNull() {
+            addCriterion("publish_rate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRateEqualTo(Integer value) {
+            addCriterion("publish_rate =", value, "publishRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRateNotEqualTo(Integer value) {
+            addCriterion("publish_rate <>", value, "publishRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRateGreaterThan(Integer value) {
+            addCriterion("publish_rate >", value, "publishRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRateGreaterThanOrEqualTo(Integer value) {
+            addCriterion("publish_rate >=", value, "publishRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRateLessThan(Integer value) {
+            addCriterion("publish_rate <", value, "publishRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRateLessThanOrEqualTo(Integer value) {
+            addCriterion("publish_rate <=", value, "publishRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRateIn(List<Integer> values) {
+            addCriterion("publish_rate in", values, "publishRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRateNotIn(List<Integer> values) {
+            addCriterion("publish_rate not in", values, "publishRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRateBetween(Integer value1, Integer value2) {
+            addCriterion("publish_rate between", value1, value2, "publishRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishRateNotBetween(Integer value1, Integer value2) {
+            addCriterion("publish_rate not between", value1, value2, "publishRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateIsNull() {
+            addCriterion("publish_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateIsNotNull() {
+            addCriterion("publish_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateEqualTo(String value) {
+            addCriterion("publish_date =", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateNotEqualTo(String value) {
+            addCriterion("publish_date <>", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateGreaterThan(String value) {
+            addCriterion("publish_date >", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateGreaterThanOrEqualTo(String value) {
+            addCriterion("publish_date >=", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateLessThan(String value) {
+            addCriterion("publish_date <", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateLessThanOrEqualTo(String value) {
+            addCriterion("publish_date <=", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateLike(String value) {
+            addCriterion("publish_date like", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateNotLike(String value) {
+            addCriterion("publish_date not like", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateIn(List<String> values) {
+            addCriterion("publish_date in", values, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateNotIn(List<String> values) {
+            addCriterion("publish_date not in", values, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateBetween(String value1, String value2) {
+            addCriterion("publish_date between", value1, value2, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateNotBetween(String value1, String value2) {
+            addCriterion("publish_date not between", value1, value2, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowStartIsNull() {
+            addCriterion("publish_window_start is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowStartIsNotNull() {
+            addCriterion("publish_window_start is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowStartEqualTo(String value) {
+            addCriterion("publish_window_start =", value, "publishWindowStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowStartNotEqualTo(String value) {
+            addCriterion("publish_window_start <>", value, "publishWindowStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowStartGreaterThan(String value) {
+            addCriterion("publish_window_start >", value, "publishWindowStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowStartGreaterThanOrEqualTo(String value) {
+            addCriterion("publish_window_start >=", value, "publishWindowStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowStartLessThan(String value) {
+            addCriterion("publish_window_start <", value, "publishWindowStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowStartLessThanOrEqualTo(String value) {
+            addCriterion("publish_window_start <=", value, "publishWindowStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowStartLike(String value) {
+            addCriterion("publish_window_start like", value, "publishWindowStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowStartNotLike(String value) {
+            addCriterion("publish_window_start not like", value, "publishWindowStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowStartIn(List<String> values) {
+            addCriterion("publish_window_start in", values, "publishWindowStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowStartNotIn(List<String> values) {
+            addCriterion("publish_window_start not in", values, "publishWindowStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowStartBetween(String value1, String value2) {
+            addCriterion("publish_window_start between", value1, value2, "publishWindowStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowStartNotBetween(String value1, String value2) {
+            addCriterion("publish_window_start not between", value1, value2, "publishWindowStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowEndIsNull() {
+            addCriterion("publish_window_end is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowEndIsNotNull() {
+            addCriterion("publish_window_end is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowEndEqualTo(String value) {
+            addCriterion("publish_window_end =", value, "publishWindowEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowEndNotEqualTo(String value) {
+            addCriterion("publish_window_end <>", value, "publishWindowEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowEndGreaterThan(String value) {
+            addCriterion("publish_window_end >", value, "publishWindowEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowEndGreaterThanOrEqualTo(String value) {
+            addCriterion("publish_window_end >=", value, "publishWindowEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowEndLessThan(String value) {
+            addCriterion("publish_window_end <", value, "publishWindowEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowEndLessThanOrEqualTo(String value) {
+            addCriterion("publish_window_end <=", value, "publishWindowEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowEndLike(String value) {
+            addCriterion("publish_window_end like", value, "publishWindowEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowEndNotLike(String value) {
+            addCriterion("publish_window_end not like", value, "publishWindowEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowEndIn(List<String> values) {
+            addCriterion("publish_window_end in", values, "publishWindowEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowEndNotIn(List<String> values) {
+            addCriterion("publish_window_end not in", values, "publishWindowEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowEndBetween(String value1, String value2) {
+            addCriterion("publish_window_end between", value1, value2, "publishWindowEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishWindowEndNotBetween(String value1, String value2) {
+            addCriterion("publish_window_end not between", value1, value2, "publishWindowEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIntervalIsNull() {
+            addCriterion("publish_time_interval is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIntervalIsNotNull() {
+            addCriterion("publish_time_interval is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIntervalEqualTo(Integer value) {
+            addCriterion("publish_time_interval =", value, "publishTimeInterval");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIntervalNotEqualTo(Integer value) {
+            addCriterion("publish_time_interval <>", value, "publishTimeInterval");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIntervalGreaterThan(Integer value) {
+            addCriterion("publish_time_interval >", value, "publishTimeInterval");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIntervalGreaterThanOrEqualTo(Integer value) {
+            addCriterion("publish_time_interval >=", value, "publishTimeInterval");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIntervalLessThan(Integer value) {
+            addCriterion("publish_time_interval <", value, "publishTimeInterval");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIntervalLessThanOrEqualTo(Integer value) {
+            addCriterion("publish_time_interval <=", value, "publishTimeInterval");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIntervalIn(List<Integer> values) {
+            addCriterion("publish_time_interval in", values, "publishTimeInterval");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIntervalNotIn(List<Integer> values) {
+            addCriterion("publish_time_interval not in", values, "publishTimeInterval");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIntervalBetween(Integer value1, Integer value2) {
+            addCriterion("publish_time_interval between", value1, value2, "publishTimeInterval");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIntervalNotBetween(Integer value1, Integer value2) {
+            addCriterion("publish_time_interval not between", value1, value2, "publishTimeInterval");
+            return (Criteria) this;
+        }
+
         public Criteria andPublishNumIsNull() {
             addCriterion("publish_num is null");
             return (Criteria) this;
@@ -586,6 +916,66 @@ public class PlanAccountExample {
             return (Criteria) this;
         }
 
+        public Criteria andPublishPreNumIsNull() {
+            addCriterion("publish_pre_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishPreNumIsNotNull() {
+            addCriterion("publish_pre_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishPreNumEqualTo(Integer value) {
+            addCriterion("publish_pre_num =", value, "publishPreNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishPreNumNotEqualTo(Integer value) {
+            addCriterion("publish_pre_num <>", value, "publishPreNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishPreNumGreaterThan(Integer value) {
+            addCriterion("publish_pre_num >", value, "publishPreNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishPreNumGreaterThanOrEqualTo(Integer value) {
+            addCriterion("publish_pre_num >=", value, "publishPreNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishPreNumLessThan(Integer value) {
+            addCriterion("publish_pre_num <", value, "publishPreNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishPreNumLessThanOrEqualTo(Integer value) {
+            addCriterion("publish_pre_num <=", value, "publishPreNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishPreNumIn(List<Integer> values) {
+            addCriterion("publish_pre_num in", values, "publishPreNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishPreNumNotIn(List<Integer> values) {
+            addCriterion("publish_pre_num not in", values, "publishPreNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishPreNumBetween(Integer value1, Integer value2) {
+            addCriterion("publish_pre_num between", value1, value2, "publishPreNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishPreNumNotBetween(Integer value1, Integer value2) {
+            addCriterion("publish_pre_num not between", value1, value2, "publishPreNum");
+            return (Criteria) this;
+        }
+
         public Criteria andPublishPreMinNumIsNull() {
             addCriterion("publish_pre_min_num is null");
             return (Criteria) this;
@@ -716,6 +1106,126 @@ public class PlanAccountExample {
             return (Criteria) this;
         }
 
+        public Criteria andPushTypeIsNull() {
+            addCriterion("push_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushTypeIsNotNull() {
+            addCriterion("push_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushTypeEqualTo(Integer value) {
+            addCriterion("push_type =", value, "pushType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushTypeNotEqualTo(Integer value) {
+            addCriterion("push_type <>", value, "pushType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushTypeGreaterThan(Integer value) {
+            addCriterion("push_type >", value, "pushType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("push_type >=", value, "pushType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushTypeLessThan(Integer value) {
+            addCriterion("push_type <", value, "pushType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("push_type <=", value, "pushType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushTypeIn(List<Integer> values) {
+            addCriterion("push_type in", values, "pushType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushTypeNotIn(List<Integer> values) {
+            addCriterion("push_type not in", values, "pushType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushTypeBetween(Integer value1, Integer value2) {
+            addCriterion("push_type between", value1, value2, "pushType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("push_type not between", value1, value2, "pushType");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiniprogramInsertFlagIsNull() {
+            addCriterion("miniprogram_insert_flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiniprogramInsertFlagIsNotNull() {
+            addCriterion("miniprogram_insert_flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiniprogramInsertFlagEqualTo(Integer value) {
+            addCriterion("miniprogram_insert_flag =", value, "miniprogramInsertFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiniprogramInsertFlagNotEqualTo(Integer value) {
+            addCriterion("miniprogram_insert_flag <>", value, "miniprogramInsertFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiniprogramInsertFlagGreaterThan(Integer value) {
+            addCriterion("miniprogram_insert_flag >", value, "miniprogramInsertFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiniprogramInsertFlagGreaterThanOrEqualTo(Integer value) {
+            addCriterion("miniprogram_insert_flag >=", value, "miniprogramInsertFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiniprogramInsertFlagLessThan(Integer value) {
+            addCriterion("miniprogram_insert_flag <", value, "miniprogramInsertFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiniprogramInsertFlagLessThanOrEqualTo(Integer value) {
+            addCriterion("miniprogram_insert_flag <=", value, "miniprogramInsertFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiniprogramInsertFlagIn(List<Integer> values) {
+            addCriterion("miniprogram_insert_flag in", values, "miniprogramInsertFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiniprogramInsertFlagNotIn(List<Integer> values) {
+            addCriterion("miniprogram_insert_flag not in", values, "miniprogramInsertFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiniprogramInsertFlagBetween(Integer value1, Integer value2) {
+            addCriterion("miniprogram_insert_flag between", value1, value2, "miniprogramInsertFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andMiniprogramInsertFlagNotBetween(Integer value1, Integer value2) {
+            addCriterion("miniprogram_insert_flag not between", value1, value2, "miniprogramInsertFlag");
+            return (Criteria) this;
+        }
+
         public Criteria andMiniStrategyIsNull() {
             addCriterion("mini_strategy is null");
             return (Criteria) this;
@@ -916,193 +1426,243 @@ public class PlanAccountExample {
             return (Criteria) this;
         }
 
-        public Criteria andPushTypeIsNull() {
-            addCriterion("push_type is null");
+        public Criteria andStatusIsNull() {
+            addCriterion("`status` is null");
             return (Criteria) this;
         }
 
-        public Criteria andPushTypeIsNotNull() {
-            addCriterion("push_type is not null");
+        public Criteria andStatusIsNotNull() {
+            addCriterion("`status` is not null");
             return (Criteria) this;
         }
 
-        public Criteria andPushTypeEqualTo(Integer value) {
-            addCriterion("push_type =", value, "pushType");
+        public Criteria andStatusEqualTo(Integer value) {
+            addCriterion("`status` =", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andPushTypeNotEqualTo(Integer value) {
-            addCriterion("push_type <>", value, "pushType");
+        public Criteria andStatusNotEqualTo(Integer value) {
+            addCriterion("`status` <>", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andPushTypeGreaterThan(Integer value) {
-            addCriterion("push_type >", value, "pushType");
+        public Criteria andStatusGreaterThan(Integer value) {
+            addCriterion("`status` >", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andPushTypeGreaterThanOrEqualTo(Integer value) {
-            addCriterion("push_type >=", value, "pushType");
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("`status` >=", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andPushTypeLessThan(Integer value) {
-            addCriterion("push_type <", value, "pushType");
+        public Criteria andStatusLessThan(Integer value) {
+            addCriterion("`status` <", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andPushTypeLessThanOrEqualTo(Integer value) {
-            addCriterion("push_type <=", value, "pushType");
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("`status` <=", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andPushTypeIn(List<Integer> values) {
-            addCriterion("push_type in", values, "pushType");
+        public Criteria andStatusIn(List<Integer> values) {
+            addCriterion("`status` in", values, "status");
             return (Criteria) this;
         }
 
-        public Criteria andPushTypeNotIn(List<Integer> values) {
-            addCriterion("push_type not in", values, "pushType");
+        public Criteria andStatusNotIn(List<Integer> values) {
+            addCriterion("`status` not in", values, "status");
             return (Criteria) this;
         }
 
-        public Criteria andPushTypeBetween(Integer value1, Integer value2) {
-            addCriterion("push_type between", value1, value2, "pushType");
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
+            addCriterion("`status` between", value1, value2, "status");
             return (Criteria) this;
         }
 
-        public Criteria andPushTypeNotBetween(Integer value1, Integer value2) {
-            addCriterion("push_type not between", value1, value2, "pushType");
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("`status` not between", value1, value2, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIsNull() {
-            addCriterion("`status` is null");
+        public Criteria andMatchStatusIsNull() {
+            addCriterion("match_status is null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIsNotNull() {
-            addCriterion("`status` is not null");
+        public Criteria andMatchStatusIsNotNull() {
+            addCriterion("match_status is not null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusEqualTo(Integer value) {
-            addCriterion("`status` =", value, "status");
+        public Criteria andMatchStatusEqualTo(Integer value) {
+            addCriterion("match_status =", value, "matchStatus");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotEqualTo(Integer value) {
-            addCriterion("`status` <>", value, "status");
+        public Criteria andMatchStatusNotEqualTo(Integer value) {
+            addCriterion("match_status <>", value, "matchStatus");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThan(Integer value) {
-            addCriterion("`status` >", value, "status");
+        public Criteria andMatchStatusGreaterThan(Integer value) {
+            addCriterion("match_status >", value, "matchStatus");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
-            addCriterion("`status` >=", value, "status");
+        public Criteria andMatchStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("match_status >=", value, "matchStatus");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThan(Integer value) {
-            addCriterion("`status` <", value, "status");
+        public Criteria andMatchStatusLessThan(Integer value) {
+            addCriterion("match_status <", value, "matchStatus");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThanOrEqualTo(Integer value) {
-            addCriterion("`status` <=", value, "status");
+        public Criteria andMatchStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("match_status <=", value, "matchStatus");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIn(List<Integer> values) {
-            addCriterion("`status` in", values, "status");
+        public Criteria andMatchStatusIn(List<Integer> values) {
+            addCriterion("match_status in", values, "matchStatus");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotIn(List<Integer> values) {
-            addCriterion("`status` not in", values, "status");
+        public Criteria andMatchStatusNotIn(List<Integer> values) {
+            addCriterion("match_status not in", values, "matchStatus");
             return (Criteria) this;
         }
 
-        public Criteria andStatusBetween(Integer value1, Integer value2) {
-            addCriterion("`status` between", value1, value2, "status");
+        public Criteria andMatchStatusBetween(Integer value1, Integer value2) {
+            addCriterion("match_status between", value1, value2, "matchStatus");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
-            addCriterion("`status` not between", value1, value2, "status");
+        public Criteria andMatchStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("match_status not between", value1, value2, "matchStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetryCountIsNull() {
+            addCriterion("retry_count is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetryCountIsNotNull() {
+            addCriterion("retry_count is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetryCountEqualTo(Integer value) {
+            addCriterion("retry_count =", value, "retryCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetryCountNotEqualTo(Integer value) {
+            addCriterion("retry_count <>", value, "retryCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetryCountGreaterThan(Integer value) {
+            addCriterion("retry_count >", value, "retryCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetryCountGreaterThanOrEqualTo(Integer value) {
+            addCriterion("retry_count >=", value, "retryCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetryCountLessThan(Integer value) {
+            addCriterion("retry_count <", value, "retryCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetryCountLessThanOrEqualTo(Integer value) {
+            addCriterion("retry_count <=", value, "retryCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetryCountIn(List<Integer> values) {
+            addCriterion("retry_count in", values, "retryCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetryCountNotIn(List<Integer> values) {
+            addCriterion("retry_count not in", values, "retryCount");
             return (Criteria) this;
         }
 
-        public Criteria andPushIdIsNull() {
-            addCriterion("push_id is null");
+        public Criteria andRetryCountBetween(Integer value1, Integer value2) {
+            addCriterion("retry_count between", value1, value2, "retryCount");
             return (Criteria) this;
         }
 
-        public Criteria andPushIdIsNotNull() {
-            addCriterion("push_id is not null");
+        public Criteria andRetryCountNotBetween(Integer value1, Integer value2) {
+            addCriterion("retry_count not between", value1, value2, "retryCount");
             return (Criteria) this;
         }
 
-        public Criteria andPushIdEqualTo(String value) {
-            addCriterion("push_id =", value, "pushId");
+        public Criteria andSendCountIsNull() {
+            addCriterion("send_count is null");
             return (Criteria) this;
         }
 
-        public Criteria andPushIdNotEqualTo(String value) {
-            addCriterion("push_id <>", value, "pushId");
+        public Criteria andSendCountIsNotNull() {
+            addCriterion("send_count is not null");
             return (Criteria) this;
         }
 
-        public Criteria andPushIdGreaterThan(String value) {
-            addCriterion("push_id >", value, "pushId");
+        public Criteria andSendCountEqualTo(Integer value) {
+            addCriterion("send_count =", value, "sendCount");
             return (Criteria) this;
         }
 
-        public Criteria andPushIdGreaterThanOrEqualTo(String value) {
-            addCriterion("push_id >=", value, "pushId");
+        public Criteria andSendCountNotEqualTo(Integer value) {
+            addCriterion("send_count <>", value, "sendCount");
             return (Criteria) this;
         }
 
-        public Criteria andPushIdLessThan(String value) {
-            addCriterion("push_id <", value, "pushId");
+        public Criteria andSendCountGreaterThan(Integer value) {
+            addCriterion("send_count >", value, "sendCount");
             return (Criteria) this;
         }
 
-        public Criteria andPushIdLessThanOrEqualTo(String value) {
-            addCriterion("push_id <=", value, "pushId");
+        public Criteria andSendCountGreaterThanOrEqualTo(Integer value) {
+            addCriterion("send_count >=", value, "sendCount");
             return (Criteria) this;
         }
 
-        public Criteria andPushIdLike(String value) {
-            addCriterion("push_id like", value, "pushId");
+        public Criteria andSendCountLessThan(Integer value) {
+            addCriterion("send_count <", value, "sendCount");
             return (Criteria) this;
         }
 
-        public Criteria andPushIdNotLike(String value) {
-            addCriterion("push_id not like", value, "pushId");
+        public Criteria andSendCountLessThanOrEqualTo(Integer value) {
+            addCriterion("send_count <=", value, "sendCount");
             return (Criteria) this;
         }
 
-        public Criteria andPushIdIn(List<String> values) {
-            addCriterion("push_id in", values, "pushId");
+        public Criteria andSendCountIn(List<Integer> values) {
+            addCriterion("send_count in", values, "sendCount");
             return (Criteria) this;
         }
 
-        public Criteria andPushIdNotIn(List<String> values) {
-            addCriterion("push_id not in", values, "pushId");
+        public Criteria andSendCountNotIn(List<Integer> values) {
+            addCriterion("send_count not in", values, "sendCount");
             return (Criteria) this;
         }
 
-        public Criteria andPushIdBetween(String value1, String value2) {
-            addCriterion("push_id between", value1, value2, "pushId");
+        public Criteria andSendCountBetween(Integer value1, Integer value2) {
+            addCriterion("send_count between", value1, value2, "sendCount");
             return (Criteria) this;
         }
 
-        public Criteria andPushIdNotBetween(String value1, String value2) {
-            addCriterion("push_id not between", value1, value2, "pushId");
+        public Criteria andSendCountNotBetween(Integer value1, Integer value2) {
+            addCriterion("send_count not between", value1, value2, "sendCount");
             return (Criteria) this;
         }
 

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

@@ -0,0 +1,125 @@
+package com.tzld.piaoquan.longarticle.model.po;
+
+import java.util.Date;
+
+public class PublishContent {
+    private Long id;
+
+    private Long planAccountId;
+
+    private String publishContentId;
+
+    private String sourceId;
+
+    private Double score;
+
+    private String contentPoolType;
+
+    private Integer status;
+
+    private String pushId;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getPlanAccountId() {
+        return planAccountId;
+    }
+
+    public void setPlanAccountId(Long planAccountId) {
+        this.planAccountId = planAccountId;
+    }
+
+    public String getPublishContentId() {
+        return publishContentId;
+    }
+
+    public void setPublishContentId(String publishContentId) {
+        this.publishContentId = publishContentId;
+    }
+
+    public String getSourceId() {
+        return sourceId;
+    }
+
+    public void setSourceId(String sourceId) {
+        this.sourceId = sourceId;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    public String getContentPoolType() {
+        return contentPoolType;
+    }
+
+    public void setContentPoolType(String contentPoolType) {
+        this.contentPoolType = contentPoolType;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getPushId() {
+        return pushId;
+    }
+
+    public void setPushId(String pushId) {
+        this.pushId = pushId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @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(", planAccountId=").append(planAccountId);
+        sb.append(", publishContentId=").append(publishContentId);
+        sb.append(", sourceId=").append(sourceId);
+        sb.append(", score=").append(score);
+        sb.append(", contentPoolType=").append(contentPoolType);
+        sb.append(", status=").append(status);
+        sb.append(", pushId=").append(pushId);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,852 @@
+package com.tzld.piaoquan.longarticle.model.po;
+
+import com.tzld.piaoquan.longarticle.utils.page.Page;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class PublishContentExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    protected Page page;
+
+    public PublishContentExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    public void setPage(Page page) {
+        this.page=page;
+    }
+
+    public Page getPage() {
+        return page;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanAccountIdIsNull() {
+            addCriterion("plan_account_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanAccountIdIsNotNull() {
+            addCriterion("plan_account_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanAccountIdEqualTo(Long value) {
+            addCriterion("plan_account_id =", value, "planAccountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanAccountIdNotEqualTo(Long value) {
+            addCriterion("plan_account_id <>", value, "planAccountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanAccountIdGreaterThan(Long value) {
+            addCriterion("plan_account_id >", value, "planAccountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanAccountIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("plan_account_id >=", value, "planAccountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanAccountIdLessThan(Long value) {
+            addCriterion("plan_account_id <", value, "planAccountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanAccountIdLessThanOrEqualTo(Long value) {
+            addCriterion("plan_account_id <=", value, "planAccountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanAccountIdIn(List<Long> values) {
+            addCriterion("plan_account_id in", values, "planAccountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanAccountIdNotIn(List<Long> values) {
+            addCriterion("plan_account_id not in", values, "planAccountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanAccountIdBetween(Long value1, Long value2) {
+            addCriterion("plan_account_id between", value1, value2, "planAccountId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlanAccountIdNotBetween(Long value1, Long value2) {
+            addCriterion("plan_account_id not between", value1, value2, "planAccountId");
+            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 andSourceIdIsNull() {
+            addCriterion("source_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdIsNotNull() {
+            addCriterion("source_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdEqualTo(String value) {
+            addCriterion("source_id =", value, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdNotEqualTo(String value) {
+            addCriterion("source_id <>", value, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdGreaterThan(String value) {
+            addCriterion("source_id >", value, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdGreaterThanOrEqualTo(String value) {
+            addCriterion("source_id >=", value, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdLessThan(String value) {
+            addCriterion("source_id <", value, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdLessThanOrEqualTo(String value) {
+            addCriterion("source_id <=", value, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdLike(String value) {
+            addCriterion("source_id like", value, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdNotLike(String value) {
+            addCriterion("source_id not like", value, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdIn(List<String> values) {
+            addCriterion("source_id in", values, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdNotIn(List<String> values) {
+            addCriterion("source_id not in", values, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdBetween(String value1, String value2) {
+            addCriterion("source_id between", value1, value2, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIdNotBetween(String value1, String value2) {
+            addCriterion("source_id not between", value1, value2, "sourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreIsNull() {
+            addCriterion("score is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreIsNotNull() {
+            addCriterion("score is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreEqualTo(Double value) {
+            addCriterion("score =", value, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreNotEqualTo(Double value) {
+            addCriterion("score <>", value, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreGreaterThan(Double value) {
+            addCriterion("score >", value, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreGreaterThanOrEqualTo(Double value) {
+            addCriterion("score >=", value, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreLessThan(Double value) {
+            addCriterion("score <", value, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreLessThanOrEqualTo(Double value) {
+            addCriterion("score <=", value, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreIn(List<Double> values) {
+            addCriterion("score in", values, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreNotIn(List<Double> values) {
+            addCriterion("score not in", values, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreBetween(Double value1, Double value2) {
+            addCriterion("score between", value1, value2, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreNotBetween(Double value1, Double value2) {
+            addCriterion("score not between", value1, value2, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentPoolTypeIsNull() {
+            addCriterion("content_pool_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentPoolTypeIsNotNull() {
+            addCriterion("content_pool_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentPoolTypeEqualTo(String value) {
+            addCriterion("content_pool_type =", value, "contentPoolType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentPoolTypeNotEqualTo(String value) {
+            addCriterion("content_pool_type <>", value, "contentPoolType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentPoolTypeGreaterThan(String value) {
+            addCriterion("content_pool_type >", value, "contentPoolType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentPoolTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("content_pool_type >=", value, "contentPoolType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentPoolTypeLessThan(String value) {
+            addCriterion("content_pool_type <", value, "contentPoolType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentPoolTypeLessThanOrEqualTo(String value) {
+            addCriterion("content_pool_type <=", value, "contentPoolType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentPoolTypeLike(String value) {
+            addCriterion("content_pool_type like", value, "contentPoolType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentPoolTypeNotLike(String value) {
+            addCriterion("content_pool_type not like", value, "contentPoolType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentPoolTypeIn(List<String> values) {
+            addCriterion("content_pool_type in", values, "contentPoolType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentPoolTypeNotIn(List<String> values) {
+            addCriterion("content_pool_type not in", values, "contentPoolType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentPoolTypeBetween(String value1, String value2) {
+            addCriterion("content_pool_type between", value1, value2, "contentPoolType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentPoolTypeNotBetween(String value1, String value2) {
+            addCriterion("content_pool_type not between", value1, value2, "contentPoolType");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("`status` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("`status` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(Integer value) {
+            addCriterion("`status` =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(Integer value) {
+            addCriterion("`status` <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(Integer value) {
+            addCriterion("`status` >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("`status` >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(Integer value) {
+            addCriterion("`status` <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("`status` <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<Integer> values) {
+            addCriterion("`status` in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<Integer> values) {
+            addCriterion("`status` not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
+            addCriterion("`status` between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("`status` not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushIdIsNull() {
+            addCriterion("push_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushIdIsNotNull() {
+            addCriterion("push_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushIdEqualTo(String value) {
+            addCriterion("push_id =", value, "pushId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushIdNotEqualTo(String value) {
+            addCriterion("push_id <>", value, "pushId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushIdGreaterThan(String value) {
+            addCriterion("push_id >", value, "pushId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushIdGreaterThanOrEqualTo(String value) {
+            addCriterion("push_id >=", value, "pushId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushIdLessThan(String value) {
+            addCriterion("push_id <", value, "pushId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushIdLessThanOrEqualTo(String value) {
+            addCriterion("push_id <=", value, "pushId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushIdLike(String value) {
+            addCriterion("push_id like", value, "pushId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushIdNotLike(String value) {
+            addCriterion("push_id not like", value, "pushId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushIdIn(List<String> values) {
+            addCriterion("push_id in", values, "pushId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushIdNotIn(List<String> values) {
+            addCriterion("push_id not in", values, "pushId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushIdBetween(String value1, String value2) {
+            addCriterion("push_id between", value1, value2, "pushId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushIdNotBetween(String value1, String value2) {
+            addCriterion("push_id not between", value1, value2, "pushId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -5,6 +5,8 @@ import java.util.Date;
 public class PublishMiniprogram {
     private Long id;
 
+    private Long contentId;
+
     private Long planAccountId;
 
     private String publishContentId;
@@ -51,6 +53,14 @@ public class PublishMiniprogram {
         this.id = id;
     }
 
+    public Long getContentId() {
+        return contentId;
+    }
+
+    public void setContentId(Long contentId) {
+        this.contentId = contentId;
+    }
+
     public Long getPlanAccountId() {
         return planAccountId;
     }
@@ -210,6 +220,7 @@ public class PublishMiniprogram {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
+        sb.append(", contentId=").append(contentId);
         sb.append(", planAccountId=").append(planAccountId);
         sb.append(", publishContentId=").append(publishContentId);
         sb.append(", appId=").append(appId);

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

@@ -176,6 +176,66 @@ public class PublishMiniprogramExample {
             return (Criteria) this;
         }
 
+        public Criteria andContentIdIsNull() {
+            addCriterion("content_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIdIsNotNull() {
+            addCriterion("content_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIdEqualTo(Long value) {
+            addCriterion("content_id =", value, "contentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIdNotEqualTo(Long value) {
+            addCriterion("content_id <>", value, "contentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIdGreaterThan(Long value) {
+            addCriterion("content_id >", value, "contentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("content_id >=", value, "contentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIdLessThan(Long value) {
+            addCriterion("content_id <", value, "contentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIdLessThanOrEqualTo(Long value) {
+            addCriterion("content_id <=", value, "contentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIdIn(List<Long> values) {
+            addCriterion("content_id in", values, "contentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIdNotIn(List<Long> values) {
+            addCriterion("content_id not in", values, "contentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIdBetween(Long value1, Long value2) {
+            addCriterion("content_id between", value1, value2, "contentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIdNotBetween(Long value1, Long value2) {
+            addCriterion("content_id not between", value1, value2, "contentId");
+            return (Criteria) this;
+        }
+
         public Criteria andPlanAccountIdIsNull() {
             addCriterion("plan_account_id is null");
             return (Criteria) this;

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/vo/LongArticleSystemPlanAccount.java

@@ -13,5 +13,5 @@ public class LongArticleSystemPlanAccount {
     //"账号名称")
     private String name;
     //"公众号ID")
-    private String gzhId;
+    private String ghId;
 }

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/CoreService.java

@@ -1,4 +1,12 @@
 package com.tzld.piaoquan.longarticle.service;
 
 public interface CoreService {
+
+    void initPlanAccount();
+
+    void matchContent();
+
+    void core();
+
+    void getPushStatus();
 }

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

@@ -103,7 +103,7 @@ public class CardServiceImpl implements CardService {
         publishMiniprogram.setVideoCover(videoDetail.getVideoCover());
         publishMiniprogram.setVideoPath(videoDetail.getVideoPath());
         publishMiniprogram.setProductionPath(jsonObject.getString("productionPath"));
-        publishMiniprogram.setRootShareId(jsonObject.getString("productionPath"));
+        publishMiniprogram.setRootShareId(jsonObject.getString("rootShareId"));
         publishMiniprogram.setIndex(index);
         publishMiniprogram.setTraceId(videoDetail.getTraceId());
         return publishMiniprogram;

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

@@ -1,7 +1,9 @@
 package com.tzld.piaoquan.longarticle.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.tzld.piaoquan.longarticle.common.enums.PublishGzhPushTypeEnum;
 import com.tzld.piaoquan.longarticle.dao.mapper.PlanAccountMapper;
+import com.tzld.piaoquan.longarticle.dao.mapper.PublishContentMapper;
 import com.tzld.piaoquan.longarticle.dao.mapper.PublishMiniprogramMapper;
 import com.tzld.piaoquan.longarticle.model.dto.*;
 import com.tzld.piaoquan.longarticle.model.bo.*;
@@ -11,14 +13,18 @@ import com.tzld.piaoquan.longarticle.model.vo.*;
 import com.tzld.piaoquan.longarticle.service.CoreService;
 import com.tzld.piaoquan.longarticle.utils.DateUtil;
 import com.tzld.piaoquan.longarticle.utils.TimeZoneUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
+import java.time.LocalTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
+@Slf4j
 @Service
 public class CoreServiceImpl implements CoreService {
 
@@ -52,6 +58,10 @@ public class CoreServiceImpl implements CoreService {
     @Autowired
     private PublishMiniprogramMapper publishMiniprogramMapper;
 
+    @Autowired
+    private PublishContentMapper publishContentMapper;
+
+    @Override
     public void initPlanAccount() {
         List<LongArticleSystemPlan> allLongArticleSystemPlans = planService.getAllLongArticleSystemPlan();
         for (LongArticleSystemPlan longArticleSystemPlan : allLongArticleSystemPlans) {
@@ -94,9 +104,19 @@ public class CoreServiceImpl implements CoreService {
                 planAccount.setPlanName(longArticleSystemPlan.getName());
                 planAccount.setAccountId(accountId);
                 planAccount.setAccountName(account.getName());
-                planAccount.setGhId(account.getGzhId());
+                planAccount.setGhId(account.getGhId());
+                planAccount.setPublishRate(longArticleSystemPlan.getPublishRate());
+                planAccount.setPublishDate(longArticleSystemPlan.getPublishDate());
                 planAccount.setPublishNum(longArticleSystemPlan.getPublishNum());
+                planAccount.setPublishWindowStart(longArticleSystemPlan.getPublishWindowStart());
+                planAccount.setPublishWindowEnd(longArticleSystemPlan.getPublishWindowEnd());
+                planAccount.setPublishTimeInterval(longArticleSystemPlan.getPublishTimeInterval());
+                planAccount.setPublishNum(longArticleSystemPlan.getPublishNum());
+                planAccount.setPublishPreNum(longArticleSystemPlan.getPublishPerNum());
                 planAccount.setPublishPreMinNum(longArticleSystemPlan.getPublishPerMinNum());
+                planAccount.setPublishPushTime(longArticleSystemPlan.getPublishPushTime());
+                planAccount.setPushType(longArticleSystemPlan.getPushType());
+                planAccount.setMiniprogramInsertFlag(longArticleSystemPlan.getMiniprogramInsertFlag());
                 MiniprogramInsertTaskParam miniprogramInsertTaskParam = miniStgMap.get(accountId);
                 if (miniprogramInsertTaskParam != null) {
                     planAccount.setMiniprogramUseType(miniprogramInsertTaskParam.getMiniprogramUseType());
@@ -111,25 +131,27 @@ public class CoreServiceImpl implements CoreService {
         }
     }
 
+    @Override
     public void matchContent() {
         //查询状态为0的请求匹配
         PlanAccountExample example = new PlanAccountExample();
-        example.createCriteria().andCreateTimeGreaterThan(DateUtil.getThatDayDate()).andStatusEqualTo(0);
+        example.createCriteria().andCreateTimeGreaterThan(DateUtil.getThatDayDate()).andMatchStatusEqualTo(0);
         List<PlanAccount> planAccounts = planAccountMapper.selectByExample(example);
         for (PlanAccount planAccount : planAccounts) {
             LongArticleSystemGetContentsParam param = new LongArticleSystemGetContentsParam();
-            param.setAccountId(param.getAccountId());
+            param.setAccountId(planAccount.getAccountId());
             param.setPlanId(planAccount.getPlanId());
             LongArticleSystemContentVO longArticleSystemContentVO = planService.getContentItemList(param);
             if (longArticleSystemContentVO == null) {
                 continue;
             }
-            //没有待匹配的文章  更新状态为1  待排序
+            //没有待匹配的文章  更新状态为1
             if (longArticleSystemContentVO.getTotalCount() == 0) {
-                planAccountService.updateStatus(1, planAccount.getId());
+                planAccountService.updateMatchStatus(1, planAccount.getId());
+                continue;
             }
             for (ContentItemVO contentItemVO : longArticleSystemContentVO.getContentItemList()) {
-                MatchVideo content = contentService.getContent(planAccount.getGhId(), contentItemVO.getContent());
+                MatchVideo content = contentService.getContent(contentItemVO.getSourceId(), planAccount.getGhId());
                 if (content != null) {
                     Integer contentStatus = content.getContentStatus();
                     if (contentStatus == 3 || contentStatus == 4) {
@@ -150,78 +172,157 @@ public class CoreServiceImpl implements CoreService {
                             statusParam.setErrorMsg("文章晋级或者退场");
                         }
                         planService.updateMatchMiniprogramStatus(statusParam);
-                        continue;
                     }
+                } else {
+                    MiniprogramCardRequest request = new MiniprogramCardRequest();
+                    request.setGhId(planAccount.getGhId());
+                    request.setAccountName(planAccount.getAccountName());
+                    request.setContent(contentItemVO.getContent());
+                    request.setTitle(contentItemVO.getTitle());
+                    //请求到新服务
+                    request.setStrategy("strategy_v2");
+                    request.setArticleId(contentItemVO.getSourceId());
+                    request.setFlowPoolLevelTag(contentItemVO.getFlowPoolLevelTag());
+                    contentService.matchMiniprogramVideo(request);
                 }
+            }
+        }
+    }
+
+    private boolean effectiveTime(String startWindow, String endWindow, TimeZoneUtil.Timezone timezone) {
+        if (!org.springframework.util.StringUtils.hasText(startWindow) || !org.springframework.util.StringUtils.hasText(endWindow)) {
+            return true;
+        }
+        LocalTime currentTime = TimeZoneUtil
+                .currentTime(Optional.ofNullable(timezone).orElse(TimeZoneUtil.Timezone.china));
+
+        if (currentTime.isAfter(LocalTime.parse(startWindow)) && currentTime.isBefore(LocalTime.parse(endWindow))) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private boolean checkPlanAccount(PlanAccount planAccount) {
 
-                MiniprogramCardRequest request = new MiniprogramCardRequest();
-                request.setGhId(planAccount.getGhId());
-                request.setAccountName(planAccount.getAccountName());
-                request.setContent(contentItemVO.getContent());
-                request.setTitle(contentItemVO.getTitle());
-                request.setStrategy(planAccount.getMiniStrategy());
-                request.setArticleId(contentItemVO.getSourceId());
-                request.setFlowPoolLevelTag(contentItemVO.getFlowPoolLevelTag());
-                contentService.matchMiniprogramVideo(request);
+        // 固定日期
+        if (planAccount.getPublishRate() == 1) {
+            List<Integer> weeks = JSON.parseArray(planAccount.getPublishDate(), Integer.class);
+            if (!weeks.contains(TimeZoneUtil.getTodayDayOfWeek(TimeZoneUtil.Timezone.china))) {
+                //TODO 更新状态
+                return false;
+            }
+        }
+        // 指定时间
+        if (StringUtils.isNotEmpty(planAccount.getPublishPushTime())) {
+            LocalTime currentTime = TimeZoneUtil.currentTime(TimeZoneUtil.Timezone.china);
+            LocalTime pushTime = LocalTime.parse(planAccount.getPublishPushTime());
+            if (currentTime.isBefore(pushTime.minusMinutes(20))) {
+                return false;
+            }
+            if (currentTime.isAfter(pushTime.plusMinutes(60))) {
+                return false;
             }
+        } else if (StringUtils.isNotEmpty(planAccount.getPublishWindowStart())
+                && StringUtils.isNotEmpty(planAccount.getPublishWindowEnd())) {
+            if (!effectiveTime(planAccount.getPublishWindowStart(), planAccount.getPublishWindowEnd(),
+                    TimeZoneUtil.Timezone.china)) {
+                log.info("当前时间不在发布时间窗口内,不需要发布，planId:{}", planAccount.getPlanId());
+                return false;
+            }
+            // TODO 找到该账号最近发布的内容，判断时间间隔
+//            Long lastPushContentTimestamp = getAccountLatestPushTimestamp(plan.getId(), publishAccount.getId());
+//            if (Objects.nonNull(lastPushContentTimestamp) && Objects.nonNull(planSetting.getPublishTimeInterval())
+//                    && (System.currentTimeMillis() - lastPushContentTimestamp) < planSetting.getPublishTimeInterval() * 60 * 1000L) {
+//                log.info("距离上次发布的时间过短,planId:{},accountId:{},lastPushContentTimestamp:{}", plan.getId(),
+//                        publishAccount.getId(), lastPushContentTimestamp);
+//                return;
+//            }
+        }
+        Integer publishNum = planAccount.getPublishNum();
+        if (publishNum == null || publishNum == 0) {
+            return false;
+        }
+        Integer sendCount = planAccount.getSendCount();
+        if (sendCount == null) {
+            sendCount = 0;
+        }
+        int needSentCount = sendCount - publishNum;
+
+
+        if (needSentCount >= 0) {
+            //TODO 修改状态
+            return false;
         }
+        if (planAccount.getRetryCount() > 3) {
+            return false;
+        }
+
+        return true;
     }
 
-    public void core() {
-//        List<PlanAccount> planAccounts = new ArrayList<>();
-//
-//        PlanAccount planAccount1 = new PlanAccount();
-//        planAccount1.setAccountId("20231208111728193795195");
-//        planAccount1.setAccountName("票圈大事件");
-//        planAccount1.setGhId("gh_9e559b3b94ca");
-//        planAccount1.setPlanId("20241012140830436890740");
-//        planAccount1.setPublishNum(8);
-//        planAccount1.setMiniStrategy("strategy_v1");
-//        planAccount1.setSortStrategy("ArticleRankV5");
-//        planAccount1.setPublishPreMinNum(4);
-//        planAccount1.setMiniprogramUseType(1);
-//        planAccount1.setPushType(2);
-//        planAccounts.add(planAccount1);
 
-        //查询状态为1的  开始排序  发布小程序视频  组装 发布文章
+    @Override
+    public void core() {
         PlanAccountExample example = new PlanAccountExample();
-        //匹配完成和发布失败
-        List<Integer> status = Arrays.asList(1, 5);
-        example.createCriteria().andCreateTimeGreaterThan(DateUtil.getThatDayDate()).andStatusIn(status);
+        example.createCriteria().andCreateTimeGreaterThan(DateUtil.getThatDayDate()).andStatusEqualTo(0);
         List<PlanAccount> planAccounts = planAccountMapper.selectByExample(example);
         for (PlanAccount planAccount : planAccounts) {
+            boolean flag = checkPlanAccount(planAccount);
+            if (!flag) {
+                continue;
+            }
             ArticleSortRequest articleSortRequest = new ArticleSortRequest();
             articleSortRequest.setAccountId(planAccount.getAccountId());
             articleSortRequest.setAccountName(planAccount.getAccountName());
             articleSortRequest.setGhId(planAccount.getGhId());
-            articleSortRequest.setStrategy(planAccount.getSortStrategy());
+            articleSortRequest.setStrategy("ArticleRankRandom");
+            //articleSortRequest.setStrategy(planAccount.getSortStrategy());
+            if (Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.manual_push.getVal())) {
+                if (planAccount.getPublishPreNum() >= (planAccount.getPublishNum() - planAccount.getSendCount())) {
+                    articleSortRequest.setPublishNum(planAccount.getPublishPreNum());
+                } else {
+                    articleSortRequest.setPublishNum(planAccount.getPublishNum() - planAccount.getSendCount());
+                }
+            }
             articleSortRequest.setPublishNum(planAccount.getPublishNum());
             articleSortRequest.setPlanId(planAccount.getPlanId());
             articleSortRequest.setPushType(planAccount.getPushType());
 
             ArticleSortResponse articleSortResponse = sortService.publishArticleSort(articleSortRequest);
-            ArticleSortResponseData data = articleSortResponse.getData();
-            if (data == null || CollectionUtils.isEmpty(data.getRank_list())) {
+            if (articleSortResponse == null
+                    || articleSortResponse.getData() == null
+                    || CollectionUtils.isEmpty(articleSortResponse.getData().getRank_list())) {
                 continue;
             }
-            if (!CollectionUtils.isEmpty(data.getFilter_list())) {
-                List<FilterSortContentParam> list = new ArrayList<>();
-                for (PublishArticleData publishArticleData : data.getFilter_list()) {
-                    FilterSortContentParam param = new FilterSortContentParam();
-                    param.setFilterReason(publishArticleData.getFilterReason());
-                    param.setPublishContentId(publishArticleData.getId());
-                    list.add(param);
-                }
-                FilterSortParam param = new FilterSortParam();
-                param.setFilterSortContentList(list);
-                planService.filterSortContents(param);
-            }
+            ArticleSortResponseData data = articleSortResponse.getData();
+//            if (!CollectionUtils.isEmpty(data.getFilter_list())) {
+//                List<FilterSortContentParam> list = new ArrayList<>();
+//                for (PublishArticleData publishArticleData : data.getFilter_list()) {
+//                    FilterSortContentParam param = new FilterSortContentParam();
+//                    param.setFilterReason(publishArticleData.getFilterReason());
+//                    param.setPublishContentId(publishArticleData.getId());
+//                    list.add(param);
+//                }
+//                FilterSortParam param = new FilterSortParam();
+//                param.setFilterSortContentList(list);
+//                planService.filterSortContents(param);
+//            }
             List<LongArticleSystemPushContentParam> pushContentList = new ArrayList<>();
             //排序结束
             List<PublishArticleData> rankList = data.getRank_list();
+            List<Long> sendIds = new ArrayList<>();
             for (PublishArticleData publishArticleData : rankList) {
                 LongArticleSystemPushContentParam contentParam = new LongArticleSystemPushContentParam();
                 String publishContentId = publishArticleData.getId();
+                PublishContent publishContent = new PublishContent();
+                publishContent.setPlanAccountId(planAccount.getId());
+                publishContent.setPublishContentId(publishArticleData.getId());
+                publishContent.setSourceId(publishArticleData.getSourceId());
+                publishContent.setScore(publishArticleData.getScore());
+                publishContent.setContentPoolType(publishArticleData.getContentPoolType());
+                long contentId = publishContentMapper.insertSelective(publishContent);
+                sendIds.add(contentId);
                 //获取小程序
                 List<CrawlerVideo> contentVideos =
                         contentService.getContentVideo(publishArticleData.getSourceId(), publishArticleData.getContentPoolType(), planAccount.getGhId());
@@ -291,10 +392,15 @@ public class CoreServiceImpl implements CoreService {
                     }
                     param.setTraceId(publishMiniprogram.getTraceId());
                     publishCardList.add(param);
+                    publishMiniprogram.setContentId(contentId);
                     publishMiniprogramMapper.insertSelective(publishMiniprogram);
                 }
 
                 if (publishCardList.size() < 2) {
+                    PublishContent update = new PublishContent();
+                    update.setId(contentId);
+                    update.setStatus(3);
+                    publishContentMapper.updateByPrimaryKeySelective(update);
                     continue;
                 }
                 contentParam.setPublishContentId(publishContentId);
@@ -314,66 +420,58 @@ public class CoreServiceImpl implements CoreService {
             }
             gzhPushParam.setPushContentList(pushContentList);
             if (pushContentList.size() < planAccount.getPublishPreMinNum()) {
-                //TODO 数量不足 更新状态 发布失败
-                planAccountService.updateStatus(5, planAccount.getId());
                 continue;
             }
-            System.out.println(gzhPushParam);
             String pushId = planService.createPushTask(gzhPushParam);
             if (StringUtils.isNotEmpty(pushId)) {
                 //更新状态  发布完成
-                PlanAccount updatePlanAccount = new PlanAccount();
-                updatePlanAccount.setId(planAccount.getId());
-                updatePlanAccount.setStatus(3);
-                updatePlanAccount.setPushId(pushId);
-                planAccountMapper.updateByPrimaryKey(updatePlanAccount);
-                planAccountService.updateStatus(3, planAccount.getId());
+                PublishContent update = new PublishContent();
+                //发布成功
+                update.setStatus(1);
+                update.setPushId(pushId);
+                PublishContentExample updateExample = new PublishContentExample();
+                updateExample.createCriteria().andStatusEqualTo(0).andIdIn(sendIds);
+                publishContentMapper.updateByExample(update, updateExample);
             }
         }
     }
 
+    @Override
     public void getPushStatus() {
-        PlanAccountExample example = new PlanAccountExample();
-        //匹配完成和发布失败
-        List<Integer> status = Arrays.asList(3);
-        example.createCriteria().andCreateTimeGreaterThan(DateUtil.getThatDayDate()).andStatusIn(status);
-        List<PlanAccount> planAccounts = planAccountMapper.selectByExample(example);
-        if (CollectionUtils.isEmpty(planAccounts)) {
-            return;
-        }
-        for (PlanAccount planAccount : planAccounts) {
-            if (StringUtils.isNotEmpty(planAccount.getPublishPushTime())) {
-                String dateTimeStr = TimeZoneUtil.todayYMD(TimeZoneUtil.Timezone.china) + " " + planAccount.getPublishPushTime();
-                long dateStrTimestamp = TimeZoneUtil.getDateStrTimestamp(dateTimeStr, "yyyy-MM-dd HH:mm:ss", TimeZoneUtil.Timezone.china);
-                if (dateStrTimestamp < new Date().getTime()) {
-                    continue;
-                }
-            }
-            if (StringUtils.isEmpty(planAccount.getPushId())) {
-                continue;
-            }
+        PublishContentExample example = new PublishContentExample();
+        example.createCriteria().andStatusEqualTo(1).andPushIdIsNotNull();
+        List<PublishContent> publishContents = publishContentMapper.selectByExample(example);
+        Set<String> collect = publishContents.stream().map(PublishContent::getPushId).collect(Collectors.toSet());
+        for (String pushId : collect) {
             PushStatusParam param = new PushStatusParam();
-            param.setPushId(planAccount.getPushId());
+            param.setPushId(pushId);
             PushStatusVO pushStatusVO = planService.queryPushStatus(param);
+            if (pushStatusVO == null) {
+                continue;
+            }
             int updateStatus = 0;
             //推送失败  重新推送
             if (pushStatusVO.getPushStatus() == 3) {
-                updateStatus = 5;
+                updateStatus = 3;
             }
             //推送成功
             if (pushStatusVO.getPushStatus() == 2) {
                 //发表失败
                 if (pushStatusVO.getPublishStatus() == 3) {
-                    updateStatus = 5;
+                    updateStatus = 3;
                 }
                 //发表成功
                 if (pushStatusVO.getPublishStatus() == 2) {
-                    updateStatus = 4;
+                    updateStatus = 2;
                 }
             }
-            //更新状态  4成功  5失败
+            //更新状态  2成功  3失败
             if (updateStatus != 0) {
-                planAccountService.updateStatus(updateStatus, planAccount.getId());
+                PublishContentExample updateExample = new PublishContentExample();
+                updateExample.createCriteria().andPushIdEqualTo(pushId);
+                PublishContent update = new PublishContent();
+                update.setStatus(updateStatus);
+                publishContentMapper.updateByExample(update, updateExample);
             }
         }
     }

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

@@ -16,23 +16,22 @@ public class CoverServiceImpl implements CoverService {
 
 
     public String pushCover(String coverUrl, String publishContentId) {
-        return coverUrl;
-//        String apiUrl = "http://aigc-testapi.cybertogether.net/aigc//publish/LongArticleSystem/uploadMiniprogramCover";
-//        try {
-//            JSONObject param = new JSONObject();
-//            param.put("coverUrl", coverUrl);
-//            param.put("publishContentId", publishContentId);
-//            String res = HTTP_POOL_CLIENT_UTIL_DEFAULT.post(apiUrl, JSONObject.toJSONString(param));
-//            JSONObject jsonObject = JSON.parseObject(res);
-//            Integer code = jsonObject.getInteger("code");
-//            if (code == 0) {
-//                JSONObject data = jsonObject.getJSONObject("data");
-//                return data.getString("wxUrl");
-//            }
-//            return null;
-//        } catch (Exception e) {
-//            log.error("getAllLongArticleSystemPlan error", e);
-//        }
-//        return null;
+        String apiUrl = "http://aigc-api.cybertogether.net/aigc//publish/LongArticleSystem/uploadMiniprogramCover";
+        try {
+            JSONObject param = new JSONObject();
+            param.put("coverUrl", coverUrl);
+            param.put("publishContentId", publishContentId);
+            String res = HTTP_POOL_CLIENT_UTIL_DEFAULT.post(apiUrl, JSONObject.toJSONString(param));
+            JSONObject jsonObject = JSON.parseObject(res);
+            Integer code = jsonObject.getInteger("code");
+            if (code == 0) {
+                JSONObject data = jsonObject.getJSONObject("data");
+                return data.getString("wxUrl");
+            }
+            return null;
+        } catch (Exception e) {
+            log.error("getAllLongArticleSystemPlan error", e);
+        }
+        return null;
     }
 }

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

@@ -11,10 +11,17 @@ public class PlanAccountServiceImpl {
     @Autowired
     private PlanAccountMapper planAccountMapper;
 
-    public void updateStatus(Integer status, Long id){
+    public void updateStatus(Integer status, Long id) {
         PlanAccount updatePlanAccount = new PlanAccount();
         updatePlanAccount.setId(id);
         updatePlanAccount.setStatus(status);
         planAccountMapper.updateByPrimaryKey(updatePlanAccount);
     }
+
+    public void updateMatchStatus(Integer status, Long id) {
+        PlanAccount updatePlanAccount = new PlanAccount();
+        updatePlanAccount.setId(id);
+        updatePlanAccount.setMatchStatus(status);
+        planAccountMapper.updateByPrimaryKey(updatePlanAccount);
+    }
 }

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

@@ -21,8 +21,9 @@ public class PlanServiceImpl {
     private static final HttpPoolClientUtil HTTP_POOL_CLIENT_UTIL_DEFAULT = HttpClientUtil.create(5000, 5000, 20, 100, 3, 3000);
 
 
+    //获取所有长文系统托管计划
     public List<LongArticleSystemPlan> getAllLongArticleSystemPlan() {
-        String apiUrl = "http://aigc-testapi.cybertogether.net/aigc/publish/LongArticleSystem/getAllLongArticleSystemPlan";
+        String apiUrl = "http://aigc-api.cybertogether.net/aigc/publish/LongArticleSystem/getAllLongArticleSystemPlan";
         try {
             String res = HTTP_POOL_CLIENT_UTIL_DEFAULT.post(apiUrl);
             JSONObject jsonObject = JSON.parseObject(res);
@@ -60,8 +61,9 @@ public class PlanServiceImpl {
         return longArticleSystemContentVO;
     }
 
+    //分页获取待排序内容列表
     public LongArticleSystemContentVO listWaitingMatchMiniprogramContents(LongArticleSystemGetContentsParam param) {
-        String apiUrl = "http://aigc-testapi.cybertogether.net/publish/LongArticleSystem/listWaitingMatchMiniprogramContents";
+        String apiUrl = "http://aigc-api.cybertogether.net/aigc/publish/LongArticleSystem/listWaitingMatchMiniprogramContents";
         List<ContentItemVO> contentItemList = new ArrayList<>();
         try {
             String res = HTTP_POOL_CLIENT_UTIL_DEFAULT.post(apiUrl, JSON.toJSONString(param));
@@ -77,8 +79,9 @@ public class PlanServiceImpl {
         return null;
     }
 
+    //创建推送任务
     public String createPushTask(LongArticleSystemCreatePushTaskParam param) {
-        String apiUrl = "http://aigc-testapi.cybertogether.net/publish/LongArticleSystem/uploadMiniprogramCover";
+        String apiUrl = "http://aigc-api.cybertogether.net/aigc/publish/LongArticleSystem/createPushTask";
         try {
             String res = HTTP_POOL_CLIENT_UTIL_DEFAULT.post(apiUrl, JSON.toJSONString(param));
             JSONObject jsonObject = JSON.parseObject(res);
@@ -92,8 +95,9 @@ public class PlanServiceImpl {
         return "";
     }
 
+    //更新匹配小程序状态
     public boolean updateMatchMiniprogramStatus(MatchMiniprogramStatusParam param) {
-        String apiUrl = "http://aigc-testapi.cybertogether.net/publish/LongArticleSystem/updateMatchMiniprogramStatus";
+        String apiUrl = "http://aigc-api.cybertogether.net/aigc/publish/LongArticleSystem/updateMatchMiniprogramStatus";
         try {
             String res = HTTP_POOL_CLIENT_UTIL_DEFAULT.post(apiUrl, JSON.toJSONString(param));
             JSONObject jsonObject = JSON.parseObject(res);
@@ -108,7 +112,7 @@ public class PlanServiceImpl {
     }
 
     public boolean filterSortContents(FilterSortParam param) {
-        String apiUrl = "http://aigc-testapi.cybertogether.net/publish/LongArticleSystem/filterSortContents";
+        String apiUrl = "http://aigc-api.cybertogether.net/aigc/publish/LongArticleSystem/filterSortContents";
         List<ContentItemVO> contentItemList = new ArrayList<>();
         try {
             String res = HTTP_POOL_CLIENT_UTIL_DEFAULT.post(apiUrl, JSON.toJSONString(param));
@@ -124,7 +128,7 @@ public class PlanServiceImpl {
     }
 
     public PushStatusVO queryPushStatus(PushStatusParam param) {
-        String apiUrl = "http://aigc-testapi.cybertogether.net/publish/LongArticleSystem/queryPushStatus";
+        String apiUrl = "http://aigc-api.cybertogether.net/aigc/publish/LongArticleSystem/queryPushStatus";
         List<ContentItemVO> contentItemList = new ArrayList<>();
         try {
             String res = HTTP_POOL_CLIENT_UTIL_DEFAULT.post(apiUrl, JSON.toJSONString(param));

long-article-server/src/main/resources/log4j2.xml

@@ -12,7 +12,7 @@
         <!-- 定义日志存储的路径，不要配置相对路径 -->
         <property name="FILE_PATH" value="/datalog" />
         <!--项目名称-->
-        <property name="FILE_NAME" value="we_com_server" />
+        <property name="FILE_NAME" value="long_article_server" />
     </Properties>
 
     <appenders>

long-article-server/src/main/resources/mapper/PlanAccountMapper.xml

@@ -8,15 +8,24 @@
     <result column="account_id" jdbcType="VARCHAR" property="accountId" />
     <result column="account_name" jdbcType="VARCHAR" property="accountName" />
     <result column="gh_id" jdbcType="VARCHAR" property="ghId" />
+    <result column="publish_rate" jdbcType="INTEGER" property="publishRate" />
+    <result column="publish_date" jdbcType="VARCHAR" property="publishDate" />
+    <result column="publish_window_start" jdbcType="VARCHAR" property="publishWindowStart" />
+    <result column="publish_window_end" jdbcType="VARCHAR" property="publishWindowEnd" />
+    <result column="publish_time_interval" jdbcType="INTEGER" property="publishTimeInterval" />
     <result column="publish_num" jdbcType="INTEGER" property="publishNum" />
+    <result column="publish_pre_num" jdbcType="INTEGER" property="publishPreNum" />
     <result column="publish_pre_min_num" jdbcType="INTEGER" property="publishPreMinNum" />
     <result column="publish_push_time" jdbcType="VARCHAR" property="publishPushTime" />
+    <result column="push_type" jdbcType="INTEGER" property="pushType" />
+    <result column="miniprogram_insert_flag" jdbcType="INTEGER" property="miniprogramInsertFlag" />
     <result column="mini_strategy" jdbcType="VARCHAR" property="miniStrategy" />
     <result column="miniprogram_use_type" jdbcType="INTEGER" property="miniprogramUseType" />
     <result column="sort_strategy" jdbcType="VARCHAR" property="sortStrategy" />
-    <result column="push_type" jdbcType="INTEGER" property="pushType" />
     <result column="status" jdbcType="INTEGER" property="status" />
-    <result column="push_id" jdbcType="VARCHAR" property="pushId" />
+    <result column="match_status" jdbcType="INTEGER" property="matchStatus" />
+    <result column="retry_count" jdbcType="INTEGER" property="retryCount" />
+    <result column="send_count" jdbcType="INTEGER" property="sendCount" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
@@ -79,9 +88,11 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, plan_id, plan_name, account_id, account_name, gh_id, publish_num, publish_pre_min_num, 
-    publish_push_time, mini_strategy, miniprogram_use_type, sort_strategy, push_type, 
-    `status`, push_id, create_time, update_time
+    id, plan_id, plan_name, account_id, account_name, gh_id, publish_rate, publish_date, 
+    publish_window_start, publish_window_end, publish_time_interval, publish_num, publish_pre_num, 
+    publish_pre_min_num, publish_push_time, push_type, miniprogram_insert_flag, mini_strategy, 
+    miniprogram_use_type, sort_strategy, `status`, match_status, retry_count, send_count, 
+    create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PlanAccountExample" resultMap="BaseResultMap">
     select
@@ -119,16 +130,24 @@
   <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.PlanAccount">
     insert into long_articles_plan_account (id, plan_id, plan_name, 
       account_id, account_name, gh_id, 
-      publish_num, publish_pre_min_num, publish_push_time, 
+      publish_rate, publish_date, publish_window_start, 
+      publish_window_end, publish_time_interval, 
+      publish_num, publish_pre_num, publish_pre_min_num, 
+      publish_push_time, push_type, miniprogram_insert_flag, 
       mini_strategy, miniprogram_use_type, sort_strategy, 
-      push_type, `status`, push_id, 
-      create_time, update_time)
+      `status`, match_status, retry_count, 
+      send_count, create_time, update_time
+      )
     values (#{id,jdbcType=BIGINT}, #{planId,jdbcType=VARCHAR}, #{planName,jdbcType=VARCHAR}, 
       #{accountId,jdbcType=VARCHAR}, #{accountName,jdbcType=VARCHAR}, #{ghId,jdbcType=VARCHAR}, 
-      #{publishNum,jdbcType=INTEGER}, #{publishPreMinNum,jdbcType=INTEGER}, #{publishPushTime,jdbcType=VARCHAR}, 
+      #{publishRate,jdbcType=INTEGER}, #{publishDate,jdbcType=VARCHAR}, #{publishWindowStart,jdbcType=VARCHAR}, 
+      #{publishWindowEnd,jdbcType=VARCHAR}, #{publishTimeInterval,jdbcType=INTEGER}, 
+      #{publishNum,jdbcType=INTEGER}, #{publishPreNum,jdbcType=INTEGER}, #{publishPreMinNum,jdbcType=INTEGER}, 
+      #{publishPushTime,jdbcType=VARCHAR}, #{pushType,jdbcType=INTEGER}, #{miniprogramInsertFlag,jdbcType=INTEGER}, 
       #{miniStrategy,jdbcType=VARCHAR}, #{miniprogramUseType,jdbcType=INTEGER}, #{sortStrategy,jdbcType=VARCHAR}, 
-      #{pushType,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{pushId,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+      #{status,jdbcType=INTEGER}, #{matchStatus,jdbcType=INTEGER}, #{retryCount,jdbcType=INTEGER}, 
+      #{sendCount,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.PlanAccount">
     insert into long_articles_plan_account
@@ -151,15 +170,39 @@
       <if test="ghId != null">
         gh_id,
       </if>
+      <if test="publishRate != null">
+        publish_rate,
+      </if>
+      <if test="publishDate != null">
+        publish_date,
+      </if>
+      <if test="publishWindowStart != null">
+        publish_window_start,
+      </if>
+      <if test="publishWindowEnd != null">
+        publish_window_end,
+      </if>
+      <if test="publishTimeInterval != null">
+        publish_time_interval,
+      </if>
       <if test="publishNum != null">
         publish_num,
       </if>
+      <if test="publishPreNum != null">
+        publish_pre_num,
+      </if>
       <if test="publishPreMinNum != null">
         publish_pre_min_num,
       </if>
       <if test="publishPushTime != null">
         publish_push_time,
       </if>
+      <if test="pushType != null">
+        push_type,
+      </if>
+      <if test="miniprogramInsertFlag != null">
+        miniprogram_insert_flag,
+      </if>
       <if test="miniStrategy != null">
         mini_strategy,
       </if>
@@ -169,14 +212,17 @@
       <if test="sortStrategy != null">
         sort_strategy,
       </if>
-      <if test="pushType != null">
-        push_type,
-      </if>
       <if test="status != null">
         `status`,
       </if>
-      <if test="pushId != null">
-        push_id,
+      <if test="matchStatus != null">
+        match_status,
+      </if>
+      <if test="retryCount != null">
+        retry_count,
+      </if>
+      <if test="sendCount != null">
+        send_count,
       </if>
       <if test="createTime != null">
         create_time,
@@ -204,15 +250,39 @@
       <if test="ghId != null">
         #{ghId,jdbcType=VARCHAR},
       </if>
+      <if test="publishRate != null">
+        #{publishRate,jdbcType=INTEGER},
+      </if>
+      <if test="publishDate != null">
+        #{publishDate,jdbcType=VARCHAR},
+      </if>
+      <if test="publishWindowStart != null">
+        #{publishWindowStart,jdbcType=VARCHAR},
+      </if>
+      <if test="publishWindowEnd != null">
+        #{publishWindowEnd,jdbcType=VARCHAR},
+      </if>
+      <if test="publishTimeInterval != null">
+        #{publishTimeInterval,jdbcType=INTEGER},
+      </if>
       <if test="publishNum != null">
         #{publishNum,jdbcType=INTEGER},
       </if>
+      <if test="publishPreNum != null">
+        #{publishPreNum,jdbcType=INTEGER},
+      </if>
       <if test="publishPreMinNum != null">
         #{publishPreMinNum,jdbcType=INTEGER},
       </if>
       <if test="publishPushTime != null">
         #{publishPushTime,jdbcType=VARCHAR},
       </if>
+      <if test="pushType != null">
+        #{pushType,jdbcType=INTEGER},
+      </if>
+      <if test="miniprogramInsertFlag != null">
+        #{miniprogramInsertFlag,jdbcType=INTEGER},
+      </if>
       <if test="miniStrategy != null">
         #{miniStrategy,jdbcType=VARCHAR},
       </if>
@@ -222,14 +292,17 @@
       <if test="sortStrategy != null">
         #{sortStrategy,jdbcType=VARCHAR},
       </if>
-      <if test="pushType != null">
-        #{pushType,jdbcType=INTEGER},
-      </if>
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
-      <if test="pushId != null">
-        #{pushId,jdbcType=VARCHAR},
+      <if test="matchStatus != null">
+        #{matchStatus,jdbcType=INTEGER},
+      </if>
+      <if test="retryCount != null">
+        #{retryCount,jdbcType=INTEGER},
+      </if>
+      <if test="sendCount != null">
+        #{sendCount,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -266,15 +339,39 @@
       <if test="record.ghId != null">
         gh_id = #{record.ghId,jdbcType=VARCHAR},
       </if>
+      <if test="record.publishRate != null">
+        publish_rate = #{record.publishRate,jdbcType=INTEGER},
+      </if>
+      <if test="record.publishDate != null">
+        publish_date = #{record.publishDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishWindowStart != null">
+        publish_window_start = #{record.publishWindowStart,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishWindowEnd != null">
+        publish_window_end = #{record.publishWindowEnd,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishTimeInterval != null">
+        publish_time_interval = #{record.publishTimeInterval,jdbcType=INTEGER},
+      </if>
       <if test="record.publishNum != null">
         publish_num = #{record.publishNum,jdbcType=INTEGER},
       </if>
+      <if test="record.publishPreNum != null">
+        publish_pre_num = #{record.publishPreNum,jdbcType=INTEGER},
+      </if>
       <if test="record.publishPreMinNum != null">
         publish_pre_min_num = #{record.publishPreMinNum,jdbcType=INTEGER},
       </if>
       <if test="record.publishPushTime != null">
         publish_push_time = #{record.publishPushTime,jdbcType=VARCHAR},
       </if>
+      <if test="record.pushType != null">
+        push_type = #{record.pushType,jdbcType=INTEGER},
+      </if>
+      <if test="record.miniprogramInsertFlag != null">
+        miniprogram_insert_flag = #{record.miniprogramInsertFlag,jdbcType=INTEGER},
+      </if>
       <if test="record.miniStrategy != null">
         mini_strategy = #{record.miniStrategy,jdbcType=VARCHAR},
       </if>
@@ -284,14 +381,17 @@
       <if test="record.sortStrategy != null">
         sort_strategy = #{record.sortStrategy,jdbcType=VARCHAR},
       </if>
-      <if test="record.pushType != null">
-        push_type = #{record.pushType,jdbcType=INTEGER},
-      </if>
       <if test="record.status != null">
         `status` = #{record.status,jdbcType=INTEGER},
       </if>
-      <if test="record.pushId != null">
-        push_id = #{record.pushId,jdbcType=VARCHAR},
+      <if test="record.matchStatus != null">
+        match_status = #{record.matchStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.retryCount != null">
+        retry_count = #{record.retryCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.sendCount != null">
+        send_count = #{record.sendCount,jdbcType=INTEGER},
       </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
@@ -312,15 +412,24 @@
       account_id = #{record.accountId,jdbcType=VARCHAR},
       account_name = #{record.accountName,jdbcType=VARCHAR},
       gh_id = #{record.ghId,jdbcType=VARCHAR},
+      publish_rate = #{record.publishRate,jdbcType=INTEGER},
+      publish_date = #{record.publishDate,jdbcType=VARCHAR},
+      publish_window_start = #{record.publishWindowStart,jdbcType=VARCHAR},
+      publish_window_end = #{record.publishWindowEnd,jdbcType=VARCHAR},
+      publish_time_interval = #{record.publishTimeInterval,jdbcType=INTEGER},
       publish_num = #{record.publishNum,jdbcType=INTEGER},
+      publish_pre_num = #{record.publishPreNum,jdbcType=INTEGER},
       publish_pre_min_num = #{record.publishPreMinNum,jdbcType=INTEGER},
       publish_push_time = #{record.publishPushTime,jdbcType=VARCHAR},
+      push_type = #{record.pushType,jdbcType=INTEGER},
+      miniprogram_insert_flag = #{record.miniprogramInsertFlag,jdbcType=INTEGER},
       mini_strategy = #{record.miniStrategy,jdbcType=VARCHAR},
       miniprogram_use_type = #{record.miniprogramUseType,jdbcType=INTEGER},
       sort_strategy = #{record.sortStrategy,jdbcType=VARCHAR},
-      push_type = #{record.pushType,jdbcType=INTEGER},
       `status` = #{record.status,jdbcType=INTEGER},
-      push_id = #{record.pushId,jdbcType=VARCHAR},
+      match_status = #{record.matchStatus,jdbcType=INTEGER},
+      retry_count = #{record.retryCount,jdbcType=INTEGER},
+      send_count = #{record.sendCount,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
@@ -345,15 +454,39 @@
       <if test="ghId != null">
         gh_id = #{ghId,jdbcType=VARCHAR},
       </if>
+      <if test="publishRate != null">
+        publish_rate = #{publishRate,jdbcType=INTEGER},
+      </if>
+      <if test="publishDate != null">
+        publish_date = #{publishDate,jdbcType=VARCHAR},
+      </if>
+      <if test="publishWindowStart != null">
+        publish_window_start = #{publishWindowStart,jdbcType=VARCHAR},
+      </if>
+      <if test="publishWindowEnd != null">
+        publish_window_end = #{publishWindowEnd,jdbcType=VARCHAR},
+      </if>
+      <if test="publishTimeInterval != null">
+        publish_time_interval = #{publishTimeInterval,jdbcType=INTEGER},
+      </if>
       <if test="publishNum != null">
         publish_num = #{publishNum,jdbcType=INTEGER},
       </if>
+      <if test="publishPreNum != null">
+        publish_pre_num = #{publishPreNum,jdbcType=INTEGER},
+      </if>
       <if test="publishPreMinNum != null">
         publish_pre_min_num = #{publishPreMinNum,jdbcType=INTEGER},
       </if>
       <if test="publishPushTime != null">
         publish_push_time = #{publishPushTime,jdbcType=VARCHAR},
       </if>
+      <if test="pushType != null">
+        push_type = #{pushType,jdbcType=INTEGER},
+      </if>
+      <if test="miniprogramInsertFlag != null">
+        miniprogram_insert_flag = #{miniprogramInsertFlag,jdbcType=INTEGER},
+      </if>
       <if test="miniStrategy != null">
         mini_strategy = #{miniStrategy,jdbcType=VARCHAR},
       </if>
@@ -363,14 +496,17 @@
       <if test="sortStrategy != null">
         sort_strategy = #{sortStrategy,jdbcType=VARCHAR},
       </if>
-      <if test="pushType != null">
-        push_type = #{pushType,jdbcType=INTEGER},
-      </if>
       <if test="status != null">
         `status` = #{status,jdbcType=INTEGER},
       </if>
-      <if test="pushId != null">
-        push_id = #{pushId,jdbcType=VARCHAR},
+      <if test="matchStatus != null">
+        match_status = #{matchStatus,jdbcType=INTEGER},
+      </if>
+      <if test="retryCount != null">
+        retry_count = #{retryCount,jdbcType=INTEGER},
+      </if>
+      <if test="sendCount != null">
+        send_count = #{sendCount,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -388,15 +524,24 @@
       account_id = #{accountId,jdbcType=VARCHAR},
       account_name = #{accountName,jdbcType=VARCHAR},
       gh_id = #{ghId,jdbcType=VARCHAR},
+      publish_rate = #{publishRate,jdbcType=INTEGER},
+      publish_date = #{publishDate,jdbcType=VARCHAR},
+      publish_window_start = #{publishWindowStart,jdbcType=VARCHAR},
+      publish_window_end = #{publishWindowEnd,jdbcType=VARCHAR},
+      publish_time_interval = #{publishTimeInterval,jdbcType=INTEGER},
       publish_num = #{publishNum,jdbcType=INTEGER},
+      publish_pre_num = #{publishPreNum,jdbcType=INTEGER},
       publish_pre_min_num = #{publishPreMinNum,jdbcType=INTEGER},
       publish_push_time = #{publishPushTime,jdbcType=VARCHAR},
+      push_type = #{pushType,jdbcType=INTEGER},
+      miniprogram_insert_flag = #{miniprogramInsertFlag,jdbcType=INTEGER},
       mini_strategy = #{miniStrategy,jdbcType=VARCHAR},
       miniprogram_use_type = #{miniprogramUseType,jdbcType=INTEGER},
       sort_strategy = #{sortStrategy,jdbcType=VARCHAR},
-      push_type = #{pushType,jdbcType=INTEGER},
       `status` = #{status,jdbcType=INTEGER},
-      push_id = #{pushId,jdbcType=VARCHAR},
+      match_status = #{matchStatus,jdbcType=INTEGER},
+      retry_count = #{retryCount,jdbcType=INTEGER},
+      send_count = #{sendCount,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=BIGINT}

long-article-server/src/main/resources/mapper/PublishContentMapper.xml

@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.PublishContentMapper">
+  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.PublishContent">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="plan_account_id" jdbcType="BIGINT" property="planAccountId" />
+    <result column="publish_content_id" jdbcType="VARCHAR" property="publishContentId" />
+    <result column="source_id" jdbcType="VARCHAR" property="sourceId" />
+    <result column="score" jdbcType="DOUBLE" property="score" />
+    <result column="content_pool_type" jdbcType="VARCHAR" property="contentPoolType" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="push_id" jdbcType="VARCHAR" property="pushId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, plan_account_id, publish_content_id, source_id, score, content_pool_type, `status`, 
+    push_id, create_time, update_time
+  </sql>
+  <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishContentExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from long_articles_publish_content
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+    <if test="page != null">
+      limit #{page.offset} , #{page.pageSize}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from long_articles_publish_content
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from long_articles_publish_content
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishContentExample">
+    delete from long_articles_publish_content
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishContent">
+    insert into long_articles_publish_content (id, plan_account_id, publish_content_id, 
+      source_id, score, content_pool_type, 
+      `status`, push_id, create_time, 
+      update_time)
+    values (#{id,jdbcType=BIGINT}, #{planAccountId,jdbcType=BIGINT}, #{publishContentId,jdbcType=VARCHAR}, 
+      #{sourceId,jdbcType=VARCHAR}, #{score,jdbcType=DOUBLE}, #{contentPoolType,jdbcType=VARCHAR}, 
+      #{status,jdbcType=INTEGER}, #{pushId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishContent" useGeneratedKeys="true" keyProperty="id">
+      insert into long_articles_publish_content
+      <trim prefix="(" suffix=")" suffixOverrides=",">
+          <if test="id != null">
+              id,
+          </if>
+          <if test="planAccountId != null">
+              plan_account_id,
+          </if>
+          <if test="publishContentId != null">
+              publish_content_id,
+          </if>
+          <if test="sourceId != null">
+              source_id,
+          </if>
+          <if test="score != null">
+              score,
+          </if>
+          <if test="contentPoolType != null">
+              content_pool_type,
+          </if>
+          <if test="status != null">
+              `status`,
+          </if>
+          <if test="pushId != null">
+              push_id,
+          </if>
+          <if test="createTime != null">
+              create_time,
+          </if>
+          <if test="updateTime != null">
+              update_time,
+          </if>
+      </trim>
+      <trim prefix="values (" suffix=")" suffixOverrides=",">
+          <if test="id != null">
+              #{id,jdbcType=BIGINT},
+          </if>
+          <if test="planAccountId != null">
+              #{planAccountId,jdbcType=BIGINT},
+          </if>
+          <if test="publishContentId != null">
+              #{publishContentId,jdbcType=VARCHAR},
+          </if>
+          <if test="sourceId != null">
+              #{sourceId,jdbcType=VARCHAR},
+          </if>
+          <if test="score != null">
+              #{score,jdbcType=DOUBLE},
+          </if>
+          <if test="contentPoolType != null">
+              #{contentPoolType,jdbcType=VARCHAR},
+          </if>
+          <if test="status != null">
+              #{status,jdbcType=INTEGER},
+          </if>
+          <if test="pushId != null">
+              #{pushId,jdbcType=VARCHAR},
+          </if>
+          <if test="createTime != null">
+              #{createTime,jdbcType=TIMESTAMP},
+          </if>
+          <if test="updateTime != null">
+              #{updateTime,jdbcType=TIMESTAMP},
+          </if>
+      </trim>
+      <selectKey resultType="java.lang.Long" order="AFTER" keyProperty="id">
+          select LAST_INSERT_ID()
+      </selectKey>
+  </insert>
+  <select id="countByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishContentExample" resultType="java.lang.Long">
+    select count(*) from long_articles_publish_content
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update long_articles_publish_content
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.planAccountId != null">
+        plan_account_id = #{record.planAccountId,jdbcType=BIGINT},
+      </if>
+      <if test="record.publishContentId != null">
+        publish_content_id = #{record.publishContentId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sourceId != null">
+        source_id = #{record.sourceId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.score != null">
+        score = #{record.score,jdbcType=DOUBLE},
+      </if>
+      <if test="record.contentPoolType != null">
+        content_pool_type = #{record.contentPoolType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null">
+        `status` = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.pushId != null">
+        push_id = #{record.pushId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update long_articles_publish_content
+    set id = #{record.id,jdbcType=BIGINT},
+      plan_account_id = #{record.planAccountId,jdbcType=BIGINT},
+      publish_content_id = #{record.publishContentId,jdbcType=VARCHAR},
+      source_id = #{record.sourceId,jdbcType=VARCHAR},
+      score = #{record.score,jdbcType=DOUBLE},
+      content_pool_type = #{record.contentPoolType,jdbcType=VARCHAR},
+      `status` = #{record.status,jdbcType=INTEGER},
+      push_id = #{record.pushId,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishContent">
+    update long_articles_publish_content
+    <set>
+      <if test="planAccountId != null">
+        plan_account_id = #{planAccountId,jdbcType=BIGINT},
+      </if>
+      <if test="publishContentId != null">
+        publish_content_id = #{publishContentId,jdbcType=VARCHAR},
+      </if>
+      <if test="sourceId != null">
+        source_id = #{sourceId,jdbcType=VARCHAR},
+      </if>
+      <if test="score != null">
+        score = #{score,jdbcType=DOUBLE},
+      </if>
+      <if test="contentPoolType != null">
+        content_pool_type = #{contentPoolType,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="pushId != null">
+        push_id = #{pushId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishContent">
+    update long_articles_publish_content
+    set plan_account_id = #{planAccountId,jdbcType=BIGINT},
+      publish_content_id = #{publishContentId,jdbcType=VARCHAR},
+      source_id = #{sourceId,jdbcType=VARCHAR},
+      score = #{score,jdbcType=DOUBLE},
+      content_pool_type = #{contentPoolType,jdbcType=VARCHAR},
+      `status` = #{status,jdbcType=INTEGER},
+      push_id = #{pushId,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

long-article-server/src/main/resources/mapper/PublishMiniprogramMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.tzld.piaoquan.longarticle.dao.mapper.PublishMiniprogramMapper">
   <resultMap id="BaseResultMap" type="com.tzld.piaoquan.longarticle.model.po.PublishMiniprogram">
     <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="content_id" jdbcType="BIGINT" property="contentId" />
     <result column="plan_account_id" jdbcType="BIGINT" property="planAccountId" />
     <result column="publish_content_id" jdbcType="VARCHAR" property="publishContentId" />
     <result column="app_id" jdbcType="VARCHAR" property="appId" />
@@ -82,9 +83,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, plan_account_id, publish_content_id, app_id, app_name, avatar, mini_id, mini_program_type, 
-    video_id, `source`, video_title, video_cover, video_path, production_path, root_share_id, 
-    `index`, trace_id, is_delete, create_time, update_time
+    id, content_id, plan_account_id, publish_content_id, app_id, app_name, avatar, mini_id, 
+    mini_program_type, video_id, `source`, video_title, video_cover, video_path, production_path, 
+    root_share_id, `index`, trace_id, is_delete, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishMiniprogramExample" resultMap="BaseResultMap">
     select
@@ -120,20 +121,22 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishMiniprogram">
-    insert into long_articles_publish_miniprogram (id, plan_account_id, publish_content_id, 
-      app_id, app_name, avatar, 
-      mini_id, mini_program_type, video_id, 
-      `source`, video_title, video_cover, 
-      video_path, production_path, root_share_id, 
-      `index`, trace_id, is_delete, 
-      create_time, update_time)
-    values (#{id,jdbcType=BIGINT}, #{planAccountId,jdbcType=BIGINT}, #{publishContentId,jdbcType=VARCHAR}, 
-      #{appId,jdbcType=VARCHAR}, #{appName,jdbcType=VARCHAR}, #{avatar,jdbcType=VARCHAR}, 
-      #{miniId,jdbcType=INTEGER}, #{miniProgramType,jdbcType=INTEGER}, #{videoId,jdbcType=BIGINT}, 
-      #{source,jdbcType=VARCHAR}, #{videoTitle,jdbcType=VARCHAR}, #{videoCover,jdbcType=VARCHAR}, 
-      #{videoPath,jdbcType=VARCHAR}, #{productionPath,jdbcType=VARCHAR}, #{rootShareId,jdbcType=VARCHAR}, 
-      #{index,jdbcType=INTEGER}, #{traceId,jdbcType=VARCHAR}, #{isDelete,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+    insert into long_articles_publish_miniprogram (id, content_id, plan_account_id, 
+      publish_content_id, app_id, app_name, 
+      avatar, mini_id, mini_program_type, 
+      video_id, `source`, video_title, 
+      video_cover, video_path, production_path, 
+      root_share_id, `index`, trace_id, 
+      is_delete, create_time, update_time
+      )
+    values (#{id,jdbcType=BIGINT}, #{contentId,jdbcType=BIGINT}, #{planAccountId,jdbcType=BIGINT}, 
+      #{publishContentId,jdbcType=VARCHAR}, #{appId,jdbcType=VARCHAR}, #{appName,jdbcType=VARCHAR}, 
+      #{avatar,jdbcType=VARCHAR}, #{miniId,jdbcType=INTEGER}, #{miniProgramType,jdbcType=INTEGER}, 
+      #{videoId,jdbcType=BIGINT}, #{source,jdbcType=VARCHAR}, #{videoTitle,jdbcType=VARCHAR}, 
+      #{videoCover,jdbcType=VARCHAR}, #{videoPath,jdbcType=VARCHAR}, #{productionPath,jdbcType=VARCHAR}, 
+      #{rootShareId,jdbcType=VARCHAR}, #{index,jdbcType=INTEGER}, #{traceId,jdbcType=VARCHAR}, 
+      #{isDelete,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishMiniprogram">
     insert into long_articles_publish_miniprogram
@@ -141,6 +144,9 @@
       <if test="id != null">
         id,
       </if>
+      <if test="contentId != null">
+        content_id,
+      </if>
       <if test="planAccountId != null">
         plan_account_id,
       </if>
@@ -203,6 +209,9 @@
       <if test="id != null">
         #{id,jdbcType=BIGINT},
       </if>
+      <if test="contentId != null">
+        #{contentId,jdbcType=BIGINT},
+      </if>
       <if test="planAccountId != null">
         #{planAccountId,jdbcType=BIGINT},
       </if>
@@ -274,6 +283,9 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=BIGINT},
       </if>
+      <if test="record.contentId != null">
+        content_id = #{record.contentId,jdbcType=BIGINT},
+      </if>
       <if test="record.planAccountId != null">
         plan_account_id = #{record.planAccountId,jdbcType=BIGINT},
       </if>
@@ -339,6 +351,7 @@
   <update id="updateByExample" parameterType="map">
     update long_articles_publish_miniprogram
     set id = #{record.id,jdbcType=BIGINT},
+      content_id = #{record.contentId,jdbcType=BIGINT},
       plan_account_id = #{record.planAccountId,jdbcType=BIGINT},
       publish_content_id = #{record.publishContentId,jdbcType=VARCHAR},
       app_id = #{record.appId,jdbcType=VARCHAR},
@@ -365,6 +378,9 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishMiniprogram">
     update long_articles_publish_miniprogram
     <set>
+      <if test="contentId != null">
+        content_id = #{contentId,jdbcType=BIGINT},
+      </if>
       <if test="planAccountId != null">
         plan_account_id = #{planAccountId,jdbcType=BIGINT},
       </if>
@@ -427,7 +443,8 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.longarticle.model.po.PublishMiniprogram">
     update long_articles_publish_miniprogram
-    set plan_account_id = #{planAccountId,jdbcType=BIGINT},
+    set content_id = #{contentId,jdbcType=BIGINT},
+      plan_account_id = #{planAccountId,jdbcType=BIGINT},
       publish_content_id = #{publishContentId,jdbcType=VARCHAR},
       app_id = #{appId,jdbcType=VARCHAR},
       app_name = #{appName,jdbcType=VARCHAR},

long-article-server/src/main/resources/mybatis-generator-config.xml

@@ -62,6 +62,9 @@
 <!--        <table tableName="long_articles_root_source_id" domainObjectName="RootSource" alias=""/>-->
         <table tableName="long_articles_plan_account" domainObjectName="PlanAccount" alias=""/>
 
+<!--                <table tableName="long_articles_publish_content" domainObjectName="PublishContent" alias=""/>-->
+<!--                <table tableName="long_articles_publish_miniprogram" domainObjectName="PublishMiniprogram" alias=""/>-->
+
     </context>
 
 </generatorConfiguration>