|
|
|
|
@ -46,6 +46,8 @@ import cn.dev33.satoken.stp.StpUtil;
|
|
|
|
|
|
|
|
|
|
import java.util.*;
|
|
|
|
|
import java.util.concurrent.CompletableFuture;
|
|
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
import org.dromara.dms.mapper.DmsFaultComponentsPartsMapper;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 故障报修工单Service业务层处理
|
|
|
|
|
@ -65,7 +67,7 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
|
|
|
|
|
|
|
|
|
|
private final IDmsInstanceFileService DmsInstanceFileService;
|
|
|
|
|
|
|
|
|
|
@DubboReference(timeout = 15000, retries = 1)
|
|
|
|
|
@DubboReference(timeout = 30000, retries = 2)
|
|
|
|
|
private final RemoteWorkflowService remoteWorkflowService;
|
|
|
|
|
|
|
|
|
|
private final DmsFaultInstanceActivityMapper dmsFaultInstanceActivityMapper;
|
|
|
|
|
@ -75,6 +77,8 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
|
|
|
|
|
@DubboReference(timeout = 15000, retries = 1)
|
|
|
|
|
private final RemoteFileService remoteFileService;
|
|
|
|
|
|
|
|
|
|
private final DmsFaultComponentsPartsMapper dmsFaultComponentsPartsMapper;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 查询故障报修工单
|
|
|
|
|
*
|
|
|
|
|
@ -176,6 +180,12 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
|
|
|
|
|
@GlobalTransactional(rollbackFor = Exception.class)
|
|
|
|
|
public Boolean insertByBo(DmsBillsFaultInstanceBo bo) {
|
|
|
|
|
bo.setMachineId((long) bo.getDeviceId());
|
|
|
|
|
|
|
|
|
|
// 【关键修复】处理PDA端outsrcId到outsourcingId的转换
|
|
|
|
|
if (bo.getOutsrcId() != null && bo.getOutsrcId() > 0) {
|
|
|
|
|
bo.setOutsourcingId(Long.valueOf(bo.getOutsrcId()));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
DmsBillsFaultInstance add = MapstructUtils.convert(bo, DmsBillsFaultInstance.class);
|
|
|
|
|
validEntityBeforeSave(add);
|
|
|
|
|
// 获取当前日期时间
|
|
|
|
|
@ -185,20 +195,28 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
|
|
|
|
|
add.setBillsFaultCode(Seq.getId(Seq.dmsBillsFaultInstanceSeqType, Seq.dmsBillsFaultInstanceSeqCode));
|
|
|
|
|
// 设置报修状态为待维修
|
|
|
|
|
add.setBillsStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_TO_REPAIR);
|
|
|
|
|
// 设置审批状态为待审批（按照PDA标准）
|
|
|
|
|
add.setApproveStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_APPROVE_STATUS_PENDING);
|
|
|
|
|
// 设置实例类型为手动录入
|
|
|
|
|
add.setInstanceType(DmsConstants.DMS_BILLS_FAULT_INSTANCE_TYPE_MAUAL);
|
|
|
|
|
// 【修复】工单创建时确认状态应该为null，不设置任何值
|
|
|
|
|
add.setRepairConfirm(null);
|
|
|
|
|
|
|
|
|
|
boolean flag = baseMapper.insert(add) > 0;
|
|
|
|
|
if (flag) {
|
|
|
|
|
bo.setRepairInstanceId(add.getRepairInstanceId());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//FIXME:工作流相关
|
|
|
|
|
//工作流相关：自动启动工作流
|
|
|
|
|
RemoteStartProcess remoteStartProcess = new RemoteStartProcess();
|
|
|
|
|
remoteStartProcess.setFlowCode(DmsConstants.DMS_BILLS_FAULT_INSTANCE_WF_CODE);
|
|
|
|
|
remoteStartProcess.setBusinessId(add.getRepairInstanceId().toString());
|
|
|
|
|
RemoteStartProcessReturn remoteStartProcessReturn = remoteWorkflowService.startWorkFlow(remoteStartProcess);
|
|
|
|
|
Long taskId = remoteStartProcessReturn.getTaskId();
|
|
|
|
|
Long processInstanceId = remoteStartProcessReturn.getProcessInstanceId();
|
|
|
|
|
|
|
|
|
|
// // 更新工作流实例ID
|
|
|
|
|
// add.setWfDefinitionId(processInstanceId);
|
|
|
|
|
|
|
|
|
|
// ** 异步线程上下文传递【核心问题】 **
|
|
|
|
|
// 在主线程中，用户的登录信息(Token)是存放在一个叫 ThreadLocal 的"线程口袋"里的。
|
|
|
|
|
@ -214,15 +232,38 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
|
|
|
|
|
try {
|
|
|
|
|
// 3. 【设置上下文】: 在子线程任务开始时，立刻用 StpUtil.setTokenValue() 把传递过来的Token放进子线程自己的"口袋"。
|
|
|
|
|
StpUtil.setTokenValue(tokenValue);
|
|
|
|
|
// 4. 【执行业务】: 现在子线程就像登录过一样，可以带着Token去调用其他需要权限的服务了。
|
|
|
|
|
updateWorkFlow(add, taskId);
|
|
|
|
|
|
|
|
|
|
// 4. 【延迟执行】: 稍微延迟，确保主事务完全提交
|
|
|
|
|
Thread.sleep(100);
|
|
|
|
|
|
|
|
|
|
// 5. 【重试机制】: 最多重试3次，每次间隔递增
|
|
|
|
|
int maxRetries = 3;
|
|
|
|
|
for (int i = 0; i < maxRetries; i++) {
|
|
|
|
|
try {
|
|
|
|
|
// 执行业务：现在子线程就像登录过一样，可以带着Token去调用其他需要权限的服务了
|
|
|
|
|
updateWorkFlow(add, taskId, processInstanceId);
|
|
|
|
|
log.info("异步工作流推进成功，repairInstanceId: {}, 重试次数: {}", add.getRepairInstanceId(), i);
|
|
|
|
|
break; // 成功则退出重试循环
|
|
|
|
|
} catch (Exception retryException) {
|
|
|
|
|
log.warn("异步工作流推进失败，repairInstanceId: {}, 重试次数: {}/{}, 错误: {}",
|
|
|
|
|
add.getRepairInstanceId(), i + 1, maxRetries, retryException.getMessage());
|
|
|
|
|
|
|
|
|
|
if (i == maxRetries - 1) {
|
|
|
|
|
// 最后一次重试失败，记录错误
|
|
|
|
|
log.error("异步工作流推进最终失败，repairInstanceId: {}, 请手动处理", add.getRepairInstanceId(), retryException);
|
|
|
|
|
// TODO: 可以考虑记录到失败表，后续补偿处理
|
|
|
|
|
} else {
|
|
|
|
|
// 等待后重试，递增延迟时间
|
|
|
|
|
Thread.sleep((i + 1) * 1000);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
// 简单记录错误，不影响主流程
|
|
|
|
|
System.err.println("异步更新工作流失败，repairInstanceId: " + add.getRepairInstanceId() + ", 错误: " + e.getMessage());
|
|
|
|
|
// 可以考虑记录到失败表，后续补偿处理
|
|
|
|
|
log.error("异步更新工作流异常，repairInstanceId: {}", add.getRepairInstanceId(), e);
|
|
|
|
|
}
|
|
|
|
|
}));
|
|
|
|
|
// 创建故障实例活动对象
|
|
|
|
|
|
|
|
|
|
// 【重要修改】创建故障实例活动对象 - 只有PDA创建工单时才生成
|
|
|
|
|
DmsFaultInstanceActivity dmsFaultInstanceActivity = new DmsFaultInstanceActivity();
|
|
|
|
|
// 设置维修实例ID
|
|
|
|
|
dmsFaultInstanceActivity.setRepairInstanceId(add.getRepairInstanceId());
|
|
|
|
|
@ -238,11 +279,11 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
|
|
|
|
|
dmsFaultInstanceActivity.setMachineId(add.getMachineId());
|
|
|
|
|
// 设置维修类型
|
|
|
|
|
dmsFaultInstanceActivity.setRepairType(add.getRepairType());
|
|
|
|
|
// 如果外部资源ID不为空，则设置外部资源ID
|
|
|
|
|
if (add.getOutsourcingId() != null) {
|
|
|
|
|
dmsFaultInstanceActivity.setOutsourcingId(add.getOutsourcingId());
|
|
|
|
|
// 【关键修复】如果外部资源ID不为空，则设置外部资源ID
|
|
|
|
|
if (bo.getOutsourcingId() != null) {
|
|
|
|
|
dmsFaultInstanceActivity.setOutsourcingId(bo.getOutsourcingId());
|
|
|
|
|
}
|
|
|
|
|
// 设置处理状态为待领取
|
|
|
|
|
// 设置处理状态为待审批
|
|
|
|
|
dmsFaultInstanceActivity.setProcessHandleStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_TO_PICK);
|
|
|
|
|
// 设置流程步骤顺序
|
|
|
|
|
dmsFaultInstanceActivity.setProcessStepOrder(1l);
|
|
|
|
|
@ -250,35 +291,405 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
|
|
|
|
|
dmsFaultInstanceActivityMapper.insert(dmsFaultInstanceActivity);
|
|
|
|
|
//存储图片
|
|
|
|
|
// 获取文件URL列表
|
|
|
|
|
List<String> fileUrls = add.getFileUrls();
|
|
|
|
|
List<String> fileUrls = bo.getFileUrls();
|
|
|
|
|
// 批量插入实例文件记录
|
|
|
|
|
batchInsertInstanceFiles(fileUrls, dmsFaultInstanceActivity.getInstanceActivityId());
|
|
|
|
|
return flag;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 审批故障报修工单
|
|
|
|
|
*
|
|
|
|
|
* @param repairInstanceId 工单ID
|
|
|
|
|
* @param approveStatus 审批状态（2-审批成功，3-审批失败）
|
|
|
|
|
* @param message 审批意见
|
|
|
|
|
* @return 是否审批成功
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@GlobalTransactional(rollbackFor = Exception.class)
|
|
|
|
|
public Boolean approveWorkOrder(Long repairInstanceId, String approveStatus, String message) {
|
|
|
|
|
// 查询工单信息
|
|
|
|
|
DmsBillsFaultInstance workOrder = baseMapper.selectById(repairInstanceId);
|
|
|
|
|
if (workOrder == null) {
|
|
|
|
|
throw new ServiceException("工单不存在");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 检查当前状态是否可以审批（必须是待审批状态）
|
|
|
|
|
if (!DmsConstants.DMS_BILLS_FAULT_INSTANCE_APPROVE_STATUS_PENDING.equals(workOrder.getApproveStatus())) {
|
|
|
|
|
throw new ServiceException("工单当前状态不允许审批");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 更新审批状态和工单状态
|
|
|
|
|
workOrder.setApproveStatus(approveStatus);
|
|
|
|
|
|
|
|
|
|
if (DmsConstants.DMS_BILLS_FAULT_INSTANCE_APPROVE_STATUS_APPROVED.equals(approveStatus)) {
|
|
|
|
|
// 审批通过：保持待维修状态
|
|
|
|
|
workOrder.setBillsStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_TO_REPAIR);
|
|
|
|
|
} else if (DmsConstants.DMS_BILLS_FAULT_INSTANCE_APPROVE_STATUS_REJECTED.equals(approveStatus)) {
|
|
|
|
|
// 审批拒绝：设置为维修完成状态（终止工单）
|
|
|
|
|
workOrder.setBillsStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_FINISH);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 先更新工单状态，确保业务数据一致性
|
|
|
|
|
boolean updateResult = baseMapper.updateById(workOrder) > 0;
|
|
|
|
|
|
|
|
|
|
if (!updateResult) {
|
|
|
|
|
throw new ServiceException("工单状态更新失败");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 业务状态更新成功后，再推进工作流
|
|
|
|
|
if (workOrder.getWfDefinitionId() != null) {
|
|
|
|
|
try {
|
|
|
|
|
// 获取当前任务ID
|
|
|
|
|
Long currentTaskId = remoteWorkflowService.getCurrentTaskIdByInstanceId(workOrder.getWfDefinitionId());
|
|
|
|
|
if (currentTaskId != null) {
|
|
|
|
|
RemoteCompleteTask remoteCompleteTask = new RemoteCompleteTask();
|
|
|
|
|
remoteCompleteTask.setTaskId(currentTaskId);
|
|
|
|
|
remoteCompleteTask.setMessage(message != null ? message : "审批完成");
|
|
|
|
|
|
|
|
|
|
// 设置消息类型
|
|
|
|
|
List<String> messageTypes = new ArrayList<>();
|
|
|
|
|
messageTypes.add("1"); // 站内信
|
|
|
|
|
remoteCompleteTask.setMessageType(messageTypes);
|
|
|
|
|
|
|
|
|
|
// 设置消息通知内容
|
|
|
|
|
if (DmsConstants.DMS_BILLS_FAULT_INSTANCE_APPROVE_STATUS_APPROVED.equals(approveStatus)) {
|
|
|
|
|
remoteCompleteTask.setNotice("故障报修工单审批通过，请及时处理，工单编号：" + workOrder.getBillsFaultCode());
|
|
|
|
|
} else {
|
|
|
|
|
remoteCompleteTask.setNotice("故障报修工单审批被拒绝，工单编号：" + workOrder.getBillsFaultCode());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 设置工作流变量 - approveStatus用于互斥网关判断
|
|
|
|
|
Map<String, Object> variables = new HashMap<>();
|
|
|
|
|
variables.put("approveStatus", approveStatus);
|
|
|
|
|
variables.put("businessId", repairInstanceId.toString());
|
|
|
|
|
|
|
|
|
|
remoteCompleteTask.setVariables(variables);
|
|
|
|
|
|
|
|
|
|
// 推进工作流
|
|
|
|
|
boolean workflowResult = remoteWorkflowService.completeTask(remoteCompleteTask);
|
|
|
|
|
if (!workflowResult) {
|
|
|
|
|
log.warn("工作流推进失败，但业务状态已更新成功，repairInstanceId: {}, approveStatus: {}",
|
|
|
|
|
repairInstanceId, approveStatus);
|
|
|
|
|
// 工作流推进失败不影响业务操作的成功
|
|
|
|
|
} else {
|
|
|
|
|
log.info("审批工单成功，repairInstanceId: {}, approveStatus: {}", repairInstanceId, approveStatus);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
log.warn("未找到当前活跃任务，跳过工作流推进，repairInstanceId: {}", repairInstanceId);
|
|
|
|
|
}
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
log.error("工作流推进异常，repairInstanceId: {}, approveStatus: {}", repairInstanceId, approveStatus, e);
|
|
|
|
|
// 工作流推进失败不影响业务操作的成功，但需要记录日志
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return updateResult;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 开始维修
|
|
|
|
|
*
|
|
|
|
|
* @param dmsFaultInstanceActivity 报修工单实例节点
|
|
|
|
|
* @return 结果
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@GlobalTransactional(rollbackFor = Exception.class)
|
|
|
|
|
public int startRepair(DmsFaultInstanceActivityBo dmsFaultInstanceActivity) {
|
|
|
|
|
// 根据维修实例ID查询故障实例信息
|
|
|
|
|
DmsBillsFaultInstance dmsBillsFaultInstance = baseMapper.selectById(dmsFaultInstanceActivity.getRepairInstanceId());
|
|
|
|
|
if (dmsBillsFaultInstance == null) {
|
|
|
|
|
throw new ServiceException("工单不存在");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 检查审批状态（按照PDA标准，只有状态为"2"审批成功才可以开始维修）
|
|
|
|
|
if (!DmsConstants.DMS_BILLS_FAULT_INSTANCE_APPROVE_STATUS_APPROVED.equals(dmsBillsFaultInstance.getApproveStatus())) {
|
|
|
|
|
throw new ServiceException("工单未审批通过，无法开始维修");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 检查工单状态
|
|
|
|
|
String dmsBillsStatus = dmsBillsFaultInstance.getBillsStatus();
|
|
|
|
|
if (!dmsBillsStatus.equals(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_TO_REPAIR)) {
|
|
|
|
|
throw new ServiceException("工单状态不允许开始维修");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 获取当前日期和登录用户名
|
|
|
|
|
Date currentDate = new Date();
|
|
|
|
|
String userName = LoginHelper.getLoginUser() == null ? LoginHelper.getUsername() : LoginHelper.getLoginUser().getNickname();
|
|
|
|
|
|
|
|
|
|
// 设置工单状态为维修中
|
|
|
|
|
dmsBillsFaultInstance.setBillsStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_REPAIRING);
|
|
|
|
|
// 设置实际开始时间
|
|
|
|
|
dmsBillsFaultInstance.setRealBeginTime(currentDate);
|
|
|
|
|
|
|
|
|
|
// 推进工作流
|
|
|
|
|
if (dmsBillsFaultInstance.getWfDefinitionId() != null) {
|
|
|
|
|
Long currentTaskId = remoteWorkflowService.getCurrentTaskIdByInstanceId(dmsBillsFaultInstance.getWfDefinitionId());
|
|
|
|
|
if (currentTaskId != null) {
|
|
|
|
|
RemoteCompleteTask remoteCompleteTask = new RemoteCompleteTask();
|
|
|
|
|
remoteCompleteTask.setTaskId(currentTaskId);
|
|
|
|
|
remoteCompleteTask.setMessage("开始维修");
|
|
|
|
|
List<String> messageTypes = new ArrayList<>();
|
|
|
|
|
messageTypes.add("1"); // 站内信
|
|
|
|
|
remoteCompleteTask.setMessageType(messageTypes);
|
|
|
|
|
remoteCompleteTask.setNotice("故障报修工单已开始维修，工单编号：" + dmsBillsFaultInstance.getBillsFaultCode());
|
|
|
|
|
boolean b = remoteWorkflowService.completeTask(remoteCompleteTask);
|
|
|
|
|
if (!b) {
|
|
|
|
|
throw new ServiceException("工作流推进失败");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 更新工单状态
|
|
|
|
|
baseMapper.updateById(dmsBillsFaultInstance);
|
|
|
|
|
|
|
|
|
|
// 设置维修实例活动记录
|
|
|
|
|
dmsFaultInstanceActivity.setRepairInstanceId(dmsBillsFaultInstance.getRepairInstanceId());
|
|
|
|
|
dmsFaultInstanceActivity.setMachineId(dmsBillsFaultInstance.getMachineId());
|
|
|
|
|
dmsFaultInstanceActivity.setProcessHandleStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_EXECUTING);
|
|
|
|
|
dmsFaultInstanceActivity.setProcessStepOrder(2L);
|
|
|
|
|
dmsFaultInstanceActivity.setStartTime(currentDate);
|
|
|
|
|
dmsFaultInstanceActivity.setHandleUserId(LoginHelper.getUserId());
|
|
|
|
|
dmsFaultInstanceActivity.setHandleBy(userName);
|
|
|
|
|
dmsFaultInstanceActivity.setHandleTime(currentDate);
|
|
|
|
|
|
|
|
|
|
// 【调试日志】打印传入的活动ID，以确认问题根源
|
|
|
|
|
log.info("调用startRepair时，从控制器传入的instanceActivityId为: {}", dmsFaultInstanceActivity.getInstanceActivityId());
|
|
|
|
|
|
|
|
|
|
// 【关键修复】在插入新的活动记录前，必须将ID设置为空。
|
|
|
|
|
// 这是因为传入的dmsFaultInstanceActivity对象可能包含了由PDA端getBillsFaultInstance4Repair接口返回的
|
|
|
|
|
// 第一个活动节点（process_step_order=1）的ID。如果不清空，MyBatis会尝试使用这个旧ID插入新记录，
|
|
|
|
|
// 如果instance_activity_id不是主键或唯一键，就会导致数据重复；如果是，则会抛出主键冲突异常。
|
|
|
|
|
dmsFaultInstanceActivity.setInstanceActivityId(null);
|
|
|
|
|
// 插入新的故障实例活动记录
|
|
|
|
|
boolean result = dmsFaultInstanceActivityService.insertByBo(dmsFaultInstanceActivity);
|
|
|
|
|
|
|
|
|
|
return result ? 1 : 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 完成维修
|
|
|
|
|
*
|
|
|
|
|
* @param dmsFaultInstanceActivity 报修工单实例节点
|
|
|
|
|
* @return 结果
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@GlobalTransactional(rollbackFor = Exception.class)
|
|
|
|
|
public int completeRepair(DmsFaultInstanceActivityBo dmsFaultInstanceActivity, List<MultipartFile> files) {
|
|
|
|
|
// 更新 dms_fault_instance_activity 表
|
|
|
|
|
DmsFaultInstanceActivity activity = new DmsFaultInstanceActivity();
|
|
|
|
|
activity.setInstanceActivityId(dmsFaultInstanceActivity.getInstanceActivityId());
|
|
|
|
|
activity.setProcessHandleStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_FINISH);
|
|
|
|
|
activity.setEndTime(new Date());
|
|
|
|
|
activity.setRepairer(LoginHelper.getLoginUser() == null ? LoginHelper.getUsername() : LoginHelper.getLoginUser().getNickname());
|
|
|
|
|
dmsFaultInstanceActivityMapper.updateById(activity);
|
|
|
|
|
|
|
|
|
|
// 批量保存处理的零部件
|
|
|
|
|
List<DmsFaultComponentsParts> parts = dmsFaultInstanceActivity.getParts();
|
|
|
|
|
if (parts != null && !parts.isEmpty()) {
|
|
|
|
|
parts.forEach(part -> {
|
|
|
|
|
part.setRepairInstanceId(dmsFaultInstanceActivity.getRepairInstanceId());
|
|
|
|
|
dmsFaultComponentsPartsMapper.insert(part);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 处理文件上传
|
|
|
|
|
if (files != null && !files.isEmpty()) {
|
|
|
|
|
List<DmsInstanceFile> fileList = new ArrayList<>();
|
|
|
|
|
for (MultipartFile file : files) {
|
|
|
|
|
try {
|
|
|
|
|
RemoteFile remoteFile = remoteFileService.upload(file.getName(), file.getOriginalFilename(), file.getContentType(), file.getBytes());
|
|
|
|
|
DmsInstanceFile instanceFile = new DmsInstanceFile();
|
|
|
|
|
instanceFile.setTargetId(dmsFaultInstanceActivity.getInstanceActivityId());
|
|
|
|
|
instanceFile.setFilePath(remoteFile.getUrl());
|
|
|
|
|
instanceFile.setTargetType("1"); // 维修完成图片
|
|
|
|
|
fileList.add(instanceFile);
|
|
|
|
|
dmsInstanceFileMapper.insert(instanceFile);
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
throw new ServiceException("文件上传失败");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 更新 dms_bills_fault_instance 表
|
|
|
|
|
DmsBillsFaultInstance instance = baseMapper.selectById(dmsFaultInstanceActivity.getRepairInstanceId());
|
|
|
|
|
if (instance == null) {
|
|
|
|
|
throw new ServiceException("工单不存在: " + dmsFaultInstanceActivity.getRepairInstanceId());
|
|
|
|
|
}
|
|
|
|
|
instance.setBillsStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_FINISH);
|
|
|
|
|
instance.setRealEndTime(new Date());
|
|
|
|
|
instance.setRepairConfirm("0"); // 设置为待确认状态
|
|
|
|
|
baseMapper.updateById(instance);
|
|
|
|
|
|
|
|
|
|
// 推进工作流
|
|
|
|
|
if (instance.getWfDefinitionId() != null) {
|
|
|
|
|
Long currentTaskId = remoteWorkflowService.getCurrentTaskIdByInstanceId(instance.getWfDefinitionId());
|
|
|
|
|
if (currentTaskId != null) {
|
|
|
|
|
RemoteCompleteTask remoteCompleteTask = new RemoteCompleteTask();
|
|
|
|
|
remoteCompleteTask.setTaskId(currentTaskId);
|
|
|
|
|
remoteCompleteTask.setMessage("完成维修");
|
|
|
|
|
List<String> messageTypes = new ArrayList<>();
|
|
|
|
|
messageTypes.add("1"); // 站内信
|
|
|
|
|
remoteCompleteTask.setMessageType(messageTypes);
|
|
|
|
|
remoteCompleteTask.setNotice("故障报修工单维修完成，待主管确认，工单编号：" + instance.getBillsFaultCode());
|
|
|
|
|
boolean b = remoteWorkflowService.completeTask(remoteCompleteTask);
|
|
|
|
|
if (!b) {
|
|
|
|
|
throw new ServiceException("工作流推进失败");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 主管确认维修结果
|
|
|
|
|
*
|
|
|
|
|
* @param repairInstanceId 工单ID
|
|
|
|
|
* @param confirmResult 确认结果（1-确认通过，2-确认不通过）
|
|
|
|
|
* @param confirmUser 确认人
|
|
|
|
|
* @return 是否确认成功
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@GlobalTransactional(rollbackFor = Exception.class)
|
|
|
|
|
public Boolean confirmRepairResult(Long repairInstanceId, String confirmResult, String confirmUser) {
|
|
|
|
|
// 查询工单信息
|
|
|
|
|
DmsBillsFaultInstance workOrder = baseMapper.selectById(repairInstanceId);
|
|
|
|
|
if (workOrder == null) {
|
|
|
|
|
throw new ServiceException("工单不存在");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 检查当前状态是否可以确认
|
|
|
|
|
if (!DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_FINISH.equals(workOrder.getBillsStatus())) {
|
|
|
|
|
throw new ServiceException("工单尚未完成维修，无法确认");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!"0".equals(workOrder.getRepairConfirm())) {
|
|
|
|
|
throw new ServiceException("工单已经确认过了");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 根据确认结果设置不同的业务状态
|
|
|
|
|
if ("1".equals(confirmResult)) {
|
|
|
|
|
// 确认通过：完成工单
|
|
|
|
|
workOrder.setRepairConfirm(confirmResult);
|
|
|
|
|
workOrder.setConfirmUser(confirmUser != null ? confirmUser : LoginHelper.getUsername());
|
|
|
|
|
workOrder.setConfirmTime(new Date());
|
|
|
|
|
} else {
|
|
|
|
|
// 确认不通过：返回到维修环节，重置相关状态
|
|
|
|
|
workOrder.setRepairConfirm(confirmResult);
|
|
|
|
|
workOrder.setConfirmUser(confirmUser != null ? confirmUser : LoginHelper.getUsername());
|
|
|
|
|
workOrder.setConfirmTime(new Date());
|
|
|
|
|
// 重置工单状态为待维修，让维修人员重新维修
|
|
|
|
|
workOrder.setBillsStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_TO_REPAIR);
|
|
|
|
|
// 清空实际结束时间，因为需要重新维修
|
|
|
|
|
workOrder.setRealEndTime(null);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 推进工作流：业务状态和工作流分支变量分离处理
|
|
|
|
|
if (workOrder.getWfDefinitionId() != null) {
|
|
|
|
|
Long currentTaskId = remoteWorkflowService.getCurrentTaskIdByInstanceId(workOrder.getWfDefinitionId());
|
|
|
|
|
if (currentTaskId != null) {
|
|
|
|
|
RemoteCompleteTask remoteCompleteTask = new RemoteCompleteTask();
|
|
|
|
|
remoteCompleteTask.setTaskId(currentTaskId);
|
|
|
|
|
|
|
|
|
|
// 设置工作流变量 - 用于互斥网关判断分支走向
|
|
|
|
|
Map<String, Object> variables = new HashMap<>();
|
|
|
|
|
if ("1".equals(confirmResult)) {
|
|
|
|
|
// 确认通过：工作流分支变量=0（走确认通过分支，结束流程）
|
|
|
|
|
remoteCompleteTask.setMessage("主管确认通过，工单完成");
|
|
|
|
|
variables.put("repairConfirm", "0");
|
|
|
|
|
} else {
|
|
|
|
|
// 确认不通过：工作流分支变量=1（走确认不通过分支，返回维修环节）
|
|
|
|
|
remoteCompleteTask.setMessage("主管确认不通过，返回维修环节");
|
|
|
|
|
variables.put("repairConfirm", "1");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
variables.put("businessId", repairInstanceId.toString());
|
|
|
|
|
remoteCompleteTask.setVariables(variables);
|
|
|
|
|
|
|
|
|
|
List<String> messageTypes = new ArrayList<>();
|
|
|
|
|
messageTypes.add("1"); // 站内信
|
|
|
|
|
remoteCompleteTask.setMessageType(messageTypes);
|
|
|
|
|
|
|
|
|
|
// 设置消息通知内容
|
|
|
|
|
if ("1".equals(confirmResult)) {
|
|
|
|
|
remoteCompleteTask.setNotice("故障报修工单已完成，工单编号：" + workOrder.getBillsFaultCode());
|
|
|
|
|
} else {
|
|
|
|
|
remoteCompleteTask.setNotice("故障报修工单确认不通过，需重新维修，工单编号：" + workOrder.getBillsFaultCode());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
boolean workflowResult = remoteWorkflowService.completeTask(remoteCompleteTask);
|
|
|
|
|
if (!workflowResult) {
|
|
|
|
|
log.warn("工作流推进失败，但业务状态已更新成功，repairInstanceId: {}, confirmResult: {}",
|
|
|
|
|
repairInstanceId, confirmResult);
|
|
|
|
|
} else {
|
|
|
|
|
log.info("主管确认完成，工作流推进成功，repairInstanceId: {}, confirmResult: {}",
|
|
|
|
|
repairInstanceId, confirmResult);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return baseMapper.updateById(workOrder) > 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 更新工作流
|
|
|
|
|
* @param dmsBillsFaultInstance
|
|
|
|
|
* @param dmsBillsFaultInstance 工单实例
|
|
|
|
|
* @param taskId 任务ID
|
|
|
|
|
* @param processInstanceId 流程实例ID
|
|
|
|
|
* @return 是否更新成功
|
|
|
|
|
*/
|
|
|
|
|
private Boolean updateWorkFlow(DmsBillsFaultInstance dmsBillsFaultInstance, Long taskId){
|
|
|
|
|
dmsBillsFaultInstance.setWfDefinitionId(taskId);
|
|
|
|
|
private Boolean updateWorkFlow(DmsBillsFaultInstance dmsBillsFaultInstance, Long taskId, Long processInstanceId){
|
|
|
|
|
try {
|
|
|
|
|
// 1. 首先更新工单的工作流实例ID，确保关联关系建立
|
|
|
|
|
dmsBillsFaultInstance.setWfDefinitionId(processInstanceId);
|
|
|
|
|
boolean updateResult = baseMapper.updateById(dmsBillsFaultInstance) > 0;
|
|
|
|
|
|
|
|
|
|
if (!updateResult) {
|
|
|
|
|
log.error("更新工单工作流实例ID失败，repairInstanceId: {}, processInstanceId: {}",
|
|
|
|
|
dmsBillsFaultInstance.getRepairInstanceId(), processInstanceId);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
log.info("成功更新工单工作流实例ID，repairInstanceId: {}, processInstanceId: {}",
|
|
|
|
|
dmsBillsFaultInstance.getRepairInstanceId(), processInstanceId);
|
|
|
|
|
|
|
|
|
|
// 2. 然后推进工作流（工单创建后自动推进到审批节点）
|
|
|
|
|
RemoteCompleteTask remoteCompleteTask = new RemoteCompleteTask();
|
|
|
|
|
// 必填字段
|
|
|
|
|
remoteCompleteTask.setTaskId(taskId);
|
|
|
|
|
remoteCompleteTask.setMessage("自动推进");
|
|
|
|
|
// 关键：设置messageType为非null的List（解决原始错误）
|
|
|
|
|
remoteCompleteTask.setMessage("工单创建完成，自动推进到审批节点");
|
|
|
|
|
|
|
|
|
|
// 设置消息类型
|
|
|
|
|
List<String> messageTypes = new ArrayList<>();
|
|
|
|
|
messageTypes.add("system"); // 系统消息
|
|
|
|
|
messageTypes.add("1"); // 站内信
|
|
|
|
|
remoteCompleteTask.setMessageType(messageTypes);
|
|
|
|
|
boolean b = remoteWorkflowService.completeTask(remoteCompleteTask);
|
|
|
|
|
if (!b) {
|
|
|
|
|
|
|
|
|
|
// 设置消息通知内容
|
|
|
|
|
remoteCompleteTask.setNotice("您有新的故障报修工单需要审批，工单编号：" + dmsBillsFaultInstance.getBillsFaultCode());
|
|
|
|
|
|
|
|
|
|
// 设置工作流变量（如果需要）
|
|
|
|
|
Map<String, Object> variables = new HashMap<>();
|
|
|
|
|
variables.put("businessId", dmsBillsFaultInstance.getRepairInstanceId().toString());
|
|
|
|
|
variables.put("initiator", LoginHelper.getUsername());
|
|
|
|
|
remoteCompleteTask.setVariables(variables);
|
|
|
|
|
|
|
|
|
|
boolean completeResult = remoteWorkflowService.completeTask(remoteCompleteTask);
|
|
|
|
|
|
|
|
|
|
if (!completeResult) {
|
|
|
|
|
log.error("工作流推进失败，repairInstanceId: {}, taskId: {}",
|
|
|
|
|
dmsBillsFaultInstance.getRepairInstanceId(), taskId);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
log.info("工作流推进成功，repairInstanceId: {}, taskId: {}",
|
|
|
|
|
dmsBillsFaultInstance.getRepairInstanceId(), taskId);
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
log.error("更新工作流异常，repairInstanceId: {}, taskId: {}, processInstanceId: {}",
|
|
|
|
|
dmsBillsFaultInstance.getRepairInstanceId(), taskId, processInstanceId, e);
|
|
|
|
|
return false;
|
|
|
|
|
}else {
|
|
|
|
|
return baseMapper.updateById(dmsBillsFaultInstance) > 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -361,44 +772,101 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public DmsBillsFaultInstanceVo selectDmsBillsFaultInstanceByRepairInstanceId(Long repairInstanceId) {
|
|
|
|
|
// 根据repairInstanceId查询故障实例及其关联的设备和第一条活动记录
|
|
|
|
|
DmsBillsFaultInstanceVo dmsBillsFaultInstance = baseMapper.selectFaultInstanceJoinFirstAndDeviceById(repairInstanceId);
|
|
|
|
|
// 创建实例文件查询对象
|
|
|
|
|
DmsInstanceFileBo queryInstanceFile = new DmsInstanceFileBo();
|
|
|
|
|
// 设置目标类型为故障实例活动
|
|
|
|
|
queryInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY);
|
|
|
|
|
// 设置目标ID为故障实例的活动ID
|
|
|
|
|
queryInstanceFile.setTargetId(dmsBillsFaultInstance.getInstanceActivityId());
|
|
|
|
|
// 查询实例文件列表
|
|
|
|
|
List<DmsInstanceFileVo> dmsInstanceFiles = DmsInstanceFileService.queryList(queryInstanceFile);
|
|
|
|
|
try {
|
|
|
|
|
// 根据repairInstanceId查询故障实例及其关联的设备和第一条活动记录
|
|
|
|
|
DmsBillsFaultInstanceVo dmsBillsFaultInstance = baseMapper.selectFaultInstanceJoinFirstAndDeviceById(repairInstanceId);
|
|
|
|
|
|
|
|
|
|
// 遍历实例文件列表FIXME
|
|
|
|
|
for (DmsInstanceFileVo dmsInstanceFile : dmsInstanceFiles){
|
|
|
|
|
// 获取文件路径
|
|
|
|
|
String filePath = dmsInstanceFile.getFilePath();
|
|
|
|
|
// 如果文件路径不包含"9005"
|
|
|
|
|
if(!filePath.contains("9005")){
|
|
|
|
|
// 如果文件路径包含"https"，将其替换为"http"
|
|
|
|
|
if(filePath.contains("https")){
|
|
|
|
|
filePath.replaceFirst("https","http");
|
|
|
|
|
}
|
|
|
|
|
// 找到"/statics"的索引位置
|
|
|
|
|
int index= filePath.indexOf("/statics");
|
|
|
|
|
// 修改文件路径为新的地址
|
|
|
|
|
filePath = "http://118.25.106.99:9005"+filePath.substring(index);
|
|
|
|
|
// 设置新的URL和文件路径
|
|
|
|
|
dmsInstanceFile.setFilePath(filePath);
|
|
|
|
|
}else{
|
|
|
|
|
// 如果文件路径包含"9005"，直接设置URL为文件路径
|
|
|
|
|
dmsInstanceFile.setFilePath(dmsInstanceFile.getFilePath());
|
|
|
|
|
if (dmsBillsFaultInstance == null) {
|
|
|
|
|
throw new ServiceException("工单不存在，repairInstanceId: " + repairInstanceId);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
List<DmsInstanceFile> InstanceFiles = MapstructUtils.convert(dmsInstanceFiles, DmsInstanceFile.class);
|
|
|
|
|
// 将修改后的实例文件列表设置到故障实例中
|
|
|
|
|
dmsBillsFaultInstance.setDmsInstanceFiles(InstanceFiles);
|
|
|
|
|
|
|
|
|
|
// 返回故障实例对象
|
|
|
|
|
return dmsBillsFaultInstance;
|
|
|
|
|
// 【调试日志】输出查询结果，确认outsourcingId是否正确获取
|
|
|
|
|
log.info("查询工单详情，repairInstanceId: {}, outsourcingId: {}, instanceActivityId: {}",
|
|
|
|
|
repairInstanceId, dmsBillsFaultInstance.getOutsourcingId(), dmsBillsFaultInstance.getInstanceActivityId());
|
|
|
|
|
|
|
|
|
|
// 【关键修复】查询零部件信息，确保PDA端兼容性
|
|
|
|
|
List<DmsFaultComponentsPartsVo> partsVoList = baseMapper.selectParts(repairInstanceId);
|
|
|
|
|
if (partsVoList == null) {
|
|
|
|
|
partsVoList = new ArrayList<>(); // 确保不为null
|
|
|
|
|
}
|
|
|
|
|
// 转换为实体对象并设置到工单中
|
|
|
|
|
List<DmsFaultComponentsParts> partsList = MapstructUtils.convert(partsVoList, DmsFaultComponentsParts.class);
|
|
|
|
|
dmsBillsFaultInstance.setParts(partsList);
|
|
|
|
|
|
|
|
|
|
// 创建实例文件查询对象
|
|
|
|
|
DmsInstanceFileBo queryInstanceFile = new DmsInstanceFileBo();
|
|
|
|
|
// 设置目标类型为故障实例活动
|
|
|
|
|
queryInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY);
|
|
|
|
|
// 设置目标ID为故障实例的活动ID
|
|
|
|
|
queryInstanceFile.setTargetId(dmsBillsFaultInstance.getInstanceActivityId());
|
|
|
|
|
// 查询实例文件列表
|
|
|
|
|
List<DmsInstanceFileVo> dmsInstanceFiles = DmsInstanceFileService.queryList(queryInstanceFile);
|
|
|
|
|
|
|
|
|
|
// 遍历实例文件列表FIXME
|
|
|
|
|
for (DmsInstanceFileVo dmsInstanceFile : dmsInstanceFiles){
|
|
|
|
|
// 获取文件路径
|
|
|
|
|
String filePath = dmsInstanceFile.getFilePath();
|
|
|
|
|
// 如果文件路径不包含"9005"
|
|
|
|
|
if(!filePath.contains("9005")){
|
|
|
|
|
// 如果文件路径包含"https"，将其替换为"http"
|
|
|
|
|
if(filePath.contains("https")){
|
|
|
|
|
filePath.replaceFirst("https","http");
|
|
|
|
|
}
|
|
|
|
|
// 找到"/statics"的索引位置
|
|
|
|
|
int index= filePath.indexOf("/statics");
|
|
|
|
|
// 修改文件路径为新的地址
|
|
|
|
|
filePath = "http://118.25.106.99:9005"+filePath.substring(index);
|
|
|
|
|
// 设置新的URL和文件路径
|
|
|
|
|
dmsInstanceFile.setFilePath(filePath);
|
|
|
|
|
}else{
|
|
|
|
|
// 如果文件路径包含"9005"，直接设置URL为文件路径
|
|
|
|
|
dmsInstanceFile.setFilePath(dmsInstanceFile.getFilePath());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
List<DmsInstanceFile> InstanceFiles = MapstructUtils.convert(dmsInstanceFiles, DmsInstanceFile.class);
|
|
|
|
|
// 将修改后的实例文件列表设置到故障实例中
|
|
|
|
|
dmsBillsFaultInstance.setDmsInstanceFiles(InstanceFiles);
|
|
|
|
|
|
|
|
|
|
// 返回故障实例对象
|
|
|
|
|
return dmsBillsFaultInstance;
|
|
|
|
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
log.error("查询工单详情异常，repairInstanceId: {}", repairInstanceId, e);
|
|
|
|
|
|
|
|
|
|
// 如果是查询返回多条记录的异常，尝试备用查询方案
|
|
|
|
|
if (e.getMessage() != null && e.getMessage().contains("Expected one result")) {
|
|
|
|
|
log.warn("检测到查询返回多条记录异常，尝试备用查询方案，repairInstanceId: {}", repairInstanceId);
|
|
|
|
|
|
|
|
|
|
// 备用方案：查询工单基本信息和最新的活动记录
|
|
|
|
|
DmsBillsFaultInstanceVo workOrder = baseMapper.selectVoById(repairInstanceId);
|
|
|
|
|
if (workOrder != null) {
|
|
|
|
|
// 查询最新的活动记录
|
|
|
|
|
MPJLambdaWrapper<DmsFaultInstanceActivity> wrapper = JoinWrappers.lambda(DmsFaultInstanceActivity.class)
|
|
|
|
|
.eq(DmsFaultInstanceActivity::getRepairInstanceId, repairInstanceId)
|
|
|
|
|
.orderByDesc(DmsFaultInstanceActivity::getProcessStepOrder)
|
|
|
|
|
.orderByDesc(DmsFaultInstanceActivity::getInstanceActivityId)
|
|
|
|
|
.last("LIMIT 1");
|
|
|
|
|
DmsFaultInstanceActivity latestActivity = dmsFaultInstanceActivityMapper.selectOne(wrapper);
|
|
|
|
|
|
|
|
|
|
if (latestActivity != null) {
|
|
|
|
|
// 设置活动相关信息
|
|
|
|
|
workOrder.setInstanceActivityId(latestActivity.getInstanceActivityId());
|
|
|
|
|
workOrder.setFaultType(latestActivity.getFaultType());
|
|
|
|
|
workOrder.setFaultDescription(latestActivity.getFaultDescription());
|
|
|
|
|
workOrder.setDesignOperations(latestActivity.getDesignOperations());
|
|
|
|
|
workOrder.setRepairType(latestActivity.getRepairType());
|
|
|
|
|
workOrder.setOutsourcingId(latestActivity.getOutsourcingId());
|
|
|
|
|
workOrder.setProcessHandleResolution(latestActivity.getProcessHandleResolution());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
log.info("备用查询方案成功，repairInstanceId: {}, instanceActivityId: {}",
|
|
|
|
|
repairInstanceId, workOrder.getInstanceActivityId());
|
|
|
|
|
return workOrder;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
throw new ServiceException("查询工单详情失败：" + e.getMessage());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -481,201 +949,6 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 开始维修
|
|
|
|
|
*
|
|
|
|
|
* @param dmsFaultInstanceActivity 报修工单实例节点
|
|
|
|
|
* @return 结果
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@GlobalTransactional(rollbackFor = Exception.class)
|
|
|
|
|
public int startRepair(DmsFaultInstanceActivityBo dmsFaultInstanceActivity) {
|
|
|
|
|
// 定义一个布尔变量b，用于存储更新结果
|
|
|
|
|
Boolean b = false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 根据维修实例ID查询故障实例信息
|
|
|
|
|
DmsBillsFaultInstance dmsBillsFaultInstance = baseMapper
|
|
|
|
|
.selectFaultInstanceJoinFirstById(dmsFaultInstanceActivity.getRepairInstanceId());//join 第一步activity
|
|
|
|
|
// 获取工单状态
|
|
|
|
|
String dmsBillsStatus = dmsBillsFaultInstance.getBillsStatus();
|
|
|
|
|
// 如果工单状态为已完成，抛出异常
|
|
|
|
|
if (dmsBillsStatus.equals(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_FINISH)) {//维修完成
|
|
|
|
|
throw new ServiceException("已经维修完成");
|
|
|
|
|
}
|
|
|
|
|
// 获取当前日期和登录用户名
|
|
|
|
|
Date currentDate = new Date();
|
|
|
|
|
String userName = LoginHelper.getLoginUser()==null ? LoginHelper.getUsername() :LoginHelper.getLoginUser().getNickname();
|
|
|
|
|
|
|
|
|
|
// 如果工单状态为待维修
|
|
|
|
|
if (dmsBillsStatus.equals(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_TO_REPAIR)) {//待维修
|
|
|
|
|
// 设置工单状态为维修中
|
|
|
|
|
dmsBillsFaultInstance.setBillsStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_REPAIRING);
|
|
|
|
|
// 设置实际开始时间
|
|
|
|
|
dmsBillsFaultInstance.setRealBeginTime(currentDate);
|
|
|
|
|
//启动工作流
|
|
|
|
|
Long taskId = getOrCreateTaskId(dmsBillsFaultInstance);
|
|
|
|
|
|
|
|
|
|
// ** 异步线程上下文传递【核心问题】 **
|
|
|
|
|
// 在主线程中，用户的登录信息(Token)是存放在一个叫 ThreadLocal 的"线程口袋"里的。
|
|
|
|
|
// 当我们使用 CompletableFuture.runAsync() 开启一个异步线程（子线程）时，
|
|
|
|
|
// 这个"口袋"里的东西默认是不会被带到子线程去的。
|
|
|
|
|
//
|
|
|
|
|
// ** 【解决方案】 **
|
|
|
|
|
// 1. 【捕获Token】: 在主线程里，我们先用 StpUtil.getTokenValue() 把Token拿出来，存好。
|
|
|
|
|
final String tokenValue = StpUtil.getTokenValue();
|
|
|
|
|
// 2. 【传递与恢复】: 使用 TtlRunnable (TransmittableThreadLocal Runnable) 包装我们的异步任务。
|
|
|
|
|
// 它就像一个特殊的"接力棒"，能在线程切换时把主线程"口袋"里的东西（包括Token）传递给子线程。
|
|
|
|
|
CompletableFuture.runAsync(TtlRunnable.get(() -> {
|
|
|
|
|
try {
|
|
|
|
|
// 3. 【设置上下文】: 在子线程任务开始时，立刻用 StpUtil.setTokenValue() 把传递过来的Token放进子线程自己的"口袋"。
|
|
|
|
|
StpUtil.setTokenValue(tokenValue);
|
|
|
|
|
// 4. 【执行业务】: 现在子线程就像登录过一样，可以带着Token去调用其他需要权限的服务了。
|
|
|
|
|
updateWorkFlow(dmsBillsFaultInstance, taskId);
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
// 简单记录错误，不影响主流程
|
|
|
|
|
System.err.println("异步更新工作流失败，repairInstanceId: " + dmsBillsFaultInstance.getRepairInstanceId() + ", 错误: " + e.getMessage());
|
|
|
|
|
// 可以考虑记录到失败表，后续补偿处理
|
|
|
|
|
}
|
|
|
|
|
}));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 设置维修实例ID
|
|
|
|
|
dmsFaultInstanceActivity.setRepairInstanceId(dmsBillsFaultInstance.getRepairInstanceId());
|
|
|
|
|
// FIXME: 工作流相关代码（暂时注释掉）
|
|
|
|
|
// dmsFaultInstanceActivity.setProcessActivityId(WfConstants.WF_BILLS_FAULT_INSTANCE_PROCESS_ACTIVITY_SECOND_ID);
|
|
|
|
|
|
|
|
|
|
// 设置机器ID
|
|
|
|
|
dmsFaultInstanceActivity.setMachineId(dmsBillsFaultInstance.getMachineId());
|
|
|
|
|
// 设置处理状态为执行中
|
|
|
|
|
dmsFaultInstanceActivity.setProcessHandleStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_EXECUTING);
|
|
|
|
|
// 设置步骤顺序
|
|
|
|
|
dmsFaultInstanceActivity.setProcessStepOrder(2L);
|
|
|
|
|
// 设置开始时间
|
|
|
|
|
dmsFaultInstanceActivity.setStartTime(currentDate);
|
|
|
|
|
// 设置处理用户ID
|
|
|
|
|
dmsFaultInstanceActivity.setHandleUserId(LoginHelper.getUserId());
|
|
|
|
|
// 设置处理人名称
|
|
|
|
|
dmsFaultInstanceActivity.setHandleBy(userName);
|
|
|
|
|
// 设置处理时间
|
|
|
|
|
dmsFaultInstanceActivity.setHandleTime(currentDate);
|
|
|
|
|
|
|
|
|
|
// 插入新的故障实例活动记录
|
|
|
|
|
b = dmsFaultInstanceActivityService.insertByBo(dmsFaultInstanceActivity);
|
|
|
|
|
|
|
|
|
|
// 创建第一个实例活动对象并设置其属性
|
|
|
|
|
DmsFaultInstanceActivityBo firstInstanceActivity = new DmsFaultInstanceActivityBo();
|
|
|
|
|
firstInstanceActivity.setInstanceActivityId(dmsBillsFaultInstance.getInstanceActivityId());
|
|
|
|
|
// 设置处理状态为已完成
|
|
|
|
|
firstInstanceActivity.setProcessHandleStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_FINISH);
|
|
|
|
|
// 设置结束时间
|
|
|
|
|
firstInstanceActivity.setEndTime(currentDate);
|
|
|
|
|
// FIXME: 需重新梳理代码dmsFaultInstanceActivityService
|
|
|
|
|
// 更新第一个实例活动记录
|
|
|
|
|
dmsFaultInstanceActivityService.updateByBo(firstInstanceActivity);
|
|
|
|
|
|
|
|
|
|
} else {// 如果工单状态为维修中
|
|
|
|
|
// 更新故障实例活动记录
|
|
|
|
|
b = dmsFaultInstanceActivityService.updateByBo(dmsFaultInstanceActivity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 返回结果1表示成功
|
|
|
|
|
return b ? 1 : 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// startRepair方法内提取的获取或创建taskId的方法
|
|
|
|
|
private Long getOrCreateTaskId(DmsBillsFaultInstance dmsBillsFaultInstance) {
|
|
|
|
|
Long taskId = dmsBillsFaultInstance.getWfDefinitionId();
|
|
|
|
|
if (StringUtils.isNull(taskId)) {
|
|
|
|
|
// 启动工作流
|
|
|
|
|
RemoteStartProcess startProcess = new RemoteStartProcess();
|
|
|
|
|
startProcess.setFlowCode(DmsConstants.DMS_BILLS_FAULT_INSTANCE_WF_CODE);
|
|
|
|
|
String businessId = dmsBillsFaultInstance.getRepairInstanceId().toString();
|
|
|
|
|
startProcess.setBusinessId(businessId);
|
|
|
|
|
RemoteStartProcessReturn remoteStartProcessReturn = remoteWorkflowService.startWorkFlow(startProcess);
|
|
|
|
|
taskId = remoteStartProcessReturn.getTaskId();
|
|
|
|
|
if (StringUtils.isNull(taskId)) {
|
|
|
|
|
throw new ServiceException("流程启动失败");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return taskId;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 完成维修
|
|
|
|
|
*
|
|
|
|
|
* @param dmsFaultInstanceActivity 报修工单实例节点
|
|
|
|
|
* @return 结果
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@GlobalTransactional(rollbackFor = Exception.class)
|
|
|
|
|
public int completeRepair(DmsFaultInstanceActivityBo dmsFaultInstanceActivity) {
|
|
|
|
|
// 批量插入实例的附件文件信息
|
|
|
|
|
batchInsertInstanceAfterFiles(dmsFaultInstanceActivity.getFileUrls(),dmsFaultInstanceActivity.getInstanceActivityId());
|
|
|
|
|
// 获取需要插入的备件列表
|
|
|
|
|
List<DmsFaultComponentsParts> parts = dmsFaultInstanceActivity.getParts();
|
|
|
|
|
// 如果备件列表不为空，则设置每个备件的故障ID并插入数据库
|
|
|
|
|
if (!CollectionUtils.isEmpty(parts)){
|
|
|
|
|
for (DmsFaultComponentsParts part : parts) {
|
|
|
|
|
part.setFaultId(dmsFaultInstanceActivity.getRepairInstanceId());
|
|
|
|
|
}
|
|
|
|
|
dmsFaultInstanceActivityMapper.insertParts(parts);
|
|
|
|
|
}
|
|
|
|
|
// 根据维修实例ID查询对应的工单实例
|
|
|
|
|
DmsBillsFaultInstanceVo dmsBillsFaultInstance = this.
|
|
|
|
|
queryById(dmsFaultInstanceActivity.getRepairInstanceId());
|
|
|
|
|
|
|
|
|
|
// 获取当前工单的状态
|
|
|
|
|
String dmsBillsStatus = dmsBillsFaultInstance.getBillsStatus();
|
|
|
|
|
// 如果状态为已完成，抛出异常提示已经维修完成
|
|
|
|
|
if (dmsBillsStatus.equals(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_FINISH)) {//维修完成
|
|
|
|
|
throw new ServiceException("已经维修完成");
|
|
|
|
|
}
|
|
|
|
|
// 如果状态为待维修，抛出异常提示请先开始维修
|
|
|
|
|
if (dmsBillsStatus.equals(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_TO_REPAIR)) {//待维修
|
|
|
|
|
throw new ServiceException("请先开始维修");
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
// 获取当前日期和时间
|
|
|
|
|
Date currentDate = new Date();
|
|
|
|
|
// 获取当前登录用户的用户名或昵称
|
|
|
|
|
String userName = LoginHelper.getLoginUser()==null ? LoginHelper.getUsername() :LoginHelper.getLoginUser().getNickname();
|
|
|
|
|
// 设置工单状态为已完成，并记录实际结束时间
|
|
|
|
|
dmsBillsFaultInstance.setBillsStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_FINISH);
|
|
|
|
|
dmsBillsFaultInstance.setRealEndTime(currentDate);
|
|
|
|
|
// 将工单实例转换为数据库实体对象并更新数据库
|
|
|
|
|
DmsBillsFaultInstance faultInstance = MapstructUtils.convert(dmsBillsFaultInstance, DmsBillsFaultInstance.class);
|
|
|
|
|
|
|
|
|
|
if(StringUtils.isNull(dmsBillsFaultInstance.getWfDefinitionId())){
|
|
|
|
|
throw new ServiceException("流程未启动");
|
|
|
|
|
}else{
|
|
|
|
|
//FIXME:完成第一步，待测试待完善
|
|
|
|
|
RemoteCompleteTask remoteCompleteTask = new RemoteCompleteTask();
|
|
|
|
|
remoteCompleteTask.setTaskId(dmsBillsFaultInstance.getWfDefinitionId());
|
|
|
|
|
remoteCompleteTask.setMessage("同意");
|
|
|
|
|
remoteWorkflowService.completeTask(remoteCompleteTask);
|
|
|
|
|
|
|
|
|
|
baseMapper.updateById(faultInstance);
|
|
|
|
|
|
|
|
|
|
// 设置工单活动状态为已完成，并记录结束时间和维修人员
|
|
|
|
|
dmsFaultInstanceActivity.setProcessHandleStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_FINISH);
|
|
|
|
|
dmsFaultInstanceActivity.setEndTime(currentDate);
|
|
|
|
|
dmsFaultInstanceActivity.setRepairer(userName);
|
|
|
|
|
// 将工单活动实例转换为数据库实体对象并更新数据库
|
|
|
|
|
DmsFaultInstanceActivity faultInstanceActivity = MapstructUtils.convert(dmsFaultInstanceActivity, DmsFaultInstanceActivity.class);
|
|
|
|
|
int i = dmsFaultInstanceActivityMapper.updateById(faultInstanceActivity);
|
|
|
|
|
|
|
|
|
|
// 返回更新操作影响的行数
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void batchInsertInstanceAfterFiles(List<String> fileUrls, Long instanceActivityId) {
|
|
|
|
|
// 判断文件URL列表是否不为空且非空集合
|
|
|
|
|
if (fileUrls != null && !fileUrls.isEmpty()) {
|
|
|
|
|
|
