复制生成gps

src/main/java/com/fdkankan/manage_jp/controller/LaserController.java

@@ -51,18 +51,18 @@ public class LaserController extends BaseController{
 
     @GetMapping("/checkEditPermission")
     public Result checkEditPermission(@RequestParam(required = false)String sceneNum){
-        String redisKey = String.format(RedisKeyUtil.checkEditPermissionCacheKey,sceneNum,getToken());
+        String username = JwtUtil.getUsername(getToken());
+        String redisKey = String.format(RedisKeyUtil.checkEditPermissionCacheKey,sceneNum,username);
         if(redisUtil.hasKey(redisKey)){
             return Result.success(redisUtil.get(redisKey).equals("1"));
         }
-        Boolean flag = this.checkEditPer(sceneNum, getToken());
+        Boolean flag = this.checkEditPer(sceneNum, getToken(),username);
         redisUtil.set(redisKey,flag?"1":"0",30);
         return Result.success(flag);
     }
 
-    private Boolean checkEditPer(String sceneNum, String token) {
-        //log.info("checkEditPermission--:{},{}",sceneNum,getToken());
-        String username = JwtUtil.getUsername(getToken());
+    private Boolean checkEditPer(String sceneNum, String token,String username) {
+        log.info("checkEditPermission--:{},{},{}",sceneNum,token,username);
         User user = userService.getByUserName(username);
         if(user == null){
            return false;
@@ -76,17 +76,14 @@ public class LaserController extends BaseController{
             return true;
         }
 
-        Long cameraId = null;
         Long userId = null;
         ScenePro scenePro = sceneProService.getByNum(sceneNum);
         if(scenePro == null){
             ScenePlus scenePlus = scenePlusService.getByNum(sceneNum);
             if(scenePlus !=null){
-                cameraId = scenePlus.getCameraId();
                 userId = scenePlus.getUserId();
             }
         }else {
-            cameraId = scenePro.getCameraId();
             userId = scenePro.getUserId();
         }
         User sceneUser = userService.getById(userId);