diff --git a/src/main/java/com/xujie/modules/oss/controller/OssController.java b/src/main/java/com/xujie/modules/oss/controller/OssController.java index 1f0c427..dfe6f0f 100644 --- a/src/main/java/com/xujie/modules/oss/controller/OssController.java +++ b/src/main/java/com/xujie/modules/oss/controller/OssController.java @@ -34,6 +34,11 @@ public class OssController { List result=sysOssService.ossUploadNoSaveOSS(files,oss); return R.ok("操作成功").put("rows",result); } + @PostMapping("/ossUploadNoSaveOSSForYJY") + public R ossUploadNoSaveOSSForYJY(@RequestParam("file") List files,@ModelAttribute SysOssEntity oss){ + List result=sysOssService.ossUploadNoSaveOSSForYJY(files,oss); + return R.ok("操作成功").put("rows",result); + } @PostMapping("/remove") public R removeOssFile(@RequestBody List ids){ diff --git a/src/main/java/com/xujie/modules/oss/service/SysOssService.java b/src/main/java/com/xujie/modules/oss/service/SysOssService.java index 6f08828..292f5b1 100644 --- a/src/main/java/com/xujie/modules/oss/service/SysOssService.java +++ b/src/main/java/com/xujie/modules/oss/service/SysOssService.java @@ -49,6 +49,8 @@ public interface SysOssService extends IService { void upload(List files, SysOssEntity oss); void uploadWithTtpe(List files, SysOssEntity oss); List ossUploadNoSaveOSS(List files, SysOssEntity oss); + List ossUploadNoSaveOSSForYJY(List files, SysOssEntity oss); + void removeOssFile(List ids); List queryOssFile(SysOssEntity oss); diff --git a/src/main/java/com/xujie/modules/oss/service/impl/SysOssServiceImpl.java b/src/main/java/com/xujie/modules/oss/service/impl/SysOssServiceImpl.java index 2fe1d89..ba6963d 100644 --- a/src/main/java/com/xujie/modules/oss/service/impl/SysOssServiceImpl.java +++ b/src/main/java/com/xujie/modules/oss/service/impl/SysOssServiceImpl.java @@ -177,6 +177,50 @@ public class SysOssServiceImpl extends ServiceImpl impl @Override @Transactional public List ossUploadNoSaveOSS(List files, SysOssEntity oss2) { + // 上传文件 + Date date = new Date(); + List ossList=new ArrayList<>(); + for (MultipartFile file : files) { + SysOssEntity oss=new SysOssEntity(); + String fileName = file.getOriginalFilename(); + if (StringUtils.isEmpty(fileName)) { + throw new IllegalArgumentException("文件名不能为空"); + } + String[] strings = fileName.split("\\."); + String suffix = strings[strings.length - 1]; + // UUID生成文件名 + String uuid = UUID.randomUUID().toString().replaceAll("-", ""); + String newFileName = uuid +"."+ suffix; + // 根目录 D:\ckp-file 加 当前年月日 + String rootPath = filePath; + String yearMonth = new SimpleDateFormat("yyyy-MM-dd").format(new Date()); + String path = rootPath + "\\" + yearMonth + "\\SrmFiles"; + File fileDir = new File(path); + if (!fileDir.exists()) { + fileDir.mkdirs(); + } + // 保存文件 + File targetFile = new File(path, fileName); + try { + file.transferTo(targetFile); + } catch (IOException e) { + throw new RuntimeException("上传文件失败"); + } + oss.setCreatedBy(oss2.getCreatedBy()); + // 保存文件信息 + oss.setFileName(fileName); + oss.setUrl(path + "\\" + fileName); + oss.setNewFileName(newFileName); + oss.setCreateDate(date); + oss.setFileType(suffix); + oss.setOrderReftype(oss2.getOrderReftype()); + ossList.add(oss); + } + return ossList; + } + @Override + @Transactional + public List ossUploadNoSaveOSSForYJY(List files, SysOssEntity oss2) { // 上传文件 Date date = new Date(); List ossList=new ArrayList<>();