aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-21 21:07:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化报警信息构建和数据库批量操作逻辑

Browse Source
This commit is contained in:
lin 2026-04-04 00:12:52 +08:00
parent d307cf1073
commit 2d1608ca7a
8 changed files with 82 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarmNotify.java
View File

@ -129,7 +129,7 @@ public class DeviceAlarmNotify {
return AlarmType.DeviceLowTemperature; return AlarmType.DeviceLowTemperature;
} }
} }
if (alarmMethod == DeviceAlarmMethod.GPS.getVal()) { if (alarmMethod == DeviceAlarmMethod.Video.getVal()) {
// 5为视频报警 // 5为视频报警
// 报警方式为5时, // 报警方式为5时,
// 取值如下: // 取值如下:

57
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
View File

@ -19,6 +19,7 @@ import com.genersoft.iot.vmp.gb28181.service.IInviteStreamService;
import com.genersoft.iot.vmp.gb28181.service.IPlatformChannelService; import com.genersoft.iot.vmp.gb28181.service.IPlatformChannelService;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander; import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
import com.genersoft.iot.vmp.gb28181.utils.SipUtils; import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
import com.genersoft.iot.vmp.service.bean.Alarm;
import com.genersoft.iot.vmp.service.bean.ErrorCallback; import com.genersoft.iot.vmp.service.bean.ErrorCallback;
import com.genersoft.iot.vmp.service.redisMsg.IRedisRpcPlayService; import com.genersoft.iot.vmp.service.redisMsg.IRedisRpcPlayService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage; import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
@ -173,29 +174,17 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
int limitCount = 500; int limitCount = 500;
if (!addChannelList.isEmpty()) { if (!addChannelList.isEmpty()) {
if (addChannelList.size() > limitCount) { for (int i = 0; i < addChannelList.size(); i += limitCount) {
for (int i = 0; i < addChannelList.size(); i += limitCount) { int end = Math.min(i + limitCount, addChannelList.size());
int toIndex = i + limitCount; List<DeviceChannel> batchList = addChannelList.subList(i, end);
if (i + limitCount > addChannelList.size()) { result += channelMapper.batchAdd(batchList);
toIndex = addChannelList.size();
}
result += channelMapper.batchAdd(addChannelList.subList(i, toIndex));
}
}else {
result += channelMapper.batchAdd(addChannelList);
} }
} }
if (!updateChannelList.isEmpty()) { if (!updateChannelList.isEmpty()) {
if (updateChannelList.size() > limitCount) { for (int i = 0; i < updateChannelList.size(); i += limitCount) {
for (int i = 0; i < updateChannelList.size(); i += limitCount) { int end = Math.min(i + limitCount, updateChannelList.size());
int toIndex = i + limitCount; List<DeviceChannel> batchList = updateChannelList.subList(i, end);
if (i + limitCount > updateChannelList.size()) { result += channelMapper.batchUpdate(batchList);
toIndex = updateChannelList.size();
}
result += channelMapper.batchUpdate(updateChannelList.subList(i, toIndex));
}
}else {
result += channelMapper.batchUpdate(updateChannelList);
} }
} }
return result; return result;
@ -461,29 +450,17 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
} }
int limitCount = 500; int limitCount = 500;
if (!addChannels.isEmpty()) { if (!addChannels.isEmpty()) {
if (addChannels.size() > limitCount) { for (int i = 0; i < addChannels.size(); i += limitCount) {
for (int i = 0; i < addChannels.size(); i += limitCount) { int end = Math.min(i + limitCount, addChannels.size());
int toIndex = i + limitCount; List<DeviceChannel> batchList = addChannels.subList(i, end);
if (i + limitCount > addChannels.size()) { channelMapper.batchAdd(batchList);
toIndex = addChannels.size();
}
channelMapper.batchAdd(addChannels.subList(i, toIndex));
}
}else {
channelMapper.batchAdd(addChannels);
} }
} }
if (!updateChannels.isEmpty()) { if (!updateChannels.isEmpty()) {
if (updateChannels.size() > limitCount) { for (int i = 0; i < updateChannels.size(); i += limitCount) {
for (int i = 0; i < updateChannels.size(); i += limitCount) { int end = Math.min(i + limitCount, updateChannels.size());
int toIndex = i + limitCount; List<DeviceChannel> batchList = updateChannels.subList(i, end);
if (i + limitCount > updateChannels.size()) { channelMapper.batchUpdate(batchList);
toIndex = updateChannels.size();
}
channelMapper.batchUpdate(updateChannels.subList(i, toIndex));
}
}else {
channelMapper.batchUpdate(updateChannels);
} }
// 不对收到的通道做比较，已确定是否真的发生变化，所以不发送更新通知 // 不对收到的通道做比较，已确定是否真的发生变化，所以不发送更新通知

29
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
View File

@ -239,17 +239,12 @@ public class DeviceServiceImpl implements IDeviceService, CommandLineRunner {
return; return;
} }
int limitCount = 300; int limitCount = 300;
if (offlineDevices.size() > limitCount) { for (int i = 0; i < offlineDevices.size(); i += limitCount) {
for (int i = 0; i < offlineDevices.size(); i += limitCount) { int endIndex = Math.min(i + limitCount, offlineDevices.size());
int toIndex = i + limitCount; List<Device> subList = offlineDevices.subList(i, endIndex);
if (i + limitCount > offlineDevices.size()) { deviceMapper.offlineByList(subList);
toIndex = offlineDevices.size();
}
deviceMapper.offlineByList(offlineDevices.subList(i, toIndex));
}
}else {
deviceMapper.offlineByList(offlineDevices);
} }
for (Device device : offlineDevices) { for (Device device : offlineDevices) {
device.setOnLine(false); device.setOnLine(false);
redisCatchStorage.updateDevice(device); redisCatchStorage.updateDevice(device);
@ -851,16 +846,10 @@ public class DeviceServiceImpl implements IDeviceService, CommandLineRunner {
} }
int limitCount = 300; int limitCount = 300;
if (!deviceList.isEmpty()) { if (!deviceList.isEmpty()) {
if (deviceList.size() > limitCount) { for (int i = 0; i < deviceList.size(); i += limitCount) {
for (int i = 0; i < deviceList.size(); i += limitCount) { int endIndex = Math.min(i + limitCount, deviceList.size());
int toIndex = i + limitCount; List<Device> subList = deviceList.subList(i, endIndex);
if (i + limitCount > deviceList.size()) { deviceMapper.batchUpdate(subList);
toIndex = deviceList.size();
}
deviceMapper.batchUpdate(deviceList.subList(i, toIndex));
}
}else {
deviceMapper.batchUpdate(deviceList);
} }
for (Device device : deviceList) { for (Device device : deviceList) {
redisCatchStorage.updateDevice(device); redisCatchStorage.updateDevice(device);

98
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java
View File

@ -258,16 +258,10 @@ public class GbChannelServiceImpl implements IGbChannelService, CommandLineRunne
int result = 0; int result = 0;
if (permission) { if (permission) {
int limitCount = 1000; int limitCount = 1000;
if (commonGBChannelList.size() > limitCount) { for (int i = 0; i < commonGBChannelList.size(); i += limitCount) {
for (int i = 0; i < commonGBChannelList.size(); i += limitCount) { int end = Math.min(i + limitCount, commonGBChannelList.size());
int toIndex = i + limitCount; List<CommonGBChannel> batchList = commonGBChannelList.subList(i, end);
if (i + limitCount > commonGBChannelList.size()) { result += commonGBChannelMapper.updateStatusForListById(batchList, "OFF");
toIndex = commonGBChannelList.size();
}
result += commonGBChannelMapper.updateStatusForListById(commonGBChannelList.subList(i, toIndex), "OFF");
}
} else {
result += commonGBChannelMapper.updateStatusForListById(commonGBChannelList, "OFF");
} }
log.info("[通道离线] 保存入库 共 {} 个改变", result); log.info("[通道离线] 保存入库 共 {} 个改变", result);
} }
@ -309,16 +303,10 @@ public class GbChannelServiceImpl implements IGbChannelService, CommandLineRunne
if (permission) { if (permission) {
// 批量更新 // 批量更新
int limitCount = 1000; int limitCount = 1000;
if (commonGBChannelList.size() > limitCount) { for (int i = 0; i < commonGBChannelList.size(); i += limitCount) {
for (int i = 0; i < commonGBChannelList.size(); i += limitCount) { int end = Math.min(i + limitCount, commonGBChannelList.size());
int toIndex = i + limitCount; List<CommonGBChannel> batchList = commonGBChannelList.subList(i, end);
if (i + limitCount > commonGBChannelList.size()) { result += commonGBChannelMapper.updateStatusForListById(batchList, "ON");
toIndex = commonGBChannelList.size();
}
result += commonGBChannelMapper.updateStatusForListById(commonGBChannelList.subList(i, toIndex), "ON");
}
} else {
result += commonGBChannelMapper.updateStatusForListById(commonGBChannelList, "ON");
} }
} }
try { try {
@ -341,16 +329,10 @@ public class GbChannelServiceImpl implements IGbChannelService, CommandLineRunne
// 批量保存 // 批量保存
int limitCount = 1000; int limitCount = 1000;
int result = 0; int result = 0;
if (commonGBChannels.size() > limitCount) { for (int i = 0; i < commonGBChannels.size(); i += limitCount) {
for (int i = 0; i < commonGBChannels.size(); i += limitCount) { int end = Math.min(i + limitCount, commonGBChannels.size());
int toIndex = i + limitCount; List<CommonGBChannel> batchList = commonGBChannels.subList(i, end);
if (i + limitCount > commonGBChannels.size()) { result += commonGBChannelMapper.batchAdd(batchList);
toIndex = commonGBChannels.size();
}
result += commonGBChannelMapper.batchAdd(commonGBChannels.subList(i, toIndex));
}
} else {
result += commonGBChannelMapper.batchAdd(commonGBChannels);
} }
try { try {
// 发送catalog // 发送catalog
@ -372,16 +354,10 @@ public class GbChannelServiceImpl implements IGbChannelService, CommandLineRunne
// 批量保存 // 批量保存
int limitCount = 1000; int limitCount = 1000;
int result = 0; int result = 0;
if (commonGBChannels.size() > limitCount) { for (int i = 0; i < commonGBChannels.size(); i += limitCount) {
for (int i = 0; i < commonGBChannels.size(); i += limitCount) { int end = Math.min(i + limitCount, commonGBChannels.size());
int toIndex = i + limitCount; List<CommonGBChannel> batchList = commonGBChannels.subList(i, end);
if (i + limitCount > commonGBChannels.size()) { result += commonGBChannelMapper.batchUpdate(batchList);
toIndex = commonGBChannels.size();
}
result += commonGBChannelMapper.batchUpdate(commonGBChannels.subList(i, toIndex));
}
} else {
result += commonGBChannelMapper.batchUpdate(commonGBChannels);
} }
log.info("[更新多个通道] 通道数量为{}，成功保存：{}", commonGBChannels.size(), result); log.info("[更新多个通道] 通道数量为{}，成功保存：{}", commonGBChannels.size(), result);
} }
@ -404,16 +380,10 @@ public class GbChannelServiceImpl implements IGbChannelService, CommandLineRunne
List<CommonGBChannel> oldChanelListByChannels = commonGBChannelMapper.queryOldChanelListByChannels(commonGBChannels); List<CommonGBChannel> oldChanelListByChannels = commonGBChannelMapper.queryOldChanelListByChannels(commonGBChannels);
int limitCount = 1000; int limitCount = 1000;
int result = 0; int result = 0;
if (commonGBChannels.size() > limitCount) { for (int i = 0; i < commonGBChannels.size(); i += limitCount) {
for (int i = 0; i < commonGBChannels.size(); i += limitCount) { int end = Math.min(i + limitCount, commonGBChannels.size());
int toIndex = i + limitCount; List<CommonGBChannel> batchList = commonGBChannels.subList(i, end);
if (i + limitCount > commonGBChannels.size()) { result += commonGBChannelMapper.updateStatus(batchList);
toIndex = commonGBChannels.size();
}
result += commonGBChannelMapper.updateStatus(commonGBChannels.subList(i, toIndex));
}
} else {
result += commonGBChannelMapper.updateStatus(commonGBChannels);
} }
log.warn("[更新多个通道状态] 通道数量为{}，成功保存：{}", commonGBChannels.size(), result); log.warn("[更新多个通道状态] 通道数量为{}，成功保存：{}", commonGBChannels.size(), result);
// 发送通过更新通知 // 发送通过更新通知
@ -925,16 +895,10 @@ public class GbChannelServiceImpl implements IGbChannelService, CommandLineRunne
@Override @Override
public void updateGPS(List<CommonGBChannel> commonGBChannels) { public void updateGPS(List<CommonGBChannel> commonGBChannels) {
int limitCount = 1000; int limitCount = 1000;
if (commonGBChannels.size() > limitCount) { for (int i = 0; i < commonGBChannels.size(); i += limitCount) {
for (int i = 0; i < commonGBChannels.size(); i += limitCount) { int end = Math.min(i + limitCount, commonGBChannels.size());
int toIndex = i + limitCount; List<CommonGBChannel> batchList = commonGBChannels.subList(i, end);
if (i + limitCount > commonGBChannels.size()) { commonGBChannelMapper.updateGps(batchList);
toIndex = commonGBChannels.size();
}
commonGBChannelMapper.updateGps(commonGBChannels.subList(i, toIndex));
}
} else {
commonGBChannelMapper.updateGps(commonGBChannels);
} }
} }
@ -1196,16 +1160,10 @@ public class GbChannelServiceImpl implements IGbChannelService, CommandLineRunne
List<CommonGBChannel> channelList = vectorTileCatch.getChannelList(id); List<CommonGBChannel> channelList = vectorTileCatch.getChannelList(id);
if (channelList != null && !channelList.isEmpty()) { if (channelList != null && !channelList.isEmpty()) {
int limitCount = 1000; int limitCount = 1000;
if (channelList.size() > limitCount) { for (int i = 0; i < channelList.size(); i += limitCount) {
for (int i = 0; i < channelList.size(); i += limitCount) { int end = Math.min(i + limitCount, channelList.size());
int toIndex = i + limitCount; List<CommonGBChannel> batchList = channelList.subList(i, end);
if (i + limitCount > channelList.size()) { commonGBChannelMapper.saveLevel(batchList);
toIndex = channelList.size();
}
commonGBChannelMapper.saveLevel(channelList.subList(i, toIndex));
}
} else {
commonGBChannelMapper.saveLevel(channelList);
} }
} }
vectorTileCatch.save(id); vectorTileCatch.save(id);

12
src/main/java/com/genersoft/iot/vmp/service/bean/Alarm.java
View File

@ -47,13 +47,13 @@ public class Alarm {
@Schema(description = "报警时间") @Schema(description = "报警时间")
private Long alarmTime; private Long alarmTime;
public static Alarm buildFromDeviceAlarmNotify(DeviceAlarmNotify deviceAlarmNotify) { public static Alarm buildFromDeviceAlarmNotify(DeviceAlarmNotify notify) {
Alarm alarm = new Alarm(); Alarm alarm = new Alarm();
alarm.setDescription(deviceAlarmNotify.getAlarmDescription()); alarm.setDescription(notify.getAlarmDescription());
alarm.setAlarmType(deviceAlarmNotify.getAlarmTypeEnum()); alarm.setAlarmType(notify.getAlarmTypeEnum());
alarm.setAlarmTime(DateUtil.yyyy_MM_dd_HH_mm_ssToTimestampMs(deviceAlarmNotify.getAlarmTime())); alarm.setAlarmTime(DateUtil.yyyy_MM_dd_HH_mm_ssToTimestampMs(notify.getAlarmTime()));
alarm.setLongitude(deviceAlarmNotify.getLongitude()); alarm.setLongitude(notify.getLongitude());
alarm.setLatitude(deviceAlarmNotify.getLatitude()); alarm.setLatitude(notify.getLatitude());
return alarm; return alarm;
} }

13
src/main/java/com/genersoft/iot/vmp/service/impl/AlarmServiceImpl.java
View File

@ -72,13 +72,13 @@ public class AlarmServiceImpl implements IAlarmService {
} }
alarm.setChannelId(deviceChannel.getId()); alarm.setChannelId(deviceChannel.getId());
// 分配一个快照路径，后续在去补充快照文件 // 分配一个快照路径，后续在去补充快照文件
alarm.setSnapPath("snap/alarm_" + UUID.randomUUID() + ".jpg"); alarm.setSnapPath("snap/alarm_" + notify.getChannelId() + "_" + System.currentTimeMillis() + ".jpg");
alarmQueue.offer(alarm); alarmQueue.offer(alarm);
} }
} }
@Scheduled(fixedDelay = 500) @Scheduled(fixedDelay = 500)
public void executeTaskQueue() { public void executeAlarmQueue() {
if (alarmQueue.isEmpty()) { if (alarmQueue.isEmpty()) {
return; return;
} }
@ -94,9 +94,12 @@ public class AlarmServiceImpl implements IAlarmService {
return; return;
} }
// 批量保存到数据库 // 批量保存到数据库
alarmMapper.insertAlarms(handlerCatchDataList); int batchSize = 1000;
// 异步处理快照的生成和保存，避免影响报警信息的保存效率 for (int i = 0; i < handlerCatchDataList.size(); i += batchSize) {
int end = Math.min(i + batchSize, handlerCatchDataList.size());
List<Alarm> batchList = handlerCatchDataList.subList(i, end);
alarmMapper.insertAlarms(batchList);
}
} }

16
src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
View File

@ -223,18 +223,12 @@ public class CloudRecordServiceImpl implements ICloudRecordService {
} }
int limitCount = 50; int limitCount = 50;
int resultCount = 0; int resultCount = 0;
if (all.size() > limitCount) { for (int i = 0; i < all.size(); i += limitCount) {
for (int i = 0; i < all.size(); i += limitCount) { int end = Math.min(i + limitCount, all.size());
int toIndex = i + limitCount; List<CloudRecordItem> batchList = all.subList(i, end);
if (i + limitCount > all.size()) { resultCount += cloudRecordServiceMapper.updateCollectList(result, batchList);
toIndex = all.size();
}
resultCount += cloudRecordServiceMapper.updateCollectList(result, all.subList(i, toIndex));
}
}else {
resultCount = cloudRecordServiceMapper.updateCollectList(result, all);
} }
return resultCount; return resultCount;
} }

13
src/main/java/com/genersoft/iot/vmp/storager/dao/AlarmMapper.java
View File

@ -2,10 +2,7 @@ package com.genersoft.iot.vmp.storager.dao;
import com.genersoft.iot.vmp.service.bean.Alarm; import com.genersoft.iot.vmp.service.bean.Alarm;
import com.genersoft.iot.vmp.service.bean.AlarmType; import com.genersoft.iot.vmp.service.bean.AlarmType;
import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List; import java.util.List;
@ -43,6 +40,12 @@ public interface AlarmMapper {
"</script>") "</script>")
void deleteAlarms(@Param("ids") List<Long> ids); void deleteAlarms(@Param("ids") List<Long> ids);
@Insert("<script>" +
"INSERT INTO wvp_alarm (channel_id, description, snap_path, record_path, longitude, latitude, alarm_type, alarm_time)" +
" VALUES " +
"<foreach collection='handlerCatchDataList' item='item' open='(' separator=',' close=')'>" +
"#{item.channelId}, #{item.description}, #{item.snapPath}, #{item.recordPath}, #{item.longitude}, #{item.latitude}, #{item.alarmType}, #{item.alarmTime}" +
"</foreach>" +
"</script>")
void insertAlarms(List<Alarm> handlerCatchDataList); void insertAlarms(List<Alarm> handlerCatchDataList);
} }