diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UploadFileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UploadFileController.java index 8225fca09..0b5ffb9d2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UploadFileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/UploadFileController.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.tool; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.base.AjaxResult; @@ -27,6 +28,7 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.io.File; import java.util.List; /** @@ -45,14 +47,19 @@ public class UploadFileController extends BaseController { */ @Log(title = "上传文件", businessType = BusinessType.INSERT) @PostMapping("/files") - public AjaxResult updateAvatar(@RequestParam("file") MultipartFile file) { + public AjaxResult updateAvatar(@RequestParam("file") MultipartFile file,String module) { try { if (!file.isEmpty()) { String originalFileName = file.getOriginalFilename(); originalFileName.substring(originalFileName.lastIndexOf(".")); - String fileName = FileUploadUtils.upload( Global.getAvatarPath(), file,originalFileName); + String filePath=""; + //上传文件路径由模块参数(module)和上传的当天日期组成 + if (null != module) { + filePath=module+ File.separator+ DateUtil.today()+ File.separator; + } + String fileName = FileUploadUtils.upload( Global.getAvatarPath()+filePath, file,originalFileName); AjaxResult ajaxResult = new AjaxResult(); - ajaxResult.put( "fileName", fileName ); + ajaxResult.put( "fileName", filePath+fileName ); ajaxResult.put( "code", "200" ); ajaxResult.put( "msg", "上传成功" ); return ajaxResult; diff --git a/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/TrainCourseController.java b/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/TrainCourseController.java index 6216b5c31..fceffe4ee 100644 --- a/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/TrainCourseController.java +++ b/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/TrainCourseController.java @@ -33,7 +33,6 @@ import com.ruoyi.common.utils.ExcelUtil; public class TrainCourseController extends BaseController { private String prefix = "train/course/trainCourse"; - @Autowired private ITrainCourseService trainCourseService; diff --git a/ruoyi-train/src/main/resources/templates/train/course/trainCourse/add.html b/ruoyi-train/src/main/resources/templates/train/course/trainCourse/add.html index fda7b836f..e7cbb16de 100644 --- a/ruoyi-train/src/main/resources/templates/train/course/trainCourse/add.html +++ b/ruoyi-train/src/main/resources/templates/train/course/trainCourse/add.html @@ -96,6 +96,7 @@ var uploadInst = upload.render({ elem: '#test1' ,url: '/upload/files' + ,data:{module:"train/course"}//文件存放路径 ,before: function(obj){ //预读本地文件示例,不支持ie8 obj.preview(function(index, file, result){ diff --git a/ruoyi-train/src/main/resources/templates/train/course/trainCourse/edit.html b/ruoyi-train/src/main/resources/templates/train/course/trainCourse/edit.html index 4b1979e90..6c64c5c27 100644 --- a/ruoyi-train/src/main/resources/templates/train/course/trainCourse/edit.html +++ b/ruoyi-train/src/main/resources/templates/train/course/trainCourse/edit.html @@ -97,6 +97,7 @@ var uploadInst = upload.render({ elem: '#test1' ,url: '/upload/files' + ,data:{module:"train/course"}//文件存放路径 ,before: function(obj){ //预读本地文件示例,不支持ie8 obj.preview(function(index, file, result){ diff --git a/ruoyi-train/src/main/resources/templates/train/trainCourseware/add.html b/ruoyi-train/src/main/resources/templates/train/trainCourseware/add.html index 031ad75fa..38acfbbde 100644 --- a/ruoyi-train/src/main/resources/templates/train/trainCourseware/add.html +++ b/ruoyi-train/src/main/resources/templates/train/trainCourseware/add.html @@ -133,6 +133,7 @@ ,uploadListIns = upload.render({ elem: '#testList' ,url: '/upload/files' + ,data:{module:"train/courseware"}//文件存放路径 ,accept: 'file' ,multiple: true ,auto: true