更改用户Tree权限， 缓存设置为2分钟

gis_admin/src/main/java/com/gis/admin/entity/po/SysRoleEntity.java

@@ -1,5 +1,6 @@
 package com.gis.admin.entity.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.gis.common.base.entity.po.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
@@ -47,6 +48,7 @@ public class SysRoleEntity extends BaseEntity implements Serializable {
     private Integer isEnabled;
 
     @Transient
+    @TableField(exist  = false)
     @ApiModelProperty(value = "该角色的用户数")
     private Integer count;
 }

gis_admin/src/main/java/com/gis/admin/entity/po/SysUserEntity.java

@@ -1,6 +1,7 @@
 package com.gis.admin.entity.po;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.gis.common.base.entity.po.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
@@ -62,14 +63,17 @@ public class SysUserEntity extends BaseEntity implements Serializable {
     private String thumb;
 
 //    @JSONField(serialize = false)
+    @TableField(exist  = false)
     @Transient
     @ApiModelProperty(value = "角色，sys_admin:系统管理员，sys_high：高级管理员， sys_normal:普通管理员, sys_visitor：游客")
     private String roleKey;
 
+    @TableField(exist  = false)
     @Transient
     @ApiModelProperty(value = "角色id")
     private Integer roleId;
 
+    @TableField(exist  = false)
     @Transient
     @ApiModelProperty(value = "角色名称")
     private String roleName;

gis_admin/src/main/java/com/gis/admin/service/impl/SysResourceServiceImpl.java

@@ -106,10 +106,10 @@ public class SysResourceServiceImpl extends ServiceImpl<SysResourceMapper, SysRe
         List<SysResourceEntity> cacheAll = findCacheAll();
 
         // 设置用户权限
-        List roles = iBaseService.getUserRole();
+//        List roles = iBaseService.getUserRole();
 
-        // 系统管理员， 拥有所有权限
-        if (1 == userId || roles.contains("sys_admin")) {
+        // 系统管理员， 拥有所有权
+        if (1 == userId) {
             tree = new SysResourceTreeUtil(cacheAll);
         } else {
             List<String> ids = getAllIdByUserId(userId);
@@ -179,10 +179,9 @@ public class SysResourceServiceImpl extends ServiceImpl<SysResourceMapper, SysRe
         List all = redisUtil.getJsonList(REDIS_RESOURCE_KEY, SysResourceEntity.class);
         if (all == null) {
             log.info("从数据库获取");
-//            all = this.findAll();
             all = this.list();
-            // 21600-> 6h
-            redisUtil.setObjectToJson(REDIS_RESOURCE_KEY, all, 21600);
+            // 2min
+            redisUtil.setObjectToJson(REDIS_RESOURCE_KEY, all, 120);
         }
         log.info("走缓存");
         return all;
@@ -195,8 +194,8 @@ public class SysResourceServiceImpl extends ServiceImpl<SysResourceMapper, SysRe
         if (all == null) {
             log.info("从数据库获取");
             all = this.list();
-            // 21600-> 6h
-            redisUtil.setObjectToJson(REDIS_RESOURCE_KEY, all, 21600);
+            // 2min
+            redisUtil.setObjectToJson(REDIS_RESOURCE_KEY, all, 120);
         }
         log.info("走缓存");
         return all;

gis_admin/src/main/java/com/gis/admin/service/impl/SysUserServiceImpl.java

@@ -113,7 +113,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
     @Override
     public Result removes(String ids) {
 
-//        List<SysUserEntity> entityList = this.findByIds(ids);
         List<SysUserEntity> entityList = this.listByIds(Arrays.asList(ids));
         for (SysUserEntity entity: entityList) {
             Long id = entity.getId();
@@ -127,9 +126,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
                 log.error("管理员账户不能删除 {}", id);
                 return Result.failure("管理员账户不能删除");
             }
-            entity.setIsDelete(1);
-            entity.setUpdateTime(LocalDateTime.now());
-            this.updateById(entity);
+//            entity.setIsDelete(1);
+//            entity.setUpdateTime(LocalDateTime.now());
+//            this.updateById(entity);
+            this.removeById(entity);
 
             // 删除用户角色表的用户id, 不删除角色统计人数会有误
             entityMapper.deleteUserRoleByUserId(id);
@@ -138,12 +138,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
         return Result.success();
     }
 
-//    @Override
-//    public Result<SysUserEntity> search(UserPageDateDto param) {
-//        startPage(param);
-//        PageInfo<SysUserEntity> page = new PageInfo<>(entityMapper.search(param));
-//        return Result.success(page);
-//    }
+
 
     @Override
     public Result<SysUserEntity> search(UserPageDateDto param) {