From 424035f2c8be6761c384d3391d951cfd0b3388a0 Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Mon, 29 Jul 2024 11:08:18 +0800
Subject: [PATCH] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9oa=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docking/hiwork/entity/LawsUnifiedTodoLog.java      |  4 ++--
 .../service/impl/LawsUnifiedTodoLogServiceImpl.java    | 10 ++++++++--
 .../hiwork/service/impl/UnifiedTodoServiceImpl.java    |  8 +++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/LawsUnifiedTodoLog.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/LawsUnifiedTodoLog.java
index 89ee2e1e..6dee5a6c 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/LawsUnifiedTodoLog.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/LawsUnifiedTodoLog.java
@@ -53,9 +53,9 @@ public class LawsUnifiedTodoLog {
     private Integer state;
 
     /**
-     * 消息类型1：OA消息 2：飞书
+     * 消息类型1：OA消息 2：飞书-待办 3: 飞书-消息
      */
-    @ApiModelProperty(value="消息类型1：OA消息 2：飞书")
+    @ApiModelProperty(value="消息类型1：OA消息 2：飞书-待办 3: 飞书-消息")
     @Dict(dicCode = "message_type")
     private Integer messageType;
 
diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/LawsUnifiedTodoLogServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/LawsUnifiedTodoLogServiceImpl.java
index 5c194dc3..c64c0f12 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/LawsUnifiedTodoLogServiceImpl.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/LawsUnifiedTodoLogServiceImpl.java
@@ -1,11 +1,14 @@
 package com.jero.modules.docking.hiwork.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.PushWorkflowIntegrationAPI;
+import com.jero.common.api.dto.message.UnifiedTodoVO;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.docking.hiwork.entity.LawsUnifiedTodoLog;
@@ -68,8 +71,11 @@ public class LawsUnifiedTodoLogServiceImpl extends ServiceImpl<LawsUnifiedTodoLo
         if(Objects.isNull(lawsUnifiedTodoLogObj)){
             return Result.error("数据不存在");
         }
-        // todo 重新发送代办 根据类型发送
-//         pushWorkflowIntegrationAPI.sendTodoTask();
+
+        String jsonStr = lawsUnifiedTodoLogObj.getJsonStr();
+        // 转换为List<HiworkTodo>
+        List<UnifiedTodoVO> unifiedTodoVOList = JSON.parseObject(jsonStr, new TypeReference<List<UnifiedTodoVO>>() {});
+        pushWorkflowIntegrationAPI.sendTodoTask(unifiedTodoVOList);
 
         LambdaUpdateWrapper<LawsUnifiedTodoLog> queryLawsUnifiedTodoLog = new LambdaUpdateWrapper<>();
         queryLawsUnifiedTodoLog.eq(LawsUnifiedTodoLog::getId,lawsUnifiedTodoLog.getId());
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 b6d154ad..8e9a9ef1 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
@@ -102,15 +102,16 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI {
         }
         try {
             List<UnifiedTodo> unifiedTodoList = getHiworkTodos(unifiedTodoVOList);
+            String reqJsonString = JSONObject.toJSONString(unifiedTodoVOList);
             String jsonString = JSONObject.toJSONString(unifiedTodoList);
             log.info("统一待办推送入参" + jsonString);
-            push(ip + todoUrl,jsonString);
+            push(ip + todoUrl,jsonString, reqJsonString);
         }catch (Exception e){
             log.error("统一待办推送异常",e);
         }
     }
 
-    private void push(String url, String jsonString) {
+    private void push(String url, String jsonString, String reqJsonString) {
         // 设置最大重试次数
         int maxRetries = 3;
         // 当前重试次数
@@ -142,7 +143,8 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI {
             }
         }
         lawsUnifiedTodoLog.setUrl(url);
-        lawsUnifiedTodoLog.setJsonStr(jsonString);
+        lawsUnifiedTodoLog.setJsonStr(reqJsonString);
+        lawsUnifiedTodoLog.setMessageType(1);
         if (retries == maxRetries){
             lawsUnifiedTodoLog.setState(2);
         }else {