From c3fd4effdef0cc5955f89b5df279b14841e857f5 Mon Sep 17 00:00:00 2001
From: qixiaoning <jony.kee@outlook.com>
Date: 星期二, 11 十一月 2025 11:21:36 +0800
Subject: [PATCH] 修改权限,修复删除rag记录问题
---
camera-common/models/Record.go | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/camera-common/models/Record.go b/camera-common/models/Record.go
index b950b7a..f778aa8 100644
--- a/camera-common/models/Record.go
+++ b/camera-common/models/Record.go
@@ -220,6 +220,10 @@
// client.WithOffset(offset),
)
+ if err != nil {
+
+ }
+
// 2. 鎻愬彇ID鍜屾枃浠惰矾寰�
var ids []int64
var imgPaths []string
@@ -267,10 +271,6 @@
if err != nil {
return 0, fmt.Errorf("failed to delete from Milvus: %v", err)
}
- err = do.client.client.DeleteByPks(ctx, "smartrag", "", idField)
- if err != nil {
- return 0, fmt.Errorf("failed to delete from Milvus: %v", err)
- }
}
// 鍥剧墖鍒犻櫎鏂囦欢
@@ -298,6 +298,12 @@
} else {
deletedFiles++
}
+ }
+
+ //鍒犻櫎rag
+ err = do.client.client.Delete(ctx, "smartrag", "", filterExpr)
+ if err != nil {
+ logger.Debug("delete rag failed!")
}
return deletedFiles, err
@@ -503,15 +509,27 @@
lists := convertResultToMap(result)
layout := "2006-01-02 15:04:05.999999"
- var temp1 time.Time
- var temp2 time.Time
+ // var temp1 time.Time
+ // var temp2 time.Time
- //鎺掑簭
+ // //鎺掑簭
+ // sort.Slice(lists, func(i, j int) bool {
+ // //return lists[i].DetectTime > lists[j].:DetectTime
+ // temp1, _ = time.Parse(layout, lists[i].DetectTime)
+ // temp2, _ = time.Parse(layout, lists[j].DetectTime)
+ // return temp1.After(temp2)
+ // })
+
sort.Slice(lists, func(i, j int) bool {
- //return lists[i].DetectTime > lists[j].:DetectTime
- temp1, _ = time.Parse(layout, lists[i].DetectTime)
- temp2, _ = time.Parse(layout, lists[j].DetectTime)
- return temp1.After(temp2)
+ t1, err1 := time.Parse(layout, lists[i].DetectTime)
+ t2, err2 := time.Parse(layout, lists[j].DetectTime)
+
+ // 閿欒澶勭悊锛氳В鏋愰敊璇殑鏃堕棿鎺掑湪鍚庨潰
+ if err1 != nil || err2 != nil {
+ return err1 == nil && err2 != nil
+ }
+
+ return t1.After(t2)
})
items := Paginate(lists, int(pageNum), int(pageSize))
--
Gitblit v1.8.0