Browse Source

权限管理OK

Michael 8 years ago
parent
commit
c5a6c99a96

+ 16 - 7
src/main/java/com/goafanti/permission/bo/PermissionBo.java

@@ -3,8 +3,6 @@ package com.goafanti.permission.bo;
 import java.util.Date;
 import java.util.List;
 
-import com.goafanti.common.model.Permission;
-
 public class PermissionBo {
 	private String id;
 
@@ -36,16 +34,27 @@ public class PermissionBo {
 	
 	private String superId;	
 	
-	private List<PermissionBo> list;
+	private List<PermissionBo> children;
+	
+	private String key;
 	
+
 	
 
-	public List<PermissionBo> getList() {
-		return list;
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public List<PermissionBo> getChildren() {
+		return children;
 	}
 
-	public void setList(List<PermissionBo> list) {
-		this.list = list;
+	public void setChildren(List<PermissionBo> children) {
+		this.children = children;
 	}
 
 	public String getCreateId() {

+ 17 - 1
src/main/java/com/goafanti/permission/controller/NewPermissionApiController.java

@@ -13,10 +13,11 @@ import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.dao.PermissionMapper;
 import com.goafanti.common.model.Permission;
 import com.goafanti.common.utils.StringUtils;
+import com.goafanti.permission.bo.PermissionBo;
 import com.goafanti.permission.service.PermissionService;
 
 @RestController
-@RequestMapping("open/api/admin")
+@RequestMapping("api/admin")
 public class NewPermissionApiController extends BaseApiController {
 	@Resource
 	private PermissionService permissionService;
@@ -66,6 +67,11 @@ public class NewPermissionApiController extends BaseApiController {
 			res.getError().add(buildError("","权限已存在"));
 			return res;
 		}
+		String supaut=permissionMapper.selectAutNoByName(record.getSuperId());
+		if(supaut.length()>=7){
+			res.getError().add(buildError("","权限层级超限"));
+			return res;
+		}
 		res.setData(permissionService.insertSubordinate(record));
 		return res;
 	}
@@ -114,6 +120,16 @@ public class NewPermissionApiController extends BaseApiController {
 			res.getError().add(buildError("","名称、路径、上级不能为空"));
 			return res;
 		}
+		String pname=permissionMapper.selectAutNoByName(record.getSuperId());
+		if(StringUtils.isBlank(pname)){
+			res.getError().add(buildError("","上级权限不匹配"));
+			return res;
+		}
+		String supaut=permissionMapper.selectAutNoByName(record.getSuperId());
+		if(supaut.length()>=7){
+			res.getError().add(buildError("","权限层级超限"));
+			return res;
+		}
 		res.setData(permissionService.updateById(record));
 		return res;
 	}

+ 14 - 5
src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java

@@ -201,7 +201,7 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
 		}else{
 			record.setHierarchies("0");
 		}
-			
+			System.out.println("name修改:"+record.getName());
 		permissionMapper.updateById(record);
 		//*******下级编号修改
 		int n=0;
@@ -271,7 +271,7 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
 			}
 			
 		}
-		return 1;
+		return permissionMapper.updateById(record);
 	}
 
 	@Override
@@ -279,13 +279,22 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
 		Map<String,Object> params = new HashMap<String, Object>();
 		List<PermissionBo> one=permissionMapper.selectOneAll();	
 		for (PermissionBo i:one){
-			String name=permissionMapper.selectNameById(i.getId());			
+			String name=permissionMapper.selectNameById(i.getId());	
+			i.setKey(i.getId());
 			List<PermissionBo> two=permissionMapper.selectAllBySuperId(name);
 			for(PermissionBo o:two){
 				String name2=permissionMapper.selectNameById(o.getId());
-				o.setList(permissionMapper.selectAllBySuperId(name2));
+				o.setChildren(permissionMapper.selectAllBySuperId(name2));
+				o.setKey(o.getId());
+				List<PermissionBo> three=permissionMapper.selectAllBySuperId(name2);
+				for(PermissionBo p:three){
+					String name3=permissionMapper.selectNameById(p.getId());
+					p.setChildren(permissionMapper.selectAllBySuperId(name3));
+					p.setKey(p.getId());					
+				}
+				o.setChildren(three);
 			}
-			i.setList(two);
+			i.setChildren(two);
 		}
 		params.put("one", one);
 		return params;