Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

anderx 8 years ago
parent
commit
09aba50c34

+ 33 - 0
src/main/java/com/goafanti/common/dao/PermissionMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Set;
 
 import com.goafanti.common.model.Permission;
+import com.goafanti.permission.bo.PermissionBo;
 
 public interface PermissionMapper {
     int deleteByPrimaryKey(String id);
@@ -25,4 +26,36 @@ public interface PermissionMapper {
 	List<Permission> findAll();
 
 	int deleteByPrimaryKeys(List<String> ids);
+	
+	int insertn(Permission record);
+	
+	String selectAdminNameById(String id);
+	
+	int selectAutNoCount (String superId);
+	
+	String selectIdByAutNo(String autNo);
+	
+	String selectAutNoByName(String name);
+	
+	Permission selectSuperIdById(String id);
+	
+	int deleteById(String id);
+	
+	Permission selectAllById(String id);
+	
+	int selectCountBySuperId(String superId);
+	
+	List<Permission> selectName(String name);
+	
+	int updateById(Permission record);
+	
+	List<Permission> selectIDNBySuperId(String superId);
+	
+	int updateByNumber(Permission record);
+	
+	List<PermissionBo> selectOneAll();
+	
+	String selectNameById(String id);
+	
+	List<PermissionBo> selectAllBySuperId (String superId);
 }

+ 161 - 1
src/main/java/com/goafanti/common/mapper/PermissionMapper.xml

@@ -5,9 +5,19 @@
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="url" jdbcType="VARCHAR" property="url" />
     <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="create_id" jdbcType="VARCHAR" property="createId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="deleted_sign" jdbcType="VARCHAR" property="deletedSign" />
+    <result column="aut_no" jdbcType="VARCHAR" property="autNo" />
+    <result column="hierarchies" jdbcType="VARCHAR" property="hierarchies" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="show_order" jdbcType="VARCHAR" property="showOrder" />
+    <result column="super_id" jdbcType="VARCHAR" property="superId" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, url, name
+    id, url, name,create_id as createId ,create_time as createTime,update_time as updateTime,
+     deleted_sign as deletedSign, aut_no as autNo, hierarchies,status ,show_order as showOrder, super_id as superId
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
@@ -99,4 +109,154 @@
 	  #{item,jdbcType=VARCHAR}  
     </foreach>
   </delete>
+  <insert id="insertn" parameterType="com.goafanti.common.model.Permission">
+    insert into permission (id, url, name, 
+      create_id, create_time, update_time, 
+      deleted_sign, aut_no, hierarchies, 
+      status, show_order, super_id
+      )
+    values (#{id,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{createId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{deletedSign,jdbcType=VARCHAR}, #{autNo,jdbcType=VARCHAR}, #{hierarchies,jdbcType=VARCHAR}, 
+      #{status,jdbcType=VARCHAR}, #{showOrder,jdbcType=VARCHAR}, #{superId,jdbcType=VARCHAR}
+      )
+  </insert>
+  <select id="selectAdminNameById" parameterType="java.lang.String" resultType="java.lang.String">
+  		select 
+  		name
+  		from admin
+  		where 
+  		id=#{id,jdbcType=VARCHAR}
+  </select>
+  <select id="selectAutNoCount" parameterType="String" resultType="java.lang.Integer">
+		select
+		count(0)
+		from permission
+		where
+		super_id=#{superId,jdbcType=VARCHAR}
+  </select>	
+  <select id="selectIdByAutNo" parameterType="java.lang.String" resultType="java.lang.String">
+  		select
+  		id
+  		from permission
+  		where
+  		aut_no=#{autNo,jdbcType=VARCHAR}
+  </select>
+  <select id="selectAutNoByName" resultType="java.lang.String">
+		select
+		aut_No as AutNo
+		from permission
+		where
+		name=#{name,jdbcType=VARCHAR}
+  </select>
+  <select id="selectSuperIdById" parameterType="java.lang.String" resultType="com.goafanti.common.model.Permission">
+  		select
+		name as superId
+		from permission
+		where
+		id=#{id,jdbcType=VARCHAR} 
+  </select>
+  <delete id="deleteById" parameterType="java.lang.String">
+	    delete from permission
+	    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <select id="selectAllById" parameterType="java.lang.String" resultType="com.goafanti.common.model.Permission">
+  		select 
+    	<include refid="Base_Column_List" />
+    	from permission
+    	where
+    	id=#{id,jdbcType=VARCHAR}
+    	order by name
+  </select>
+  <select id="selectCountBySuperId" parameterType="String" resultType="java.lang.Integer">
+  		select
+		count(0)
+		from permission
+		where
+		super_id=#{superId,jdbcType=VARCHAR}
+  </select>
+  <select id="selectName" resultType="com.goafanti.common.model.Permission">
+		select
+		name
+		from permission
+		where
+		name  like concat('%',#{name,jdbcType=VARCHAR},'%')
+  </select>
+  <update id="updateById"  parameterType="com.goafanti.common.model.Permission">
+  	update permission
+    <set>
+      <if test="url != null">
+        url = #{url,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="createId != null">
+        create_id = #{createId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deletedSign != null">
+        deleted_sign = #{deletedSign,jdbcType=VARCHAR},
+      </if>
+      <if test="autNo != null">
+        aut_no = #{autNo,jdbcType=VARCHAR},
+      </if>
+      <if test="hierarchies != null">
+        hierarchies = #{hierarchies,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=VARCHAR},
+      </if>
+      <if test="showOrder != null">
+        show_order = #{showOrder,jdbcType=VARCHAR},
+      </if>
+      <if test="superId != null">
+        super_id = #{superId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR} 		
+  </update>
+  <select id="selectIDNBySuperId" parameterType="java.lang.String" resultType="com.goafanti.common.model.Permission">
+  		select
+  		<include refid="Base_Column_List" />
+  		from permission 		
+  		where
+  		super_id=#{superId,jdbcType=VARCHAR}
+  		order by aut_no
+  </select>
+  <update id="updateByNumber" parameterType="com.goafanti.common.model.Permission">
+  		update permission
+	    <set>
+	    	aut_no = #{autNo,jdbcType=VARCHAR}
+	    </set>
+	    where
+	    id=#{id,jdbcType=VARCHAR}
+  </update>
+  <select id="selectOneAll" resultType="com.goafanti.permission.bo.PermissionBo">
+  		select
+  		<include refid="Base_Column_List" />
+  		from permission 		
+  		where
+  		hierarchies=1
+  		order by aut_no
+  </select>
+  <select id="selectNameById" parameterType="java.lang.String" resultType="java.lang.String">
+  		select
+		name as superId
+		from permission
+		where
+		id=#{id,jdbcType=VARCHAR} 
+  </select>
+  <select id="selectAllBySuperId" parameterType="String" resultType="com.goafanti.permission.bo.PermissionBo">
+  		select
+		<include refid="Base_Column_List" />
+		from permission
+		where
+		super_id=#{superId,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 90 - 0
src/main/java/com/goafanti/common/model/Permission.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.model;
 
+import java.util.Date;
+
 public class Permission  {
 
 	private String id;
@@ -14,7 +16,95 @@ public class Permission  {
 	 */
 	private String	name;
 	
+	private String createId;
+	
+	private Date createTime;
+	
+	private Date updateTime;
+	
+	private String deletedSign;
+	
+	private String autNo;
+	
+	private String hierarchies;
 	
+	private String status;
+	
+	private String showOrder;
+	
+	private String superId;	
+
+	public String getCreateId() {
+		return createId;
+	}
+
+	public void setCreateId(String createId) {
+		this.createId = createId;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getDeletedSign() {
+		return deletedSign;
+	}
+
+	public void setDeletedSign(String deletedSign) {
+		this.deletedSign = deletedSign;
+	}
+
+	public String getAutNo() {
+		return autNo;
+	}
+
+	public void setAutNo(String autNo) {
+		this.autNo = autNo;
+	}
+
+	public String getHierarchies() {
+		return hierarchies;
+	}
+
+	public void setHierarchies(String hierarchies) {
+		this.hierarchies = hierarchies;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getShowOrder() {
+		return showOrder;
+	}
+
+	public void setShowOrder(String showOrder) {
+		this.showOrder = showOrder;
+	}
+
+	public String getSuperId() {
+		return superId;
+	}
+
+	public void setSuperId(String superId) {
+		this.superId = superId;
+	}
 
 	public String getId() {
 		return id;

+ 156 - 0
src/main/java/com/goafanti/permission/bo/PermissionBo.java

@@ -0,0 +1,156 @@
+package com.goafanti.permission.bo;
+
+import java.util.Date;
+import java.util.List;
+
+public class PermissionBo {
+	private String id;
+
+	/**
+	 * 权限对应的url path
+	 */
+	private String	url;
+
+	/**
+	 * 权限名字
+	 */
+	private String	name;
+	
+	private String createId;
+	
+	private Date createTime;
+	
+	private Date updateTime;
+	
+	private String deletedSign;
+	
+	private String autNo;
+	
+	private String hierarchies;
+	
+	private String status;
+	
+	private String showOrder;
+	
+	private String superId;	
+	
+	private List<PermissionBo> children;
+	
+	private String key;
+	
+
+	
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public List<PermissionBo> getChildren() {
+		return children;
+	}
+
+	public void setChildren(List<PermissionBo> children) {
+		this.children = children;
+	}
+
+	public String getCreateId() {
+		return createId;
+	}
+
+	public void setCreateId(String createId) {
+		this.createId = createId;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getDeletedSign() {
+		return deletedSign;
+	}
+
+	public void setDeletedSign(String deletedSign) {
+		this.deletedSign = deletedSign;
+	}
+
+	public String getAutNo() {
+		return autNo;
+	}
+
+	public void setAutNo(String autNo) {
+		this.autNo = autNo;
+	}
+
+	public String getHierarchies() {
+		return hierarchies;
+	}
+
+	public void setHierarchies(String hierarchies) {
+		this.hierarchies = hierarchies;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getShowOrder() {
+		return showOrder;
+	}
+
+	public void setShowOrder(String showOrder) {
+		this.showOrder = showOrder;
+	}
+
+	public String getSuperId() {
+		return superId;
+	}
+
+	public void setSuperId(String superId) {
+		this.superId = superId;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+}

+ 136 - 0
src/main/java/com/goafanti/permission/controller/NewPermissionApiController.java

@@ -0,0 +1,136 @@
+package com.goafanti.permission.controller;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+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("api/admin")
+public class NewPermissionApiController extends BaseApiController {
+	@Resource
+	private PermissionService permissionService;
+	@Autowired
+	PermissionMapper		permissionMapper;
+	/**权限管理列表 **/
+	@RequestMapping(value = "/permissions", method = RequestMethod.POST)
+	public Result permissions() {
+		Result res = new Result();
+		res.setData(permissionService.findPermissionsAll());
+		return res;
+	}
+	
+	/**权限管理最上级新增 **/
+	@RequestMapping(value = "/addSupPermission" , method = RequestMethod.POST)
+	public Result addSupPermission(Permission record ){
+		Result res = new Result();
+		if(StringUtils.isBlank(record.getName())){
+			res.getError().add(buildError("","权限名不能为空"));
+			return res;
+		}
+		String aut=permissionMapper.selectAutNoByName(record.getName());
+		if(aut!=null){
+			res.getError().add(buildError("","权限已存在"));
+			return res;
+		}
+		res.setData(permissionService.insertn(record));
+		return res;
+	}
+	/**新增上级名称自动生成 **/
+	@RequestMapping(value = "/selectSuperIdById" , method = RequestMethod.POST)
+	public Permission selectSuperIdById(String id ){
+		return permissionService.selectSuperIdById(id);
+	}
+	
+	/**权限管理新增 **/
+	@RequestMapping(value = "/addPermission" , method = RequestMethod.POST)
+	public Result addPermission(Permission record ){
+		Result res = new Result();
+		if(StringUtils.isBlank(record.getName())|| StringUtils.isBlank(record.getUrl())
+				|| StringUtils.isBlank(record.getSuperId())){
+			res.getError().add(buildError("","名称、路径、上级不能为空"));
+			return res;
+		}
+		String aut=permissionMapper.selectAutNoByName(record.getName());
+		if(aut!=null){
+			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;
+	}
+	
+	/**删除列表信息**/
+	@RequestMapping(value = "/deleteById" , method = RequestMethod.POST)
+	public Result deleteById(String id){
+		Result res = new Result();
+		if(StringUtils.isBlank(id)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "id"));
+			return res;
+		}
+		Permission permission=permissionMapper.selectAllById(id);
+		String superId=permission.getName();
+		int subordinate=permissionMapper.selectCountBySuperId(superId);
+		if(subordinate>0){
+			res.getError().add(buildError("","存在下级权限不能删除"));
+			return res;
+		}
+		res.setData(permissionService.deleteById(id));
+		return res;
+	}
+	
+	/**编辑页面数据读取**/
+	@RequestMapping(value = "/selectAllById" , method = RequestMethod.POST)
+	public Result selectAllById(String id){
+		Result res = new Result();
+		res.setData(permissionService.selectAllById(id));
+		return res;
+	}
+	
+	/**上级权限自动补全查询**/
+	@RequestMapping(value = "/selectName" , method = RequestMethod.POST)
+	public Result selectName(String name){
+		Result res = new Result();
+		res.setData(permissionService.selectName(name));
+		return res;
+	}
+	
+	/**修改信息**/
+	@RequestMapping(value = "/updateById" , method = RequestMethod.POST)
+	public Result updateById(Permission record ){
+		Result res = new Result();
+		if(StringUtils.isBlank(record.getName())|| StringUtils.isBlank(record.getUrl())
+				|| StringUtils.isBlank(record.getSuperId())){
+			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;
+	}
+}

+ 18 - 0
src/main/java/com/goafanti/permission/service/PermissionService.java

@@ -1,6 +1,7 @@
 package com.goafanti.permission.service;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import com.goafanti.common.model.Permission;
@@ -15,4 +16,21 @@ public interface PermissionService {
 	List<Permission> findPermissions();
 
 	int insert(List<Permission> records);
+	
+	int insertn(Permission record);
+	
+	Permission selectSuperIdById(String id);
+	
+	int insertSubordinate(Permission record);
+	
+	int deleteById(String id);
+	
+	Permission selectAllById(String id);
+	
+	List<Permission> selectName(String name);
+	
+	int updateById(Permission record);
+	
+	Map<String,Object> findPermissionsAll();
+
 }

+ 255 - 0
src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java

@@ -1,7 +1,11 @@
 package com.goafanti.permission.service.impl;
 
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -12,7 +16,9 @@ import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.dao.UserRoleMapper;
 import com.goafanti.common.model.Permission;
 import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.permission.service.PermissionService;
+import com.goafanti.permission.bo.PermissionBo;
 
 @Service
 public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> implements PermissionService {
@@ -47,4 +53,253 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
 		return permissionMapper.deleteByPrimaryKeys(ids);
 	}
 
+	@Override
+	public int insertn(Permission record) {
+		String id = UUID.randomUUID().toString();
+		Date now = new Date();
+		record.setId(id);
+		record.setUrl(record.getUrl());
+		record.setName(record.getName());
+		String createId=permissionMapper.selectAdminNameById(TokenManager.getAdminId());
+		record.setCreateId(createId);
+		record.setCreateTime(now);
+		record.setUpdateTime(now);
+		record.setDeletedSign("0");
+		int Count=permissionMapper.selectAutNoCount("PM");
+		if(Count<10){
+			String aut="PM0"+Count;
+			String sid=permissionMapper.selectIdByAutNo(aut);
+			while(sid!=null){
+				Count=Count+1;				
+				if(Count>=10){
+					aut="PM"+Count;	
+				}else{
+					aut="PM0"+Count;
+				}
+				sid=permissionMapper.selectIdByAutNo(aut);			
+			}
+			record.setAutNo(aut);
+		}
+		if(Count>=10){
+			String aut="PM"+Count;
+			String sid=permissionMapper.selectIdByAutNo(aut);
+			while(sid!=null){
+				Count=Count+1;				
+				aut="PM"+Count;
+				sid=permissionMapper.selectIdByAutNo(aut);				
+			}
+			record.setAutNo(aut);
+		}
+		record.setHierarchies("1");//1第一层
+		record.setStatus("0");//0正常 1解除
+		record.setShowOrder("0");//0
+		record.setSuperId("PM");//顶级为PM	
+		permissionMapper.insertn(record);
+		return 1;
+	}
+
+	@Override
+	public Permission selectSuperIdById(String id) {
+		return permissionMapper.selectSuperIdById(id);
+	}
+
+	@Override
+	public int insertSubordinate(Permission record) {
+		String id = UUID.randomUUID().toString();
+		Date now = new Date();
+		record.setId(id);
+		record.setUrl(record.getUrl());
+		record.setName(record.getName());
+		String createId=permissionMapper.selectAdminNameById(TokenManager.getAdminId());
+		record.setCreateId(createId);
+		record.setCreateTime(now);
+		record.setUpdateTime(now);
+		record.setDeletedSign("0");
+		String autNo=permissionMapper.selectAutNoByName(record.getSuperId());
+		int Count=permissionMapper.selectAutNoCount(record.getSuperId());
+		if(Count<10){
+			String aut=autNo+"0"+Count;
+			String sid=permissionMapper.selectIdByAutNo(aut);
+			while(sid!=null){
+				Count=Count+1;				
+				if(Count>=10){
+					aut=autNo+Count;	
+				}else{
+					aut=autNo+"0"+Count;
+				}
+				sid=permissionMapper.selectIdByAutNo(aut);			
+			}
+			record.setAutNo(aut);
+		}
+		if(Count>=10){
+			String aut=autNo+Count;
+			String sid=permissionMapper.selectIdByAutNo(aut);
+			while(sid!=null){
+				Count=Count+1;				
+				aut=autNo+Count;
+				sid=permissionMapper.selectIdByAutNo(aut);				
+			}
+			record.setAutNo(aut);
+		}
+		record.setHierarchies("0");//0下层
+		record.setStatus("0");//0正常 1解除
+		record.setShowOrder("0");//正常
+		record.setSuperId(record.getSuperId());//上级名称	
+		permissionMapper.insertn(record);
+		return 1;
+	}
+
+	@Override
+	public int deleteById(String id) {
+		permissionMapper.deleteById(id);
+		return 1;
+	}
+
+	@Override
+	public Permission selectAllById(String id) {
+		
+		return permissionMapper.selectAllById(id);
+	}
+
+	@Override
+	public List<Permission> selectName(String name) {
+		return permissionMapper.selectName(name);
+	}
+
+	@Override
+	public int updateById(Permission record) {
+		Date now=new Date();
+		record.setUpdateTime(now);
+		String autNo=permissionMapper.selectAutNoByName(record.getSuperId());
+		int Count=permissionMapper.selectAutNoCount(record.getSuperId());
+		if(Count<10){
+			String aut=autNo+"0"+Count;
+			String sid=permissionMapper.selectIdByAutNo(aut);
+			while(sid!=null){
+				Count=Count+1;				
+				if(Count>=10){
+					aut=autNo+Count;	
+				}else{
+					aut=autNo+"0"+Count;
+				}
+				sid=permissionMapper.selectIdByAutNo(aut);			
+			}
+			record.setAutNo(aut);
+		}
+		if(Count>=10){
+			String aut=autNo+Count;
+			String sid=permissionMapper.selectIdByAutNo(aut);
+			while(sid!=null){
+				Count=Count+1;				
+				aut=autNo+Count;
+				sid=permissionMapper.selectIdByAutNo(aut);				
+			}
+			record.setAutNo(aut);
+		}
+		if(record.getSuperId().equals("平台超级模块")){
+			record.setHierarchies("1");
+		}else{
+			record.setHierarchies("0");
+		}
+			System.out.println("name修改:"+record.getName());
+		permissionMapper.updateById(record);
+		//*******下级编号修改
+		int n=0;
+		List<Permission> Nos =permissionMapper.selectIDNBySuperId(record.getName());
+		for(Permission i:Nos){			
+			autNo=permissionMapper.selectAutNoByName(i.getSuperId());
+			if(n<10){
+				String aut=autNo+"0"+n;			
+				if(n>=10){
+					aut=autNo+n;	
+				}else{
+					aut=autNo+"0"+n;
+				}	
+				i.setAutNo(aut);
+			}
+			if(n>=10){
+				String aut=autNo+n;			
+				aut=autNo+n;	
+				i.setAutNo(aut);
+			}
+			permissionMapper.updateByNumber(i);
+			n++;
+			
+			//*******下下级编号修改
+			int m=0;
+			List<Permission> Noss =permissionMapper.selectIDNBySuperId(i.getName());
+			for(Permission o:Noss){			
+				autNo=permissionMapper.selectAutNoByName(o.getSuperId());
+				if(m<10){
+					String aut=autNo+"0"+m;			
+					if(m>=10){
+						aut=autNo+m;	
+					}else{
+						aut=autNo+"0"+m;
+					}	
+					o.setAutNo(aut);
+				}
+				if(m>=10){
+					String aut=autNo+m;			
+					aut=autNo+m;	
+					o.setAutNo(aut);
+				}
+				permissionMapper.updateByNumber(o);
+				m++;
+				//*******下下级编号修改
+				int z=0;
+				List<Permission> Nosss =permissionMapper.selectIDNBySuperId(o.getName());
+				for(Permission p:Nosss){			
+					autNo=permissionMapper.selectAutNoByName(p.getSuperId());
+					if(z<10){
+						String aut=autNo+"0"+z;			
+						if(z>=10){
+							aut=autNo+z;	
+						}else{
+							aut=autNo+"0"+z;
+						}	
+						p.setAutNo(aut);
+					}
+					if(z>=10){
+						String aut=autNo+z;			
+						aut=autNo+z;	
+						p.setAutNo(aut);
+					}
+					permissionMapper.updateByNumber(p);
+					z++;
+				}
+			}
+			
+		}
+		return permissionMapper.updateById(record);
+	}
+
+	@Override
+	public Map<String,Object> findPermissionsAll() {
+		Map<String,Object> params = new HashMap<String, Object>();
+		List<PermissionBo> one=permissionMapper.selectOneAll();	
+		for (PermissionBo i:one){
+			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.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.setChildren(two);
+		}
+		params.put("one", one);
+		return params;
+	}
+	
+	
+
 }