上传接口调整

yangys

5 天以前 44fda5fa3787c78e74d62f9713dd36abdeadcac8

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

@@ -1,106 +1,131 @@
package org.springblade.mdm.flow.service;

import lombok.AllArgsConstructor;
import org.flowable.engine.HistoryService;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.runtime.ProcessInstance;
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;
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.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;

/**
 * 固化流程服务
 */
@Service
@AllArgsConstructor
public class CureFlowService {

   @Autowired
   private RuntimeService runtimeService;
   @Autowired
   private AutoAssignUsersService autoAssignUsersService;
   @Autowired
   private IdentityService identityService;
   private final RuntimeService runtimeService;

   @Autowired
   private NcProgramService ncProgramService;
   @Autowired
   private MachineService machineService;
   private final HistoryService historyService;

   private final IdentityService identityService;

   private final NcProgramService ncProgramService;

   private final MachineService machineService;

   private final ProcessProgRefService processProgRefService;
   /**
    * 固化流程的key
    */
   private static final String PROCESS_KEY = "program-cure";



   @Transactional
   public void startCure(List<NcProgram> programs) {
      //DncSendBackData sendBackData;
      //List<Long> ncProgramIdList = dataList.stream().map(DncSendBackData::getId).toList();
      //Map<String,List<NcProgram>> groupedProgram = groupProgramsByMachineCode(ncProgramIdList);
      //List<NcProgram> programs = ncProgramService.listByIds(ncProgramIdList);
      //根据分组启动流程，并插入关联表
      programs.forEach(this::startOne);
   }

   /**
    * 启动固化流程
    * @param programId 程序id
    * 启动一个数控程序的固化流程
    * @param prog 数控程序实体
    */
   public void start(long programId){
   public void startOne(NcProgram prog){
      Map<String, Object> vars = new HashMap<>();
      NcProgram prog = ncProgramService.getById(programId);

      //NcProgram prog = programs.get(0);
      Machine machine = machineService.getByCode(prog.getMachineCode());
      vars.put("machineCode",machine.getCode());
      vars.put("machineCode",prog.getMachineCode());
      vars.put("machineMode",machine.getName());
      vars.put("processEdition",prog.getProcessEdition());
      //vars.put("processNo",startVO.getProcessNo());prog.getProcessEdition()
      //vars.put("processName",startVO.getProcessName());
      /*
      Map<String,Object> preAssignee = autoAssignUsersService.autoAssignUsers(startVO.getProducePlanId());
      Map<String, Object> vars = new HashMap<>(preAssignee);

      vars.put("machineCode",startVO.getMachineCode());
      vars.put("machineMode",startVO.getMachineMode());
      //该程序在计划任务时 获取编制，校对，审批的人员，作为默认用户，其中编制时第一个固定的用户
      ProcessProgRef preRef = processProgRefService.lastDispatchDataByNcProgramId(prog.getId());
      //获取审批用户
      List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
         .processInstanceId(preRef.getProcessInstanceId())
         .orderByHistoricTaskInstanceEndTime().desc()
         .list();

      vars.put("processNo",startVO.getProcessNo());
      vars.put("processName",startVO.getProcessName());
      vars.put("processEdition",startVO.getProcessEdition());
      String programmer = null;
      String checker = null;
      String senior = null;

      vars.put("craftEdition",startVO.getCraftEdition());
      vars.put("planStartTime",startVO.getPlanStartTime());
      vars.put("drawingNo",startVO.getDrawingNo());
      vars.put("drawingNoEdition",startVO.getDrawingNoEdition());
      vars.put("planLockDays",startVO.getPlanLockDays());
      for (HistoricTaskInstance task : historicTasks) {
         // 获取任务的办理人
         if(task.getTaskDefinitionKey().equals("programmingTask")){
            //编制
            programmer = task.getAssignee();
         }else if(task.getTaskDefinitionKey().equals("check")){
            //校对
            checker = task.getAssignee();
         }else if(task.getTaskDefinitionKey().equals("senior")){
            //审核
            senior = task.getAssignee();
         }

      //零组件代码
      String partNo = generatePartNo(startVO);
      vars.put("partNo",partNo);
      }
      vars.put("programmer",programmer);
      vars.put("checker",checker);
      vars.put("senior",senior);

      NcProgram curedNcProgram = ncProgramService.getCuredNcProgram(partNo,startVO.getMachineCode());
      vars.put("curedNcProgram",curedNcProgram);

      //设置是否有固化程序标记
      vars.put("hasCuredProgram",curedNcProgram != null ? "Y":"N");
      */
      String businessKey = "0";//业务表key

      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人
      ProcessInstance pinst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);

      int a=1;
      //log.info()
      ProcessProgRef ref = new ProcessProgRef();
      ref.setProcessInstanceId(pinst.getId());
      ref.setNcProgramId(prog.getId());

      processProgRefService.save(ref);

   }

   /**
    * 生成零组件编号
    * 图号、图号版次、工序号、工序名称、工艺版次、工序版次 组合起来获得零组件号
    * @param startVO
    * 将程序按照机器代码分组
    * @param ncProgramIdList
    * @return
    */
   String generatePartNo(TaskAssignVO startVO){
      //TODO 这个格式未确定，需要确认
      return String.format("%s-%s-%s-%s-%s-%s",
         startVO.getDrawingNo(),
         startVO.getDrawingNoEdition(),
         startVO.getProcessNo(),
         startVO.getProcessName(),
         startVO.getCraftEdition(),
         startVO.getProcessEdition());
   }
   /*
   Map<String,List<NcProgram>> groupProgramsByMachineCode(List<Long> ncProgramIdList){
      List<NcProgram> programs = ncProgramService.listByIds(ncProgramIdList);
      return programs.stream().collect(Collectors.groupingBy(NcProgram::getMachineCode));
   }*/
}