From feeb980b825c91177eaf471fbf1424944be2fd22 Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Mon, 29 Jul 2024 11:24:46 +0800
Subject: [PATCH] =?UTF-8?q?update:=E6=B6=88=E6=81=AF=E9=87=8D=E5=8F=91?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E7=B1=BB=E5=9E=8B=E8=BF=9B=E8=A1=8C=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsUnifiedTodoLogServiceImpl.java   | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

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 c64c0f12..7b3565ee 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
@@ -11,6 +11,9 @@ 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.feishu.dto.BotMessageDto;
+import com.jero.modules.docking.feishu.dto.InstanceDto;
+import com.jero.modules.docking.feishu.service.IFeiShuDockingService;
 import com.jero.modules.docking.hiwork.entity.LawsUnifiedTodoLog;
 import com.jero.modules.docking.hiwork.mapper.LawsUnifiedTodoLogMapper;
 import com.jero.modules.docking.hiwork.service.LawsUnifiedTodoLogService;
@@ -32,6 +35,8 @@ public class LawsUnifiedTodoLogServiceImpl extends ServiceImpl<LawsUnifiedTodoLo
 
     @Resource
     private PushWorkflowIntegrationAPI pushWorkflowIntegrationAPI;
+    @Resource
+    private IFeiShuDockingService feiShuDockingService;
 
     @Override
     public Result<IPage<LawsUnifiedTodoLog>> getPage(LawsUnifiedTodoLog lawsUnifiedTodoLog, Integer pageNo,
@@ -73,10 +78,17 @@ public class LawsUnifiedTodoLogServiceImpl extends ServiceImpl<LawsUnifiedTodoLo
         }
 
         String jsonStr = lawsUnifiedTodoLogObj.getJsonStr();
-        // 转换为List<HiworkTodo>
-        List<UnifiedTodoVO> unifiedTodoVOList = JSON.parseObject(jsonStr, new TypeReference<List<UnifiedTodoVO>>() {});
-        pushWorkflowIntegrationAPI.sendTodoTask(unifiedTodoVOList);
-
+        Integer messageType = lawsUnifiedTodoLogObj.getMessageType();
+        if (messageType == 1) { // 重发OA
+            List<UnifiedTodoVO> unifiedTodoVOList = JSON.parseObject(jsonStr, new TypeReference<List<UnifiedTodoVO>>() {});
+            pushWorkflowIntegrationAPI.sendTodoTask(unifiedTodoVOList);
+        }else if (messageType == 2) { // 重发飞书-待办
+            InstanceDto instanceDto = JSON.parseObject(jsonStr, InstanceDto.class);
+            feiShuDockingService.synchronizeApprovalInstance(instanceDto);
+        }else { // 重发飞书-消息
+            BotMessageDto botMessageDto = JSON.parseObject(jsonStr, BotMessageDto.class);
+            feiShuDockingService.sendHrefMessageByBot(botMessageDto);
+        }
         LambdaUpdateWrapper<LawsUnifiedTodoLog> queryLawsUnifiedTodoLog = new LambdaUpdateWrapper<>();
         queryLawsUnifiedTodoLog.eq(LawsUnifiedTodoLog::getId,lawsUnifiedTodoLog.getId());
         queryLawsUnifiedTodoLog.set(LawsUnifiedTodoLog::getState,1);