1

src/main/java/com/fdkankan/ucenter/common/constants/ResultCode.java

@@ -11,6 +11,8 @@ public enum ResultCode {
     UPLOAD_ERROR3(500003, "文件不存在！"),
     CAMERA_NOT_EXIT(500004, "相机不存在或未绑定"),
     DIS_COO_ERROR(500005, "解除失败，相机没协作用户"),
+    NOT_PER(500006, "权限不足"),
+    COO_ERROR(500007, "协作失败，请先解除协作"),
 
     USER_NOT_LOGIN(3004, "用户未登录"),
     PARAM_MISS(3001, "参数缺失"),

src/main/java/com/fdkankan/ucenter/service/impl/SceneCooperationServiceImpl.java

@@ -293,8 +293,11 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
         if(camera == null || cameraDetail == null || cameraDetail.getUserId() == null){
             throw new BusinessException(ResultCode.CAMERA_NOT_EXIT);
         }
-        if(loginUser.getId().equals(cameraDetail.getUserId())){
-            throw new BusinessException(LoginConstant.FAILURE_CODE_3025, LoginConstant.FAILURE_MSG_3025);
+        if(!loginUser.getId().equals(cameraDetail.getUserId())){
+            throw new BusinessException(ResultCode.NOT_PER);
+        }
+        if(cameraDetail.getCooperationUser() != null){
+            throw new BusinessException(ResultCode.COO_ERROR);
         }
 
         List<ScenePro> v3List = sceneProService.getListByCameraId(param.getCameraId());