mdm.git - Gitblit

			@@ -8,6 +8,9 @@
			import org.flowable.engine.runtime.ProcessInstance;
			import org.flowable.task.api.Task;
			import org.simpleframework.xml.core.Replace;
			import org.springblade.core.log.exception.ServiceException;
			import org.springblade.core.oss.OssTemplate;
			import org.springblade.core.oss.model.BladeFile;
			import org.springblade.core.secure.utils.AuthUtil;
			import org.springblade.mdm.basesetting.machine.MachineService;
			import org.springblade.mdm.basesetting.machine.entity.Machine;
			@@ -15,15 +18,19 @@
			import org.springblade.mdm.flow.entity.FlowProgramFile;
			import org.springblade.mdm.flow.entity.ReplaceProgramFile;
			import org.springblade.mdm.flow.vo.ReplaceFlowStartVO;
			import org.springblade.mdm.flow.vo.ReplaceUploadVO;
			import org.springblade.mdm.flow.vo.TaskAssignVO;
			import org.springblade.mdm.program.entity.NcNode;
			import org.springblade.mdm.program.service.NcNodeService;
			import org.springblade.mdm.program.service.NodeDeptQueryService;
			import org.springblade.mdm.program.vo.NcNodeVO;
			import org.springblade.mdm.utils.EntityUtil;
			import org.springblade.mdm.utils.ProgramFileNameCheckUtil;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.web.multipart.MultipartFile;

			import java.util.Arrays;
			import java.util.HashMap;
			@@ -35,13 +42,13 @@
			@Service
			public class ReplaceFlowService {
			private final NcNodeService nodeService;
			private final TaskService taskService;
			private final RuntimeService runtimeService;
			private final TaskService taskService;
			private final IdentityService identityService;
			private final FlowProgramFileService flowProgramFileService;
			private final ReplaceProgramFileService replaceProgramFileService;
			private final NodeDeptQueryService nodeDeptQueryService;

			private OssTemplate ossTemplate;
			public static final String NODE_ID = "nodeId";
			/**
			* 转派，并记录自己的备注信息
			@@ -136,36 +143,58 @@

			vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());
			vars.put(NODE_ID, startVO.getNodeId());

			vars.put("comment", startVO.getComment());
			identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人
			ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.REPLACE_PROCESS_KEY,startVO.getNodeId()+"",vars);
			//replaceProgramFileService.lambdaUpdate().eq(ReplaceProgramFile::getTempId,startVO.getTempId()).set(ReplaceProgramFile::getProcessInstanceId,inst.getProcessInstanceId());

			/*
			Task startTask = taskService.createTaskQuery()
			.processInstanceId(inst.getId())
			.singleResult();

			// 添加评论
			taskService.addComment(startTask.getId(), inst.getProcessInstanceId(),startVO.getComment());
			*/
			flowProgramFileService.lambdaUpdate()
			.eq(FlowProgramFile::getProcessInstanceId,startVO.getTempInstanceId())
			.set(FlowProgramFile::getProcessInstanceId,inst.getProcessInstanceId()).update();

			/*
			List<ReplaceProgramFile> repFiles = replaceProgramFileService.lambdaQuery().eq(ReplaceProgramFile::getTempId,startVO.getTempId()).list();

			for(ReplaceProgramFile repFile : repFiles) {
			FlowProgramFile flowProgramFile = new FlowProgramFile();
			BeanUtils.copyProperties(repFile, flowProgramFile);
			flowProgramFile.setProgramName(programPackge.getName());

			EntityUtil.clearBaseProperties(flowProgramFile);
			flowProgramFile.setProcessInstanceId(inst.getId());
			flowProgramFile.setIsCured(0);

			flowProgramFileService.save(flowProgramFile);
			}

			//暂时注释，测试方便
			replaceProgramFileService.deleteByTempId(startVO.getTempId());

			*/
			//return inst.getProcessInstanceId();
			}


			/**
			* 上传程序徐文件（编制节点调用）
			* @param uploadVO 上传对象
			*/
			public void uploadReplaceProgramFile(ReplaceUploadVO uploadVO) {

			//FlowProgramProperties progProps= flowCommonService.getProgramProperties(uploadVO.getProcessInstanceId());
			MultipartFile file = uploadVO.getFile();
			if(file.getSize() == 0){
			throw new ServiceException("程序文件不可为空文件");
			}
			FlowProgramProperties progProps = new FlowProgramProperties();
			progProps.setDrawingNo(uploadVO.getDrawingNo());
			progProps.setProcessNo(uploadVO.getProcessNo());
			progProps.setProcessEdition(uploadVO.getProcessEdition());

			ProgramFileNameCheckUtil.checkFilename(file.getOriginalFilename(),progProps);

			String programName = NcNodeService.genProgramName(progProps.getDrawingNo(),progProps.getProcessNo());

			BladeFile bfile = ossTemplate.putFile(file);

			FlowProgramFile progFile = new FlowProgramFile();
			progFile.setName(file.getOriginalFilename());
			progFile.setOssName(bfile.getName());
			progFile.setProcessInstanceId(uploadVO.getProcessInstanceId());
			progFile.setProgramName(programName);

			flowProgramFileService.save(progFile);

			}
			}