From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 5653f6b..8c134dd 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,11 +2,15 @@
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;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -29,8 +33,10 @@
*/
@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)
{
@@ -43,9 +49,9 @@
}
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);
}
@@ -56,9 +62,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));
}
@@ -69,6 +76,7 @@
*/
@ApiOperation("编辑角色")
@PostMapping("/update")
+ @Authorization
public ResultData updateConfig(@RequestBody RoleManagementEntity entity)
{
// entity.setUpdateUserId(sysUser.getUserId()+"");
@@ -81,6 +89,7 @@
* @return
*/
@DeleteMapping("/delete")
+ @Authorization
public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
{
if(StringUtils.isEmpty(Id))
--
Gitblit v1.7.1