From f961867e0e1ca3251928b1134eb66549a6a89ee3 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 02 三月 2021 23:45:43 +0800
Subject: [PATCH] Merge branch 'lybfix20210302'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java
index d45dad2..3775104 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpAccessoryController.java
@@ -16,7 +16,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Map;
@@ -97,4 +96,37 @@
}
}
+ @PostMapping("/mvFiles")
+ @PreAuthorize("hasAuthority('empAccessory:mv')")
+ public void mvFiles(@NotBlank(message = "{required}") String accessoryids,@NotNull(message = "{required}") Long labelid,@NotNull(message = "{required}") Long empId) throws FebsException {
+ try {
+ this.empAccessoryService.mvFiles(accessoryids,labelid,empId);
+ } catch (Exception e) {
+ String message = "移动文件失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+ @PostMapping("/singledownload")
+ @PreAuthorize("hasAuthority('empAccessory:singledownload')")
+ public void singledownload(@NotBlank(message = "{required}") String empIds, @NotNull(message = "{required}") Long labelid, HttpServletRequest request, HttpServletResponse response) throws FebsException {
+ try {
+ this.empAccessoryService.singledownload(empIds,labelid,request,response);
+ } catch (Exception e) {
+ String message = "下载文件失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+ @GetMapping("{labelid}")
+ @PreAuthorize("hasAuthority('empAccessory:delete')")
+ public FebsResponse getLabelCount(@PathVariable(value = "labelid") String labelid) throws FebsException {
+ try {
+ return new FebsResponse().data(empAccessoryService.getLabelCount(Long.valueOf(labelid)));
+ } catch (Exception e) {
+ String message = "修改Label失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
}
--
Gitblit v1.8.0