From 074448d44b35250d903c8812c00643066a18be54 Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Tue, 28 Dec 2021 13:45:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B4=E6=98=8E=EF=BC=9A1=E3=80=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=A4=A9=E8=A1=8C=E6=95=B0=E6=8D=AE=E6=96=87=E6=A1=88?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=99=8D=E7=BA=A7=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/factory/TianXingFeignFactory.java  |  9 +++---
 .../copywriting/CopyWritingController.java    |  1 -
 .../impl/TianXingCopyWritingFactory.java      | 29 ++++++++++++-------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/common/client/factory/TianXingFeignFactory.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/client/factory/TianXingFeignFactory.java
index 73d1ec4c..c5a3df60 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/common/client/factory/TianXingFeignFactory.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/client/factory/TianXingFeignFactory.java
@@ -1,9 +1,7 @@
 package com.xjs.common.client.factory;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.xjs.common.client.TianXingFeignClient;
-import com.xjs.copywriting.domain.CopyWriting;
 import com.xjs.copywriting.domain.RequestBody;
 import com.xjs.copywriting.service.CopyWritingService;
 import lombok.extern.log4j.Log4j2;
@@ -29,9 +27,10 @@ public class TianXingFeignFactory implements FallbackFactory<TianXingFeignClient
         return new TianXingFeignClient() {
             @Override
             public JSONObject copyWritingApi(RequestBody requestBody) {
-                CopyWriting copyWriting = copyWritingService.getOneToRandom();
-                String jsonString = JSON.toJSONString(copyWriting);
-                return JSONObject.parseObject(jsonString);
+                JSONObject jsonObject = new JSONObject();
+                //构建一个异常json给下层接口处理
+                jsonObject.put("error", 500);
+                return jsonObject;
             }
         };
     }
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/CopyWritingController.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/CopyWritingController.java
index 83451047..ce1ddbc2 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/CopyWritingController.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/CopyWritingController.java
@@ -38,7 +38,6 @@ public class CopyWritingController {
 
     //todo 文案管理前端页面，
     // 第三方api服务降级，
-    // 分析错误状态码（天行数据），
     // 天行数据整合一个菜单，
     // 实现其他天行数据接口，
     // 实现其他朋友圈文案api，
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/factory/impl/TianXingCopyWritingFactory.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/factory/impl/TianXingCopyWritingFactory.java
index dddf3092..2bee7c73 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/factory/impl/TianXingCopyWritingFactory.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/copywriting/factory/impl/TianXingCopyWritingFactory.java
@@ -34,16 +34,25 @@ public class TianXingCopyWritingFactory implements CopyWritingFactory {
     public CopyWriting productCopyWriting(RequestBody requestBody) {
         requestBody.setKey(tianXingProperties.getKey());
         JSONObject jsonObject = tianXingFeignClient.copyWritingApi(requestBody);
-        if (HttpStatus.HTTP_OK != jsonObject.getInteger("code")) {
-            throw new ApiException("天行数据朋友圈文案接口调用异常");
+        //调用服务正常
+        if(jsonObject.containsKey("code")){
+            if (HttpStatus.HTTP_OK !=jsonObject.getInteger("code")) {
+                throw new ApiException("天行数据朋友圈文案接口调用异常");
+            }
+            JSONArray newslist = jsonObject.getJSONArray("newslist");
+            String content = newslist.getJSONObject(0).getString("content");
+            String source = newslist.getJSONObject(0).getString("source");
+            CopyWriting copyWriting = new CopyWriting();
+            copyWriting.setContent(content);
+            copyWriting.setSource(source);
+            copyWritingMapper.insert(copyWriting);
+            return copyWriting;
+        }else {
+            //调用服务失败的降级之后的处理
+            if (jsonObject.containsKey("error")) {
+                return copyWritingMapper.getOneToNew();
+            }
+            return new CopyWriting();
         }
-        JSONArray newslist = jsonObject.getJSONArray("newslist");
-        String content = newslist.getJSONObject(0).getString("content");
-        String source = newslist.getJSONObject(0).getString("source");
-        CopyWriting copyWriting = new CopyWriting();
-        copyWriting.setContent(content);
-        copyWriting.setSource(source);
-        copyWritingMapper.insert(copyWriting);
-        return copyWriting;
     }
 }