From 3496700a5ba18be8ca0590a79e21a867782d1ea9 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Mon, 01 Jun 2026 16:56:57 +0800
Subject: [PATCH] 优化
---
ard-modules/ard-modules-gb28181/src/main/java/com/ard/gb28181/api/Gb28181ApiController.java | 177 -----------------------------------------------------------
1 files changed, 0 insertions(+), 177 deletions(-)
diff --git a/ard-modules/ard-modules-gb28181/src/main/java/com/ard/gb28181/api/Gb28181ApiController.java b/ard-modules/ard-modules-gb28181/src/main/java/com/ard/gb28181/api/Gb28181ApiController.java
index 2923efb..73a8020 100644
--- a/ard-modules/ard-modules-gb28181/src/main/java/com/ard/gb28181/api/Gb28181ApiController.java
+++ b/ard-modules/ard-modules-gb28181/src/main/java/com/ard/gb28181/api/Gb28181ApiController.java
@@ -809,181 +809,4 @@
dto.setSnap(c.getSnap());
return dto;
}
-
- /**
- * 一键迁移：将 Redis 中已注册的国标设备同步到 MySQL（供首次执行 SQL 后使用）
- */
- @Operation(summary = "迁移Redis国标设备到MySQL")
- @PostMapping("/migrateGbDevices")
- public R<String> migrateGbDevices() {
- List<Device> allDevices = deviceService.getAllDevices();
- int deviceCount = 0;
- int channelCount = 0;
-
- for (Device device : allDevices) {
- try {
- // 创建设备记录
- GbDevice existingDevice = gbDeviceService.selectGbDeviceByGbDeviceId(device.getDeviceId());
- if (existingDevice == null) {
- GbDevice gbDevice = new GbDevice();
- gbDevice.setGbDeviceId(device.getDeviceId());
- gbDevice.setDeviceName(StringUtils.hasText(device.getName()) ? device.getName() : device.getDeviceId());
- gbDevice.setDeviceCode(device.getDeviceId());
- gbDevice.setIp(device.getIp());
- gbDevice.setPort(device.getPort());
- gbDevice.setManufacturer(device.getManufacturer());
- gbDevice.setModel(device.getModel());
- gbDevice.setFirmware(device.getFirmware());
- gbDevice.setOnLine(device.isOnLine());
- gbDeviceService.insertGbDevice(gbDevice);
- deviceCount++;
- log.info("[迁移] 创建设备: {}", device.getDeviceId());
- }
-
- // 创建默认通道（设备自身）
- GbChannel existingDefaultChannel = gbChannelService.selectByGbDeviceIdAndGbChannelId(
- device.getDeviceId(), device.getDeviceId());
- if (existingDefaultChannel == null) {
- GbChannel gbChannel = new GbChannel();
- gbChannel.setGbDeviceId(device.getDeviceId());
- gbChannel.setGbChannelId(device.getDeviceId());
- gbChannel.setChannelName(StringUtils.hasText(device.getName()) ? device.getName() : device.getDeviceId());
- gbChannel.setDeviceCode(device.getDeviceId());
- gbChannel.setStreamMode(device.getStreamMode() != null ? device.getStreamMode() : "TCP-PASSIVE");
- gbChannel.setEnableMp4("0");
- gbChannelService.insertGbChannel(gbChannel);
- channelCount++;
- }
-
- // 创建所有通道
- List<DeviceChannel> channels = deviceService.getChannelsByDeviceId(device.getDeviceId());
- if (channels != null) {
- for (DeviceChannel channel : channels) {
- String channelId = channel.getDeviceId();
- if (channelId == null || channelId.length() <= 8) {
- continue;
- }
- if (channelId.length() == 20) {
- try {
- com.ard.gb28181.api.domain.GbCode gbCode = com.ard.gb28181.api.domain.GbCode.decode(channelId);
- if (gbCode != null && ("215".equals(gbCode.getTypeCode()) || "216".equals(gbCode.getTypeCode()))) {
- continue;
- }
- } catch (Exception ignored) {}
- }
- GbChannel existing = gbChannelService.selectByGbDeviceIdAndGbChannelId(device.getDeviceId(), channelId);
- if (existing == null) {
- GbChannel gbChannel = new GbChannel();
- gbChannel.setGbDeviceId(device.getDeviceId());
- gbChannel.setGbChannelId(channelId);
- gbChannel.setChannelName(StringUtils.hasText(channel.getName()) ? channel.getName() : channelId);
- gbChannel.setDeviceCode(channelId);
- gbChannel.setStreamMode(device.getStreamMode() != null ? device.getStreamMode() : "TCP-PASSIVE");
- gbChannel.setEnableMp4("0");
- gbChannelService.insertGbChannel(gbChannel);
- channelCount++;
- }
- }
- }
- } catch (Exception e) {
- log.error("[迁移] 处理设备失败: {}", device.getDeviceId(), e);
- }
- }
-
- return R.ok("迁移完成: 设备 " + deviceCount + " 条, 通道 " + channelCount + " 条");
- }
-
- /**
- * 从 Redis 同步通道数据到 MySQL，使 ard_gb_channel 与 Redis 一致
- */
- @Operation(summary = "从Redis同步通道到MySQL")
- @PostMapping("/syncGbChannelsFromRedis")
- public R<String> syncGbChannelsFromRedis() {
- List<Device> allDevices = deviceService.getAllRedisDevices();
- int createdCount = 0;
- int deletedCount = 0;
- int skippedCount = 0;
-
- for (Device device : allDevices) {
- try {
- String deviceId = device.getDeviceId();
- List<DeviceChannel> redisChannels = deviceService.getChannelsByDeviceId(deviceId);
- if (redisChannels == null) {
- redisChannels = new ArrayList<>();
- }
-
- Set<String> redisChannelIds = new HashSet<>();
- boolean hasRealSubChannel = false;
-
- for (DeviceChannel ch : redisChannels) {
- String channelId = ch.getDeviceId();
- if (channelId == null || channelId.length() <= 8) {
- continue;
- }
- if (channelId.length() == 20) {
- try {
- GbCode gbCode = GbCode.decode(channelId);
- if (gbCode != null && ("215".equals(gbCode.getTypeCode()) || "216".equals(gbCode.getTypeCode()))) {
- continue;
- }
- } catch (Exception ignored) {}
- }
- redisChannelIds.add(channelId);
- if (!channelId.equals(deviceId)) {
- hasRealSubChannel = true;
- }
-
- GbChannel existing = gbChannelService.selectByGbDeviceIdAndGbChannelId(deviceId, channelId);
- if (existing == null) {
- GbChannel gbChannel = new GbChannel();
- gbChannel.setGbDeviceId(deviceId);
- gbChannel.setGbChannelId(channelId);
- gbChannel.setChannelName(StringUtils.hasText(ch.getName()) ? ch.getName() : channelId);
- gbChannel.setDeviceCode(channelId);
- gbChannel.setStreamMode(device.getStreamMode() != null ? device.getStreamMode() : "TCP-PASSIVE");
- gbChannel.setEnableMp4("0");
- gbChannelService.insertGbChannel(gbChannel);
- createdCount++;
- log.info("[同步] 创建通道: deviceId={}, channelId={}", deviceId, channelId);
- } else if (StringUtils.hasText(ch.getName())
- && !ch.getName().equals(existing.getChannelName())) {
- existing.setChannelName(ch.getName());
- gbChannelService.updateGbChannel(existing);
- log.info("[同步] 更新通道名称: deviceId={}, channelId={}, {} -> {}",
- deviceId, channelId, existing.getChannelName(), ch.getName());
- }
- }
-
- List<GbChannel> mysqlChannels = gbChannelService.selectGbChannelByGbDeviceId(deviceId);
- for (GbChannel mysqlCh : mysqlChannels) {
- if (!redisChannelIds.contains(mysqlCh.getGbChannelId())) {
- if ("1".equals(mysqlCh.getStreamStatus())) {
- skippedCount++;
- continue;
- }
- gbChannelService.deleteGbChannelById(mysqlCh.getId());
- deletedCount++;
- }
- }
-
- if (hasRealSubChannel) {
- GbChannel defaultChannel = gbChannelService.selectByGbDeviceIdAndGbChannelId(deviceId, deviceId);
- if (defaultChannel != null && !redisChannelIds.contains(deviceId)) {
- if (!"1".equals(defaultChannel.getStreamStatus())) {
- gbChannelService.deleteGbChannelById(defaultChannel.getId());
- deletedCount++;
- } else {
- skippedCount++;
- }
- }
- }
-
- } catch (Exception e) {
- log.error("[同步] 处理设备失败: {}", device.getDeviceId(), e);
- }
- }
-
- return R.ok(String.format("同步完成: 创建 %d 条, 删除 %d 条, 跳过 %d 条(推流中)",
- createdCount, deletedCount, skippedCount));
- }
}
--
Gitblit v1.9.3