From 7e568d81e62a6a5df658c44b060decd1885b3649 Mon Sep 17 00:00:00 2001 From: GUO <1923636941@qq.com> Date: Sat, 18 May 2024 20:05:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=BC=96=E7=A0=81=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/VideoItemServiceImpl.java | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) 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());