去掉mail依赖

yangys

2025-08-20 432198337fb3d8a99fadb4b7825771d68bb10b9e

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

@@ -6,10 +6,7 @@
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.Task;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
@@ -17,23 +14,15 @@
import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.excution.AutoAssignUsersService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.entity.ProcessProgRef;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springblade.mdm.program.service.NodeDeptQueryService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

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

/**
 * 固化流程服务
@@ -45,131 +34,28 @@

   private final RuntimeService runtimeService;

   private final HistoryService historyService;
   private final TaskService taskService;
   private final IdentityService identityService;

   private final NodeDeptQueryService nodeDeptQueryService;
   private final NcNodeService ncNodeService;

   private final FlowProgramFileService flowProgramFileService;
   private final ProduceDivisionService produceDivisionService;
   private final MachineService machineService;
   private final FlowCommonService flowCommonService;

   /**
    * 启动固化流程
    */
   @Transactional
   public void startCure(List<NcNode> programPackageList, Map<Long,List<NcNode>> allFlowProgramFilesMap) {
      //根据分组启动流程，并插入关联表
      programPackageList.forEach(pkg -> {
         this.startOne(pkg,allFlowProgramFilesMap.get(pkg.getId()));
      });
   }

   /**
    * 启动一个数控程序的固化流程
    * @param programPackage 程序包名 节点实体
    */
   public void startOne(NcNode programPackage,List<NcNode> programNodes) {
      Map<String, Object> vars = new HashMap<>();
      //该程序在计划任务时 获取编制，校对，审批的人员，作为默认用户，其中编制时第一个固定的用户
      if(programPackage.getProcessInstanceId() != null) {
         //获取审批用户
         HistoricProcessInstance instance = historyService.createHistoricProcessInstanceQuery()
            .processInstanceId(programPackage.getProcessInstanceId()).includeProcessVariables()
            .singleResult();
         if(instance != null) {//使用任务派工流程的变量
            Map<String, Object> oldVars = instance.getProcessVariables();
            //机床编号
            vars.put(FlowContants.MACHINE_CODE,oldVars.get(FlowContants.MACHINE_CODE));
            //机床型号
            vars.put(FlowContants.MACHINE_MODE,oldVars.get(FlowContants.MACHINE_MODE));
            vars.put(FlowContants.PROCESS_NO,oldVars.get(FlowContants.PROCESS_NO));
            vars.put(FlowContants.PROCESS_NAME,oldVars.get(FlowContants.PROCESS_NAME));
            vars.put(FlowContants.PROCESS_EDITION,oldVars.get(FlowContants.PROCESS_EDITION));
            vars.put(FlowContants.CRAFT_EDITION, oldVars.get(FlowContants.CRAFT_EDITION));
            vars.put(FlowContants.DRAWING_NO,oldVars.get(FlowContants.DRAWING_NO));
            vars.put(FlowContants.DRAWING_NO_EDITION,oldVars.get(FlowContants.DRAWING_NO_EDITION));

            vars.put(FlowContants.PRODUCT_MODEL,oldVars.get(FlowContants.PRODUCT_MODEL));
         }

      }

      //查找历史实际的审批人
      List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
         .orderByTaskCreateTime().desc().processInstanceId(programPackage.getProcessInstanceId())
         .list();
      fillHistoryAssignees(vars, historicTasks);

      String businessKey = "0";//业务表key

      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人

      vars.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
      vars.put(FlowContants.TITLE,programPackage.getName()+"-固化");//自动增加标题

      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,businessKey,vars);

      //更新程序包名节点的流程实例id
      programPackage.setProcessInstanceId(inst.getProcessInstanceId());
      ncNodeService.updateById(programPackage);

      //更新文件的流程实例id，和 程序节点的流程文件id 并入库
      programNodes.forEach(programNode -> {
         FlowProgramFile flowProgramFile = programNode.getFlowProgramFile();
         flowProgramFile.setProcessInstanceId(inst.getProcessInstanceId());
         this.flowProgramFileService.save(flowProgramFile);

         programNode.setFlowProgramFileId(flowProgramFile.getId());
         this.ncNodeService.save(programNode);
      });
      log.info("启动固化流程完成，实例id={}", inst.getId());
   }

   /**
    * 填充历史审批人，从试切流程中查找
    * @param vars 找到审批人后填充的map
    * @param historicTasks 历史任务集合
    */
   @Deprecated
   void fillHistoryAssignees(Map<String, Object> vars,List<HistoricTaskInstance> historicTasks){
      String programmer = null;
      String checker = null;
      String senior = null;

      //找不到工艺员，那么查询最后一个审批的工艺员

      for (HistoricTaskInstance task : historicTasks) {
         // 获取任务的办理人
         if (task.getTaskDefinitionKey().equals("programmingTask")) {
            //编制
            if (programmer == null) {
               programmer = task.getAssignee();
            }
         } else if (task.getTaskDefinitionKey().equals("check")) {
            //校对
            if (checker == null) {
               checker = task.getAssignee();
            }

         } else if (task.getTaskDefinitionKey().equals("approveTask")) {
            //审核
            if (senior == null) {
               senior = task.getAssignee();
            }
         }

      }

      vars.put(FlowContants.PROGRAMMER,programmer);
      vars.put(FlowContants.CHECKER,checker);
      vars.put(FlowContants.SENIOR,senior);
      vars.put(FlowContants.ASSIGNEE,programmer);
   }

   public void startCureNew(Map<Long, List<FlowProgramFile>> pkgIdFileMap) {
      pkgIdFileMap.forEach((nodeId, fileList) -> {
         this.startOneNew(nodeId,fileList);
      });

      pkgIdFileMap.forEach(this::startOneNew);
   }

   /**
    * 启动一调程序的固化流程
    * @param nodeId
    * @param fileList
    */
   private void startOneNew(Long nodeId, List<FlowProgramFile> fileList) {
      Map<String, Object> vars = new HashMap<>();
      NcNode programPackage = this.ncNodeService.getById(nodeId);
@@ -177,6 +63,15 @@
      vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
      //机床型号
      //vars.put(FlowContants.MACHINE_MODE,programPackage.getm);
      //机床型号
      Machine machine = machineService.getByCode(programPackage.getMachineCode());
      if(machine != null) {
         vars.put(FlowContants.MACHINE_MODE,machine.getName());
      }

      String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(programPackage.getMachineCode());
      vars.put(FlowContants.WORKSHOP,workshop);

      vars.put(FlowContants.PROCESS_NO,programPackage.getProcessNo());
      vars.put(FlowContants.PROCESS_NAME,programPackage.getProcessName());
      vars.put(FlowContants.PROCESS_EDITION,programPackage.getProcessEdition());
@@ -186,21 +81,25 @@

      vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());

      vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
      /*

      ProduceDivision div = produceDivisionService.getByDrawingNo(programPackage.getDrawingNo());
      if(div != null) {
         vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
         vars.put(FlowContants.CHECKER,div.getCheckerId());
         vars.put(FlowContants.SENIOR,div.getSeniorId());
         vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId());
      vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
      vars.put(FlowContants.CHECKER,div.getCheckerId());
      vars.put(FlowContants.SENIOR,div.getSeniorId());
      vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId());
      */
      flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),null);
      //ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
      vars.put(FlowContants.ASSIGNEE,vars.get(FlowContants.PROGRAMMER));

         vars.put(FlowContants.ASSIGNEE,div.getProgrammerId());
      }

      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人

      vars.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
      vars.put(FlowContants.TITLE,programPackage.getName()+"-固化");//自动增加标题

      vars.put(FlowContants.MY_PROCESS_NAME, "固化流程");

      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,"0",vars);

@@ -211,7 +110,7 @@
      for(FlowProgramFile flowProgramFile : fileList){
         flowProgramFile.setProcessInstanceId(inst.getProcessInstanceId());
      }
      this.flowProgramFileService.updateBatchById(fileList);
      this.flowProgramFileService.saveBatch(fileList);

      log.info("启动固化流程完成，实例id={}", inst.getId());
   }