From 1d811fff842a9ef98536b491531f83b468d60017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Thu, 1 Aug 2024 16:11:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OA=E5=AF=B9=E6=8E=A5=E5=BC=82?=
 =?UTF-8?q?=E6=9E=84=E7=B3=BB=E7=BB=9F=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UnifiedTodoServiceImpl.java  | 41 +++++++++++++------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java
index b94f6a43..67afb131 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java
@@ -6,6 +6,7 @@ import cn.hutool.http.Header;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.api.PushWorkflowIntegrationAPI;
@@ -130,20 +131,31 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI {
                     .timeout(3000)//超时，毫秒
                     .execute();
             if (execute.isOk()) {
-                log.info("统一待办推送成功");
                 String body = execute.body();
-                lawsUnifiedTodoLog.setResponseBody(body);
-                break;
+                List<JSONObject> listJson = JSONArray.parseArray(body,JSONObject.class);
+                if(!CollectionUtils.isEmpty(listJson)) {
+                    String operResult = String.valueOf(listJson.get(0).get("operResult"));
+                    lawsUnifiedTodoLog.setResponseBody(body);
+                    if (Objects.equals(operResult, "0")) {
+                        lawsUnifiedTodoLog.setState(2);
+                    } else {
+                        log.info("统一待办推送成功");
+                        lawsUnifiedTodoLog.setState(1);
+                        break;
+                    }
+                }
             }else {
                 String body = execute.body();
                 lawsUnifiedTodoLog.setResponseBody(body);
-                JSONObject jsonObject = JSONObject.parseObject(body);
-                String operResult = jsonObject.getString("operResult");
-                if ("1".equals(operResult)){
-                    log.info("统一待办推送成功");
-                    break;
+                List<JSONObject> listJson = JSONArray.parseArray(body,JSONObject.class);
+                if(!CollectionUtils.isEmpty(listJson)){
+                    String operResult = String.valueOf(listJson.get(0).get("operResult"));
+                    if ("1".equals(operResult)){
+                        log.info("统一待办推送成功");
+                        break;
+                    }
                 }
-                log.info("统一待办推送失败{}",jsonObject);
+                log.info("统一待办推送失败{}",body);
                 retries++;
             }
         }
@@ -151,11 +163,14 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI {
         lawsUnifiedTodoLog.setJsonStr(jsonString);
         lawsUnifiedTodoLog.setMessageType(1);
         lawsUnifiedTodoLog.setTitle(title);
-        if (retries == maxRetries){
-            lawsUnifiedTodoLog.setState(2);
-        }else {
-            lawsUnifiedTodoLog.setState(1);
+        if(Objects.isNull(lawsUnifiedTodoLog.getState())){
+            if (retries == maxRetries){
+                lawsUnifiedTodoLog.setState(2);
+            }else {
+                lawsUnifiedTodoLog.setState(1);
+            }
         }
+
         unifiedTodoLogService.add(lawsUnifiedTodoLog);
     }