From dfe95ce4b0072a3d78f9a0d2c0f2409dda528988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Mon, 29 Jul 2024 18:58:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0OA=E8=8E=B7=E5=8F=96=E5=8F=91?= =?UTF-8?q?=E9=80=81=E5=BE=85=E5=8A=9E=E5=A4=B1=E8=B4=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/docking/hiwork/service/impl/HiworkService.java | 6 +----- .../hiwork/service/impl/UnifiedTodoServiceImpl.java | 7 +++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkService.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkService.java index d1668e13..ab8d0051 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkService.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/HiworkService.java @@ -61,10 +61,6 @@ public class HiworkService { queryLawsUnifiedTodoLog.eq(LawsUnifiedTodoLog::getMessageType,1); queryLawsUnifiedTodoLog.eq(LawsUnifiedTodoLog::getState,2); List listLawsUnifiedTodoLog = lawsUnifiedTodoLogService.list(queryLawsUnifiedTodoLog); - if(CollectionUtils.isEmpty(listLawsUnifiedTodoLog)){ - return Result.OK(); - } - - return Result.OK(); + return Result.OK(listLawsUnifiedTodoLog); } } 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 82d8744a..cc5ac5e4 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 @@ -108,16 +108,15 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI { } try { List unifiedTodoList = getHiworkTodos(unifiedTodoVOList); - String reqJsonString = JSONObject.toJSONString(unifiedTodoVOList); String jsonString = JSONObject.toJSONString(unifiedTodoList); log.info("统一待办推送入参" + jsonString); - push(ip + todoUrl,jsonString, reqJsonString, unifiedTodoList.get(0).getRequestname()); + push(ip + todoUrl,jsonString, unifiedTodoList.get(0).getRequestname()); }catch (Exception e){ log.error("统一待办推送异常",e); } } - private void push(String url, String jsonString, String reqJsonString, String title) { + private void push(String url, String jsonString, String title) { // 设置最大重试次数 int maxRetries = 3; // 当前重试次数 @@ -149,7 +148,7 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI { } } lawsUnifiedTodoLog.setUrl(url); - lawsUnifiedTodoLog.setJsonStr(reqJsonString); + lawsUnifiedTodoLog.setJsonStr(jsonString); lawsUnifiedTodoLog.setMessageType(1); lawsUnifiedTodoLog.setTitle(title); if (retries == maxRetries){