|
|
@@ -3,6 +3,7 @@ package com.goafanti.permission.controller;
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.cache.annotation.Cacheable;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
@@ -24,12 +25,13 @@ public class NewPermissionApiController extends BaseApiController {
|
|
|
PermissionMapper permissionMapper;
|
|
|
/**权限管理列表 **/
|
|
|
@RequestMapping(value = "/permissions", method = RequestMethod.POST)
|
|
|
+ @Cacheable(cacheNames = "permissions#60",key = "'permissions:'+'all'")
|
|
|
public Result permissions() {
|
|
|
Result res = new Result();
|
|
|
res.setData(permissionService.findPermissionsAll());
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**权限管理最上级新增 **/
|
|
|
@RequestMapping(value = "/addSupPermission" , method = RequestMethod.POST)
|
|
|
public Result addSupPermission(Permission record ){
|
|
|
@@ -51,7 +53,7 @@ public class NewPermissionApiController extends BaseApiController {
|
|
|
public Permission selectSuperIdById(String id ){
|
|
|
return permissionService.selectSuperIdById(id);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**权限管理新增 **/
|
|
|
@RequestMapping(value = "/addPermission" , method = RequestMethod.POST)
|
|
|
public Result addPermission(Permission record ){
|
|
|
@@ -83,13 +85,13 @@ public class NewPermissionApiController extends BaseApiController {
|
|
|
String aut=autNo+"0"+Count;
|
|
|
String sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
while(sid!=null){
|
|
|
- Count=(Count+1)%100;
|
|
|
+ Count=(Count+1)%100;
|
|
|
if(Count>=10){
|
|
|
- aut=autNo+Count;
|
|
|
+ aut=autNo+Count;
|
|
|
}else{
|
|
|
aut=autNo+"0"+Count;
|
|
|
}
|
|
|
- sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
+ sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
}
|
|
|
record.setAutNo(aut);
|
|
|
}
|
|
|
@@ -97,16 +99,16 @@ public class NewPermissionApiController extends BaseApiController {
|
|
|
String aut=autNo+Count;
|
|
|
String sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
while(sid!=null){
|
|
|
- Count=(Count+1)%100;
|
|
|
+ Count=(Count+1)%100;
|
|
|
aut=autNo+Count;
|
|
|
- sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
+ sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
}
|
|
|
record.setAutNo(aut);
|
|
|
}
|
|
|
res.setData(permissionService.insertSubordinate(record));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**删除列表信息**/
|
|
|
@RequestMapping(value = "/deleteById" , method = RequestMethod.POST)
|
|
|
public Result deleteById(String id){
|
|
|
@@ -128,7 +130,7 @@ public class NewPermissionApiController extends BaseApiController {
|
|
|
res.setData(permissionService.deleteById(id));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**编辑页面数据读取**/
|
|
|
@RequestMapping(value = "/selectAllById" , method = RequestMethod.POST)
|
|
|
public Result selectAllById(String id){
|
|
|
@@ -136,7 +138,7 @@ public class NewPermissionApiController extends BaseApiController {
|
|
|
res.setData(permissionService.selectAllById(id));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**上级权限自动补全查询**/
|
|
|
@RequestMapping(value = "/selectName" , method = RequestMethod.POST)
|
|
|
public Result selectName(String name){
|
|
|
@@ -144,7 +146,7 @@ public class NewPermissionApiController extends BaseApiController {
|
|
|
res.setData(permissionService.selectName(name));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**修改信息**/
|
|
|
@RequestMapping(value = "/updateById" , method = RequestMethod.POST)
|
|
|
public Result updateById(Permission record ){
|
|
|
@@ -158,7 +160,7 @@ public class NewPermissionApiController extends BaseApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR,"名称"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
String pname=permissionMapper.selectAutNoByNamei(record.getSuperId());
|
|
|
if(StringUtils.isBlank(pname)){
|
|
|
res.getError().add(buildError("","上级权限不匹配"));
|
|
|
@@ -176,7 +178,7 @@ public class NewPermissionApiController extends BaseApiController {
|
|
|
res.getError().add(buildError("","权限层级超限"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
//*********权限编号判断**************
|
|
|
String superName=record.getSuperId();//上级名称
|
|
|
@@ -191,13 +193,13 @@ public class NewPermissionApiController extends BaseApiController {
|
|
|
String aut=autNo+"0"+Count;
|
|
|
String sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
while(sid!=null){
|
|
|
- Count=(Count+1)%100;
|
|
|
+ Count=(Count+1)%100;
|
|
|
if(Count>=10){
|
|
|
- aut=autNo+Count;
|
|
|
+ aut=autNo+Count;
|
|
|
}else{
|
|
|
aut=autNo+"0"+Count;
|
|
|
}
|
|
|
- sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
+ sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
}
|
|
|
record.setAutNo(aut);
|
|
|
}
|
|
|
@@ -205,19 +207,19 @@ public class NewPermissionApiController extends BaseApiController {
|
|
|
String aut=autNo+Count;
|
|
|
String sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
while(sid!=null){
|
|
|
- Count=(Count+1)%100;
|
|
|
+ Count=(Count+1)%100;
|
|
|
aut=autNo+Count;
|
|
|
- sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
+ sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
}
|
|
|
record.setAutNo(aut);
|
|
|
}
|
|
|
res.setData(permissionService.updateById(record,superName));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 查询导航
|
|
|
- * @param navId 导航
|
|
|
+ * @param navId 导航
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/selectNavList",method=RequestMethod.GET)
|
|
|
@@ -226,7 +228,7 @@ public class NewPermissionApiController extends BaseApiController {
|
|
|
res.setData(permissionService.selectNavList());
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 查询菜单
|
|
|
* @param navId
|