From 1258479f6f3209b352139fe8e310df0c8f27fe86 Mon Sep 17 00:00:00 2001 From: sunzheng Date: Mon, 5 Aug 2024 13:36:18 +0800 Subject: [PATCH] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E4=BB=A3=E5=8A=9E?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FeiShuDockingServiceImpl.java | 15 ++++++--------- .../service/impl/SendFeiShuServiceImpl.java | 1 + .../src/main/resources/application-dev-chery.yml | 8 +++++++- .../src/main/resources/application-dev.yml | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java index e4fe0139..3df921a1 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/feishu/service/impl/FeiShuDockingServiceImpl.java @@ -292,8 +292,8 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService { botApprovalMessageDto.setTemplateId("1008"); botApprovalMessageDto.setApprovalName(instanceDto.getTitle()); botApprovalMessageDto.setReceivedUserId(approvalsInstanceVo.getTask_list().get(0).getUser_id()); - botApprovalMessageDto.setApplicantUserId(approvalsInstanceVo.getUser_id()); - botApprovalMessageDto.setTitleUserId(approvalsInstanceVo.getUser_id()); + botApprovalMessageDto.setApplicantUserId(instanceDto.getPromoterUserId()); + botApprovalMessageDto.setTitleUserId(instanceDto.getPromoterUserId()); botApprovalMessageDto.setContent1(instanceDto.getTitle()); botApprovalMessageDto.setPcUrl(approvalsInstanceVo.getTask_list().get(0).getLinks().getPc_link()); botApprovalMessageDto.setMobileUrl(approvalsInstanceVo.getTask_list().get(0).getLinks().getMobile_link()); @@ -308,6 +308,7 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService { SysUser promoterUser = sysUserService.getById(promoterUserId); if (!Objects.isNull(promoterUser) && StringUtils.isNotBlank(promoterUser.getFeishuId())) { promoterUserId = promoterUser.getFeishuId(); + instanceDto.setPromoterUserId(promoterUserId); } } // 审核人的id(可能为多个),查出对应的飞书id @@ -398,7 +399,7 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService { instanceLink.setMobile_link(instanceDto.getPromoterMobileLink()); approvalsInstanceVo.setLinks(instanceLink); approvalsInstanceVo.setTitle("@i18n@1"); - approvalsInstanceVo.setUser_id(promoterUserId); // 审批发起人的user_id + approvalsInstanceVo.setUser_id(""); // 审批发起人的user_id approvalsInstanceVo.setStart_time(String.valueOf(instanceDto.getInstanceStartTime().getTime())); approvalsInstanceVo.setEnd_time("0"); approvalsInstanceVo.setUpdate_time(String.valueOf(System.currentTimeMillis())); @@ -740,14 +741,12 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService { // 审批事由 List messageSummaries = new ArrayList<>(); messageSummaries.add(new MessageSummary("@i18n@2")); -// messageSummaries.add(new MessageSummary("@i18n@3")); messageContent.setSummaries(messageSummaries); approvalsSendMessageVo.setContent(messageContent); -// approvalsSendMessageVo.setNote("@i18n@4"); // 行动区 List actions = new ArrayList<>(); - actions.add(new MessageAction("DETAIL",botApprovalMessageDto.getPcUrl(),botApprovalMessageDto.getMobileUrl(), - botApprovalMessageDto.getMobileUrl(),botApprovalMessageDto.getPcUrl())); + actions.add(new MessageAction("DETAIL",botApprovalMessageDto.getPcUrl(),botApprovalMessageDto.getPcUrl(), + botApprovalMessageDto.getPcUrl(),botApprovalMessageDto.getPcUrl())); approvalsSendMessageVo.setActions(actions); // 国际化文案 MessageI18nResources messageI18nResources = new MessageI18nResources(); @@ -756,8 +755,6 @@ public class FeiShuDockingServiceImpl implements IFeiShuDockingService { HashMap map = new HashMap<>(); map.put("@i18n@1", botApprovalMessageDto.getApprovalName()); map.put("@i18n@2", botApprovalMessageDto.getContent1()); -// map.put("@i18n@3", "当前节点：" + botApprovalMessageDto.getContent2()); -// map.put("@i18n@4", "来自oa"); messageI18nResources.setTexts(map); List i18n_resources = new ArrayList<>(); i18n_resources.add(messageI18nResources); diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendFeiShuServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendFeiShuServiceImpl.java index 5c276742..9b7cf579 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendFeiShuServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/SendFeiShuServiceImpl.java @@ -115,6 +115,7 @@ public class SendFeiShuServiceImpl implements ISendFeiShuService { String transferTaskId = processApprovalRecord.getTransferTaskId(); String taskId = processApprovalRecord.getTaskId(); InstanceDto instanceDto = new InstanceDto(); + instanceDto.setPromoterUserId(processAll.getCreateUserId()); SysUser sysUserCreate = sysUserService.getById(processAll.getCreateUserId()); if(!Objects.isNull(sysUserCreate)){ instanceDto.setPromoterUseName(sysUserCreate.getRealname()); diff --git a/laws-single-startup/src/main/resources/application-dev-chery.yml b/laws-single-startup/src/main/resources/application-dev-chery.yml index b1819861..826101d0 100644 --- a/laws-single-startup/src/main/resources/application-dev-chery.yml +++ b/laws-single-startup/src/main/resources/application-dev-chery.yml @@ -591,10 +591,16 @@ feishu: bot_send_message: ${feishu.base_url}/im/v1/messages # 飞书根据预登录code获取用户信息 get_userinfo_by_code: ${feishu.base_url}/authen/v1/access_token + # 飞书发送审批 Bot消息 + bot_send_approval_message: ${feishu.base_url}/approval/v1/message/send + # 飞书更新审批 Bot消息 + update_send_approval_message: ${feishu.base_url}/approval/v1/message/update + # 使用Bot发送卡片消息 + bot_send_card_message: ${feishu.base_url}/im/v1/messages?receive_id_type=user_id # 飞书单点登录地址 sign_login_in: ${feishu.base_url}/authen/v1/index?redirect_uri={REDIRECT_URI}&app_id=${feishu.app_id}&state=feishu # 飞书PC端待办地址 promoter_pc_link: ${feishu.redirect_prefix}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} # 飞书PC端发起流程地址 - review_pc_link: ${feishu.redirect_prefix}/mobile{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} + review_pc_link: ${feishu.redirect_prefix}{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml index 5e17241d..e7ae7414 100644 --- a/laws-single-startup/src/main/resources/application-dev.yml +++ b/laws-single-startup/src/main/resources/application-dev.yml @@ -600,4 +600,4 @@ feishu: # 飞书PC端待办地址 promoter_pc_link: ${feishu.redirect_prefix}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} # 飞书PC端发起流程地址 - review_pc_link: ${feishu.redirect_prefix}/mobile{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} + review_pc_link: ${feishu.redirect_prefix}{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}