apps/gb-cms
1
0
Fork 0
mirror of https://github.com/lkmio/gb-cms.git synced 2025-12-24 11:51:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 刷新通道造成截图路径丢失;

Browse Source
This commit is contained in:
ydajiang
2025-11-29 17:21:10 +08:00
parent 160d0b4b02
commit 140d427494
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
stack/device.go
View File

@@ -203,7 +203,13 @@ func (d *Device) QueryCatalog(timeoutSeconds int) ([]*dao.ChannelModel, error) {
}
// 删除旧的通道列表
oldChannels := make(map[string]*dao.ChannelModel)
if oldChannelCount > 0 {
channels, err := dao.Channel.QueryChannelsByRootID(d.DeviceID)
for _, channel := range channels {
oldChannels[channel.RootID+"/"+channel.DeviceID] = channel
}
err = dao.Channel.DeleteChannels(d.DeviceID)
if err != nil {
log.Sugar.Errorf("delete channels failed, device: %s, err: %s", d.DeviceID, err.Error())
@@ -213,7 +219,7 @@ func (d *Device) QueryCatalog(timeoutSeconds int) ([]*dao.ChannelModel, error) {
device, _ := dao.Device.QueryDevice(d.DeviceID)
// 批量保存通道
result, err = d.SaveChannels(list, device)
result, err = d.SaveChannels(list, device, oldChannels)
// 更新查询目录的时间
now := time.Now()
@@ -248,7 +254,7 @@ func IsDir(typeCode int) bool {
return typeCode < 131 || typeCode > 199
}
func (d *Device) SaveChannels(list []*CatalogResponse, device *dao.DeviceModel) ([]*dao.ChannelModel, error) {
func (d *Device) SaveChannels(list []*CatalogResponse, device *dao.DeviceModel, oldChannels map[string]*dao.ChannelModel) ([]*dao.ChannelModel, error) {
var channels []*dao.ChannelModel
// 目录
dirs := make(map[string]*dao.ChannelModel)
@@ -343,6 +349,14 @@ func (d *Device) SaveChannels(list []*CatalogResponse, device *dao.DeviceModel)
}
}
// 保留旧的通道截图路径
for _, channel := range channels {
oldChannel, ok := oldChannels[channel.RootID+"/"+channel.DeviceID]
if ok && oldChannel.SnapshotPath != "" {
channel.SnapshotPath = oldChannel.SnapshotPath
}
}
err := dao.Channel.SaveChannels(channels)
if err != nil {
log.Sugar.Errorf("save channels failed, device: %s, err: %s", d.DeviceID, err.Error())