流程集成飞书推送待办

2024-07-29 18:53:26 +08:00
parent dc5a6a88bd
commit b8ea5f5b5e
8 changed files with 60 additions and 25 deletions
@@ -4,6 +4,8 @@ import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.api.dto.message.UnifiedTodoVO;
 import com.jero.common.constant.CommonConstant;
+import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
 import com.jero.modules.activiti.enums.CommitFlagEnum;
@@ -11,13 +13,12 @@ import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessApprovalRecordService;
 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.service.ISendFeiShuService;
-import com.jero.modules.docking.hiwork.service.LawsUnifiedTodoLogService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;

@@ -35,22 +36,28 @@ import java.util.Objects;
@Service
 public class SendFeiShuServiceImpl implements ISendFeiShuService {

-    @Resource
-    private ISysUserService sysUserService;
    @Resource
    private ProcessApprovalRecordService processApprovalRecordService;
    @Resource
    private ProcessAllService processAllService;
    @Resource
-    private LawsUnifiedTodoLogService unifiedTodoLogService;
+    private ISysUserService sysUserService;
    @Resource
    private IFeiShuDockingService feiShuDockingService;
+    @Resource
+    private ISysBaseAPI sysBaseAPI;

    @Value("${feishu.isSendStatus}")
    private boolean isSendStatus;

-    @Value("${feishu.redirect_prefix}")
-    private String redirectPrefix;
+    @Value("${feishu.promoter_pc_link}")
+    private String promoterPcLink;
+    @Value("${feishu.review_pc_link}")
+    private String reviewPcLink;
+    @Value("${feishu.promoter_mobile_link}")
+    private String promoterMobileLink;
+    @Value("${feishu.review_mobile_link}")
+    private String reviewMobileLink;

    /**
     * @Author: liao
@@ -66,6 +73,10 @@ public class SendFeiShuServiceImpl implements ISendFeiShuService {
        if(CollectionUtils.isEmpty(unifiedTodoVOList)){
            return;
        }
+        sendData(unifiedTodoVOList);
+    }
+
+    private void sendData(List<UnifiedTodoVO> unifiedTodoVOList){

        for (UnifiedTodoVO unifiedTodoVO : unifiedTodoVOList) {
            ProcessApprovalRecord processApprovalRecord =
@@ -81,21 +92,21 @@ public class SendFeiShuServiceImpl implements ISendFeiShuService {
                break;
            }
            String userId;
-            if (unifiedTodoVO.getToUserId() == null){
+            if (StringUtils.isEmpty(unifiedTodoVO.getToUserId())){
                userId = processApprovalRecord.getUserId();
            }else {
                userId = unifiedTodoVO.getToUserId();
            }
-            String date = DateUtil.formatDateTime(new Date());
-            SysUser sysUser = sysUserService.getById(userId);
-            String noticeTitle = processApprovalRecord.getTaskName() + "(" + sysUser.getRealname() + " " + date + ")";
+            String transferTaskId = processApprovalRecord.getTransferTaskId();
            String taskId = processApprovalRecord.getTaskId();
            InstanceDto instanceDto = new InstanceDto();
            instanceDto.setPromoterUserId(processAll.getCreateUserId());
            instanceDto.setReviewedIds(userId);
-            instanceDto.setTitle(noticeTitle);
+            String title = sysBaseAPI.translateDict("prc_type",String.valueOf(processAll.getPrcType()));
+            instanceDto.setTitle(title);
+            instanceDto.setProcessType(processAll.getPrcType());
            instanceDto.setProcessInstanceId(processApprovalRecord.getProcessInstanceId());
-            instanceDto.setTaskIds(taskId);
+            instanceDto.setTaskIds(StringUtils.isBlank(transferTaskId) ? taskId : transferTaskId);

            // PENDING：   审批中 APPROVED：  审批流程结束，结果为同意 REJECTED：  审批流程结束，结果为拒绝
            // CANCELED：  审批发起人撤回 DELETED： 审批被删除 HIDDEN：    状态隐藏(不显示状态) TERMINATED：审批终止
@@ -103,21 +114,23 @@ public class SendFeiShuServiceImpl implements ISendFeiShuService {
            String status = "";
            String instanceStatus = "";
            //PENDING：待审批 APPROVED：任务同意 REJECTED：任务拒绝 TRANSFERRED：任务转交
-            switch (unifiedTodoVO.getIsRemark()){
+            switch (unifiedTodoVO.getIsStatus()){
                // 0待办，2已办，4办结
-                case CommonConstant.TODO_TYPE_0: status = instanceStatus = "PENDING"; break;
+                case CommonConstant.TODO_TYPE_0: status = instanceStatus = "PENDING";
+                    break;
                default: status = instanceStatus =
                        Objects.equals(processApprovalRecord.getCommitFlag(),
-                                CommitFlagEnum.PASS.getValue()) ? "APPROVED" : "REJECTED"; break;
+                                CommitFlagEnum.PASS.getValue()) ? "APPROVED" : "REJECTED";
+                    break;
            }

            instanceDto.setInstanceStatus(instanceStatus);
            instanceDto.setTaskStatus(status);
-            instanceDto.setPromoterPcLink(redirectPrefix + "/workCenter/processCenter/processCenter");
-            instanceDto.setReviewPcLink(redirectPrefix + "/workCenter/processCenter/processCenter");
+            instanceDto.setPromoterPcLink(promoterPcLink);
+            instanceDto.setReviewPcLink(reviewPcLink);
            // todo 移动端跳转地址
-             instanceDto.setPromoterMobileLink(redirectPrefix + "/workCenter/processCenter/processCenter");
-             instanceDto.setReviewMobileLink(redirectPrefix + "/workCenter/processCenter/processCenter");
+            instanceDto.setPromoterMobileLink(promoterMobileLink);
+            instanceDto.setReviewMobileLink(reviewMobileLink);
            feiShuDockingService.synchronizeApprovalInstance(instanceDto);
        }
    }
@@ -204,10 +204,11 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI {
                if (StrUtil.isNotBlank(processAll.getProjectId())){
                    projectId = processAll.getProjectId();
                }
+                String transferTaskId = processApprovalRecord.getTransferTaskId();
                String url = hiworkFontUrl
                        .replace("{projectId}",projectId)
                        .replace("{taskName}",processApprovalRecord.getTaskName())
-                        .replace("{taskId}", taskId)
+                        .replace("{taskId}", StringUtils.isBlank(transferTaskId) ? taskId : transferTaskId)
                        .replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())
                        .replace("{nodeId}",processApprovalRecord.getNodeId());
                // 跳转链接
@@ -217,7 +218,7 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI {
                String appUrl = hiworkFontAppUrl
                        .replace("{projectId}",projectId)
                        .replace("{taskName}",processApprovalRecord.getTaskName())
-                        .replace("{taskId}", taskId)
+                        .replace("{taskId}", StringUtils.isBlank(transferTaskId) ? taskId : transferTaskId)
                        .replace("{processInstanceId}",processApprovalRecord.getProcessInstanceId())
                        .replace("{nodeId}",processApprovalRecord.getNodeId());
                String appBusinessLink = appUrl.replace("{url}", Objects.requireNonNull(ProcessTypeEnum.getFontReturnUrlPc(processAll.getPrcType())));