diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/MntnUploadController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/MntnUploadController.java index 0e66b45..0e490da 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/MntnUploadController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/MntnUploadController.java @@ -45,9 +45,9 @@ public class MntnUploadController extends BaseController { @PostMapping("uploadLog") @ApiOperation("上传日志") public ResponseReult uploadLog(@RequestParam("file") MultipartFile file, - @RequestParam(value = "termId", required = true) Integer termId) throws Exception { - if (file == null) { - throw new ApiException("缺少上传的文件"); + @RequestParam(value = "termId", required = false) Integer termId) throws Exception { + if (termId == null) { + termId = 0; } service.uploadLog(termId, file); ResponseReult result = new ResponseReult(); diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/bean/MultipartConfig.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/bean/MultipartConfig.java index 30e9dea..0895a55 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/bean/MultipartConfig.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/bean/MultipartConfig.java @@ -19,7 +19,7 @@ public class MultipartConfig { String os = System.getProperty("os.name"); // 兼容windows if (os.toLowerCase().startsWith("win")) { - fileTempDir = "D:" + fileTempDir; + fileTempDir = fileTempDir; } log.info("fileTempDir:{}", fileTempDir); MultipartConfigFactory factory = new MultipartConfigFactory(); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/MntnUploadServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/MntnUploadServiceImpl.java index 1f64582..e1f8620 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/MntnUploadServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/MntnUploadServiceImpl.java @@ -59,7 +59,9 @@ public class MntnUploadServiceImpl implements MntnUploadService { @Override public void delete(Integer id) throws Exception { + MntnUploads record = mapper.selectByPrimaryKey(id); mapper.deleteByPrimaryKey(id); + new File(termlog + record.getPath()).delete(); } @Override