From bdf115fc3eec4f95fed6def5f3350b600e1b2b53 Mon Sep 17 00:00:00 2001
From: liyanqi <15181887205@163.com>
Date: 星期四, 08 九月 2022 16:16:57 +0800
Subject: [PATCH] 基本设置
---
ycl-platform/src/main/java/com/ycl/controller/user/UmsAdminController.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/UmsAdminController.java b/ycl-platform/src/main/java/com/ycl/controller/user/UmsAdminController.java
similarity index 88%
rename from ycl-platform/src/main/java/com/ycl/controller/UmsAdminController.java
rename to ycl-platform/src/main/java/com/ycl/controller/user/UmsAdminController.java
index 135d517..277425d 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/UmsAdminController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/user/UmsAdminController.java
@@ -1,6 +1,7 @@
-package com.ycl.controller;
+package com.ycl.controller.user;
import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
@@ -11,6 +12,7 @@
import com.ycl.entity.user.UmsRole;
import com.ycl.service.user.UmsAdminService;
import com.ycl.service.user.UmsRoleService;
+import com.ycl.vo.user.UserVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -87,7 +89,7 @@
@RequestMapping(value = "/info", method = RequestMethod.GET)
@ResponseBody
public CommonResult getAdminInfo(Principal principal) {
- if(principal==null){
+ if (principal == null) {
return CommonResult.unauthorized(null);
}
String username = principal.getName();
@@ -97,9 +99,9 @@
data.put("menus", roleService.getMenuList(umsAdmin.getId()));
data.put("icon", umsAdmin.getIcon());
List<UmsRole> roleList = adminService.getRoleList(umsAdmin.getId());
- if(CollUtil.isNotEmpty(roleList)){
+ if (CollUtil.isNotEmpty(roleList)) {
List<String> roles = roleList.stream().map(UmsRole::getName).collect(Collectors.toList());
- data.put("roles",roles);
+ data.put("roles", roles);
}
return CommonResult.success(data);
}
@@ -111,14 +113,12 @@
return CommonResult.success(null);
}
- @ApiOperation("鏍规嵁鐢ㄦ埛鍚嶆垨濮撳悕鍒嗛〉鑾峰彇鐢ㄦ埛鍒楄〃")
- @RequestMapping(value = "/list", method = RequestMethod.GET)
+ @ApiOperation("鍒嗛〉")
+ @RequestMapping(value = "/page", method = RequestMethod.GET)
@ResponseBody
- public CommonResult<CommonPage<UmsAdmin>> list(@RequestParam(value = "keyword", required = false) String keyword,
- @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
- @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
- Page<UmsAdmin> adminList = adminService.list(keyword, pageSize, pageNum);
- return CommonResult.success(CommonPage.restPage(adminList));
+ public CommonResult<IPage<UmsAdmin>> list(@Validated UserVO.PageUserVO pageUserVO) {
+ IPage<UmsAdmin> page = adminService.pageUser(pageUserVO);
+ return CommonResult.success(page);
}
@ApiOperation("鑾峰彇鎸囧畾鐢ㄦ埛淇℃伅")
@@ -172,10 +172,10 @@
@ApiOperation("淇敼甯愬彿鐘舵��")
@RequestMapping(value = "/updateStatus/{id}", method = RequestMethod.POST)
@ResponseBody
- public CommonResult updateStatus(@PathVariable Long id,@RequestParam(value = "status") Integer status) {
+ public CommonResult updateStatus(@PathVariable Long id, @RequestParam(value = "status") Integer status) {
UmsAdmin umsAdmin = new UmsAdmin();
umsAdmin.setStatus(status);
- boolean success = adminService.update(id,umsAdmin);
+ boolean success = adminService.update(id, umsAdmin);
if (success) {
return CommonResult.success(null);
}
--
Gitblit v1.8.0