修改constant类名

yangys

2025-09-18 0d61b9bfca526e9c3da2209de8f9f367e76fd013

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/LockFlowService.java

@@ -4,14 +4,20 @@
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.runtime.ProcessInstance;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
import org.springblade.mdm.flow.constants.FlowConstant;
import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

@AllArgsConstructor
@@ -20,47 +26,58 @@
   private final NcNodeService nodeService;
   private final RuntimeService runtimeService;
   private final IdentityService identityService;
   public static final String NODE_ID = "nodeId";


   private final ProduceDivisionService produceDivisionService;
   private final FlowCommonService flowCommonService;
   private final FlowProgramFileService flowProgramFileService;
   /**
    * 启动解锁流程
    */
   @Transactional
   public void startUnlock(Long nodeId,String assignee){
   public void startUnlock(Long nodeId,String unlockReason){
      NcNode programPackage = nodeService.getById(nodeId);
      if(flowCommonService.isProcessInstanceActive(programPackage.getProcessInstanceId())){
         throw new ServiceException("流程正在进行");
      }
      Map<String, Object> vars = new HashMap<>();
      vars.put(FlowContants.ASSIGNEE,assignee);//第一个审批用户
      flowCommonService.putFlowVariablesByNode(vars,programPackage);

      vars.put(FlowContants.TITLE,programPackage.getName()+"程序替换");
      ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
      vars.put(FlowVariableConstant.PROGRAMMER,div.getProgrammerId());
      vars.put(FlowVariableConstant.SENIOR,div.getSeniorId());
      vars.put(FlowVariableConstant.ASSIGNEE,div.getSeniorId());//审批用户:高师

      //机床编号
      vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
      //Machine machine = machineService.getByCode(programPackge.getMachineCode());
      //机床型号
      //if(machine != null) {
         //vars.put(FlowContants.MACHINE_MODE, programPackge.getMachineMode());
      //}
      vars.put(FlowContants.PROCESS_NO,programPackage.getProcessNo());
      vars.put(FlowContants.PROCESS_NAME,programPackage.getProcessName());
      vars.put(FlowContants.PROCESS_EDITION,programPackage.getProcessEdition());
      vars.put(FlowContants.CRAFT_EDITION,programPackage.getCraftEdition());
      vars.put(FlowVariableConstant.TITLE,programPackage.getName()+"程序解锁");

      vars.put(FlowContants.DRAWING_NO,programPackage.getDrawingNo());
      vars.put(FlowContants.DRAWING_NO_EDITION,programPackage.getDrawingNoEdition());
      vars.put(FlowVariableConstant.MY_PROCESS_NAME,"解锁流程");
      vars.put("comment", "解锁程序"+programPackage.getName());
      vars.put("unlockReason", unlockReason);

      vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
      String userId = String.valueOf(AuthUtil.getUserId());
      identityService.setAuthenticatedUserId(userId);//设置流程发起人
      vars.put(FlowVariableConstant.ACT_PROGRAMMER,userId);

      vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());
      vars.put(NODE_ID, nodeId);
      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowConstant.UNLOCK_PROCESS_KEY,nodeId+"",vars);

      vars.put("comment", "add on start");
      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人
      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.REPLACE_PROCESS_KEY,nodeId+"",vars);
      programPackage.setProcessInstanceId(inst.getId());
      this.nodeService.updateById(programPackage);

      //更新节点文件的流程实例id

      updateFlowProgramFilesProcessInstance(programPackage);
   }

   /**
    * 更新所属流程文件的流程实例id
    * @param programPackage 要解锁的程序报名节点
    */
   void updateFlowProgramFilesProcessInstance(NcNode programPackage){
      List<NcNode> fileNodes = nodeService.getProgramFilesByPackageId(programPackage.getId());
      List<Long> fileIds = fileNodes.stream().map(NcNode::getFlowProgramFileId).toList();
      if(!fileIds.isEmpty()){
         flowProgramFileService.lambdaUpdate().in(FlowProgramFile::getId, fileIds)
            .set(FlowProgramFile::getProcessInstanceId, programPackage.getProcessInstanceId()).update();
      }
   }
}