From 6f30b5c886cd05081d6250eb0506816fb2ac80ec Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 22 十一月 2022 14:11:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java b/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
index c724c8d..bcc1744 100644
--- a/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
+import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.RoleManagementEntity;
+import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IRoleManagementService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
@@ -30,23 +33,24 @@
*/
@ApiOperation("查询角色列表")
@GetMapping("/getList")
+ @Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
- @RequestParam(value = "pageSize",required = false) Integer pageSize)
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "name",required = false) String name)
{
if(pageNum==null)
{
return getDataTable("分页不能为空");
}
-
if(pageSize==null)
{
return getDataTable("分页条数不能为空");
}
Page<RoleManagementEntity> pageParam = new Page<>(pageNum,pageSize);
- List<RoleManagementEntity> list = iRoleManagementService.selectConfigList(pageParam,pageSize);
+ List<RoleManagementEntity> list = iRoleManagementService.selectConfigList(pageParam,pageSize,name);
- int num=iRoleManagementService.countNum();
+ int num=iRoleManagementService.countNum(name);
return getDataTable(list,num);
}
@@ -57,9 +61,10 @@
*/
@ApiOperation("新增角色")
@PostMapping("/add")
- public ResultData insertConfig(@RequestBody RoleManagementEntity entity)
+ @Authorization
+ public ResultData insertConfig(@RequestBody RoleManagementEntity entity, @CurrentUser SysUser sysUser)
{
-// entity.setCreateUserId(sysUser.getUserId()+"");
+ entity.setCreateUserId(sysUser.getUserId()+"");
return toAjax(iRoleManagementService.insertConfig(entity));
}
@@ -70,9 +75,10 @@
*/
@ApiOperation("编辑角色")
@PostMapping("/update")
- public ResultData updateConfig(@RequestBody RoleManagementEntity entity)
+ @Authorization
+ public ResultData updateConfig(@RequestBody RoleManagementEntity entity,@CurrentUser SysUser sysUser)
{
-// entity.setUpdateUserId(sysUser.getUserId()+"");
+ entity.setUpdateUserId(sysUser.getUserId()+"");
return toAjax(iRoleManagementService.updateConfig(entity));
}
@@ -82,6 +88,7 @@
* @return
*/
@DeleteMapping("/delete")
+ @Authorization
public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
{
if(StringUtils.isEmpty(Id))
--
Gitblit v1.7.1