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-service/controllers/camera.go | 164 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 136 insertions(+), 28 deletions(-)
diff --git a/camera-service/controllers/camera.go b/camera-service/controllers/camera.go
index e90ed77..7e54e1f 100644
--- a/camera-service/controllers/camera.go
+++ b/camera-service/controllers/camera.go
@@ -90,6 +90,7 @@
if b, err := sv.CameraUpdate(camVo); b {
//鏇存柊鍒嗚鲸鐜�
if ok {
+ //
logger.Debug("DoPostRequest:", camVo)
if cam.IsRunning && (cam.ResolutionWidth != camVo.ResolutionWidth && cam.ResolutionHeight != camVo.ResolutionHeight) {
header := map[string]string{}
@@ -99,6 +100,18 @@
"videoType": 0,
}
res, err := util.DoPostRequest("http://127.0.0.1:8088/v1/task/openAnalysis", util.CONTENT_TYPE_JSON, paramBody, nil, header, time.Second*10)
+ if err != nil {
+ logger.Debug("DoPostRequest err:", err)
+ }
+ logger.Debug("DoPostRequest:", res)
+ }
+ //鏇存柊鐘舵��
+ if cam.IsRunning {
+ header := map[string]string{}
+ paramBody := map[string]interface{}{
+ "state": 1,
+ }
+ res, err := util.DoPostRequest("http://127.0.0.1:8088/v1/task/updateAllStatus?state=1", util.CONTENT_TYPE_JSON, paramBody, nil, header, time.Second*10)
if err != nil {
logger.Debug("DoPostRequest err:", err)
}
@@ -131,15 +144,24 @@
}
//鍒ゆ柇鏄惁鏈夐厤缃换鍔�
- total, _ := models.GetTaskTotal(cid)
- if total > 0 {
- return &bhomeclient.Reply{Success: false, Msg: "璇峰厛鍒犻櫎閰嶇疆鐨勪换鍔�"}
- }
+ // total, _ := models.GetTaskTotal(cid)
+ // if total > 0 {
+ // return &bhomeclient.Reply{Success: false, Msg: "璇峰厛鍒犻櫎閰嶇疆鐨勪换鍔�"}
+ // }
rows, _ := cam.Delete(cid)
if rows == 0 {
return &bhomeclient.Reply{Success: true, Msg: "璁板綍涓嶅瓨鍦�"}
}
+
+ //鍒犻櫎浠诲姟
+ items, _ := models.GetTaskTotal(cid)
+ if len(items) > 0 {
+ for _, item := range items {
+ cam.DelLink(item.ID)
+ }
+ }
+
pMsg := protomsg.DbChangeMessage{ //闇�瑕侀噸鏂拌绠楃畻鍔涘崰鐢ㄦ儏鍐�
Table: protomsg.TableChanged_T_Camera,
Action: protomsg.DbAction_Delete,
@@ -1046,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)
@@ -1059,6 +1085,16 @@
} else {
return &bhomeclient.Reply{Success: false, Msg: "鍒犻櫎澶辫触", Data: nil}
}
+}
+
+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
}
/**
@@ -1125,9 +1161,9 @@
if len(TaskName) > 0 {
quotedNames := make([]string, len(TaskName))
for i, name := range TaskName {
- quotedNames[i] = "'" + name + "'" // 姣忎釜鍏冪礌鍔犲崟寮曞彿
+ quotedNames[i] = " task_name like '%%" + name + "%%' " // 姣忎釜鍏冪礌鍔犲崟寮曞彿
}
- filter += fmt.Sprintf(" and %s in [%s]", "task_name", strings.Join(quotedNames, ","))
+ filter += " and (" + strings.Join(quotedNames, "or") + ")"
} else {
if Warning > 0 {
return &bhomeclient.Reply{Success: true, Msg: "鑾峰彇鎴愬姛", Data: nil}
@@ -1177,7 +1213,7 @@
IsWarning: v.IsWarning,
DetectNum: v.DetectNum,
TaskName: v.TaskName,
- WarnTaskName: v.WarnTaskName,
+ WarnTaskId: v.WarnTaskId,
ZhDescClass: v.ZhDescClass,
EventLevelName: v.EventLevelName,
KnowledgeId: v.KnowledgeId,
@@ -1195,14 +1231,15 @@
VideoName: v.CameraName,
CameraAddr: v.CameraName,
CameraName: v.CameraName,
+ DynamicLevel: v.DynamicLevel,
}
var taskId []int64
//浠诲姟id閲嶆柊璧嬪��
- if len(v.WarnTaskName) > 0 {
+ if len(v.WarnTaskId) > 0 {
v.TaskId = []int64{}
taskId = []int64{}
- arr := strings.Split(v.WarnTaskName, ";")
+ arr := strings.Split(v.WarnTaskId, ";")
for _, temp := range arr {
if len(temp) > 0 {
@@ -1213,21 +1250,50 @@
}
v.TaskId = taskId
}
- items, _ := models.GetTaskByIds(v.TaskId)
+ // items, _ := models.GetTaskByIds(v.TaskId)
+ //浠诲姟鍚嶇О
+ // items, _ := db.GetTaskByIds(v.TaskId)
+ items := []models.TaskOption{}
+ //if strings.Contains(v.TaskName, ",") {
+ taskNames := strings.Split(v.TaskName, ",")
+ for _, name := range taskNames {
+ task := models.TaskOption{}
+ if len(name) > 0 {
+ if strings.Contains(name, "_") {
+ tempNames := strings.Split(name, "_")
+ if len(tempNames[0]) > 0 {
+ id, _ := strconv.ParseInt(tempNames[0], 10, 64)
+ task.TaskId = id
+ }
+ task.TaskName = tempNames[1]
+ }
+ }
+ items = append(items, task)
+ }
+ //}
+
temp.TaskNames = items
+
//浠诲姟鍚嶇О閲嶆柊璧嬪��
var result string
- if len(taskId) > 0 && len(items) > 0 {
- v.EventLevelId = []int64{}
- for index, item := range items {
- v.EventLevelId = append(v.EventLevelId, item.EventLevel)
- if index > 0 {
- result += ","
+ var result1 string
+ if len(items) > 0 {
+ for _, item := range items {
+ // v.EventLevelId = append(v.EventLevelId, item.EventLevel)
+ if containsID(taskId, item.TaskId) {
+ result += item.TaskName + ","
}
- result += item.TaskName
+ result1 += item.TaskName + ","
}
- temp.TaskName = result
+ if len(taskId) > 0 {
+ temp.TaskName = result
+ } else {
+ temp.TaskName = result1
+ }
}
+
+ //浠诲姟
+ temp.TaskName = strings.TrimSuffix(temp.TaskName, ",")
//瑙嗛鍐呭
// items4, _ := models.GetVideoById(v.VideoPointId)
@@ -1243,19 +1309,51 @@
temp.RuleNames = items3
//浜嬩欢
- items5, _ := models.GetEventByIds(v.EventLevelId)
- temp.EventLevels = items5
+ items5 := []models.TaskOption{}
+ //if strings.Contains(v.EventLevelName, ",") {
+ eventNames := strings.Split(v.EventLevelName, ",")
+ for _, name := range eventNames {
+ task := models.TaskOption{}
+ if len(name) > 0 {
+ if strings.Contains(name, "_") {
+ tempNames := strings.Split(name, "_")
+ if len(tempNames[0]) > 0 {
+ id, _ := strconv.ParseInt(tempNames[0], 10, 64)
+ task.TaskId = id
+ }
+ task.EventLevelName = tempNames[1]
+ }
+ }
+ items5 = append(items5, task)
+ }
+ //}
+
+ tempEventName := temp.DynamicLevel
//浜嬩欢绛夌骇閲嶆柊璧嬪��
var result2 string
- if len(taskId) > 0 && len(items5) > 0 {
- for i, item5 := range items5 {
- if i > 0 {
- result2 += ","
+ var result22 string
+ if len(taskId) > 0 {
+ for _, item5 := range items5 {
+ if containsID(taskId, item5.TaskId) {
+ result2 += item5.EventLevelName + ","
}
- result2 += item5.DictValue
+ result22 += item5.EventLevelName + ","
}
- temp.EventLevelName = result2
+ if len(taskId) > 0 {
+ temp.EventLevelName = result2
+ } else {
+ temp.EventLevelName = result22
+ }
+ temp.EventLevelName = strings.TrimSuffix(temp.EventLevelName, ",")
+
+ if len(tempEventName) > 0 {
+ if len(temp.EventLevelName) > 0 {
+ temp.EventLevelName = tempEventName + "," + temp.EventLevelName
+ } else {
+ temp.EventLevelName = tempEventName
+ }
+ }
}
//鐭ヨ瘑搴�
@@ -1287,6 +1385,16 @@
return &bhomeclient.Reply{Success: true, Msg: "鑾峰彇鎴愬姛", Data: pageRes}
}
+// 鍖呭惈id
+func containsID(taskId []int64, id int64) bool {
+ for _, v := range taskId {
+ if v == id {
+ return true
+ }
+ }
+ return false
+}
+
/**
*鑾峰彇鐫ｆ煡浠诲姟
*/
--
Gitblit v1.8.0