admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

萤石设备修改

Browse Source
This commit is contained in:
pengjie 2023-04-04 17:44:15 +08:00
parent 0ada098ac2
commit 8c0a68714b
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java
View File

@ -71,10 +71,11 @@ public class VideoItemServiceImpl extends ServiceImpl<VideoItemMapper, VideoItem
if (projectVideoConfig.getVideoType() != 2) { if (projectVideoConfig.getVideoType() != 2) {
QueryWrapper<VideoItem> queryWrapper = new QueryWrapper<>(); QueryWrapper<VideoItem> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(VideoItem::getVideoId, videoItem.getVideoId()) 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); int count = videoItemMapper.selectCount(queryWrapper);
if (count > 0) { if (count > 0) {
throw new OpenAlertException(MessageUtil.get("serialNumberExistErr")); throw new OpenAlertException(MessageUtil.get("serialNumberAndCodeExistErr"));
} }
} }
// TODO 此处直接添加成功,暂时不需要添加萤石设备 用户使用此功能前需要先在萤石添加好自己需要的设备,之后在智慧工地平台添加 // TODO 此处直接添加成功,暂时不需要添加萤石设备 用户使用此功能前需要先在萤石添加好自己需要的设备,之后在智慧工地平台添加

1
src/main/resources/i18n/messages.properties
View File

@ -68,6 +68,7 @@ userNotExist=用户不存在
appKeyNotExist=appKey不存在 appKeyNotExist=appKey不存在
videoTypeEnableErr=该视频类型未启用 videoTypeEnableErr=该视频类型未启用
serialNumberExistErr=设备序列号已存在 serialNumberExistErr=设备序列号已存在
serialNumberAndCodeExistErr=设备序列号下通道已存在
keyAndSecretMatchErr=appkey和appSecret不匹配 keyAndSecretMatchErr=appkey和appSecret不匹配
closeClientErr=请在萤石客户端关闭终端绑定 closeClientErr=请在萤石客户端关闭终端绑定
workerTypeNameExistErr=工种名称已存在 workerTypeNameExistErr=工种名称已存在

1
src/main/resources/i18n/messages_en_US.properties
View File

@ -68,6 +68,7 @@ userNotExist=user does not exist
appKeyNotExist=Appkey does not exist appKeyNotExist=Appkey does not exist
videoTypeEnableErr=The video type is not enabled videoTypeEnableErr=The video type is not enabled
serialNumberExistErr=Device serial number already exists serialNumberExistErr=Device serial number already exists
serialNumberAndCodeExistErr=The channel under the device serial number already exists
keyAndSecretMatchErr=Appkey and appsecret do not match keyAndSecretMatchErr=Appkey and appsecret do not match
closeClientErr=Please turn off terminal binding in fluorite client closeClientErr=Please turn off terminal binding in fluorite client
workerTypeNameExistErr=Job name already exists workerTypeNameExistErr=Job name already exists

1
src/main/resources/i18n/messages_zh_CN.properties
View File

@ -68,6 +68,7 @@ userNotExist=用户不存在
appKeyNotExist=appKey不存在 appKeyNotExist=appKey不存在
videoTypeEnableErr=该视频类型未启用 videoTypeEnableErr=该视频类型未启用
serialNumberExistErr=设备序列号已存在 serialNumberExistErr=设备序列号已存在
serialNumberAndCodeExistErr=设备序列号下通道已存在
keyAndSecretMatchErr=appkey和appSecret不匹配 keyAndSecretMatchErr=appkey和appSecret不匹配
closeClientErr=请在萤石客户端关闭终端绑定 closeClientErr=请在萤石客户端关闭终端绑定
workerTypeNameExistErr=工种名称已存在 workerTypeNameExistErr=工种名称已存在