From 5ee5331527a19cb477cfebb8643c606fa2e42797 Mon Sep 17 00:00:00 2001
From: qixiaoning <jony.kee@outlook.com>
Date: 星期一, 01 十二月 2025 09:47:17 +0800
Subject: [PATCH] milvus查询record记录接口修改，查询milvus暂存数据
---
camera-common/models/Record.go | 88 ++++++++++++++++++++++++++++----------------
1 files changed, 56 insertions(+), 32 deletions(-)
diff --git a/camera-common/models/Record.go b/camera-common/models/Record.go
index b950b7a..9d50c7b 100644
--- a/camera-common/models/Record.go
+++ b/camera-common/models/Record.go
@@ -50,7 +50,7 @@
IsWarning int64 `json:"is_warning"`
ZhDescClass string `json:"zh_desc_class"`
TaskName string `json:"task_name"`
- WarnTaskName string `json:"warn_task_name"`
+ WarnTaskId string `json:"warn_task_id"`
EventLevelName string `json:"event_level_name"`
DetectNum int64 `json:"detect_num"`
Suggestion string `json:"suggestion"`
@@ -84,6 +84,7 @@
TargetInfo []TargetInfo `json:"targetInfo"`
FileId string `json:"fileId"` // 鏁版嵁鏍堟枃浠秈d
DataSource string `json:"dataSource"` // 鏁版嵁鏉ユ簮:鎽勫儚鏈�, 鏁版嵁鏍�
+ DynamicLevel string `json:"dynamic_level"`
}
type Point struct {
@@ -131,9 +132,10 @@
}
type TaskOption struct {
- TaskId int64 `db:"task_id" json:"taskId"`
- TaskName string `db:"task_name" json:"taskName"`
- EventLevel int64 `db:"event_level" json:"eventLevel"`
+ TaskId int64 `db:"task_id" json:"taskId"`
+ TaskName string `db:"task_name" json:"taskName"`
+ EventLevel int64 `db:"event_level" json:"eventLevel"`
+ EventLevelName string `db:"event_level_name" json:"eventLevelName"`
}
type CheckOption struct {
@@ -220,6 +222,10 @@
// client.WithOffset(offset),
)
+ if err != nil {
+
+ }
+
// 2. 鎻愬彇ID鍜屾枃浠惰矾寰�
var ids []int64
var imgPaths []string
@@ -256,38 +262,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)
}
- err = do.client.client.DeleteByPks(ctx, "smartrag", "", 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,9 +292,13 @@
for _, path := range videoPaths {
if err := do.deleteFile(path); err != nil {
logger.Debug("failed to delete file " + path + " " + err.Error())
- } else {
- deletedFiles++
}
+ }
+
+ //鍒犻櫎rag
+ err = do.client.client.Delete(ctx, "smartrag", "", filterExpr)
+ if err != nil {
+ logger.Debug("delete rag failed!")
}
return deletedFiles, err
@@ -418,7 +419,7 @@
case "warn_task_id":
WarnColumn := field.(*entity.ColumnVarChar).Data()
if len(WarnColumn) > 0 {
- record.WarnTaskName = WarnColumn[i]
+ record.WarnTaskId = WarnColumn[i]
}
case "event_level_name":
EVColumn := field.(*entity.ColumnVarChar).Data()
@@ -503,15 +504,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))
@@ -611,14 +624,25 @@
// 鑾峰彇浜嬩欢
func GetEventByIds(ids []int64) (items []DictOption, err error) {
- placeholders := make([]string, len(ids))
- args := make([]interface{}, len(ids))
+ // 鍔ㄦ�佺敓鎴� UNION ALL 瀛愭煡璇�
+ unionAllParts := make([]string, len(ids))
for i, id := range ids {
- placeholders[i] = "?"
- args[i] = id
+ unionAllParts[i] = fmt.Sprintf("SELECT %d AS dict_id", id)
}
- sqlStr := `select dict_id,dict_name,dict_value from mal_dict_type where dict_id in (` + strings.Join(placeholders, ",") + `)`
- if err := db.Raw(sqlStr, args...).Scan(&items).Error; err != nil {
+
+ // 鎷兼帴 UNION ALL 瀛愭煡璇�
+ unionAllQuery := strings.Join(unionAllParts, " UNION ALL ")
+
+ // 鎷兼帴鏈�缁� SQL 鏌ヨ
+ sqlStr := fmt.Sprintf(`
+ SELECT t.dict_id, t.dict_name, t.dict_value
+ FROM mal_dict_type t
+ JOIN (
+ %s
+ ) AS input_list
+ ON t.dict_id = input_list.dict_id;`, unionAllQuery)
+
+ if err := db.Raw(sqlStr).Scan(&items).Error; err != nil {
return nil, err
}
--
Gitblit v1.8.0