Authored by mali

回退代码

@@ -210,11 +210,11 @@ public class UfoLiveService { @@ -210,11 +210,11 @@ public class UfoLiveService {
210 210
211 // 查询当前登录用户默认的摄像头设备 211 // 查询当前登录用户默认的摄像头设备
212 public Integer queryInitCameraCode(QiniuLiveRecord req) { 212 public Integer queryInitCameraCode(QiniuLiveRecord req) {
213 - Integer liveCameraCode = liveRecordTimeMapper.selectCameraByOrderCode(req.getOrderCode()); // 优先取录制按钮时候保存的摄像头编号 213 + /*Integer liveCameraCode = liveRecordTimeMapper.selectCameraByOrderCode(req.getOrderCode()); // 优先取录制按钮时候保存的摄像头编号
214 if (null != liveCameraCode) { 214 if (null != liveCameraCode) {
215 req.setCameraCode(null == req.getCameraCode() ? liveCameraCode : req.getCameraCode()); 215 req.setCameraCode(null == req.getCameraCode() ? liveCameraCode : req.getCameraCode());
216 return liveCameraCode; 216 return liveCameraCode;
217 - } 217 + }*/
218 218
219 // UserCameraRecord userCameraRecord = userCameraRecordMapper.selectUserCameraRecord(new UserHelper().getUserId()); 219 // UserCameraRecord userCameraRecord = userCameraRecordMapper.selectUserCameraRecord(new UserHelper().getUserId());
220 Optional<Integer> phoneCamera = Optional.ofNullable(req.getPhoneUid()).map(phoneUidCameraService::selectByphoneUid).map(PhoneUidCameraBo::getCameraCode); 220 Optional<Integer> phoneCamera = Optional.ofNullable(req.getPhoneUid()).map(phoneUidCameraService::selectByphoneUid).map(PhoneUidCameraBo::getCameraCode);