Merge branch 'dev-xym-add-shenhe' of Server/long-article-manage into master

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

@@ -37,6 +37,16 @@ public class CrawlerVideo {
 
     private Float score;
 
+    private Integer isIllegal;
+
+    private Integer status;
+
+    private String auditAccount;
+
+    private Long auditTimestamp;
+
+    private Byte scoreVersion;
+
     private String videoUrl;
 
     private String coverUrl;
@@ -177,6 +187,46 @@ public class CrawlerVideo {
         this.score = score;
     }
 
+    public Integer getIsIllegal() {
+        return isIllegal;
+    }
+
+    public void setIsIllegal(Integer isIllegal) {
+        this.isIllegal = isIllegal;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getAuditAccount() {
+        return auditAccount;
+    }
+
+    public void setAuditAccount(String auditAccount) {
+        this.auditAccount = auditAccount;
+    }
+
+    public Long getAuditTimestamp() {
+        return auditTimestamp;
+    }
+
+    public void setAuditTimestamp(Long auditTimestamp) {
+        this.auditTimestamp = auditTimestamp;
+    }
+
+    public Byte getScoreVersion() {
+        return scoreVersion;
+    }
+
+    public void setScoreVersion(Byte scoreVersion) {
+        this.scoreVersion = scoreVersion;
+    }
+
     public String getVideoUrl() {
         return videoUrl;
     }
@@ -216,6 +266,11 @@ public class CrawlerVideo {
         sb.append(", userId=").append(userId);
         sb.append(", traceId=").append(traceId);
         sb.append(", score=").append(score);
+        sb.append(", isIllegal=").append(isIllegal);
+        sb.append(", status=").append(status);
+        sb.append(", auditAccount=").append(auditAccount);
+        sb.append(", auditTimestamp=").append(auditTimestamp);
+        sb.append(", scoreVersion=").append(scoreVersion);
         sb.append(", videoUrl=").append(videoUrl);
         sb.append(", coverUrl=").append(coverUrl);
         sb.append("]");

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

@@ -1215,6 +1215,316 @@ public class CrawlerVideoExample {
             addCriterion("score not between", value1, value2, "score");
             return (Criteria) this;
         }
+
+        public Criteria andIsIllegalIsNull() {
+            addCriterion("is_illegal is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsIllegalIsNotNull() {
+            addCriterion("is_illegal is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsIllegalEqualTo(Integer value) {
+            addCriterion("is_illegal =", value, "isIllegal");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsIllegalNotEqualTo(Integer value) {
+            addCriterion("is_illegal <>", value, "isIllegal");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsIllegalGreaterThan(Integer value) {
+            addCriterion("is_illegal >", value, "isIllegal");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsIllegalGreaterThanOrEqualTo(Integer value) {
+            addCriterion("is_illegal >=", value, "isIllegal");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsIllegalLessThan(Integer value) {
+            addCriterion("is_illegal <", value, "isIllegal");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsIllegalLessThanOrEqualTo(Integer value) {
+            addCriterion("is_illegal <=", value, "isIllegal");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsIllegalIn(List<Integer> values) {
+            addCriterion("is_illegal in", values, "isIllegal");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsIllegalNotIn(List<Integer> values) {
+            addCriterion("is_illegal not in", values, "isIllegal");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsIllegalBetween(Integer value1, Integer value2) {
+            addCriterion("is_illegal between", value1, value2, "isIllegal");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsIllegalNotBetween(Integer value1, Integer value2) {
+            addCriterion("is_illegal not between", value1, value2, "isIllegal");
+            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 andAuditAccountIsNull() {
+            addCriterion("audit_account is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountIsNotNull() {
+            addCriterion("audit_account is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountEqualTo(String value) {
+            addCriterion("audit_account =", value, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountNotEqualTo(String value) {
+            addCriterion("audit_account <>", value, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountGreaterThan(String value) {
+            addCriterion("audit_account >", value, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountGreaterThanOrEqualTo(String value) {
+            addCriterion("audit_account >=", value, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountLessThan(String value) {
+            addCriterion("audit_account <", value, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountLessThanOrEqualTo(String value) {
+            addCriterion("audit_account <=", value, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountLike(String value) {
+            addCriterion("audit_account like", value, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountNotLike(String value) {
+            addCriterion("audit_account not like", value, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountIn(List<String> values) {
+            addCriterion("audit_account in", values, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountNotIn(List<String> values) {
+            addCriterion("audit_account not in", values, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountBetween(String value1, String value2) {
+            addCriterion("audit_account between", value1, value2, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditAccountNotBetween(String value1, String value2) {
+            addCriterion("audit_account not between", value1, value2, "auditAccount");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampIsNull() {
+            addCriterion("audit_timestamp is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampIsNotNull() {
+            addCriterion("audit_timestamp is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampEqualTo(Long value) {
+            addCriterion("audit_timestamp =", value, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampNotEqualTo(Long value) {
+            addCriterion("audit_timestamp <>", value, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampGreaterThan(Long value) {
+            addCriterion("audit_timestamp >", value, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampGreaterThanOrEqualTo(Long value) {
+            addCriterion("audit_timestamp >=", value, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampLessThan(Long value) {
+            addCriterion("audit_timestamp <", value, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampLessThanOrEqualTo(Long value) {
+            addCriterion("audit_timestamp <=", value, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampIn(List<Long> values) {
+            addCriterion("audit_timestamp in", values, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampNotIn(List<Long> values) {
+            addCriterion("audit_timestamp not in", values, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampBetween(Long value1, Long value2) {
+            addCriterion("audit_timestamp between", value1, value2, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditTimestampNotBetween(Long value1, Long value2) {
+            addCriterion("audit_timestamp not between", value1, value2, "auditTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreVersionIsNull() {
+            addCriterion("score_version is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreVersionIsNotNull() {
+            addCriterion("score_version is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreVersionEqualTo(Byte value) {
+            addCriterion("score_version =", value, "scoreVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreVersionNotEqualTo(Byte value) {
+            addCriterion("score_version <>", value, "scoreVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreVersionGreaterThan(Byte value) {
+            addCriterion("score_version >", value, "scoreVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreVersionGreaterThanOrEqualTo(Byte value) {
+            addCriterion("score_version >=", value, "scoreVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreVersionLessThan(Byte value) {
+            addCriterion("score_version <", value, "scoreVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreVersionLessThanOrEqualTo(Byte value) {
+            addCriterion("score_version <=", value, "scoreVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreVersionIn(List<Byte> values) {
+            addCriterion("score_version in", values, "scoreVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreVersionNotIn(List<Byte> values) {
+            addCriterion("score_version not in", values, "scoreVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreVersionBetween(Byte value1, Byte value2) {
+            addCriterion("score_version between", value1, value2, "scoreVersion");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreVersionNotBetween(Byte value1, Byte value2) {
+            addCriterion("score_version not between", value1, value2, "scoreVersion");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -287,7 +287,10 @@ public class ContentServiceImpl implements ContentService {
         try {
             CrawlerVideoExample example = new CrawlerVideoExample();
             example.setOrderByClause("score desc");
-            example.createCriteria().andDownloadStatusEqualTo(2).andContentIdEqualTo(publishContent.getSourceId());
+            example.createCriteria().andDownloadStatusEqualTo(2)
+                    .andContentIdEqualTo(publishContent.getSourceId())
+                    .andStatusEqualTo(1)
+                    .andIsIllegalEqualTo(0);
             List<CrawlerVideo> crawlerVideoList = crawlerVideoMapper.selectByExample(example);
             List<CrawlerVideo> videoList = new ArrayList<>();
             if (!CollectionUtils.isEmpty(crawlerVideoList)) {

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

@@ -19,6 +19,11 @@
     <result column="user_id" jdbcType="VARCHAR" property="userId" />
     <result column="trace_id" jdbcType="VARCHAR" property="traceId" />
     <result column="score" jdbcType="REAL" property="score" />
+    <result column="is_illegal" jdbcType="INTEGER" property="isIllegal" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="audit_account" jdbcType="VARCHAR" property="auditAccount" />
+    <result column="audit_timestamp" jdbcType="BIGINT" property="auditTimestamp" />
+    <result column="score_version" jdbcType="TINYINT" property="scoreVersion" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.tzld.piaoquan.longarticle.model.po.CrawlerVideo">
     <result column="video_url" jdbcType="LONGVARCHAR" property="videoUrl" />
@@ -85,7 +90,7 @@
   <sql id="Base_Column_List">
     id, content_id, out_video_id, platform, video_title, play_count, like_count, share_count, 
     publish_time, crawler_time, duration, download_status, video_oss_path, cover_oss_path, 
-    user_id, trace_id, score
+    user_id, trace_id, score, is_illegal, `status`, audit_account, audit_timestamp, score_version
   </sql>
   <sql id="Blob_Column_List">
     video_url, cover_url
@@ -150,15 +155,19 @@
       like_count, share_count, publish_time, 
       crawler_time, duration, download_status, 
       video_oss_path, cover_oss_path, user_id, 
-      trace_id, score, video_url, 
-      cover_url)
+      trace_id, score, is_illegal, 
+      `status`, audit_account, audit_timestamp, 
+      score_version, video_url, cover_url
+      )
     values (#{id,jdbcType=INTEGER}, #{contentId,jdbcType=VARCHAR}, #{outVideoId,jdbcType=VARCHAR}, 
       #{platform,jdbcType=VARCHAR}, #{videoTitle,jdbcType=VARCHAR}, #{playCount,jdbcType=INTEGER}, 
       #{likeCount,jdbcType=INTEGER}, #{shareCount,jdbcType=INTEGER}, #{publishTime,jdbcType=TIMESTAMP}, 
       #{crawlerTime,jdbcType=TIMESTAMP}, #{duration,jdbcType=INTEGER}, #{downloadStatus,jdbcType=INTEGER}, 
       #{videoOssPath,jdbcType=VARCHAR}, #{coverOssPath,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, 
-      #{traceId,jdbcType=VARCHAR}, #{score,jdbcType=REAL}, #{videoUrl,jdbcType=LONGVARCHAR}, 
-      #{coverUrl,jdbcType=LONGVARCHAR})
+      #{traceId,jdbcType=VARCHAR}, #{score,jdbcType=REAL}, #{isIllegal,jdbcType=INTEGER}, 
+      #{status,jdbcType=INTEGER}, #{auditAccount,jdbcType=VARCHAR}, #{auditTimestamp,jdbcType=BIGINT}, 
+      #{scoreVersion,jdbcType=TINYINT}, #{videoUrl,jdbcType=LONGVARCHAR}, #{coverUrl,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.longarticle.model.po.CrawlerVideo">
     insert into long_articles_crawler_videos
@@ -214,6 +223,21 @@
       <if test="score != null">
         score,
       </if>
+      <if test="isIllegal != null">
+        is_illegal,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="auditAccount != null">
+        audit_account,
+      </if>
+      <if test="auditTimestamp != null">
+        audit_timestamp,
+      </if>
+      <if test="scoreVersion != null">
+        score_version,
+      </if>
       <if test="videoUrl != null">
         video_url,
       </if>
@@ -273,6 +297,21 @@
       <if test="score != null">
         #{score,jdbcType=REAL},
       </if>
+      <if test="isIllegal != null">
+        #{isIllegal,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="auditAccount != null">
+        #{auditAccount,jdbcType=VARCHAR},
+      </if>
+      <if test="auditTimestamp != null">
+        #{auditTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="scoreVersion != null">
+        #{scoreVersion,jdbcType=TINYINT},
+      </if>
       <if test="videoUrl != null">
         #{videoUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -341,6 +380,21 @@
       <if test="record.score != null">
         score = #{record.score,jdbcType=REAL},
       </if>
+      <if test="record.isIllegal != null">
+        is_illegal = #{record.isIllegal,jdbcType=INTEGER},
+      </if>
+      <if test="record.status != null">
+        `status` = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.auditAccount != null">
+        audit_account = #{record.auditAccount,jdbcType=VARCHAR},
+      </if>
+      <if test="record.auditTimestamp != null">
+        audit_timestamp = #{record.auditTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="record.scoreVersion != null">
+        score_version = #{record.scoreVersion,jdbcType=TINYINT},
+      </if>
       <if test="record.videoUrl != null">
         video_url = #{record.videoUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -371,6 +425,11 @@
       user_id = #{record.userId,jdbcType=VARCHAR},
       trace_id = #{record.traceId,jdbcType=VARCHAR},
       score = #{record.score,jdbcType=REAL},
+      is_illegal = #{record.isIllegal,jdbcType=INTEGER},
+      `status` = #{record.status,jdbcType=INTEGER},
+      audit_account = #{record.auditAccount,jdbcType=VARCHAR},
+      audit_timestamp = #{record.auditTimestamp,jdbcType=BIGINT},
+      score_version = #{record.scoreVersion,jdbcType=TINYINT},
       video_url = #{record.videoUrl,jdbcType=LONGVARCHAR},
       cover_url = #{record.coverUrl,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -395,7 +454,12 @@
       cover_oss_path = #{record.coverOssPath,jdbcType=VARCHAR},
       user_id = #{record.userId,jdbcType=VARCHAR},
       trace_id = #{record.traceId,jdbcType=VARCHAR},
-      score = #{record.score,jdbcType=REAL}
+      score = #{record.score,jdbcType=REAL},
+      is_illegal = #{record.isIllegal,jdbcType=INTEGER},
+      `status` = #{record.status,jdbcType=INTEGER},
+      audit_account = #{record.auditAccount,jdbcType=VARCHAR},
+      audit_timestamp = #{record.auditTimestamp,jdbcType=BIGINT},
+      score_version = #{record.scoreVersion,jdbcType=TINYINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -451,6 +515,21 @@
       <if test="score != null">
         score = #{score,jdbcType=REAL},
       </if>
+      <if test="isIllegal != null">
+        is_illegal = #{isIllegal,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="auditAccount != null">
+        audit_account = #{auditAccount,jdbcType=VARCHAR},
+      </if>
+      <if test="auditTimestamp != null">
+        audit_timestamp = #{auditTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="scoreVersion != null">
+        score_version = #{scoreVersion,jdbcType=TINYINT},
+      </if>
       <if test="videoUrl != null">
         video_url = #{videoUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -478,6 +557,11 @@
       user_id = #{userId,jdbcType=VARCHAR},
       trace_id = #{traceId,jdbcType=VARCHAR},
       score = #{score,jdbcType=REAL},
+      is_illegal = #{isIllegal,jdbcType=INTEGER},
+      `status` = #{status,jdbcType=INTEGER},
+      audit_account = #{auditAccount,jdbcType=VARCHAR},
+      audit_timestamp = #{auditTimestamp,jdbcType=BIGINT},
+      score_version = #{scoreVersion,jdbcType=TINYINT},
       video_url = #{videoUrl,jdbcType=LONGVARCHAR},
       cover_url = #{coverUrl,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
@@ -499,7 +583,12 @@
       cover_oss_path = #{coverOssPath,jdbcType=VARCHAR},
       user_id = #{userId,jdbcType=VARCHAR},
       trace_id = #{traceId,jdbcType=VARCHAR},
-      score = #{score,jdbcType=REAL}
+      score = #{score,jdbcType=REAL},
+      is_illegal = #{isIllegal,jdbcType=INTEGER},
+      `status` = #{status,jdbcType=INTEGER},
+      audit_account = #{auditAccount,jdbcType=VARCHAR},
+      audit_timestamp = #{auditTimestamp,jdbcType=BIGINT},
+      score_version = #{scoreVersion,jdbcType=TINYINT}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

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

@@ -60,7 +60,7 @@
 <!--            <columnOverride column="cover_url" javaType="java.lang.String" jdbcType="LONGVARCHAR" />-->
 <!--        </table>-->
 <!--        <table tableName="long_articles_root_source_id" domainObjectName="RootSource" alias=""/>-->
-        <table tableName="long_articles_account_special_settings" domainObjectName="AccountSpecialSettings" alias=""/>
+        <table tableName="long_articles_crawler_videos" domainObjectName="CrawlerVideo" alias=""/>
 <!--            <table tableName="long_articles_plan" domainObjectName="Plan" alias=""/>-->
 
 <!--                <table tableName="long_articles_publish_content" domainObjectName="PublishContent" alias=""/>-->