diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java index 34439e0ed..f4cd30a36 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java @@ -92,16 +92,7 @@ public class VideoItemServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(VideoItem::getVideoId, videoItem.getVideoId()) - .eq(VideoItem::getSerialNumber, videoItem.getSerialNumber()) - .eq(VideoItem::getVerificationCode, videoItem.getVerificationCode()); - int count = videoItemMapper.selectCount(queryWrapper); - if (count > 0) { - throw new OpenAlertException(MessageUtil.get("serialNumberAndCodeExistErr")); - } - } + valid(videoItem, projectVideoConfig); // TODO 此处直接添加成功,暂时不需要添加萤石设备 用户使用此功能前需要先在萤石添加好自己需要的设备,之后在智慧工地平台添加 // if (projectVideoConfig.getVideoType() == 1) { // String accessToken = YsVideoUtil.getToken(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret()); @@ -119,6 +110,27 @@ public class VideoItemServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(VideoItem::getVideoId, videoItem.getVideoId()) + .eq(VideoItem::getSerialNumber, videoItem.getSerialNumber()); + int count = videoItemMapper.selectCount(queryWrapper); + if (count > 0) { + throw new OpenAlertException(MessageUtil.get("serialNumberExistErr")); + } + } else if (projectVideoConfig.getVideoType() != 2) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(VideoItem::getVideoId, videoItem.getVideoId()) + .eq(VideoItem::getSerialNumber, videoItem.getSerialNumber()) + .eq(VideoItem::getVerificationCode, videoItem.getVerificationCode()); + int count = videoItemMapper.selectCount(queryWrapper); + if (count > 0) { + throw new OpenAlertException(MessageUtil.get("serialNumberAndCodeExistErr")); + } + } + } + @Override public void updateVideoItem(VideoItem videoItem) { ProjectVideoConfig projectVideoConfig = projectVideoConfigMapper.selectById(videoItem.getVideoId());