From 8c0a68714b5e290512c92aad68c38df166b50259 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Tue, 4 Apr 2023 17:44:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=90=A4=E7=9F=B3=E8=AE=BE=E5=A4=87=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/video/service/impl/VideoItemServiceImpl.java | 5 +++-- src/main/resources/i18n/messages.properties | 1 + src/main/resources/i18n/messages_en_US.properties | 1 + src/main/resources/i18n/messages_zh_CN.properties | 1 + 4 files changed, 6 insertions(+), 2 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 44cc23040..0ae662a45 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 @@ -71,10 +71,11 @@ public class VideoItemServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(VideoItem::getVideoId, videoItem.getVideoId()) - .eq(VideoItem::getSerialNumber, videoItem.getSerialNumber()); + .eq(VideoItem::getSerialNumber, videoItem.getSerialNumber()) + .eq(VideoItem::getVerificationCode, videoItem.getVerificationCode()); int count = videoItemMapper.selectCount(queryWrapper); if (count > 0) { - throw new OpenAlertException(MessageUtil.get("serialNumberExistErr")); + throw new OpenAlertException(MessageUtil.get("serialNumberAndCodeExistErr")); } } // TODO 此处直接添加成功,暂时不需要添加萤石设备 用户使用此功能前需要先在萤石添加好自己需要的设备,之后在智慧工地平台添加 diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties index 9e7fa35d9..55c2ff5a3 100644 --- a/src/main/resources/i18n/messages.properties +++ b/src/main/resources/i18n/messages.properties @@ -68,6 +68,7 @@ userNotExist=用户不存在 appKeyNotExist=appKey不存在 videoTypeEnableErr=该视频类型未启用 serialNumberExistErr=设备序列号已存在 +serialNumberAndCodeExistErr=设备序列号下通道已存在 keyAndSecretMatchErr=appkey和appSecret不匹配 closeClientErr=请在萤石客户端关闭终端绑定 workerTypeNameExistErr=工种名称已存在 diff --git a/src/main/resources/i18n/messages_en_US.properties b/src/main/resources/i18n/messages_en_US.properties index 5c7bdc1c7..d2cef5058 100644 --- a/src/main/resources/i18n/messages_en_US.properties +++ b/src/main/resources/i18n/messages_en_US.properties @@ -68,6 +68,7 @@ userNotExist=user does not exist appKeyNotExist=Appkey does not exist videoTypeEnableErr=The video type is not enabled serialNumberExistErr=Device serial number already exists +serialNumberAndCodeExistErr=The channel under the device serial number already exists keyAndSecretMatchErr=Appkey and appsecret do not match closeClientErr=Please turn off terminal binding in fluorite client workerTypeNameExistErr=Job name already exists diff --git a/src/main/resources/i18n/messages_zh_CN.properties b/src/main/resources/i18n/messages_zh_CN.properties index 830ee89c7..f7292fffd 100644 --- a/src/main/resources/i18n/messages_zh_CN.properties +++ b/src/main/resources/i18n/messages_zh_CN.properties @@ -68,6 +68,7 @@ userNotExist=用户不存在 appKeyNotExist=appKey不存在 videoTypeEnableErr=该视频类型未启用 serialNumberExistErr=设备序列号已存在 +serialNumberAndCodeExistErr=设备序列号下通道已存在 keyAndSecretMatchErr=appkey和appSecret不匹配 closeClientErr=请在萤石客户端关闭终端绑定 workerTypeNameExistErr=工种名称已存在