From 03880bf61cf059f063e252ef17dfea50c932c9dc Mon Sep 17 00:00:00 2001
From: qixiaoning <jony.kee@outlook.com>
Date: 星期三, 12 十一月 2025 09:11:03 +0800
Subject: [PATCH] 清理数据接口修改
---
camera-service/controllers/camera.go | 18 ++++++++++++++++--
camera-common/models/Record.go | 13 +++----------
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/camera-common/models/Record.go b/camera-common/models/Record.go
index f778aa8..0cbc697 100644
--- a/camera-common/models/Record.go
+++ b/camera-common/models/Record.go
@@ -260,34 +260,29 @@
VideoPath := VideoPathColumn[i]
videoPaths = append(videoPaths, VideoPath)
}
-
}
}
}
-
+ // 鍥剧墖鍒犻櫎鏂囦欢
+ deletedFiles := 0
if len(ids) > 0 {
idField := entity.NewColumnInt64("id", ids)
err = do.client.client.DeleteByPks(ctx, collectionName, "", idField)
if err != nil {
return 0, fmt.Errorf("failed to delete from Milvus: %v", err)
}
+ deletedFiles = len(ids)
}
- // 鍥剧墖鍒犻櫎鏂囦欢
- deletedFiles := 0
for _, path := range imgPaths {
if err := do.deleteFile(path); err != nil {
logger.Debug("failed to delete file " + path + " " + err.Error())
- } else {
- deletedFiles++
}
}
//鍒犻櫎鎻忚堪鍥剧墖
for _, path := range imgDesPaths {
if err := do.deleteFile(path); err != nil {
logger.Debug("failed to delete file " + path + " " + err.Error())
- } else {
- deletedFiles++
}
}
@@ -295,8 +290,6 @@
for _, path := range videoPaths {
if err := do.deleteFile(path); err != nil {
logger.Debug("failed to delete file " + path + " " + err.Error())
- } else {
- deletedFiles++
}
}
diff --git a/camera-service/controllers/camera.go b/camera-service/controllers/camera.go
index 2029bfc..ed927d8 100644
--- a/camera-service/controllers/camera.go
+++ b/camera-service/controllers/camera.go
@@ -1068,8 +1068,12 @@
return &bhomeclient.Reply{Success: false, Msg: "鍙傛暟鏈夎"}
}
startTime := info.StartTime
- endTime := info.EndTime
- if len(startTime) > 0 && len(endTime) > 0 {
+ if len(startTime) > 0 && len(info.EndTime) > 0 {
+ endTime, err1 := addDaySimple(info.EndTime)
+ if err1 != nil {
+ endTime = info.EndTime
+ }
+
filter += fmt.Sprintf(" and detect_time > '%s'", startTime)
filter += fmt.Sprintf(" and detect_time < '%s'", endTime)
deleteRecord, err := models.DeleteRecord("smartobject", filter)
@@ -1083,6 +1087,16 @@
}
}
+func addDaySimple(dateStr string) (string, error) {
+ // 鍋囪鏍煎紡涓� "2006-01-02"
+ t, err := time.Parse("2006-01-02", dateStr)
+ if err != nil {
+ return "", err
+ }
+ t = t.AddDate(0, 0, 1)
+ return t.Format("2006-01-02"), nil
+}
+
/**
* 鑾峰彇鎶撴媿璁板綍
*/
--
Gitblit v1.8.0