From cb51349e00a4edcafcc2e96fcf46ee7af69e8a36 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 2 Aug 2024 13:33:04 +0800 Subject: [PATCH] =?UTF-8?q?2024-08-02=20=E9=87=87=E9=9B=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pms/controller/QcController.java | 4 +- .../pms/service/Impl/QcServiceImpl.java | 102 ++++++++++-------- .../sys/modules/pms/service/QcService.java | 2 +- 3 files changed, 58 insertions(+), 50 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java index 206ec7f0..4c017ed6 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java +++ b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java @@ -1732,8 +1732,8 @@ public class QcController { * @return */ @PostMapping("/upload") - public R upload(@RequestParam("file") MultipartFile file, @ModelAttribute GetParamInData inData){ - SysOssEntity ossEntity = qcService.upload(file, inData); + public R upload(@RequestParam("file") MultipartFile[] list, @ModelAttribute GetParamInData inData){ + List ossEntity = qcService.upload(list, inData); return R.ok().put("ossEntity", ossEntity); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java index 1bd38bd8..07548d6b 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java @@ -4927,52 +4927,56 @@ public class QcServiceImpl implements QcService { /** * 文件上传 - * @param file + * @param list * @param inData * @return */ @Override - public SysOssEntity upload(MultipartFile file, GetParamInData inData) { - if (file.isEmpty()) { + public List upload(MultipartFile[] list, GetParamInData inData) { + if (Objects.isNull(list) || list.length == 0) { throw new XJException("上传文件不能为空"); } - // 保存文件信息 - SysOssEntity ossEntity = new SysOssEntity(); - // 处理文件后缀 - int chartIndex = file.getOriginalFilename().lastIndexOf("."); - String suffix = ""; - String fileName = ""; - // 判断是否存在 - if (chartIndex > 0) { - suffix = file.getOriginalFilename().substring(chartIndex); - fileName = file.getOriginalFilename().substring(0, chartIndex); - } - String newFileName = RandomUtil.getOrderNoByAtomic1("file") + suffix; - String basePath = filePath; - String baseDatePath = DateUtils.format(new Date()); - File baseFilePath = new File(basePath + "\\" + baseDatePath + "\\" + inData.getFolder()); - if (!baseFilePath.exists()) { - baseFilePath.mkdirs(); - } - //最终的目录 - String finalFileName = baseFilePath.getPath() + "\\" + newFileName; - try { - baseFilePath = multipartFileToFile(file, finalFileName); - }catch (Exception e){ - throw new XJException(e.getMessage()); + List ossEntityList = new ArrayList<>(); + for (MultipartFile file : list) { + // 保存文件信息 + SysOssEntity ossEntity = new SysOssEntity(); + // 处理文件后缀 + int chartIndex = file.getOriginalFilename().lastIndexOf("."); + String suffix = ""; + String fileName = ""; + // 判断是否存在 + if (chartIndex > 0) { + suffix = file.getOriginalFilename().substring(chartIndex); + fileName = file.getOriginalFilename().substring(0, chartIndex); + } + String newFileName = RandomUtil.getOrderNoByAtomic1("file") + suffix; + String basePath = filePath; + String baseDatePath = DateUtils.format(new Date()); + File baseFilePath = new File(basePath + "\\" + baseDatePath + "\\" + inData.getFolder()); + if (!baseFilePath.exists()) { + baseFilePath.mkdirs(); + } + //最终的目录 + String finalFileName = baseFilePath.getPath() + "\\" + newFileName; + try { + baseFilePath = multipartFileToFile(file, finalFileName); + }catch (Exception e){ + throw new XJException(e.getMessage()); + } + ossEntity.setUrl(baseFilePath.getPath()); + ossEntity.setCreatedBy(inData.getCreateBy()); + ossEntity.setFileType(suffix.substring(1)); + ossEntity.setFileName(fileName+suffix); + ossEntity.setNewFileName(newFileName); + ossEntity.setCreateDate(new Date()); + ossEntity.setOrderRef1(inData.getOrderRef1()); + ossEntity.setOrderRef2(inData.getOrderRef2()); + ossEntity.setOrderRef3(inData.getOrderRef3()); + ossEntity.setOrderRef4(inData.getOrderRef4()); + sysOssService.save(ossEntity); + ossEntityList.add(ossEntity); } - ossEntity.setUrl(baseFilePath.getPath()); - ossEntity.setCreatedBy(inData.getCreateBy()); - ossEntity.setFileType(suffix.substring(1)); - ossEntity.setFileName(fileName+suffix); - ossEntity.setNewFileName(newFileName); - ossEntity.setCreateDate(new Date()); - ossEntity.setOrderRef1(inData.getOrderRef1()); - ossEntity.setOrderRef2(inData.getOrderRef2()); - ossEntity.setOrderRef3(inData.getOrderRef3()); - ossEntity.setOrderRef4(inData.getOrderRef4()); - sysOssService.save(ossEntity); - return ossEntity; + return ossEntityList; } @Override @@ -5111,10 +5115,12 @@ public class QcServiceImpl implements QcService { // 数据采集来源 tempAcquisitionData.setCollectionSource(acquisitionData.getCollectionSource().split(",")[i]); // 数据采集方式 - if (tempAcquisitionData.getCollectionSource().startsWith("value") && "file".equals(tempAcquisitionData.getCollectionMethod())) { // 如果采集来源是以"value"开头则采集方式使用文件数据采集(file) - tempAcquisitionData.setCollectionMethod("file"); - } else if (tempAcquisitionData.getCollectionSource().startsWith("value") && "plc".equals(tempAcquisitionData.getCollectionMethod())) { // plc 数据采集 - tempAcquisitionData.setCollectionMethod("plc"); + if (tempAcquisitionData.getCollectionSource().startsWith("value")) { // 如果采集来源是以"value"开头则采集方式使用文件数据采集(file) + if (tempAcquisitionData.getCollectionMethod().contains("plc")) { + tempAcquisitionData.setCollectionMethod("plc"); + } else { + tempAcquisitionData.setCollectionMethod("file"); + } } else if ("photo_value1".equals(tempAcquisitionData.getCollectionSource())){ // // 如果采集来源是"photo_value1"开头则采集方式使用文件数据采集(image) tempAcquisitionData.setCollectionMethod("image"); } else if ("file_value1".equals(tempAcquisitionData.getCollectionSource())){ // // 如果采集来源是"file_value1"开头则采集方式使用文件数据采集(fileUrl) @@ -5338,10 +5344,12 @@ public class QcServiceImpl implements QcService { // 数据采集来源 tempAcquisitionData.setCollectionSource(acquisitionData.getCollectionSource().split(",")[i]); // 数据采集方式 - if (tempAcquisitionData.getCollectionSource().startsWith("value") && "file".equals(tempAcquisitionData.getCollectionMethod())) { // 如果采集来源是以"value"开头则采集方式使用文件数据采集(file) - tempAcquisitionData.setCollectionMethod("file"); - } else if (tempAcquisitionData.getCollectionSource().startsWith("value") && "plc".equals(tempAcquisitionData.getCollectionMethod())) { // plc 数据采集 - tempAcquisitionData.setCollectionMethod("plc"); + if (tempAcquisitionData.getCollectionSource().startsWith("value")) { // 如果采集来源是以"value"开头则采集方式使用文件数据采集(file) + if (tempAcquisitionData.getCollectionMethod().contains("plc")) { + tempAcquisitionData.setCollectionMethod("plc"); + } else { + tempAcquisitionData.setCollectionMethod("file"); + } } else if ("photo_value1".equals(tempAcquisitionData.getCollectionSource())){ // // 如果采集来源是"photo_value1"开头则采集方式使用文件数据采集(image) tempAcquisitionData.setCollectionMethod("image"); } else if ("file_value1".equals(tempAcquisitionData.getCollectionSource())){ // // 如果采集来源是"file_value1"开头则采集方式使用文件数据采集(fileUrl) diff --git a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java index f44da80c..76d3be80 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java @@ -269,7 +269,7 @@ public interface QcService { void iqcRecordOverLoad(QcFAIRecordData data); - SysOssEntity upload(MultipartFile file, GetParamInData inData); + List upload(MultipartFile[] list, GetParamInData inData); List searchSeqInfo(QcFAIRecordData data);