xins
/
hwmom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(dms): 修复工作流相关问题

Browse Source 
- 修复了检查工单、润滑工单和保养工单在创建时未正确存储流程实例ID的问题
- 优化了工作流推进逻辑，确保在异步线程中正确处理租户上下文
- 改进了日志信息，使其更加准确地反映流程实例ID和任务ID
master
zch 1 week ago
parent 269219e976
commit df28ff1633
3 changed files with 66 additions and 43 deletions
Show Stats Download Patch File Download Diff File

56
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteInspectInstanceServiceImpl.java
Unescape Escape View File

@ -51,16 +51,16 @@ public class RemoteInspectInstanceServiceImpl implements RemoteInspectInstanceSe
public R<Integer> insertInspectInstance(String planInspectCode, String tenantId, Long userId){ public R<Integer> insertInspectInstance(String planInspectCode, String tenantId, Long userId){
// 【重要】在主线程中先登录，确保后续所有调用都有认证上下文 // 【重要】在主线程中先登录，确保后续所有调用都有认证上下文
StpUtil.login(userId, "login"); StpUtil.login(userId, "login");
// 【关键修复】设置租户上下文，确保工作流能获取到正确的租户ID // 【关键修复】设置租户上下文，确保工作流能获取到正确的租户ID
TenantHelper.setDynamic(tenantId); TenantHelper.setDynamic(tenantId);
try { try {
// 创建检查实例 // 创建检查实例
R<Long> rInspectInstanceId = createInspectInstance(planInspectCode, tenantId, userId); R<Long> rInspectInstanceId = createInspectInstance(planInspectCode, tenantId, userId);
Long inspectInstanceId = rInspectInstanceId.getData(); Long inspectInstanceId = rInspectInstanceId.getData();
String businessId = inspectInstanceId.toString(); String businessId = inspectInstanceId.toString();
if (!R.isSuccess(rInspectInstanceId)) { if (!R.isSuccess(rInspectInstanceId)) {
return R.fail(); return R.fail();
} else { } else {
@ -68,30 +68,33 @@ public class RemoteInspectInstanceServiceImpl implements RemoteInspectInstanceSe
RemoteStartProcess remoteStartProcess = new RemoteStartProcess(); RemoteStartProcess remoteStartProcess = new RemoteStartProcess();
remoteStartProcess.setBusinessId(businessId); remoteStartProcess.setBusinessId(businessId);
remoteStartProcess.setFlowCode(DmsConstants.DMS_BILLS_INSPECT_INSTANCE_WF_CODE); remoteStartProcess.setFlowCode(DmsConstants.DMS_BILLS_INSPECT_INSTANCE_WF_CODE);
// 【重要】通过Dubbo隐式参数传递租户ID // 【重要】通过Dubbo隐式参数传递租户ID
RpcContext.getContext().setAttachment("tenantId", tenantId); RpcContext.getContext().setAttachment("tenantId", tenantId);
RemoteStartProcessReturn result = remoteWorkflowService.startWorkFlow(remoteStartProcess); RemoteStartProcessReturn result = remoteWorkflowService.startWorkFlow(remoteStartProcess);
if (ObjectUtils.isEmpty(result)) { if (ObjectUtils.isEmpty(result)) {
return R.fail(); return R.fail();
} else { } else {
// 【关键修复】存储流程实例ID而不是任务ID
Long processInstanceId = result.getProcessInstanceId();
Long taskId = result.getTaskId(); Long taskId = result.getTaskId();
// 【简化方案】异步处理工作流推进，避免死锁 // 【简化方案】异步处理工作流推进，避免死锁
CompletableFuture.runAsync(TtlRunnable.get(() -> { CompletableFuture.runAsync(TtlRunnable.get(() -> {
try { try {
// 【关键】在异步线程中重新登录相同用户 // 【关键】在异步线程中重新登录相同用户
StpUtil.login(userId, "login"); StpUtil.login(userId, "login");
// 【关键修复】在异步线程中重新设置租户上下文 // 【关键修复】在异步线程中重新设置租户上下文
TenantHelper.setDynamic(tenantId); TenantHelper.setDynamic(tenantId);
log.info("检查工单异步线程中，当前租户ID: {}", TenantHelper.getTenantId()); log.info("检查工单异步线程中，当前租户ID: {}", TenantHelper.getTenantId());
// 【执行业务】更新检查工单的工作流信息 // 【关键修复】传递流程实例ID而不是任务ID
updateInspectWorkflow(inspectInstanceId, taskId); updateInspectWorkflow(inspectInstanceId, processInstanceId, taskId);
log.info("检查工单 {} 异步工作流处理完成", inspectInstanceId); log.info("检查工单 {} 异步工作流处理完成", inspectInstanceId);
} catch (Exception e) { } catch (Exception e) {
log.error("检查工单 {} 异步工作流处理失败: {}", inspectInstanceId, e.getMessage(), e); log.error("检查工单 {} 异步工作流处理失败: {}", inspectInstanceId, e.getMessage(), e);
@ -168,7 +171,7 @@ public class RemoteInspectInstanceServiceImpl implements RemoteInspectInstanceSe
MPJLambdaWrapper<DmsInspectRouteDetail> lqw = JoinWrappers.lambda(DmsInspectRouteDetail.class) MPJLambdaWrapper<DmsInspectRouteDetail> lqw = JoinWrappers.lambda(DmsInspectRouteDetail.class)
.eq(DmsInspectRouteDetail::getInspectRouteId, dmsBillsInspectInstance.getInspectRouteId()); .eq(DmsInspectRouteDetail::getInspectRouteId, dmsBillsInspectInstance.getInspectRouteId());
List<DmsInspectRouteDetail> dmsInspectRouteDetails = dmsInspectRouteDetailMapper.selectList(lqw); List<DmsInspectRouteDetail> dmsInspectRouteDetails = dmsInspectRouteDetailMapper.selectList(lqw);
// 遍历检查路线明细，生成检查实例明细 // 遍历检查路线明细，生成检查实例明细
for(DmsInspectRouteDetail dmsInspectRouteDetail:dmsInspectRouteDetails){ for(DmsInspectRouteDetail dmsInspectRouteDetail:dmsInspectRouteDetails){
DmsInspectInstanceDetail dmsInspectInstanceDetail = new DmsInspectInstanceDetail(); DmsInspectInstanceDetail dmsInspectInstanceDetail = new DmsInspectInstanceDetail();
@ -206,29 +209,30 @@ public class RemoteInspectInstanceServiceImpl implements RemoteInspectInstanceSe
return R.ok(dmsBillsInspectInstance.getInspectInstanceId()); return R.ok(dmsBillsInspectInstance.getInspectInstanceId());
} }
private void updateInspectWorkflow(Long businessId, Long taskId) { private void updateInspectWorkflow(Long businessId, Long processInstanceId, Long taskId) {
try { try {
// 【关键修复】确保在工作流操作前有正确的租户上下文 // 【关键修复】确保在工作流操作前有正确的租户上下文
String currentTenantId = TenantHelper.getTenantId(); String currentTenantId = TenantHelper.getTenantId();
log.info("检查工作流更新前，当前租户ID: {}", currentTenantId); log.info("检查工作流更新前，当前租户ID: {}", currentTenantId);
// 1. 更新工作流ID // 【关键修复】更新流程实例ID而不是任务ID
DmsBillsInspectInstance inspectInstance = dmsBillsInspectInstanceMapper.selectById(businessId); DmsBillsInspectInstance inspectInstance = dmsBillsInspectInstanceMapper.selectById(businessId);
if (inspectInstance != null) { if (inspectInstance != null) {
inspectInstance.setWfDefinitionId(taskId); // 【关键修复】存储流程实例ID而不是任务ID
inspectInstance.setWfDefinitionId(processInstanceId);
int updateResult = dmsBillsInspectInstanceMapper.updateById(inspectInstance); int updateResult = dmsBillsInspectInstanceMapper.updateById(inspectInstance);
if (updateResult > 0) { if (updateResult > 0) {
log.info("检查工单 {} 工作流ID更新成功: {}", businessId, taskId); log.info("检查工单 {} 工作流实例ID更新成功: {}", businessId, processInstanceId);
} else { } else {
log.error("检查工单 {} 工作流ID更新失败", businessId); log.error("检查工单 {} 工作流实例ID更新失败", businessId);
return; return;
} }
} else { } else {
log.error("检查工单 {} 不存在，无法更新工作流ID", businessId); log.error("检查工单 {} 不存在，无法更新工作流实例ID", businessId);
return; return;
} }
// 2. 推进工作流状态 // 推进工作流状态
RemoteCompleteTask completeTask = new RemoteCompleteTask(); RemoteCompleteTask completeTask = new RemoteCompleteTask();
completeTask.setTaskId(taskId); completeTask.setTaskId(taskId);
completeTask.setMessage("检查工单启动，自动推进"); completeTask.setMessage("检查工单启动，自动推进");
@ -236,21 +240,21 @@ public class RemoteInspectInstanceServiceImpl implements RemoteInspectInstanceSe
List<String> messageTypes = new ArrayList<>(); List<String> messageTypes = new ArrayList<>();
messageTypes.add("system"); // 系统消息 messageTypes.add("system"); // 系统消息
completeTask.setMessageType(messageTypes); completeTask.setMessageType(messageTypes);
// 【关键修复】在调用工作流推进前再次确认租户上下文 // 【关键修复】在调用工作流推进前再次确认租户上下文
log.info("检查工作流推进前，当前租户ID: {}", TenantHelper.getTenantId()); log.info("检查工作流推进前，当前租户ID: {}", TenantHelper.getTenantId());
// 【重要】通过Dubbo隐式参数传递租户ID // 【重要】通过Dubbo隐式参数传递租户ID
RpcContext.getContext().setAttachment("tenantId", currentTenantId); RpcContext.getContext().setAttachment("tenantId", currentTenantId);
// 【关键】调用工作流推进 // 【关键】调用工作流推进
boolean completeResult = remoteWorkflowService.completeTask(completeTask); boolean completeResult = remoteWorkflowService.completeTaskIgnoreAuth(taskId, "检查工单启动，自动推进");
if (completeResult) { if (completeResult) {
log.info("检查工单 {} 工作流推进成功", businessId); log.info("检查工单 {} 工作流推进成功", businessId);
} else { } else {
log.warn("检查工单 {} 工作流推进失败，但工单已创建成功", businessId); log.warn("检查工单 {} 工作流推进失败，但工单已创建成功", businessId);
} }
} catch (Exception e) { } catch (Exception e) {
log.error("检查工单 {} 工作流更新失败: {}", businessId, e.getMessage(), e); log.error("检查工单 {} 工作流更新失败: {}", businessId, e.getMessage(), e);
// 注意：这里不抛出异常，避免影响主流程 // 注意：这里不抛出异常，避免影响主流程

20
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteLubeInstanceServiceImpl.java
Unescape Escape View File

@ -92,7 +92,10 @@ public class RemoteLubeInstanceServiceImpl implements RemoteLubeInstanceService
if(ObjectUtils.isEmpty(result)){ if(ObjectUtils.isEmpty(result)){
return R.fail(); return R.fail();
}else { }else {
// 【关键修复】存储流程实例ID而不是任务ID
Long processInstanceId = result.getProcessInstanceId();
Long taskId = result.getTaskId(); Long taskId = result.getTaskId();
// 【简化方案】直接在异步线程中重新登录相同用户，避免Token传递复杂性 // 【简化方案】直接在异步线程中重新登录相同用户，避免Token传递复杂性
CompletableFuture.runAsync(TtlRunnable.get(() -> { CompletableFuture.runAsync(TtlRunnable.get(() -> {
try { try {
@ -105,8 +108,8 @@ public class RemoteLubeInstanceServiceImpl implements RemoteLubeInstanceService
log.info("异步线程中，当前租户ID: {}", TenantHelper.getTenantId()); log.info("异步线程中，当前租户ID: {}", TenantHelper.getTenantId());
// 【执行业务】更新润滑工单的工作流信息 // 【关键修复】传递流程实例ID而不是任务ID
updateWarmFlow(LubeStanceId, taskId); updateWarmFlow(LubeStanceId, processInstanceId, taskId);
log.info("润滑工单 {} 异步工作流处理完成", LubeStanceId); log.info("润滑工单 {} 异步工作流处理完成", LubeStanceId);
} catch (Exception e) { } catch (Exception e) {
@ -224,26 +227,27 @@ public class RemoteLubeInstanceServiceImpl implements RemoteLubeInstanceService
} }
private void updateWarmFlow(Long businessId,Long taskId){ private void updateWarmFlow(Long businessId, Long processInstanceId, Long taskId){
try { try {
// 【关键修复】确保在工作流操作前有正确的租户上下文 // 【关键修复】确保在工作流操作前有正确的租户上下文
String currentTenantId = TenantHelper.getTenantId(); String currentTenantId = TenantHelper.getTenantId();
log.info("工作流更新前，当前租户ID: {}", currentTenantId); log.info("工作流更新前，当前租户ID: {}", currentTenantId);
// 1. 更新工作流ID // 1. 【关键修复】更新流程实例ID而不是任务ID
DmsBillsLubeInstanceVo dmsBillsLubeInstanceVo = dmsBillsLubeInstanceService.queryById(businessId); DmsBillsLubeInstanceVo dmsBillsLubeInstanceVo = dmsBillsLubeInstanceService.queryById(businessId);
if (dmsBillsLubeInstanceVo == null) { if (dmsBillsLubeInstanceVo == null) {
log.error("润滑工单 {} 不存在，无法更新工作流ID", businessId); log.error("润滑工单 {} 不存在，无法更新工作流实例ID", businessId);
return; return;
} }
DmsBillsLubeInstance billsLubeInstance = MapstructUtils.convert(dmsBillsLubeInstanceVo, DmsBillsLubeInstance.class); DmsBillsLubeInstance billsLubeInstance = MapstructUtils.convert(dmsBillsLubeInstanceVo, DmsBillsLubeInstance.class);
billsLubeInstance.setWfDefinitionId(taskId); // 【关键修复】存储流程实例ID而不是任务ID
billsLubeInstance.setWfDefinitionId(processInstanceId);
int updateResult = dmsBillsLubeInstanceMapper.updateById(billsLubeInstance); int updateResult = dmsBillsLubeInstanceMapper.updateById(billsLubeInstance);
if (updateResult > 0) { if (updateResult > 0) {
log.info("润滑工单 {} 工作流ID更新成功: {}", businessId, taskId); log.info("润滑工单 {} 工作流实例ID更新成功: {}", businessId, processInstanceId);
} else { } else {
log.error("润滑工单 {} 工作流ID更新失败", businessId); log.error("润滑工单 {} 工作流实例ID更新失败", businessId);
return; return;
} }

33
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/dubbo/RemoteMaintInstanceServiceImpl.java
Unescape Escape View File

@ -90,7 +90,15 @@ public class RemoteMaintInstanceServiceImpl implements RemoteMaintInstanceServic
if (ObjectUtils.isEmpty(result)) { if (ObjectUtils.isEmpty(result)) {
return R.fail(); return R.fail();
} else { } else {
// 【关键修复】获取流程实例ID和任务ID，区分存储
Long processInstanceId = result.getProcessInstanceId();
Long taskId = result.getTaskId(); Long taskId = result.getTaskId();
if (processInstanceId == null) {
log.error("保养工作流启动失败，未获取到流程实例ID");
return R.fail();
}
// 【简化方案】异步处理工作流推进，避免死锁 // 【简化方案】异步处理工作流推进，避免死锁
CompletableFuture.runAsync(TtlRunnable.get(() -> { CompletableFuture.runAsync(TtlRunnable.get(() -> {
try { try {
@ -102,8 +110,8 @@ public class RemoteMaintInstanceServiceImpl implements RemoteMaintInstanceServic
log.info("保养工单异步线程中，当前租户ID: {}", TenantHelper.getTenantId()); log.info("保养工单异步线程中，当前租户ID: {}", TenantHelper.getTenantId());
// 【执行业务】更新保养工单的工作流信息 // 【执行业务】更新保养工单的工作流信息并推进
updateMaintWorkflow(maintInstanceId, taskId); updateMaintWorkflow(maintInstanceId, processInstanceId, taskId);
log.info("保养工单 {} 异步工作流处理完成", maintInstanceId); log.info("保养工单 {} 异步工作流处理完成", maintInstanceId);
} catch (Exception e) { } catch (Exception e) {
@ -206,7 +214,7 @@ public class RemoteMaintInstanceServiceImpl implements RemoteMaintInstanceServic
billsMaintDetailProject.setMaintProjectId(project.getMaintProjectId()); billsMaintDetailProject.setMaintProjectId(project.getMaintProjectId());
billsMaintDetailProject.setMaintProjectName(project.getMaintProjectName()); billsMaintDetailProject.setMaintProjectName(project.getMaintProjectName());
billsMaintDetailProject.setMaintProjectDesc(project.getMaintProjectDesc()); billsMaintDetailProject.setMaintProjectDesc(project.getMaintProjectDesc());
billsMaintDetailProject.setMaintProjectStatus("2");//保养项目状态（0待保养 1保养完成） billsMaintDetailProject.setMaintProjectStatus("2");//FIXME:保养项目状态（0待保养 1保养完成）
//字段没有自动填充，只能代码手动填充 //字段没有自动填充，只能代码手动填充
billsMaintDetailProject.setCreateBy(userId); billsMaintDetailProject.setCreateBy(userId);
@ -217,25 +225,32 @@ public class RemoteMaintInstanceServiceImpl implements RemoteMaintInstanceServic
} }
} }
private void updateMaintWorkflow(Long businessId, Long taskId) { /**
* 【参考润滑工单优化】更新保养工单的工作流信息并推进工作流
*
* @param businessId 业务ID（保养实例ID）
* @param processInstanceId 流程实例ID
* @param taskId 工作流任务ID（用于推进工作流）
*/
private void updateMaintWorkflow(Long businessId, Long processInstanceId, Long taskId) {
try { try {
// 【关键修复】确保在工作流操作前有正确的租户上下文 // 【关键修复】确保在工作流操作前有正确的租户上下文
String currentTenantId = TenantHelper.getTenantId(); String currentTenantId = TenantHelper.getTenantId();
log.info("保养工作流更新前，当前租户ID: {}", currentTenantId); log.info("保养工作流更新前，当前租户ID: {}", currentTenantId);
// 1. 更新工作流ID // 1. 【关键修复】存储流程实例ID到wfDefinitionId字段，而不是任务ID
DmsBillsMaintInstance maintInstance = dmsBillsMaintInstanceMapper.selectById(businessId); DmsBillsMaintInstance maintInstance = dmsBillsMaintInstanceMapper.selectById(businessId);
if (maintInstance != null) { if (maintInstance != null) {
maintInstance.setWfDefinitionId(taskId); maintInstance.setWfDefinitionId(processInstanceId); // 存储流程实例ID
int updateResult = dmsBillsMaintInstanceMapper.updateById(maintInstance); int updateResult = dmsBillsMaintInstanceMapper.updateById(maintInstance);
if (updateResult > 0) { if (updateResult > 0) {
log.info("保养工单 {} 工作流ID更新成功: {}", businessId, taskId); log.info("保养工单 {} 流程实例ID更新成功: {}", businessId, processInstanceId);
} else { } else {
log.error("保养工单 {} 工作流ID更新失败", businessId); log.error("保养工单 {} 流程实例ID更新失败", businessId);
return; return;
} }
} else { } else {
log.error("保养工单 {} 不存在，无法更新工作流ID", businessId); log.error("保养工单 {} 不存在，无法更新流程实例ID", businessId);
return; return;
} }

Write Preview
Loading…
Cancel
Save