Procházet zdrojové kódy

管理员列表修改

anderx před 3 roky
rodič
revize
fbe0d9166a

+ 29 - 30
src/main/java/com/goafanti/common/mapper/PermissionMapper.xml

@@ -21,7 +21,7 @@
      deleted_sign as deletedSign, aut_no as autNo, hierarchies,status ,show_order as showOrder, super_id as superId,type
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select 
+    select
     <include refid="Base_Column_List" />
     from permission
     where id = #{id,jdbcType=VARCHAR}
@@ -87,14 +87,14 @@
     where tur.uid = #{userId,jdbcType=VARCHAR}
   </select>
   <select id="findAll" resultMap="BaseResultMap">
-    select 
+    select
     <include refid="Base_Column_List" />
     from permission order by name
   </select>
-  
+
   <insert id="insertBatch" parameterType="com.goafanti.common.model.Permission">
     insert into permission (id, name, url)
-    values 
+    values
     <foreach item="item" index="index" collection="list" separator=",">
       (#{item.id,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}, #{item.url,jdbcType=VARCHAR})
     </foreach>
@@ -102,31 +102,31 @@
 	    name = values(name),
 	    url = values(url)
   </insert>
-  
+
   <delete id="deleteByPrimaryKeys" parameterType="java.lang.String">
     delete from permission
-    where id in 
-    <foreach item="item" index="index" collection="list" open="(" separator="," close=")">  
-	  #{item,jdbcType=VARCHAR}  
+    where id in
+    <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+	  #{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, 
+    insert into permission (id, url, name,
+      create_id, create_time, update_time,
+      deleted_sign, aut_no, hierarchies,
       status, show_order, super_id,type
       )
-    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}, 
+    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},#{type,jdbcType=INTEGER}
       )
   </insert>
   <select id="selectAdminNameById" parameterType="java.lang.String" resultType="java.lang.String">
-  		select 
+  		select
   		name
   		from admin
-  		where 
+  		where
   		id=#{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAutNoCount" parameterType="String" resultType="java.lang.Integer">
@@ -135,7 +135,7 @@
 		from permission
 		where
 		super_id=#{superId,jdbcType=VARCHAR}
-  </select>	
+  </select>
   <select id="selectIdByAutNo" parameterType="java.lang.String" resultType="java.lang.String">
   		select
   		id
@@ -155,14 +155,14 @@
 		name as superId
 		from permission
 		where
-		id=#{id,jdbcType=VARCHAR} 
+		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 
+  		select
     	<include refid="Base_Column_List" />
     	from permission
     	where
@@ -223,12 +223,12 @@
       	type = #{type,jdbcType=INTEGER},
       </if>
     </set>
-    where id = #{id,jdbcType=VARCHAR} 		
+    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 		
+  		from permission
   		where
   		super_id=#{superId,jdbcType=VARCHAR}
   		order by aut_no
@@ -244,9 +244,8 @@
   <select id="selectOneAll" resultType="com.goafanti.permission.bo.PermissionBo">
   		select
   		<include refid="Base_Column_List" />
-  		from permission 		
-  		where
-  		hierarchies=1
+  		from permission
+  		where 1=1
   		order by show_order
   </select>
   <select id="selectNameById" parameterType="java.lang.String" resultType="java.lang.String">
@@ -254,7 +253,7 @@
 		name as superId
 		from permission
 		where
-		id=#{id,jdbcType=VARCHAR} 
+		id=#{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAllBySuperId" parameterType="String" resultType="com.goafanti.permission.bo.PermissionBo">
   		select
@@ -278,7 +277,7 @@
 		where
 		name=#{name,jdbcType=VARCHAR}
   </select>
-  
+
   <select id="selectIdByNameCount" resultType="java.lang.Integer">
 		select count(*)
 		from permission
@@ -290,7 +289,7 @@
   		count(0)
   		from role_permission
   		where
-  		pid=#{id,jdbcType=VARCHAR} 
+  		pid=#{id,jdbcType=VARCHAR}
   </select>
   <select id="selectNavList" parameterType="java.lang.String" resultType="com.goafanti.permission.bo.Navigation">
 		<choose>
@@ -302,7 +301,7 @@
 					url
 				from
 					permission
-				where type = 0	 
+				where type = 0
 			</when>
 			<otherwise>
 				select
@@ -334,7 +333,7 @@
 					super_id = #{superId,jdbcType=VARCHAR}
 					and (type = 1 or type = 2)
   			</when>
-  			<otherwise>				
+  			<otherwise>
 				select
 					d.id,
 					d.name,
@@ -356,4 +355,4 @@
   <select id="selectTopNavBySubUrl" resultType="java.lang.String" parameterType="java.lang.String">
   	select super_id  from permission where id = (select super_id from permission where url = #{subUrl,jdbcType=VARCHAR})
   </select>
-</mapper>
+</mapper>

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

@@ -15,31 +15,38 @@ public class PermissionBo {
 	 * 权限名字
 	 */
 	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 String superId;
+
 	private List<PermissionBo> children;
-	
+
 	private String key;
-	
 
-	
+	private Integer type;
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
 
 	public String getKey() {
 		return key;
@@ -152,6 +159,6 @@ public class PermissionBo {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
-	
+
+
 }

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

@@ -26,7 +26,6 @@ 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());
@@ -35,7 +34,6 @@ public class NewPermissionApiController extends BaseApiController {
 
 	/**权限管理最上级新增 **/
 	@RequestMapping(value = "/addSupPermission" , method = RequestMethod.POST)
-	@CachePut(cacheNames = "permissions#60",key = "'permissions:'+'all'")
 	public Result addSupPermission(Permission record ){
 		Result res = new Result();
 		if(StringUtils.isBlank(record.getName())){

+ 24 - 13
src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -233,26 +234,36 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
 	@Override
 	public Map<String,Object> findPermissionsAll() {
 		Map<String,Object> params = new HashMap<String, Object>();
-		List<PermissionBo> one=permissionMapper.selectOneAll();
-		for (PermissionBo i:one){
-			i.setKey(i.getId());
-			List<PermissionBo> two=permissionMapper.selectAllBySuperId(i.getId());
-			for(PermissionBo o:two){
-				o.setChildren(permissionMapper.selectAllBySuperId(o.getId()));
-				o.setKey(o.getId());
-				List<PermissionBo> three=permissionMapper.selectAllBySuperId(o.getId());
-				for(PermissionBo p:three){
-					p.setChildren(permissionMapper.selectAllBySuperId(p.getId()));
-					p.setKey(p.getId());
+		List<PermissionBo> all=permissionMapper.selectOneAll();
+		List<PermissionBo> one = all.stream().filter(e -> e.getType()==0).collect(Collectors.toList());
+		List<PermissionBo> tow= all.stream().filter(e -> e.getType()==1).collect(Collectors.toList());
+		List<PermissionBo> three= all.stream().filter(e -> e.getType()==2).collect(Collectors.toList());
+		for (PermissionBo bo : one) {
+			bo.setKey(bo.getId());
+			List<PermissionBo> one2=new ArrayList<>();
+			for (PermissionBo bo2 : tow) {
+				bo2.setKey(bo2.getId());
+				if (bo2.getSuperId().equals(bo.getId())){
+					List<PermissionBo> one3=new ArrayList<>();
+					for (PermissionBo bo3 : three) {
+						bo3.setKey(bo3.getId());
+						if (bo3.getSuperId().equals(bo2.getId())){
+							one3.add(bo3);
+						}
+					}
+					bo2.setChildren(one3);
+					one2.add(bo2);
 				}
-				o.setChildren(three);
 			}
-			i.setChildren(two);
+			bo.setChildren(one2);
 		}
 		params.put("one", one);
 		return params;
 	}
 
+
+
+
 	@Override
 	public List<Navigation> selectNavList(){
 		String aid = TokenManager.hasRole(AFTConstants.SUPERADMIN) ? null : TokenManager.getAdminId();