去掉mail依赖

yangys

2025-08-20 432198337fb3d8a99fadb4b7825771d68bb10b9e

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

@@ -12,9 +12,15 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NodeDeptQueryService;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
@@ -28,6 +34,9 @@
   private final RuntimeService runtimeService;
   private final HistoryService historyService;
   private final ProduceDivisionService produceDivisionService;
   private final NodeDeptQueryService nodeDeptQueryService;
   private final MachineService machineService;
   private final IUserClient userClient;
   /**
    * 根据流程实例id获取definitionKey
    * @param processInstanceId
@@ -53,6 +62,7 @@
      Map<String, Object> vars = runtimeService.getVariables(processInstanceId);

      programProperties.setTitle(String.valueOf(vars.get(FlowContants.TITLE)));
      programProperties.setIsTempFlow(Func.toStr(vars.get(FlowContants.IS_TEMP_FLOW)));
      programProperties.setDrawingNo(String.valueOf(vars.get(FlowContants.DRAWING_NO)));
      programProperties.setDrawingNoEdition(String.valueOf(vars.get(FlowContants.DRAWING_NO_EDITION)));
      programProperties.setProductModel(String.valueOf(vars.get(FlowContants.PRODUCT_MODEL)));
@@ -76,6 +86,7 @@
      }
      programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));

      programProperties.setProgrammerId(Func.toLong(vars.get(FlowContants.PROGRAMMER)));

      ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
         .processInstanceId(processInstanceId)
@@ -145,8 +156,41 @@
         vars.put(FlowContants.ASSIGNEE, defaultAssignee);//第一个审批用户：组长
      }

      R<User> programmerResult = userClient.userInfoById(div.getProgrammerId());
      if(programmerResult.isSuccess()) {
         vars.put(FlowContants.PROGRAMMER_NAME, programmerResult.getData().getName());
      }
      return div;
   }

   /**
    * 根据程序包名节点，填充变量map
    * @param vars
    * @param programPackageNode
    */
   public void putFlowVariablesByNode(Map<String, Object> vars, NcNode programPackageNode){
      //机床编号
      vars.put(FlowContants.MACHINE_CODE,programPackageNode.getMachineCode());
      Machine machine = machineService.getByCode(programPackageNode.getMachineCode());
      //机床型号
      if(machine != null) {
         vars.put(FlowContants.MACHINE_MODE, machine.getName());
      }
      vars.put(FlowContants.PROCESS_NO,programPackageNode.getProcessNo());
      vars.put(FlowContants.PROCESS_NAME,programPackageNode.getProcessName());
      vars.put(FlowContants.PROCESS_EDITION,programPackageNode.getProcessEdition());
      vars.put(FlowContants.CRAFT_EDITION,programPackageNode.getCraftEdition());

      vars.put(FlowContants.DRAWING_NO,programPackageNode.getDrawingNo());
      vars.put(FlowContants.DRAWING_NO_EDITION,programPackageNode.getDrawingNoEdition());

      vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackageNode.getName());

      vars.put(FlowContants.PRODUCT_MODEL,programPackageNode.getProductModel());
      vars.put(FlowContants.NODE_ID, programPackageNode.getId());
      vars.put(FlowContants.WORKSHOP,nodeDeptQueryService.getWorkshopNameByMachineCode(programPackageNode.getMachineCode()));

   }
}