From 07b9e113adf973c305cb52d9bd457615b316c25d Mon Sep 17 00:00:00 2001 From: yang chen Date: Tue, 21 Oct 2025 15:44:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(biz):=20=E6=96=B0=E5=A2=9E=E9=A3=8E?= =?UTF-8?q?=E9=99=A9=E9=9A=90=E6=82=A3=E5=BE=85=E5=8A=9E=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=8A=9F=E8=83=BD-=20=E5=9C=A8=20IPortalTodoService=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=B8=AD=E6=96=B0=E5=A2=9E=20pushCancelRiskH?= =?UTF-8?q?azardWorkflow=20=E6=96=B9=E6=B3=95=20-=20=E5=9C=A8=20PortalTodo?= =?UTF-8?q?Controller=20=E4=B8=AD=E6=96=B0=E5=A2=9E=20DELETE=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=94=A8=E4=BA=8E=E5=8F=96=E6=B6=88=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E6=8E=A8=E9=80=81=20-=20=E5=9C=A8=20PortalTodoServiceImpl=20?= =?UTF-8?q?=E4=B8=AD=E5=AE=9E=E7=8E=B0=E5=BE=85=E5=8A=9E=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E5=8C=85=E6=8B=AC=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E4=B8=8E=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= =?UTF-8?q?=20-=20=E5=BC=95=E5=85=A5=20DeleteRequestInfoDTO=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E5=B0=81=E8=A3=85=E5=88=A0=E9=99=A4=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=8F=82=E6=95=B0=20-=20=E5=AF=B9=E6=8E=A5=20PortalRequest=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BF=A1=E6=81=AF=E7=9A=84=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=8E=A8=E9=80=81-=20=E5=A2=9E=E5=8A=A0=E5=AF=B9=E9=A3=8E?= =?UTF-8?q?=E9=99=A9=E9=9A=90=E6=82=A3=E6=95=B0=E6=8D=AE=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E6=80=A7=E5=92=8C=20PortalRequest=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/controller/PortalTodoController.java | 12 ++++++++++ .../biz/service/IPortalTodoService.java | 12 ++++++++-- .../service/impl/PortalTodoServiceImpl.java | 23 +++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/controller/PortalTodoController.java b/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/controller/PortalTodoController.java index b311fd8..5317fef 100644 --- a/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/controller/PortalTodoController.java +++ b/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/controller/PortalTodoController.java @@ -39,4 +39,16 @@ public class PortalTodoController extends BaseController { return CommonResult.success(portalTodoService.pushDoneRiskHazardWorkflow(workflowId)); } + /** + * 风险隐患推送待办取消 + * + * @param workflowId 待办id + * @return boolean 推送结果 + */ + @Operation(summary = "风险隐患推送待办取消") + @RequestMapping(value = "/risk-hazard/{workflowId}", method = RequestMethod.DELETE) + public CommonResult pushCancelRiskHazardWorkflow(@PathVariable("workflowId") Long workflowId) { + return CommonResult.success(portalTodoService.pushCancelRiskHazardWorkflow(workflowId)); + } + } diff --git a/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/service/IPortalTodoService.java b/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/service/IPortalTodoService.java index a1fee7b..d9b40d3 100644 --- a/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/service/IPortalTodoService.java +++ b/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/service/IPortalTodoService.java @@ -10,9 +10,17 @@ public interface IPortalTodoService { /** * 风险隐患推送待办完成 * - * @param workflowId 流程id + * @param id 流程id * @return boolean 推送结果 */ - boolean pushDoneRiskHazardWorkflow(Long workflowId); + boolean pushDoneRiskHazardWorkflow(Long id); + + /** + * 风险隐患推送待办取消 + * + * @param id 待办id + * @return boolean 推送结果 + */ + boolean pushCancelRiskHazardWorkflow(Long id); } diff --git a/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/service/impl/PortalTodoServiceImpl.java b/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/service/impl/PortalTodoServiceImpl.java index 1c858fd..05f92ae 100644 --- a/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/service/impl/PortalTodoServiceImpl.java +++ b/jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/service/impl/PortalTodoServiceImpl.java @@ -9,6 +9,7 @@ import com.jeelowcode.framework.utils.tool.spring.SpringUtils; import com.jeelowcode.module.biz.service.IPortalTodoService; import com.jeelowcode.module.biz.service.IRiskService; import com.jeelowcode.service.bpm.config.framework.portal.core.PortalRequest; +import com.jeelowcode.service.bpm.config.framework.portal.core.dto.DeleteRequestInfoDTO; import com.jeelowcode.service.bpm.config.framework.portal.core.dto.ReceiveRequestInfoDTO; import com.jeelowcode.service.system.api.IApiAdminUserApi; import com.jeelowcode.service.system.dto.AdminUserRespDTO; @@ -109,4 +110,26 @@ public class PortalTodoServiceImpl implements IPortalTodoService { return true; } + @Override + public boolean pushCancelRiskHazardWorkflow(Long id) { + // 0.1.查找风险隐患数据，如果查不到则放弃推送 + Map risk = riskService.getRiskById(id); + if (MapUtil.isEmpty(risk)) return false; + // 0.2.从容器中获取 PortalRequest 对象，如果没有配置则放弃通知 + PortalRequest portalRequest = SpringUtils.getBean(PortalRequest.class); + if (ObjectUtil.isNull(portalRequest)) return false; + + // 1.构建请求参数,准备推送待办信息 + DeleteRequestInfoDTO deleteRequestInfoDTO = new DeleteRequestInfoDTO() + .setFlowId(Base64.encode(String.valueOf(id))); + // 2.推送待办信息，使用try-catch避免影响上层调用方法的事务回滚 + try { + portalRequest.deleteRequestInfo(deleteRequestInfoDTO); + } catch (Exception e) { + log.error("删除待办信息失败", e); + return false; + } + return true; + } + }