From f2501d5bf27a67d3ea6fbf9ec7c1272524ca4af4 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 02 八月 2025 13:24:19 +0800
Subject: [PATCH] 上传文件改单个
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/constants/FlowContants.java | 4 ++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/ProgramUploadVO.java | 4 +-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java | 2 +
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java | 7 ---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java | 48 +++++-------------------
6 files changed, 19 insertions(+), 48 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/constants/FlowContants.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/constants/FlowContants.java
index 40c7ce7..adf4479 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/constants/FlowContants.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/constants/FlowContants.java
@@ -27,4 +27,8 @@
* 宸ヨ壓鐗堟
*/
public static final String CRAFT_EDITION = "craftEdition";
+ /**
+ * 浜у搧鍨嬪彿
+ */
+ public static final String PRODUCT_MODEL = "productModel";
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java
index e7b5f56..3c841b1 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java
@@ -1,7 +1,6 @@
package org.springblade.mdm.flow.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -10,16 +9,10 @@
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.flow.entity.FlowProgramFile;
-import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
-import org.springblade.mdm.flow.vo.ApproveRecordVO;
import org.springblade.mdm.flow.vo.ProgramUploadVO;
-import org.springblade.mdm.flow.vo.TaskTraceVO;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProcessProgRefService;
-import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
-import org.springblade.mdm.program.vo.NcProgramUploadVO;
-import org.springblade.mdm.program.vo.NcProgramVO;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
index b85c8a1..218c7bd 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
@@ -38,6 +38,8 @@
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.setMachineCode(String.valueOf(vars.get(FlowContants.MACHINE_CODE)));
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java
index a4593ff..a6de868 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramFileService.java
@@ -12,14 +12,10 @@
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.tool.api.IResultCode;
-import org.springblade.core.tool.api.ResultCode;
import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.NumberUtil;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.mapper.FlowProgramFileMapper;
import org.springblade.mdm.flow.vo.ProgramUploadVO;
-import org.springblade.mdm.program.entity.NcProgram;
-import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -27,8 +23,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
/**
* 娴佺▼绋嬪簭澶勭悊锛屽寘鎷笂浼狅紝鏌ヨ灞曠ず
@@ -47,49 +41,27 @@
public void uploadFlowProgramFile(ProgramUploadVO uploadVO) {
- //Map<String, Object> vars = runtimeService.getVariables(uploadVO.getProcessInstanceId());
-
FlowProgramProperties progProps= flowCommonService.getProgramProperties(uploadVO.getProcessInstanceId());
- checkFilenames(uploadVO.getFiles(),progProps);
+ MultipartFile file = uploadVO.getFile();
+ checkFilename(file.getOriginalFilename(),progProps);
String programName = getProgramName(progProps);
- for(MultipartFile file : uploadVO.getFiles()) {
- BladeFile bfile = ossTemplate.putFile(file);
- FlowProgramFile progFile = new FlowProgramFile();
- progFile.setName(file.getOriginalFilename());
- progFile.setOssName(bfile.getName());
- progFile.setProcessInstanceId(uploadVO.getProcessInstanceId());
+ BladeFile bfile = ossTemplate.putFile(file);
- progFile.setProgramName(programName);
+ FlowProgramFile progFile = new FlowProgramFile();
+ progFile.setName(file.getOriginalFilename());
+ progFile.setOssName(bfile.getName());
+ progFile.setProcessInstanceId(uploadVO.getProcessInstanceId());
- save(progFile);
- }
- //
- //BladeFile bfile = ossTemplate.putFile(uploadVO.getFile());
- //String link = bfile.getLink();
- //淇濆瓨profame
- /*
- NcProgram prog = new NcProgram();
- prog.setCode(generageCode());
- prog.setName(file.getOriginalFilename());
- prog.setNcNodeId(uploadVO.getNodeId());
- prog.setOssName(bfile.getName());
- prog.setDrawingNo(uploadVO.getDrawingNo());
- prog.setProcessEdition(uploadVO.getProcessEdition());
- prog.setIsLastEdition(1);
+ progFile.setProgramName(programName);
- */
+ save(progFile);
+
}
String getProgramName(FlowProgramProperties progProps){
return progProps.getDrawingNo()+"-"+progProps.getProcessNo();
- }
-
- public void checkFilenames(MultipartFile[] files,FlowProgramProperties programProperties){
- for (MultipartFile file : files){
- checkFilename(file.getOriginalFilename(),programProperties);
- }
}
/**
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/ProgramUploadVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/ProgramUploadVO.java
index 36015db..7433709 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/ProgramUploadVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/ProgramUploadVO.java
@@ -13,7 +13,7 @@
public class ProgramUploadVO {
@Schema(description = "娴佺▼瀹炰緥id")
private String processInstanceId;
- @Schema(description = "鏂囦欢闆嗗悎")
- private MultipartFile[] files;
+ @Schema(description = "鏂囦欢")
+ private MultipartFile file;
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java
index 802662e..c7167f7 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java
@@ -17,7 +17,7 @@
@Schema(description = "璁惧缂栧彿")
private String machineCode;
- @Schema(description = "璁惧缂栧彿")
+ @Schema(description = "鏂囦欢")
private MultipartFile file;
@Schema(description = "闆剁粍浠跺彿/鍥惧彿")
--
Gitblit v1.9.3