From 28187d584b00856bb1961b7ce6ebd168ef1aded7 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期四, 13 五月 2021 18:11:17 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FilesUploadController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 10 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FilesUploadController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FilesUploadController.java
index 7788480..85c9a9d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FilesUploadController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FilesUploadController.java
@@ -1,18 +1,23 @@
package cc.mrbird.febs.server.hr.controller;
-import cc.mrbird.febs.server.hr.entity.FilesUpload;
-import cc.mrbird.febs.server.hr.service.IFilesUploadService;
import cc.mrbird.febs.common.core.entity.FebsResponse;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
-import lombok.extern.slf4j.Slf4j;
+import cc.mrbird.febs.server.hr.entity.FilesUpload;
+import cc.mrbird.febs.server.hr.service.IFilesUploadService;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
-import javax.validation.Valid;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import java.util.Map;
/**
@@ -44,22 +49,34 @@
}
@PostMapping
- @PreAuthorize("hasAuthority('filesUpload:add')")
- public void addFilesUpload(@Valid FilesUpload filesUpload) throws FebsException {
+ public void addFilesUpload(@NotNull(message = "{required}") Long folderid, MultipartFile file) throws FebsException {
try {
- this.filesUploadService.createFilesUpload(filesUpload);
+ this.filesUploadService.createFilesUpload(folderid, file);
} catch (Exception e) {
- String message = "新增FilesUpload失败";
+ String message = "上传文件失败";
log.error(message, e);
throw new FebsException(message);
}
}
+ @PostMapping("/download")
+ @PreAuthorize("hasAuthority('filesUpload:download')")
+ public void download(@NotBlank(message = "{required}") String fileids,HttpServletRequest request, HttpServletResponse response) throws FebsException {
+ try {
+ this.filesUploadService.download(fileids,request,response);
+ } catch (Exception e) {
+ String message = "下载文件失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+
@DeleteMapping
@PreAuthorize("hasAuthority('filesUpload:delete')")
- public void deleteFilesUpload(FilesUpload filesUpload) throws FebsException {
+ public void deleteFilesUpload(@NotBlank(message = "{required}") String fileids) throws FebsException {
try {
- this.filesUploadService.deleteFilesUpload(filesUpload);
+ this.filesUploadService.deleteFilesUpload(fileids);
} catch (Exception e) {
String message = "删除FilesUpload失败";
log.error(message, e);
@@ -75,6 +92,29 @@
} catch (Exception e) {
String message = "修改FilesUpload失败";
log.error(message, e);
+ throw new FebsException(e.getMessage());
+ }
+ }
+
+ @PostMapping("/mvFiles")
+ @PreAuthorize("hasAuthority('filesUpload:mv')")
+ public void mvFiles(@NotBlank(message = "{required}") String fileids,@NotNull(message = "{required}") Long folderid) throws FebsException {
+ try {
+ this.filesUploadService.mvFiles(fileids,folderid);
+ } catch (Exception e) {
+ String message = "移动文件失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+ @GetMapping("image/{filesid}")
+ public void getImage(@PathVariable String filesid, HttpServletResponse response) throws FebsException {
+ try {
+ this.filesUploadService.getImage(filesid,response);
+ } catch (Exception e) {
+ String message = "获取员工图片异常";
+ log.error(message, e);
throw new FebsException(message);
}
}
--
Gitblit v1.8.0