From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/sys/RoleController.java | 71 +++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/sys/RoleController.java b/src/main/java/com/lf/server/controller/sys/RoleController.java
index edc7f2c..a8d57dc 100644
--- a/src/main/java/com/lf/server/controller/sys/RoleController.java
+++ b/src/main/java/com/lf/server/controller/sys/RoleController.java
@@ -1,10 +1,11 @@
package com.lf.server.controller.sys;
-import com.lf.server.aspect.SysLog;
+import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.sys.RoleEntity;
import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.service.all.PermsService;
import com.lf.server.service.sys.RoleService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
@@ -32,76 +33,81 @@
@Autowired
TokenService tokenService;
+ @Autowired
+ PermsService permsService;
+
@SysLog()
@ApiOperation(value = "鏌ヨ璁板綍鏁�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", required = false, example = "sys_role"),
- @ApiImplicitParam(name = "depName", value = "鍚嶇О", dataType = "String", paramType = "query", example = "sys_role")
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "Admin"),
+ @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping({"/selectCount"})
- public ResponseMsg<Integer> selectCount(String name, String depName) {
+ public ResponseMsg<Integer> selectCount(String name, Integer depid) {
try {
- int count = roleService.selectCount(name, depName);
+ int count = roleService.selectCount(name, depid);
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ")
@ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "sys_role"),
- @ApiImplicitParam(name = "depName", value = "鍚嶇О", dataType = "String", paramType = "query", example = "sys_role"),
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "Admin"),
+ @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPage")
- public ResponseMsg<List<RoleEntity>> selectByPage(String name, String depName, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<RoleEntity>> selectByPage(String name, Integer depid, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- List<RoleEntity> rs = roleService.selectByPage(name, depName, pageSize, pageSize * (pageIndex - 1));
+
+ List<RoleEntity> rs = roleService.selectByPage(name, depid, pageSize, pageSize * (pageIndex - 1));
+
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "1"),
- @ApiImplicitParam(name = "depName", value = "鍚嶇О", dataType = "String", paramType = "query", example = "sys_role"),
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "Admin"),
+ @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<List<RoleEntity>> selectByPageAndCount(String name, String depName, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<RoleEntity>> selectByPageAndCount(String name, Integer depid, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = roleService.selectCount(name, depName);
+ int count = roleService.selectCount(name, depid);
if (count == 0) {
return success(0, null);
}
- List<RoleEntity> rs = roleService.selectByPage(name, depName, pageSize, pageSize * (pageIndex - 1));
+ List<RoleEntity> rs = roleService.selectByPage(name, depid, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
@ApiOperation(value = "鎻掑叆涓�鏉�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.sys.RoleEntity", paramType = "body", example = "")
+ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "RoleEntity", paramType = "body", example = "")
})
@PostMapping(value = "/insertRole", produces = "application/json; charset=UTF-8")
public ResponseMsg<Integer> insertRole(@RequestBody RoleEntity entity, HttpServletRequest req) {
@@ -112,10 +118,13 @@
}
int count = roleService.insertRole(entity);
+ if (count > 0) {
+ permsService.clearPermsCache();
+ }
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -135,10 +144,13 @@
}
int count = roleService.insertRoles(list);
+ if (count > 0) {
+ permsService.clearPermsCache();
+ }
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -151,10 +163,13 @@
public ResponseMsg<Integer> deleteRole(int id) {
try {
int count = roleService.deleteRole(id);
+ if (count > 0) {
+ permsService.clearPermsCache();
+ }
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -171,10 +186,13 @@
}
int count = roleService.deleteRoles(ids);
+ if (count > 0) {
+ permsService.clearPermsCache();
+ }
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -193,10 +211,13 @@
}
int count = roleService.updateRole(entity);
+ if (count > 0) {
+ permsService.clearPermsCache();
+ }
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -212,7 +233,7 @@
return success(roleEntity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -225,7 +246,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
}
--
Gitblit v1.9.3