From c9db22f6ccb6a6d66e38dec09807e88b160f29e8 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 11:20:50 +0800
Subject: [PATCH] 销售订单-修改2
---
mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
index cf0d2ca..4fda2b9 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
@@ -37,6 +37,7 @@
import com.chinaztt.mes.common.oa.OAResult;
import com.chinaztt.mes.common.util.StateResult;
import com.chinaztt.mes.common.util.WechatMsgTips;
+import com.chinaztt.mes.common.util.easyexcel.EasyExcelUtils;
import com.chinaztt.mes.common.wechat.WechatProperty;
import com.chinaztt.mes.plan.dto.*;
import com.chinaztt.mes.plan.entity.*;
@@ -51,6 +52,7 @@
import com.chinaztt.mes.plan.util.CustomerOrderClientConfigure;
import com.chinaztt.mes.plan.util.CustomerOrderUnitWhiteListConfig;
import com.chinaztt.mes.plan.util.CustomerOrderUtil;
+import com.chinaztt.mes.plan.util.FileSaveUtil;
import com.chinaztt.mes.plan.vo.CustomerOrderVO1;
import com.chinaztt.mes.quality.dto.CustomOrderSyncDTO;
import com.chinaztt.mes.technology.entity.*;
@@ -97,6 +99,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
@@ -1873,15 +1876,14 @@
@Override
public R uploadProcessConfigFile(MultipartFile file, String orderNumber, String lineNumber) {
- String fileName = IdUtil.simpleUUID() + StrUtil.DOT + FileUtil.extName(file.getOriginalFilename());
+ String fileName = FileUtil.extName(file.getOriginalFilename());
try {
- minioTemplate.putObject(ossProperties.getBucketName(), fileName, file.getInputStream());
OrderProcessConfigFile configFile = new OrderProcessConfigFile();
configFile.setFileName(fileName);
configFile.setOriginalFileName(file.getOriginalFilename());
configFile.setOrderNumber(orderNumber);
configFile.setLineNumber(lineNumber);
- configFile.setBucketName(ossProperties.getBucketName());
+ configFile.setBucketName(FileSaveUtil.StoreFile(file));
orderProcessConfigFileMapper.insert(configFile);
ProcessConfigFileOrderMapping mapping = ProcessConfigFileOrderMapping.builder().configFileId(configFile.getId())
.orderNumber(orderNumber).lineNumber(lineNumber).build();
@@ -1908,7 +1910,10 @@
@Override
public void getFile(String bucket, String fileName, HttpServletResponse response) {
- try (InputStream inputStream = minioTemplate.getObject(bucket, fileName)) {
+ try {
+ String path = FileSaveUtil.FILE_PATH + bucket;
+ InputStream inputStream = new FileInputStream(path);
+// EasyExcel.write(path).sheet().doWrite(null);
response.setContentType("application/octet-stream; charset=UTF-8");
IoUtil.copy(inputStream, response.getOutputStream());
} catch (Exception e) {
--
Gitblit v1.9.3