apps/monibuca
1
0
Fork 0
mirror of https://github.com/langhuihui/monibuca.git synced 2025-11-03 06:33:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove event_id from normal record table query

Browse Source
This commit is contained in:
dexter
2025-06-19 02:25:15 +00:00
parent 01fa1f3ed8
commit 9e45c3eb71
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/mp4/api.go
View File

@@ -167,7 +167,7 @@ func (p *MP4Plugin) download(w http.ResponseWriter, r *http.Request) {
queryRecord := m7s.RecordStream{ queryRecord := m7s.RecordStream{
Type: "mp4", Type: "mp4",
} }
p.DB.Where(&queryRecord).Find(&streams, "event_id=0 AND end_time>? AND start_time<? AND stream_path=?", startTime, endTime, streamPath) p.DB.Where(&queryRecord).Find(&streams, "end_time>? AND start_time<? AND stream_path=?", startTime, endTime, streamPath)
// 创建 MP4 混合器 // 创建 MP4 混合器
muxer := mp4.NewMuxer(flag) muxer := mp4.NewMuxer(flag)

8
plugin/mp4/exception.go
View File

@@ -91,7 +91,7 @@ func (p *DeleteRecordTask) deleteOldestFile() {
} }
for _, filePath := range filePaths { for _, filePath := range filePaths {
for p.getDiskOutOfSpace(filePath) { for p.getDiskOutOfSpace(filePath) {
var eventRecords []m7s.RecordStream var eventRecords []m7s.EventRecordStream
// 使用不同的方法进行路径匹配，避免ESCAPE语法问题 // 使用不同的方法进行路径匹配，避免ESCAPE语法问题
// 解决方案：用MySQL能理解的简单方式匹配路径前缀 // 解决方案：用MySQL能理解的简单方式匹配路径前缀
basePath := filePath basePath := filePath
@@ -147,12 +147,12 @@ func (t *DeleteRecordTask) Tick(any) {
return return
} }
//搜索event_records表中event_id值为0的（非事件）录像，并将其create_time与当前时间比对，大于RecordFileExpireDays则进行删除，数据库标记is_delete为1，磁盘上删除录像文件 //搜索event_records表中event_id值为0的（非事件）录像，并将其create_time与当前时间比对，大于RecordFileExpireDays则进行删除，数据库标记is_delete为1，磁盘上删除录像文件
var eventRecords []m7s.RecordStream var records []m7s.RecordStream
expireTime := time.Now().AddDate(0, 0, -t.RecordFileExpireDays) expireTime := time.Now().AddDate(0, 0, -t.RecordFileExpireDays)
t.Debug("RecordFileExpireDays is set to auto delete oldestfile", "expireTime", expireTime.Format("2006-01-02 15:04:05")) t.Debug("RecordFileExpireDays is set to auto delete oldestfile", "expireTime", expireTime.Format("2006-01-02 15:04:05"))
err := t.DB.Find(&eventRecords, "event_id=0 AND end_time < ? AND end_time IS NOT NULL", expireTime).Error err := t.DB.Find(&records, "end_time < ? AND end_time IS NOT NULL", expireTime).Error
if err == nil { if err == nil {
for _, record := range eventRecords { for _, record := range records {
t.Info("RecordFileExpireDays is set to auto delete oldestfile", "ID", record.ID, "create time", record.EndTime, "filepath", record.FilePath) t.Info("RecordFileExpireDays is set to auto delete oldestfile", "ID", record.ID, "create time", record.EndTime, "filepath", record.FilePath)
err = os.Remove(record.FilePath) err = os.Remove(record.FilePath)
if err != nil { if err != nil {

2
puller.go
View File

@@ -240,7 +240,7 @@ func (p *RecordFilePuller) queryRecordStreams(startTime, endTime time.Time) (err
queryRecord := RecordStream{ queryRecord := RecordStream{
Type: p.Type, Type: p.Type,
} }
tx := p.PullJob.Plugin.DB.Where(&queryRecord).Find(&p.Streams, "event_id=0 AND end_time>=? AND start_time<=? AND stream_path=?", startTime, endTime, p.PullJob.RemoteURL) tx := p.PullJob.Plugin.DB.Where(&queryRecord).Find(&p.Streams, "end_time>=? AND start_time<=? AND stream_path=?", startTime, endTime, p.PullJob.RemoteURL)
if tx.Error != nil { if tx.Error != nil {
return tx.Error return tx.Error
} }