Shikong/gb28181-docking-platform-proxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改设备表 索引定义 与 添加设备 逻辑

Browse Source 
一个下级平台 有多个设备, 每个设备为一个通道
This commit is contained in:
shikong 2023-09-11 10:17:58 +08:00
parent 84e0addf53
commit ffac3458fd
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gb28181-wvp-proxy-orm/src/main/java/cn/skcks/docking/gb28181/wvp/orm/mybatis/operation/WvpProxyOperateTableMapper.xml
View File

@ -4,20 +4,17 @@
<mapper namespace="cn.skcks.docking.gb28181.wvp.orm.mybatis.operation.WvpProxyOperateTableMapper">
<update id="createDeviceTable">
CREATE TABLE IF NOT EXISTS `wvp_proxy_device`
(
`id` bigint NOT NULL AUTO_INCREMENT,
`device_code` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL,
`gb_device_id` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL,
`gb_device_channel_id` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL,
`name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`address` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `gb_device_id` (`gb_device_id`),
UNIQUE KEY `device_code` (`device_code`),
UNIQUE KEY `gb_device_id_2` (`gb_device_id`, `gb_device_channel_id`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_unicode_ci;
CREATE TABLE `wvp_proxy_device` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`device_code` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL,
`gb_device_id` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL,
`gb_device_channel_id` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL,
`name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`address` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `gb_device_id` (`gb_device_id`),
UNIQUE KEY `device_code_2` (`device_code`,`gb_device_id`,`gb_device_channel_id`),
KEY `device_code` (`device_code`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
</update>
</mapper>

14
gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/service/device/DeviceService.java
View File

@ -40,6 +40,12 @@ public class DeviceService {
s.where(WvpProxyDeviceDynamicSqlSupport.gbDeviceId,isEqualTo(gbDeviceId)));
}
public Optional<WvpProxyDevice> getDeviceByGbDeviceIdAndChannel(String gbDeviceId,String channel){
return deviceMapper.selectOne(s->
s.where(WvpProxyDeviceDynamicSqlSupport.gbDeviceId,isEqualTo(gbDeviceId))
.and(WvpProxyDeviceDynamicSqlSupport.gbDeviceChannelId,isEqualTo(channel)));
}
/**
* 添加设备
* @param device 设备
@ -60,11 +66,15 @@ public class DeviceService {
}
String gbDeviceId = device.getGbDeviceId();
String channel = device.getGbDeviceChannelId();
if(StringUtils.isBlank(gbDeviceId)){
throw new JsonException("国标编码不能为空");
}
if(getDeviceByGbDeviceId(gbDeviceId).isPresent()){
throw new JsonException(MessageFormat.format("国标编码 {0} 已存在" ,gbDeviceId));
if(StringUtils.isBlank(channel)){
throw new JsonException("国标通道不能为空");
}
if(getDeviceByGbDeviceIdAndChannel(gbDeviceId,channel).isPresent()){
throw new JsonException(MessageFormat.format("国标编码 {0}, 通道 {1} 已存在" ,gbDeviceId, channel));
}
return deviceMapper.insert(device) > 0;