票圈视频审核

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/cgi/PQVideoAuditResultENum.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/cgi/PQVideoAuditResultEnum.java

@@ -5,7 +5,7 @@ import lombok.Getter;
 import java.util.Objects;
 
 @Getter
-public enum PQVideoAuditResultENum {
+public enum PQVideoAuditResultEnum {
     WAITING(0, "审核中"),
     PASS(1, "审核通过"),
     REJECT(2, "审核不通过"),
@@ -16,13 +16,13 @@ public enum PQVideoAuditResultENum {
     private final Integer status;
     private final String description;
 
-    PQVideoAuditResultENum(Integer status, String description) {
+    PQVideoAuditResultEnum(Integer status, String description) {
         this.status = status;
         this.description = description;
     }
 
-    public static PQVideoAuditResultENum from(Integer status) {
-        for (PQVideoAuditResultENum statusEnum : PQVideoAuditResultENum.values()) {
+    public static PQVideoAuditResultEnum from(Integer status) {
+        for (PQVideoAuditResultEnum statusEnum : PQVideoAuditResultEnum.values()) {
             if (Objects.equals(statusEnum.status, status)) {
                 return statusEnum;
             }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/cgi/PQVideoAuditResult.java

@@ -6,5 +6,6 @@ import lombok.Data;
 public class PQVideoAuditResult {
     private Long taskId;
     private Integer auditResult;
+    private Integer sensitiveLevel;
     private String reason;
 }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/remote/pq/PQVideoAuditResultService.java

@@ -1,5 +1,6 @@
 package com.tzld.longarticle.recommend.server.remote.pq;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.tzld.longarticle.recommend.server.common.HttpPoolFactory;
 import com.tzld.longarticle.recommend.server.model.cgi.PQVideoAuditResult;
@@ -31,11 +32,11 @@ public class PQVideoAuditResultService {
     @Autowired
     ArticleRepository articleRepository;
 
-    @Value("${pq.host")
+    @Value("${pq.host:}")
     private String host;
 
     private final CloseableHttpClient client = HttpPoolFactory.aigcPool();
-    private static final String url = "/longvideoapi/openai/audit/queryTaskResult";
+    private static final String url = "/longvideoapi/openapi/audit/queryTaskResult";
 
     public List<PQVideoAuditResult> getResult(List<Long> taskIds) {
         int retryTimes = 3;
@@ -63,9 +64,9 @@ public class PQVideoAuditResultService {
                 HttpEntity responseEntity = response.getEntity();
                 if (Objects.nonNull(responseEntity)) {
                     String responseBody = EntityUtils.toString(responseEntity, "UTF-8");
-                    PQResponse<List<PQVideoAuditResult>> pqResponse = JSONObject.parseObject(responseBody, PQResponse.class);
-                    if (pqResponse.getCode() == 0) {
-                        return pqResponse.getData();
+                    PQResponse pqResponse = JSONObject.parseObject(responseBody, PQResponse.class);
+                    if (pqResponse.getCode() == 0 && Objects.nonNull(pqResponse.getData())) {
+                        return JSONArray.parseArray(JSONObject.toJSONString(pqResponse.getData()), PQVideoAuditResult.class);
                     } else {
                         return null;
                     }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/remote/pq/PQVideoAuditStartProcessService.java

@@ -26,11 +26,11 @@ public class PQVideoAuditStartProcessService {
     @Autowired
     ArticleRepository articleRepository;
 
-    @Value("${pq.host")
+    @Value("${pq.host:}")
     private String host;
 
     private final CloseableHttpClient client = HttpPoolFactory.aigcPool();
-    private static final String url = "/longvideoapi/openai/audit/startProcess";
+    private static final String url = "/longvideoapi/openapi/audit/startProcess";
 
     public Long startProcess(Long videoId) {
         int retryTimes = 3;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/ArticleAuditService.java

@@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.google.common.collect.Lists;
 import com.tzld.longarticle.recommend.server.common.enums.StatusEnum;
 import com.tzld.longarticle.recommend.server.common.enums.aigc.PushTypeEnum;
+import com.tzld.longarticle.recommend.server.common.enums.cgi.PQVideoAuditResultEnum;
 import com.tzld.longarticle.recommend.server.common.enums.recommend.ArticleDeleteStatusEnum;
-import com.tzld.longarticle.recommend.server.common.enums.cgi.PQVideoAuditResultENum;
 import com.tzld.longarticle.recommend.server.common.enums.recommend.FeishuRobotIdEnum;
 import com.tzld.longarticle.recommend.server.mapper.aigc.AigcBaseMapper;
 import com.tzld.longarticle.recommend.server.model.cgi.PQVideoAuditResult;
@@ -15,7 +15,6 @@ import com.tzld.longarticle.recommend.server.model.entity.aigc.PublishAccount;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
 import com.tzld.longarticle.recommend.server.model.entity.longArticle.*;
 import com.tzld.longarticle.recommend.server.model.param.ArticleDangerFindDeleteParam;
-import com.tzld.longarticle.recommend.server.model.param.ArticleVideoAuditResultParam;
 import com.tzld.longarticle.recommend.server.model.param.PublishContentParam;
 import com.tzld.longarticle.recommend.server.remote.WxAccessTokenRemoteService;
 import com.tzld.longarticle.recommend.server.remote.WxArticleDeleteService;
@@ -73,7 +72,7 @@ public class ArticleAuditService {
 
     @XxlJob("articleVideoAudit")
     public ReturnT<String> articleVideoAudit(String param) {
-        long publishTime = DateUtils.getTodayStart();
+        long publishTime = DateUtils.getTodayStart() / 1000;
         if (StringUtils.hasText(param)) {
             publishTime = DateUtils.getStartOfDay(param, "yyyyMMdd");
         }
@@ -136,14 +135,14 @@ public class ArticleAuditService {
 
 
     public void saveVideoAuditResult(LongArticleVideoAudit longArticleVideoAudit, Integer auditResult) {
-        if (Objects.equals(auditResult, PQVideoAuditResultENum.PASS.getStatus())) {
+        if (Objects.equals(auditResult, PQVideoAuditResultEnum.PASS.getStatus())) {
             // 审核通过，更新文章状态
-            longArticleVideoAudit.setStatus(PQVideoAuditResultENum.PASS.getStatus());
+            longArticleVideoAudit.setStatus(PQVideoAuditResultEnum.PASS.getStatus());
             longArticleVideoAudit.setFinishTimestamp(System.currentTimeMillis());
             longArticleVideoAuditRepository.save(longArticleVideoAudit);
-        } else if (Objects.equals(auditResult, PQVideoAuditResultENum.REJECT.getStatus())) {
+        } else if (Objects.equals(auditResult, PQVideoAuditResultEnum.REJECT.getStatus())) {
             // 审核不通过，删除文章
-            longArticleVideoAudit.setStatus(PQVideoAuditResultENum.REJECT.getStatus());
+            longArticleVideoAudit.setStatus(PQVideoAuditResultEnum.REJECT.getStatus());
             longArticleVideoAudit.setFinishTimestamp(System.currentTimeMillis());
             longArticleVideoAuditRepository.save(longArticleVideoAudit);
             // 构建删除文章记录 并保存
@@ -177,7 +176,7 @@ public class ArticleAuditService {
         Map<String, String> publishPushIdMap = pushContentRelList.stream()
                 .collect(Collectors.toMap(PublishGzhPushContentRelDTO::getPublishContentId,
                         PublishGzhPushContentRelDTO::getPushId,
-                         (o1, o2) -> o2));
+                        (o1, o2) -> o2));
         List<PublishGzhPushDTO> pushList = aigcBaseMapper.getPushByPushIdIn(pushIds);
         Map<String, PublishGzhPushDTO> pushDTOMap = pushList.stream()
                 .collect(Collectors.toMap(PublishGzhPushDTO::getPushId, Function.identity()));