Преглед на файлове

场景权限校验改为查相机detail的companyid

dsx преди 2 години
родител
ревизия
84d5ac7001
променени са 1 файла, в които са добавени 6 реда и са изтрити 7 реда
  1. 6 7
      src/main/java/com/fdkankan/scene/Interceptor/CheckPermitAspect.java

+ 6 - 7
src/main/java/com/fdkankan/scene/Interceptor/CheckPermitAspect.java

@@ -9,10 +9,7 @@ import com.fdkankan.common.constant.SceneStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.scene.entity.SceneCooperation;
-import com.fdkankan.scene.entity.ScenePlus;
-import com.fdkankan.scene.entity.User;
-import com.fdkankan.scene.entity.UserRole;
+import com.fdkankan.scene.entity.*;
 import com.fdkankan.scene.service.*;
 import com.fdkankan.web.user.SSOLoginHelper;
 import com.fdkankan.web.user.SSOUser;
@@ -54,6 +51,8 @@ public class CheckPermitAspect {
 	private IUserRoleService userRoleService;
 	@Autowired
 	private IUserService userService;
+	@Autowired
+	private ICameraDetailService cameraDetailService;
 
 
 	@Pointcut("@annotation(com.fdkankan.scene.annotation.CheckPermit)")
@@ -108,10 +107,10 @@ public class CheckPermitAspect {
 		if(roleIdSet.contains(6L)){
 			//当前登录用户user
 			User currentUser = userService.getById(user.getId());
-			User sceneUser = userService.getById(scenePlus.getUserId());
+			CameraDetail cameraDetail = cameraDetailService.findByCameraId(scenePlus.getCameraId());
 			if(Objects.isNull(currentUser) || Objects.isNull(currentUser.getCompanyId())
-					|| Objects.isNull(sceneUser) || Objects.isNull(sceneUser.getCompanyId())
-					|| !currentUser.getCompanyId().equals(sceneUser.getCompanyId())){
+					|| Objects.isNull(cameraDetail) || Objects.isNull(cameraDetail.getCompanyId())
+					|| !currentUser.getCompanyId().equals(cameraDetail.getCompanyId())){
 				throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
 			}else{
 				return;