增加文件监控

yangys

2025-09-02 2689c8fec95018952784bd8d032afb5a194a6616

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

@@ -4,15 +4,12 @@
import lombok.AllArgsConstructor;
import org.flowable.engine.HistoryService;
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.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.service.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;
@@ -22,8 +19,6 @@
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;

import java.util.List;
import java.util.Map;
@@ -60,7 +55,8 @@
      programProperties.setProcessInstanceId(processInstanceId);

      Map<String, Object> vars = runtimeService.getVariables(processInstanceId);

      this.copyFlowPropertiesFromMap(programProperties, vars);
      /*
      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)));
@@ -84,12 +80,16 @@
      if(vars.containsKey(FlowContants.CURED_NODE_ID)){
         programProperties.setCuredNodeId(Func.toLong(vars.get(FlowContants.CURED_NODE_ID)));
      }
      if(vars.containsKey(FlowContants.NODE_ID)){
         programProperties.setNodeId(Func.toLong(vars.get(FlowContants.NODE_ID)));
      }
      programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));

      programProperties.setTeamLeaderId(Func.toLong(vars.get(FlowContants.TEAM_LEADER)));
      programProperties.setProgrammerId(Func.toLong(vars.get(FlowContants.PROGRAMMER)));
      programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
      programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));
      */
      ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
         .processInstanceId(processInstanceId)
         .singleResult();
@@ -106,6 +106,46 @@
      programProperties.setProcessInstanceId(processInstanceId);

      Map<String, Object> vars =historicInstance.getProcessVariables();
      this.copyFlowPropertiesFromMap(programProperties,vars);
      /*
      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)));

      programProperties.setProcessNo(String.valueOf(vars.get(FlowContants.PROCESS_NO)));
      programProperties.setProcessEdition(String.valueOf(vars.get(FlowContants.PROCESS_EDITION)));//工序版次
      programProperties.setProcessName(String.valueOf(vars.get(FlowContants.PROCESS_NAME)));
      programProperties.setMachineCode(String.valueOf(vars.get(FlowContants.MACHINE_CODE)));

      programProperties.setMachineMode(String.valueOf(vars.get(FlowContants.MACHINE_MODE)));
      //数据处理名称为版次以前，零件号加工序号：YZL4-1100-01-50 零组件号：YZL4-1100-01 工序号 50

      programProperties.setCraftEdition(String.valueOf(vars.get(FlowContants.CRAFT_EDITION)));
      programProperties.setHasCuredProgram(String.valueOf(vars.get(FlowContants.HAS_CURED_PROGRAM)));
      programProperties.setIsProcessEditionSame(String.valueOf(vars.get(FlowContants.IS_PROCESS_EDITION_SAME)));
      if(vars.containsKey(FlowContants.DEVIATION)) {
         programProperties.setDeviation(String.valueOf(vars.get(FlowContants.DEVIATION)));
      }
      if(vars.containsKey(FlowContants.CURED_NODE_ID)){
         programProperties.setCuredNodeId(Func.toLong(vars.get(FlowContants.CURED_NODE_ID)));
      }
      if(vars.containsKey(FlowContants.NODE_ID)){
         programProperties.setNodeId(Func.toLong(vars.get(FlowContants.NODE_ID)));
      }
      programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));

      programProperties.setTeamLeaderId(Func.toLong(vars.get(FlowContants.TEAM_LEADER)));
      programProperties.setProgrammerId(Func.toLong(vars.get(FlowContants.PROGRAMMER)));
      programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
      programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));
      */
      programProperties.setProcessDefinitionKey(historicInstance.getProcessDefinitionKey());
      return programProperties;
   }

   void copyFlowPropertiesFromMap(FlowProgramProperties programProperties,Map<String, Object> vars){

      programProperties.setTitle(String.valueOf(vars.get(FlowContants.TITLE)));
      programProperties.setIsTempFlow(Func.toStr(vars.get(FlowContants.IS_TEMP_FLOW)));
@@ -130,6 +170,9 @@
      if(vars.containsKey(FlowContants.CURED_NODE_ID)){
         programProperties.setCuredNodeId(Func.toLong(vars.get(FlowContants.CURED_NODE_ID)));
      }
      if(vars.containsKey(FlowContants.NODE_ID)){
         programProperties.setNodeId(Func.toLong(vars.get(FlowContants.NODE_ID)));
      }
      programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));

      programProperties.setTeamLeaderId(Func.toLong(vars.get(FlowContants.TEAM_LEADER)));
@@ -137,8 +180,6 @@
      programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
      programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));

      programProperties.setProcessDefinitionKey(historicInstance.getProcessDefinitionKey());
      return programProperties;
   }
   /**
    * 流程是否在进行