|
@@ -8,6 +8,7 @@ import com.fdkankan.common.exception.BusinessException;
|
|
import com.fdkankan.ucenter.common.PageInfo;
|
|
import com.fdkankan.ucenter.common.PageInfo;
|
|
import com.fdkankan.common.util.DateUtil;
|
|
import com.fdkankan.common.util.DateUtil;
|
|
import com.fdkankan.common.util.FileSizeUtil;
|
|
import com.fdkankan.common.util.FileSizeUtil;
|
|
|
|
+import com.fdkankan.ucenter.common.constants.NacosProperty;
|
|
import com.fdkankan.ucenter.constant.CameraConstant;
|
|
import com.fdkankan.ucenter.constant.CameraConstant;
|
|
import com.fdkankan.ucenter.constant.LoginConstant;
|
|
import com.fdkankan.ucenter.constant.LoginConstant;
|
|
import com.fdkankan.ucenter.constant.OrderConstant;
|
|
import com.fdkankan.ucenter.constant.OrderConstant;
|
|
@@ -232,7 +233,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
|
|
cameraIds.add(Long.valueOf(id));
|
|
cameraIds.add(Long.valueOf(id));
|
|
}
|
|
}
|
|
userIncrementService.unbindCamera(cameraIds); //取消关联用户权益
|
|
userIncrementService.unbindCamera(cameraIds); //取消关联用户权益
|
|
- cameraDetailService.unbindCamera(cameraIds); //取消相机用户关联
|
|
|
|
|
|
+ cameraDetailService.unbindCamera(cameraIds); //取消相机用户关联
|
|
sceneService.bindOrUnCamera(cameraIds,null); //取消关联场景
|
|
sceneService.bindOrUnCamera(cameraIds,null); //取消关联场景
|
|
sceneProService.bindOrUnCamera(cameraIds,null); //取消关联场景
|
|
sceneProService.bindOrUnCamera(cameraIds,null); //取消关联场景
|
|
scenePlusService.bindOrUnCamera(cameraIds,null); //取消关联场景
|
|
scenePlusService.bindOrUnCamera(cameraIds,null); //取消关联场景
|
|
@@ -270,6 +271,10 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
|
|
sceneService.bindOrUnCamera(cameraIds,user.getId());
|
|
sceneService.bindOrUnCamera(cameraIds,user.getId());
|
|
sceneProService.bindOrUnCamera(cameraIds,user.getId());
|
|
sceneProService.bindOrUnCamera(cameraIds,user.getId());
|
|
scenePlusService.bindOrUnCamera(cameraIds,user.getId());
|
|
scenePlusService.bindOrUnCamera(cameraIds,user.getId());
|
|
|
|
+
|
|
|
|
+ if("local".equals(NacosProperty.uploadType)){ //局域网绑定相机,添加权益
|
|
|
|
+ userIncrementService.addByCameraAndUser(cameraIds,user.getId());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|