FIX4.1

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkServiceImpl.java

@@ -423,39 +423,21 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
             e.printStackTrace();
         }
         String userNameForToken = getUserNameForToken();
-        if (!userNameForToken.equals(entity.getUserId())) {
-            if (ObjectUtil.isNotEmpty(entity.getType())&&!entity.getType().equalsIgnoreCase("pro")){
-                JSONObject cameraList =fdkkClient.getCameraListByToken(getToken(),"3,4,5");
-                List<String> snCodes = new ArrayList<>();
-                if (cameraList.getInteger("code") == 0) {
-                    JSONArray data = cameraList.getJSONObject("data").getJSONArray("snCodes");
-                    for (Object datum : data) {
-                        snCodes.add(String.valueOf(datum));
-                    }
-                    if (!snCodes.contains(entity.getSnCode())) {
-                        return Result.failure(ErrorEnum.FAILURE_SYS_3011.code(), "当前无操作权限");
-                    }
-                } else {
-                    return Result.failure("获取四维用户激光数据失败");
+        if (!userNameForToken.equals(entity.getUserId())&&ObjectUtil.isNotEmpty(entity.getType())&&!entity.getType().equalsIgnoreCase("pro")) {
+            return Result.failure(ErrorEnum.FAILURE_SYS_3011.code(), "当前无操作权限");
+        } else {
+            JSONObject cameraList =fdkkClient.getCameraListByToken(getToken(),"3,4,5");
+            List<String> snCodes = new ArrayList<>();
+            if (cameraList.getInteger("code") == 0) {
+                JSONArray data = cameraList.getJSONObject("data").getJSONArray("snCodes");
+                for (Object datum : data) {
+                    snCodes.add(String.valueOf(datum));
                 }
-            }else {
-                return Result.failure(ErrorEnum.FAILURE_SYS_3011.code(), "当前无操作权限");
-            }
-        }else {
-            if (ObjectUtil.isNotEmpty(entity.getType())&&!entity.getType().equalsIgnoreCase("pro")){
-                JSONObject cameraList =fdkkClient.getCameraListByToken(getToken(),"3,4,5");
-                List<String> snCodes = new ArrayList<>();
-                if (cameraList.getInteger("code") == 0) {
-                    JSONArray data = cameraList.getJSONObject("data").getJSONArray("snCodes");
-                    for (Object datum : data) {
-                        snCodes.add(String.valueOf(datum));
-                    }
-                    if (!snCodes.contains(entity.getSnCode())) {
-                        return Result.failure(ErrorEnum.FAILURE_SYS_3011.code(), "当前无操作权限");
-                    }
-                } else {
-                    return Result.failure("获取四维用户激光数据失败");
+                if (!snCodes.contains(entity.getSnCode())) {
+                    return Result.failure(ErrorEnum.FAILURE_SYS_3011.code(), "当前无操作权限");
                 }
+            } else {
+                return Result.failure("获取四维用户激光数据失败");
             }
         }
 

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/WorkController.java

@@ -160,42 +160,26 @@ public class WorkController extends BaseController {
         String userId = getUserNameForToken();
         log.info("userId: {}", userId);
 
-        if (!userId.equals(entity.getUserId())) {
-            if (ObjectUtil.isNotEmpty(entity.getType())&&!entity.getType().equalsIgnoreCase("pro")){
-                JSONObject cameraList =fdkkClient.getCameraListByToken(getToken(),"3,4,5");
-                List<String> snCodes = new ArrayList<>();
-                if (cameraList.getInteger("code") == 0) {
-                    JSONArray data = cameraList.getJSONObject("data").getJSONArray("snCodes");
-                    for (Object datum : data) {
-                        snCodes.add(String.valueOf(datum));
-                    }
-                    if (!snCodes.contains(entity.getSnCode())) {
-                        return Result.failure(ErrorEnum.FAILURE_SYS_3011.code(), "当前无操作权限");
-                    }
-                } else {
-                    return Result.failure("获取四维用户激光数据失败");
-                }
-            }else {
-                return Result.failure(ErrorEnum.FAILURE_SYS_3011.code(), "当前无操作权限");
-            }
+
+        if (!userId.equals(entity.getUserId())&&ObjectUtil.isNotEmpty(entity.getType())&&!entity.getType().equalsIgnoreCase("pro")) {
+            return Result.failure(MsgCode.e3005, "当前无操作权限");
         }else {
-            if (ObjectUtil.isNotEmpty(entity.getType())&&!entity.getType().equalsIgnoreCase("pro")){
-                JSONObject cameraList =fdkkClient.getCameraListByToken(getToken(),"3,4,5");
-                List<String> snCodes = new ArrayList<>();
-                if (cameraList.getInteger("code") == 0) {
-                    JSONArray data = cameraList.getJSONObject("data").getJSONArray("snCodes");
-                    for (Object datum : data) {
-                        snCodes.add(String.valueOf(datum));
-                    }
-                    if (!snCodes.contains(entity.getSnCode())) {
-                        return Result.failure(ErrorEnum.FAILURE_SYS_3011.code(), "当前无操作权限");
-                    }
-                } else {
-                    return Result.failure("获取四维用户激光数据失败");
+            JSONObject cameraList =fdkkClient.getCameraListByToken(getToken(),"3,4,5");
+            List<String> snCodes = new ArrayList<>();
+            if (cameraList.getInteger("code") == 0) {
+                JSONArray data = cameraList.getJSONObject("data").getJSONArray("snCodes");
+                for (Object datum : data) {
+                    snCodes.add(String.valueOf(datum));
                 }
+                if (!snCodes.contains(entity.getSnCode())) {
+                    return Result.failure(ErrorEnum.FAILURE_SYS_3011.code(), "当前无操作权限");
+                }
+            } else {
+                return Result.failure("获取四维用户激光数据失败");
             }
         }
 
+
         redisUtil.set(RedisConstant.WORK_ID + workId, entity, 30, TimeUnit.SECONDS);
 
         return Result.success();