Browse Source

导出过滤修改

wangyunpeng 2 days ago
parent
commit
555fe5fd6c

+ 15 - 1
core/src/main/java/com/tzld/supply/job/ContentMediaSearchJob.java

@@ -44,7 +44,11 @@ public class ContentMediaSearchJob {
     @Autowired
     private SpiderMapperExt spiderMapperExt;
 
-
+    /**
+     * 图片素材搜索
+     * @param param
+     * @return
+     */
     @XxlJob("contentImageMediaSearchJob")
     public ReturnT<String> contentImageMediaSearchJob(String param) {
         Long startTime = DateUtils.getTodayStart();
@@ -118,6 +122,11 @@ public class ContentMediaSearchJob {
         return spiderContentMediaMapper.selectByExample(example);
     }
 
+    /**
+     * 图片素材安全检测
+     * @param param
+     * @return
+     */
     @XxlJob("contentMediaImageCheckJob")
     public ReturnT<String> contentMediaImageCheckJob(String param) {
         Long startTime = DateUtils.getTodayStart();
@@ -151,6 +160,11 @@ public class ContentMediaSearchJob {
     }
 
 
+    /**
+     * 视频素材搜索
+     * @param param
+     * @return
+     */
     @XxlJob("contentVideoMediaSearchJob")
     public ReturnT<String> contentVideoMediaSearchJob(String param) {
         Long startTime = DateUtils.getTodayStart();

+ 26 - 6
core/src/main/java/com/tzld/supply/job/ContentScreenJob.java

@@ -1,8 +1,8 @@
 package com.tzld.supply.job;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
-import com.hankcs.hanlp.HanLP;
 import com.tzld.supply.api.DeepSeekApiService;
 import com.tzld.supply.common.enums.SpiderContentScreenStatusEnum;
 import com.tzld.supply.common.enums.SpiderContentStatusEnum;
@@ -45,7 +45,11 @@ public class ContentScreenJob {
     @Value("${deepseek.pq-improve-narration-script-prompt}")
     private String pqNarrationScriptPrompt;
 
-
+    /**
+     * 粗筛
+     * @param param
+     * @return
+     */
     @XxlJob("contentRoughScreenJob")
     public ReturnT<String> contentRoughScreenJob(String param) {
         List<SpiderContent> contentList = getRoughScreenSpiderContent();
@@ -94,6 +98,11 @@ public class ContentScreenJob {
         return spiderContentMapper.selectByExample(example);
     }
 
+    /**
+     * 精筛
+     * @param param
+     * @return
+     */
     @XxlJob("contentPrecisionScreenJob")
     public ReturnT<String> contentPrecisionScreenJob(String param) {
         List<SpiderContent> contentList = spiderMapperExt.getRoughScreenSpiderContentHasContent();
@@ -117,6 +126,9 @@ public class ContentScreenJob {
                 Integer aiPrecisionStatus = checkPrecisionScreenStatus(obj);
                 content.setAiPrecisionStatus(aiPrecisionStatus);
                 content.setAiPrecisionResult(JSONObject.toJSONString(obj));
+                if (CollectionUtil.isNotEmpty(obj.getKeywords())) {
+                    content.setKeyword(JSONObject.toJSONString(obj.getKeywords()));
+                }
                 if (aiPrecisionStatus == SpiderContentScreenStatusEnum.PASSED.getCode()) {
                     content.setStatus(SpiderContentStatusEnum.PASSED.getCode());
                 } else {
@@ -139,6 +151,11 @@ public class ContentScreenJob {
         return SpiderContentScreenStatusEnum.PASSED.getCode();
     }
 
+    /**
+     * 票圈标题改写生成
+     * @param param
+     * @return
+     */
     @XxlJob("contentTitleProduceJob")
     public ReturnT<String> contentTitleProduceJob(String param) {
         Long startTime = DateUtils.getTodayStart();
@@ -147,7 +164,7 @@ public class ContentScreenJob {
         }
         Long endTime = startTime + 86400 * 1000;
         List<SpiderContent> contentList = spiderMapperExt.getExportContentList(
-                Lists.newArrayList(SpiderContentStatusEnum.PASSED.getCode(), SpiderContentStatusEnum.ABANDONED.getCode()),
+                Lists.newArrayList(SpiderContentStatusEnum.PASSED.getCode()),
                 SpiderContentScreenStatusEnum.PASSED.getCode(), startTime, endTime);
         if (contentList.isEmpty()) {
             return ReturnT.SUCCESS;
@@ -177,6 +194,11 @@ public class ContentScreenJob {
         return ReturnT.SUCCESS;
     }
 
+    /**
+     * 口播生成
+     * @param param
+     * @return
+     */
     @XxlJob("contentNarrationScriptProduceJob")
     public ReturnT<String> contentNarrationScriptProduceJob(String param) {
         Long startTime = DateUtils.getTodayStart();
@@ -185,7 +207,7 @@ public class ContentScreenJob {
         }
         Long endTime = startTime + 86400 * 1000;
         List<SpiderContent> contentList = spiderMapperExt.getExportContentList(
-                Lists.newArrayList(SpiderContentStatusEnum.PASSED.getCode(), SpiderContentStatusEnum.ABANDONED.getCode()),
+                Lists.newArrayList(SpiderContentStatusEnum.PASSED.getCode()),
                 SpiderContentScreenStatusEnum.PASSED.getCode(), startTime, endTime);
         if (contentList.isEmpty()) {
             return ReturnT.SUCCESS;
@@ -206,10 +228,8 @@ public class ContentScreenJob {
                     log.error(result.getResponse().getChoices().get(0).getMessage().getContent());
                 }
             }
-            List<String> keyWords = HanLP.extractKeyword(content.getContent(), 3);
             if (StringUtils.isNotBlank(narrationScript)) {
                 content.setPqImproveNarrationScript(narrationScript);
-                content.setKeyword(JSONObject.toJSONString(keyWords));
                 content.setUpdateTime(System.currentTimeMillis());
                 spiderContentMapper.updateByPrimaryKeySelective(content);
             }

+ 6 - 4
core/src/main/java/com/tzld/supply/job/SpiderContentFeishuJob.java

@@ -40,7 +40,11 @@ public class SpiderContentFeishuJob {
     @Autowired
     private SpiderMapperExt spiderMapperExt;
 
-
+    /**
+     * 外部来源内容供给筛选结果导出
+     * @param param
+     * @return
+     */
     @XxlJob("spiderContentFeishuJob")
     public ReturnT<String> spiderContentFeishuJob(String param) {
         Long startTime = DateUtils.getTodayStart();
@@ -49,7 +53,7 @@ public class SpiderContentFeishuJob {
         }
         Long endTime = startTime + 86400 * 1000;
         List<SpiderContent> dataList = spiderMapperExt.getExportContentList(
-                Lists.newArrayList(SpiderContentStatusEnum.PASSED.getCode(), SpiderContentStatusEnum.ABANDONED.getCode()),
+                Lists.newArrayList(SpiderContentStatusEnum.PASSED.getCode()),
                 SpiderContentScreenStatusEnum.PASSED.getCode(), startTime, endTime);
         if (CollectionUtil.isEmpty(dataList)) {
             return ReturnT.SUCCESS;
@@ -64,10 +68,8 @@ public class SpiderContentFeishuJob {
             spiderContentEntity.setStatus(SpiderContentStatusEnum.getByCode(spiderContent.getStatus()).getMsg());
             if (StringUtils.isNotBlank(spiderContent.getAiPrecisionResult())) {
                 PrecisionScreenEntity entity = JSONObject.parseObject(spiderContent.getAiPrecisionResult(), PrecisionScreenEntity.class);
-                spiderContentEntity.setImprovedTitle(entity.getImprovedTitle());
                 spiderContentEntity.setFilterReason(entity.getReason());
                 spiderContentEntity.setRegion(entity.getRegion());
-                spiderContentEntity.setNarrationScript(entity.getNarrationScript());
                 spiderContentEntity.setPqNarrationScript(spiderContent.getPqImproveNarrationScript());
             }
             spiderContentEntity.setContent(spiderContent.getContent());

+ 10 - 0
core/src/main/java/com/tzld/supply/job/SpiderJob.java

@@ -41,6 +41,11 @@ public class SpiderJob {
     @ApolloJsonValue("${spider.filter.source.list:[\"知乎\",\"知乎日报\",\"果壳\",\"壹心理\",\"China Daily\",\"NASA \uD83C\uDF0D\",\"wikiHow 中文\"]}")
     private List<String> filterSourceList;
 
+    /**
+     * 热榜爬取
+     * @param param
+     * @return
+     */
     @XxlJob("spiderTaskJob")
     public ReturnT<String> spiderTaskJob(String param) {
         int cursor = 1;
@@ -118,6 +123,11 @@ public class SpiderJob {
         return spiderContentMapper.countByExample(example) > 0;
     }
 
+    /**
+     * 内容详情搜索
+     * @param param
+     * @return
+     */
     @XxlJob("searchContentDetailJob")
     public ReturnT<String> searchContentDetailJob(String param) {
         List<SpiderContent> contentList = spiderMapperExt.getRoughScreenSpiderContentNoContent();

+ 3 - 0
core/src/main/java/com/tzld/supply/model/entity/PrecisionScreenEntity.java

@@ -2,6 +2,8 @@ package com.tzld.supply.model.entity;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class PrecisionScreenEntity {
 
@@ -9,6 +11,7 @@ public class PrecisionScreenEntity {
     private String summary;
     private String improvedTitle;
     private String region;
+    private List<String> keywords;
     private Double propagationScore;
     private Double suitabilityScore;
     private String reason;

+ 0 - 2
core/src/main/java/com/tzld/supply/model/entity/feishu/SpiderContentEntity.java

@@ -8,11 +8,9 @@ public class SpiderContentEntity {
     private String source;
     private String title;
     private String status;
-    private String improvedTitle;
     private String pqImprovedTitle;
     private String filterReason;
     private String content;
     private String region;
-    private String narrationScript;
     private String pqNarrationScript;
 }

+ 0 - 6
pom.xml

@@ -277,12 +277,6 @@
             <version>0.9.9</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.hankcs</groupId>
-            <artifactId>hanlp</artifactId>
-            <version>portable-1.8.6</version>
-        </dependency>
-
     </dependencies>
 
 </project>