From 87895ab581b2f44e3492e4395dce5fc7e8341363 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 16 八月 2025 17:00:48 +0800
Subject: [PATCH] 替换注化
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java | 93 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 71 insertions(+), 22 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java
index 14ce99a..e3c53f1 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ReplaceFlowService.java
@@ -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,20 @@
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.service.ProgramFlowStatusQueryService;
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,18 +43,20 @@
@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 ProgramFlowStatusQueryService flowStatusQueryService;
private final NodeDeptQueryService nodeDeptQueryService;
-
+ private OssTemplate ossTemplate;
public static final String NODE_ID = "nodeId";
/**
* 杞淳锛屽苟璁板綍鑷繁鐨勫娉ㄤ俊鎭�
* @param nodeId 鏇挎崲鐨勮妭鐐筰d
*/
+ /*
@Transactional
public void prestart(long nodeId,String tempInstanceId) {
List<NcNode> fileNodes = nodeService.lambdaQuery()
@@ -69,8 +79,17 @@
}
}
+ */
+
+ /**
+ * 鍑嗗鏇挎崲娴佺▼闇�瑕佺殑鏁版嵁
+ * @param nodeId 瑕佹浛鎹㈢殑绋嬪簭鍖呭悕鑺傜偣id
+ * @param tempInstanceId 涓存椂娴佺▼瀹炰緥id锛岀敤浜庢柊鐨勬枃浠�
+ * @return 鍚姩鏁版嵁
+ */
@Transactional
public NcNodeVO pre(long nodeId, String tempInstanceId) {
+ checkFlowStatus(nodeId);
List<NcNode> fileNodes = nodeService.lambdaQuery()
.eq(NcNode::getParentId, nodeId)
@@ -103,6 +122,14 @@
return vo;
}
+ void checkFlowStatus(long nodeId) {
+ NcNode packageNode = nodeService.getById(nodeId);
+ int status = flowStatusQueryService.queryFlowStatus(packageNode.getProcessInstanceId());
+ if (status == 1) {
+ throw new ServiceException("绋嬪簭鐨勬祦绋嬫鍦ㄨ繘琛屼腑锛屼笉鑳借繘琛屾浛鎹�");
+ }
+ }
+
/**
* 鍚姩鏇挎崲娴佺▼
*/
@@ -133,36 +160,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);
+
+ }
}
--
Gitblit v1.9.3