From 9969bea2a8c1eab64c12a51a2d24d65e5b6c0dd0 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 24 十月 2022 18:12:41 +0800
Subject: [PATCH] 日志导出乱码 日志查询导出 代码重构
---
ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
index 700ec04..f3d12e7 100644
--- a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.dto.UmsAdminLoginParam;
@@ -15,6 +16,8 @@
import com.ycl.utils.redis.RedisKey;
import com.ycl.vo.user.UserVO;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -51,6 +54,7 @@
@ApiOperation(value = "鐢ㄦ埛娉ㄥ唽")
@RequestMapping(value = "/register", method = RequestMethod.POST)
@ResponseBody
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "娣诲姞鐢ㄦ埛")
public CommonResult<UmsAdmin> register(@Validated @RequestBody UmsAdminParam umsAdminParam) {
UmsAdmin umsAdmin = adminService.register(umsAdminParam);
if (umsAdmin == null) {
@@ -98,6 +102,7 @@
String username = principal.getName();
UmsAdmin umsAdmin = adminService.getAdminByUsername(username);
Map<String, Object> data = new HashMap<>();
+ data.put("userId", umsAdmin.getId());
data.put("username", umsAdmin.getUsername());
data.put("menus", roleService.getMenuList(umsAdmin.getId()));
data.put("icon", umsAdmin.getIcon());
@@ -137,6 +142,7 @@
@ApiOperation("淇敼鎸囧畾鐢ㄦ埛淇℃伅")
@RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
@ResponseBody
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "淇敼鐢ㄦ埛")
public CommonResult update(@PathVariable Long id, @RequestBody UmsAdmin admin) {
boolean success = adminService.update(id, admin);
if (success) {
@@ -148,6 +154,7 @@
@ApiOperation("淇敼鎸囧畾鐢ㄦ埛瀵嗙爜")
@RequestMapping(value = "/updatePassword", method = RequestMethod.POST)
@ResponseBody
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "淇敼鐢ㄦ埛瀵嗙爜")
public CommonResult updatePassword(@Validated @RequestBody UpdateAdminPasswordParam updatePasswordParam) {
int status = adminService.updatePassword(updatePasswordParam);
if (status > 0) {
@@ -166,6 +173,7 @@
@ApiOperation("鍒犻櫎鎸囧畾鐢ㄦ埛淇℃伅")
@RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
@ResponseBody
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "鍒犻櫎鐢ㄦ埛")
public CommonResult delete(@PathVariable Long id) {
boolean success = adminService.delete(id);
if (success) {
@@ -177,6 +185,7 @@
@ApiOperation("淇敼甯愬彿鐘舵��")
@RequestMapping(value = "/updateStatus/{id}", method = RequestMethod.POST)
@ResponseBody
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "鐢ㄦ埛璐﹀彿鍚敤/绂佺敤")
public CommonResult updateStatus(@PathVariable Long id, @RequestParam(value = "status") Integer status) {
UmsAdmin umsAdmin = new UmsAdmin();
umsAdmin.setStatus(status);
@@ -206,4 +215,42 @@
List<UmsRole> roleList = adminService.getRoleList(adminId);
return CommonResult.success(roleList);
}
-}
+
+ @ApiOperation("鎵归噺鍒犻櫎鐢ㄦ埛")
+ @RequestMapping(value = "/deleteBatch", method = RequestMethod.POST)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "ids", value = "鐢ㄦ埛Ids", required = true, dataType = "Array")
+ })
+ @ResponseBody
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "鎵归噺鍒犻櫎鐢ㄦ埛")
+ public CommonResult deleteBatch(@RequestParam("ids") List<Long> ids) {
+ boolean success = adminService.deleteBatch(ids);
+ if (success) {
+ return CommonResult.success(null);
+ }
+ return CommonResult.failed();
+ }
+
+ @ApiOperation("鎵归噺淇敼鐢ㄦ埛鐘舵��")
+ @RequestMapping(value = "/updateStatusBatch", method = RequestMethod.POST)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "ids", value = "鐢ㄦ埛Ids", required = true, dataType = "Array"),
+ @ApiImplicitParam(name = "status", value = "鐘舵��0->绂佺敤锛�1->鍚敤", required = true, dataType = "Integer")
+ })
+ @ResponseBody
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "鐢ㄦ埛璐﹀彿鎵归噺鍚敤/绂佺敤")
+ public CommonResult updateStatusBatch(@RequestParam("ids") List<Long> ids, @RequestParam(value = "status") Integer status) {
+ boolean success = adminService.updateStatusBatch(ids, status);
+ if (success) {
+ return CommonResult.success(null);
+ }
+ return CommonResult.failed();
+ }
+
+ @ApiOperation("鑾峰彇閮ㄩ棬浜哄憳")
+ @RequestMapping(value = "/getDepartUser/{departId}", method = RequestMethod.GET)
+ @ResponseBody
+ public CommonResult<List<UmsAdmin>> getDepartUser(@PathVariable Long departId) {
+ return CommonResult.success(adminService.getDepartUser(departId));
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0