修改调用文章匹配小程序

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

@@ -0,0 +1,25 @@
+package com.tzld.piaoquan.longarticle.common.enums;
+
+public enum MatchRequestStatusEnum {
+
+    DEFAULT(0,"异常情况"),
+    SUCCESS(1, "匹配成功"),
+    NOT_CONTENT(2, "没有文章内容");
+
+    private final int statusCode;
+    private final String message;
+
+    MatchRequestStatusEnum(int statusCode, String message) {
+        this.statusCode = statusCode;
+        this.message = message;
+    }
+
+    public int getStatusCode() {
+        return statusCode;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+}

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

@@ -0,0 +1,23 @@
+package com.tzld.piaoquan.longarticle.common.enums;
+
+public enum MatchResultStatusEnum {
+    SUCCESS(2, "匹配成功"),
+    FAIL(3, "匹配失败");
+
+    private final int statusCode;
+    private final String message;
+
+    MatchResultStatusEnum(int statusCode, String message) {
+        this.statusCode = statusCode;
+        this.message = message;
+    }
+
+    public int getStatusCode() {
+        return statusCode;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+}

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

@@ -3,9 +3,7 @@ package com.tzld.piaoquan.longarticle.service.local.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.tzld.piaoquan.longarticle.common.constants.TimeConstant;
-import com.tzld.piaoquan.longarticle.common.enums.ContentStatusEnum;
-import com.tzld.piaoquan.longarticle.common.enums.PublishGzhPushTypeEnum;
-import com.tzld.piaoquan.longarticle.common.enums.SourceTypesEnum;
+import com.tzld.piaoquan.longarticle.common.enums.*;
 import com.tzld.piaoquan.longarticle.dao.mapper.PlanAccountMapper;
 import com.tzld.piaoquan.longarticle.dao.mapper.PublishContentMapper;
 import com.tzld.piaoquan.longarticle.dao.mapper.PublishMiniprogramMapper;
@@ -777,7 +775,7 @@ public class CoreServiceImpl implements CoreService {
                             //只匹配小程序文章不做处理
                             if (Objects.equals(matchContent.getSourceType(), SourceTypesEnum.longArticleVideoPoolSource.getVal())) {
                                 MatchMiniprogramStatusParam statusParam = new MatchMiniprogramStatusParam();
-                                statusParam.setStatus(2);
+                                statusParam.setStatus(MatchResultStatusEnum.SUCCESS.getStatusCode());
                                 statusParam.setPublishContentId(matchContent.getPublishContentId());
                                 aigcService.updateMatchMiniprogramStatus(statusParam);
                                 continue;
@@ -787,7 +785,7 @@ public class CoreServiceImpl implements CoreService {
                                 Integer contentStatus = matchVideo.getContentStatus();
                                 if (ContentStatusEnum.isSuccess(contentStatus)) {
                                     MatchMiniprogramStatusParam statusParam = new MatchMiniprogramStatusParam();
-                                    statusParam.setStatus(2);
+                                    statusParam.setStatus(MatchResultStatusEnum.SUCCESS.getStatusCode());
                                     statusParam.setPublishContentId(matchContent.getPublishContentId());
                                     aigcService.updateMatchMiniprogramStatus(statusParam);
                                     contentService.addMatchContent(matchVideo, matchContent.getPublishContentId());
@@ -795,7 +793,7 @@ public class CoreServiceImpl implements CoreService {
                                 }
                                 if (ContentStatusEnum.isFail(contentStatus)) {
                                     MatchMiniprogramStatusParam statusParam = new MatchMiniprogramStatusParam();
-                                    statusParam.setStatus(3);
+                                    statusParam.setStatus(MatchResultStatusEnum.FAIL.getStatusCode());
                                     statusParam.setPublishContentId(matchContent.getPublishContentId());
                                     String errorMessage = ContentStatusEnum.getErrorMessage(contentStatus);
                                     statusParam.setErrorMsg(errorMessage);
@@ -814,9 +812,9 @@ public class CoreServiceImpl implements CoreService {
                                 request.setFlowPoolLevelTag(matchContent.getFlowPoolLevelTag());
                                 request.setPublishFlag(2);
                                 Integer status = matchService.matchMiniprogramVideo(request);
-                                if (status == 2) {
+                                if (status == MatchRequestStatusEnum.NOT_CONTENT.getStatusCode()) {
                                     MatchMiniprogramStatusParam statusParam = new MatchMiniprogramStatusParam();
-                                    statusParam.setStatus(3);
+                                    statusParam.setStatus(MatchResultStatusEnum.FAIL.getStatusCode());
                                     statusParam.setPublishContentId(matchContent.getPublishContentId());
                                     String errorMessage = "没有文章内容";
                                     statusParam.setErrorMsg(errorMessage);

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

@@ -2,6 +2,7 @@ package com.tzld.piaoquan.longarticle.service.remote.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.tzld.piaoquan.longarticle.common.enums.MatchRequestStatusEnum;
 import com.tzld.piaoquan.longarticle.model.dto.MiniprogramCardRequest;
 import com.tzld.piaoquan.longarticle.service.remote.MatchService;
 import com.tzld.piaoquan.longarticle.utils.HttpClientUtil;
@@ -27,19 +28,19 @@ public class MatchServiceImpl implements MatchService {
             Integer code = jsonObject.getInteger("code");
             if (code == 0) {
                 // 1成功
-                return 1;
+                return MatchRequestStatusEnum.SUCCESS.getStatusCode();
             } else if (code == 1) {
                 if ("params check error".equals(jsonObject.getString("info"))
                         && "content".equals(jsonObject.getString("message"))
                         && "fail".equals(jsonObject.getString("status"))) {
                     //2 没有文章内容
-                    return 2;
+                    return MatchRequestStatusEnum.NOT_CONTENT.getStatusCode();
                 }
             }
         } catch (Exception e) {
             log.error("matchMiniprogramVideo error", e);
         }
         //0 异常情况
-        return 0;
+        return MatchRequestStatusEnum.DEFAULT.getStatusCode();
     }
 }