1

src/main/java/com/fdkankan/manage/httpClient/client/FdKKClient.java

@@ -13,7 +13,7 @@ import java.util.HashMap;
 public interface FdKKClient {
 
 
-    @Get("/api/scene/file/rebuildScene")
+    @Get(value = "/api/scene/file/rebuildScene" ,timeout = 60000,connectTimeout = 60000)
     JSONObject rebuildScene( @Query HashMap<String, Object> param);
 
     @Get("/ucenter/_manage/_copy_scene")

src/main/java/com/fdkankan/manage/service/ISysMenuService.java

@@ -1,6 +1,8 @@
 package com.fdkankan.manage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.entity.SysRole;
+import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.vo.request.RequestBase;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.SysMenu;
@@ -34,4 +36,6 @@ public interface ISysMenuService extends IService<SysMenu> {
     HashMap<Long, SysMenu> getByIds(List<Long> menuIds);
 
     List<Long> getMenuIdsByRoleId(Long roleId);
+
+    void setRoleAndMenuCache(SysRole role, SysUser sysUser);
 }

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -331,7 +331,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             throw new BusinessException(SceneConstant.FAILURE_CODE_5037, SceneConstant.FAILURE_MSG_5037);
         }
 
-        Long cameraId = scenePro == null ? scenePlus.getCameraId() : scenePro.getCameraId();
+        Long sceneCameraId = scenePro == null ? scenePlus.getCameraId() : scenePro.getCameraId();
         Long space = scenePro == null ? 0 :scenePro.getSpace();
         if(scenePlus !=null){
             ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
@@ -341,7 +341,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         Long newUseSpace = space + cameraDetail.getUsedSpace();
 
         Long totalSpace = cameraDetail.getTotalSpace();
-        UserIncrement userIncrement = userIncrementService.getByCameraId(cameraId);
+        UserIncrement userIncrement = userIncrementService.getByCameraId(camera.getId());
         if(userIncrement!=null){
             IncrementType incrementType = incrementTypeService.getById(userIncrement.getIncrementTypeId());
             if(incrementType!=null){
@@ -357,7 +357,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             throw new BusinessException(ResultCode.CAMERA_SPACE_ERROR);
         }
 
-        Camera oldCamera = cameraService.getById(cameraId);
+        Camera oldCamera = cameraService.getById(sceneCameraId);
         if(oldCamera == null){
             throw new BusinessException(ResultCode.CAMERA_NOT_EXIST);
         }

src/main/java/com/fdkankan/manage/service/impl/SysMenuServiceImpl.java

@@ -1,19 +1,20 @@
 package com.fdkankan.manage.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.config.MenuInit;
+import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.vo.request.RequestBase;
 import com.fdkankan.manage.common.PageInfo;
-import com.fdkankan.manage.entity.Meta;
-import com.fdkankan.manage.entity.SysMenu;
-import com.fdkankan.manage.entity.SysRoleMenu;
-import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.mapper.ISysMenuMapper;
 import com.fdkankan.manage.service.ISysMenuService;
 import com.fdkankan.manage.service.ISysRoleMenuService;
 import com.fdkankan.manage.service.ISysUserService;
 import com.fdkankan.manage.vo.response.SysMenuVo;
+import com.fdkankan.redis.constant.RedisKey;
+import com.fdkankan.redis.util.RedisUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,6 +37,10 @@ public class SysMenuServiceImpl extends ServiceImpl<ISysMenuMapper, SysMenu> imp
     ISysRoleMenuService roleMenuService;
     @Autowired
     ISysUserService userService;
+    @Autowired
+    RedisUtil redisUtil;
+    @Autowired
+    MenuInit menuInit;
 
 
     @Override
@@ -217,4 +222,16 @@ public class SysMenuServiceImpl extends ServiceImpl<ISysMenuMapper, SysMenu> imp
         wrapper.eq(SysMenu::getParentId,parentId);
         return  this.list(wrapper);
     }
+
+    @Override
+    public void setRoleAndMenuCache(SysRole role, SysUser sysUser) {
+        //设置redis role
+        String roleType = role.getRoleType();
+        List<String> roleList = Collections.singletonList(roleType);
+        redisUtil.set(String.format(RedisKey.MANAGE_ROLE_USER,sysUser.getId()), JSONObject.toJSONString(roleList));
+        //设置redis perm
+        List<SysMenu> menus = this.getListByUserId(sysUser.getId());
+        List<String> menuList = menus.parallelStream().map(SysMenu::getPerms).collect(Collectors.toList());
+        redisUtil.set(String.format(RedisKey.MANAGE_PERM_USER,sysUser.getId()), JSONObject.toJSONString(menuList));
+    }
 }

src/main/java/com/fdkankan/manage/service/impl/SysRoleServiceImpl.java

@@ -10,6 +10,7 @@ import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.manage.entity.SysRole;
 import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.mapper.ISysRoleMapper;
+import com.fdkankan.manage.service.ISysMenuService;
 import com.fdkankan.manage.service.ISysRoleMenuService;
 import com.fdkankan.manage.service.ISysRoleService;
 import com.fdkankan.manage.service.ISysUserService;
@@ -39,6 +40,8 @@ public class SysRoleServiceImpl extends ServiceImpl<ISysRoleMapper, SysRole> imp
     ISysUserService sysUserService;
     @Autowired
     ISysRoleMenuService roleMenuService;
+    @Autowired
+    ISysMenuService sysMenuService;
 
     @Override
     public void addOrUpdate(SysRoleParam param) {

src/main/java/com/fdkankan/manage/service/impl/SysUserServiceImpl.java

@@ -48,6 +48,8 @@ public class SysUserServiceImpl extends ServiceImpl<ISysUserMapper, SysUser> imp
     private ISysMenuService menuService;
     @Autowired
     private RedisUtil redisUtil;
+    @Autowired
+    private ISysMenuService sysMenuService;
 
     @Override
     public SysUser getByUserName(String userName) {
@@ -77,14 +79,8 @@ public class SysUserServiceImpl extends ServiceImpl<ISysUserMapper, SysUser> imp
         loginVO.setRoleId(role.getId());
         loginVO.setRoleName(role.getRoleName());
 
-        //设置redis role
-        String roleType = role.getRoleType();
-        List<String> roleList = Collections.singletonList(roleType);
-        redisUtil.set(String.format(RedisKey.MANAGE_ROLE_USER,sysUser.getId()), JSONObject.toJSONString(roleList));
-        //设置redis perm
-        List<SysMenu> menus = menuService.getListByUserId(sysUser.getId());
-        List<String> menuList = menus.parallelStream().map(SysMenu::getPerms).collect(Collectors.toList());
-        redisUtil.set(String.format(RedisKey.MANAGE_PERM_USER,sysUser.getId()), JSONObject.toJSONString(menuList));
+        sysMenuService.setRoleAndMenuCache(role,sysUser);
+
         return loginVO;
     }