diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index a40e75a..93901d9 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -13,13 +13,15 @@ + + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index a40e75a..93901d9 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -13,13 +13,15 @@ + + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index 832e87a..fc87bef 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -96,14 +96,15 @@ /** * 业务表主键，前端跳转审批详情使用 */ - @TableField(exist = false) + @TableField("business_id") private String businessId; /** * 流程实例id，前端跳转审批详情使用 */ - @TableField(exist = false) + @TableField("process_id") private String processId; + /** * 前端跳转审批详情使用 */ diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index a40e75a..93901d9 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -13,13 +13,15 @@ + + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index 832e87a..fc87bef 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -96,14 +96,15 @@ /** * 业务表主键，前端跳转审批详情使用 */ - @TableField(exist = false) + @TableField("business_id") private String businessId; /** * 流程实例id，前端跳转审批详情使用 */ - @TableField(exist = false) + @TableField("process_id") private String processId; + /** * 前端跳转审批详情使用 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/flowable/ProcessUpdateStateListener.java index afb74e8..89b1887 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/flowable/ProcessUpdateStateListener.java @@ -37,7 +37,7 @@ RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class); RuntimeService runtimeService = SpringContextUtil.getBean(RuntimeService.class); SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class); - System.err.println("审批通过触发监听器:" + execution); + System.out.println("审批通过触发监听器:" + execution); ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId()); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("pro_def_id", processDefinition.getKey()); @@ -77,6 +77,8 @@ WorkbenchApprovalMessage approvalMessage = new WorkbenchApprovalMessage(); approvalMessage.setNoticeId(rootId); approvalMessage.setNoticeDeptId(user.getDeptId()); + approvalMessage.setBusinessId(execution.getProcessInstanceBusinessKey()); + approvalMessage.setProcessId(execution.getProcessInstanceId()); approvalMessage.setMessageTitle("结果通知"); approvalMessage.setMessageSourceModule(ApplyFromIdEnum.getSourceByCode(formId)); approvalMessage.setMessageContent(formName); @@ -85,6 +87,7 @@ if (approvalMessageMapper.insert(approvalMessage) < 0) { log.error("审批通过，通知发起人失败，approvalMessage：{}", approvalMessage.toString()); }else { + log.info("审批通过，插入数据库成功，approvalMessage：{}", approvalMessage.toString()); //websocket消息推送 WebSocket webSocket = SpringContextUtil.getBean(WebSocket.class); webSocket.sendOneMessage(String.valueOf(rootId), JSONObject.toJSONString(approvalMessage)); diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml index a40e75a..93901d9 100644 --- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml @@ -13,13 +13,15 @@ + + - id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time + id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, business_id, process_id, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java index 832e87a..fc87bef 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java @@ -96,14 +96,15 @@ /** * 业务表主键，前端跳转审批详情使用 */ - @TableField(exist = false) + @TableField("business_id") private String businessId; /** * 流程实例id，前端跳转审批详情使用 */ - @TableField(exist = false) + @TableField("process_id") private String processId; + /** * 前端跳转审批详情使用 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/flowable/ProcessUpdateStateListener.java index afb74e8..89b1887 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/flowable/ProcessUpdateStateListener.java @@ -37,7 +37,7 @@ RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class); RuntimeService runtimeService = SpringContextUtil.getBean(RuntimeService.class); SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class); - System.err.println("审批通过触发监听器:" + execution); + System.out.println("审批通过触发监听器:" + execution); ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId()); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("pro_def_id", processDefinition.getKey()); @@ -77,6 +77,8 @@ WorkbenchApprovalMessage approvalMessage = new WorkbenchApprovalMessage(); approvalMessage.setNoticeId(rootId); approvalMessage.setNoticeDeptId(user.getDeptId()); + approvalMessage.setBusinessId(execution.getProcessInstanceBusinessKey()); + approvalMessage.setProcessId(execution.getProcessInstanceId()); approvalMessage.setMessageTitle("结果通知"); approvalMessage.setMessageSourceModule(ApplyFromIdEnum.getSourceByCode(formId)); approvalMessage.setMessageContent(formName); @@ -85,6 +87,7 @@ if (approvalMessageMapper.insert(approvalMessage) < 0) { log.error("审批通过，通知发起人失败，approvalMessage：{}", approvalMessage.toString()); }else { + log.info("审批通过，插入数据库成功，approvalMessage：{}", approvalMessage.toString()); //websocket消息推送 WebSocket webSocket = SpringContextUtil.getBean(WebSocket.class); webSocket.sendOneMessage(String.valueOf(rootId), JSONObject.toJSONString(approvalMessage)); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentApplyEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentApplyEventPostProcessor.java index b17dbc5..35ce12d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentApplyEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentApplyEventPostProcessor.java @@ -6,12 +6,17 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardApplyEquipmentMapper; +import com.casic.missiles.mapper.equipment.EquipmentStandardApplyMapper; +import com.casic.missiles.mapper.equipment.EquipmentStandardEquipmentMapper; import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStandardApply; import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; +import com.casic.missiles.model.equipment.EquipmentStandardEquipment; +import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.utils.SpringContextUtil; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.List; @@ -22,6 +27,7 @@ * * 审批通过后修改标准装置业务状态 */ +@Slf4j @Service(ActionStatusBeanEnum.APPLY_BEAN_NAME) public class EquipmentApplyEventPostProcessor implements NotifyEventPostProcessor { @@ -29,15 +35,23 @@ public void doHandleNotifyEvent( NotifyEventStatusDTO notifyEventStatusDTO) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); EquipmentStandardApplyEquipmentMapper applyEquipmentMapper = SpringContextUtil.getBean(EquipmentStandardApplyEquipmentMapper.class); - // 通过申请id查询出申请设备列表 + EquipmentStandardApplyMapper applyMapper = SpringContextUtil.getBean(EquipmentStandardApplyMapper.class); + EquipmentStandardEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentStandardEquipmentMapper.class); + //通过申请id查询出标准装置id + EquipmentStandardApply equipmentStandardApply = applyMapper.selectById(notifyEventStatusDTO.getId()); + //通过申请id查询出申请设备列表 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("standard_apply_id", notifyEventStatusDTO.getId()); List equipmentStandardApplyEquipments = applyEquipmentMapper.selectList(queryWrapper); List equipmentIds = equipmentStandardApplyEquipments.stream().map(EquipmentStandardApplyEquipment::getEquipmentId).collect(Collectors.toList()); - // 修改对应设备状态 + //修改对应关联设备状态 UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.in("id", equipmentIds).set("manager_state", notifyEventStatusDTO.getStatus()); - if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) { + //修改标准装置状态 + EquipmentStandardEquipment equipmentStandardEquipment = new EquipmentStandardEquipment(); + equipmentStandardEquipment.setId(Long.valueOf(equipmentStandardApply.getStandardEquipmentId())); + equipmentStandardEquipment.setManagerState(notifyEventStatusDTO.getStatus()); + if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0 || equipmentMapper.updateById(equipmentStandardEquipment) <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } }