From 87b55a899bc1b4bc7d5a0f8d6ad1a1ede233ebd1 Mon Sep 17 00:00:00 2001
From: qixiaoning <jony.kee@outlook.com>
Date: 星期四, 04 九月 2025 17:35:24 +0800
Subject: [PATCH] 系统监控模型进程统计实时监控摄像机名称为空问题修复
---
camera-service/controllers/camera.go | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/camera-service/controllers/camera.go b/camera-service/controllers/camera.go
index a4764fd..e554612 100644
--- a/camera-service/controllers/camera.go
+++ b/camera-service/controllers/camera.go
@@ -166,10 +166,14 @@
}
m["resolutions"] = []models.Resolution{dRe0, dRe1, dRe2}
+
+ //鑾峰彇鐫ｆ煡浠诲姟
+ tasks := models.GetTasks()
//澶勭悊鎽勫儚鏈虹殑鐘舵��
- var crApi bhomedbapi.CameraRuleApi
+ //var crApi bhomedbapi.CameraRuleApi
if cam.RunType == models.TYPE_RUNTYPE_POLL || cam.RunType == models.TYPE_RUNTYPE_REALTIME {
- if crApi.ExistRunningTask(cam.Id) {
+ //if crApi.ExistRunningTask(cam.Id) {
+ if taskInfo, ok := tasks[cam.Id]; ok && taskInfo != nil && len(taskInfo) > 0 {
if cam.IsRunning {
m["status"] = models.Camera_Status_Doing
} else {
@@ -323,9 +327,9 @@
sv := service.CameraService{}
if sv.ChangeRunType(ccrVo) {
- cIds := strings.Join(ccrVo.CameraIds, ",")
- cc.addDbChangeMsg(h.Bk, protomsg.TableChanged_T_Camera, cIds, protomsg.DbAction_Update, "")
- _, _ = service2.DoBusReq("/data/api-v/saas/syncCamera", config.Server.AnalyServerId, aiot.RequestMethod_Post, aiot.RequestContentType_ApplicationJson, map[string]interface{}{})
+ //cIds := strings.Join(ccrVo.CameraIds, ",")
+ //cc.addDbChangeMsg(h.Bk, protomsg.TableChanged_T_Camera, cIds, protomsg.DbAction_Update, "")
+ // _, _ = service2.DoBusReq("/data/api-v/saas/syncCamera", config.Server.AnalyServerId, aiot.RequestMethod_Post, aiot.RequestContentType_ApplicationJson, map[string]interface{}{})
return &bhomeclient.Reply{Success: true, Msg: "鏇存柊鎴愬姛"}
} else {
return &bhomeclient.Reply{Success: false, Msg: "鏇存柊澶辫触"}
@@ -1019,6 +1023,7 @@
pageSize := info.PageSize
idsStr := info.Ids
TaskIds := info.TaskIds
+ TaskName := info.TaskName
videoIdStr := info.VideoIds
Warning := info.Warning
@@ -1045,7 +1050,7 @@
}
}
//鏍规嵁id鏌ヨ瑙嗛id
- var vids []int
+ var vids []int64
cameras, _ := models.GetCameraIds(videoIds)
for _, camera := range cameras {
if len(camera.Id) > 0 {
@@ -1054,7 +1059,7 @@
}
idStr := make([]string, len(vids))
for i, id := range vids {
- idStr[i] = strconv.Itoa(id)
+ idStr[i] = strconv.FormatInt(id, 10)
}
filter += fmt.Sprintf(" and %s in [%s]", "video_point_id", strings.Join(idStr, ","))
}
@@ -1062,6 +1067,19 @@
//鏍规嵁浠诲姟鏌ヨ
if len(TaskIds) > 0 {
filter += fmt.Sprintf(" and array_contains(task_id, %d)", TaskIds[0])
+ }
+
+ //鏍规嵁浠诲姟鍚嶇О
+ if len(TaskName) > 0 {
+ quotedNames := make([]string, len(TaskName))
+ for i, name := range TaskName {
+ quotedNames[i] = "'" + name + "'" // 姣忎釜鍏冪礌鍔犲崟寮曞彿
+ }
+ filter += fmt.Sprintf(" and %s in [%s]", "task_name", strings.Join(quotedNames, ","))
+ } else {
+ if Warning > 0 {
+ return &bhomeclient.Reply{Success: true, Msg: "鑾峰彇鎴愬姛", Data: nil}
+ }
}
//鏄惁棰勮
@@ -1121,6 +1139,9 @@
Content: v.CameraName,
PicDate: v.PicDate,
LikeDate: v.LikeDate,
+ VideoName: v.CameraName,
+ CameraAddr: v.CameraName,
+ CameraName: v.CameraName,
}
//浠诲姟鍚嶇О
@@ -1128,9 +1149,9 @@
temp.TaskNames = items
//瑙嗛鍐呭
- items4, _ := models.GetVideoById(v.VideoPointId)
- temp.VideoName = items4.Name
- temp.CameraAddr = items4.Addr
+ // items4, _ := models.GetVideoById(v.VideoPointId)
+ // temp.VideoName = items4.Name
+ // temp.CameraAddr = items4.Addr
//妫�鏌ュ唴瀹�
items2, _ := models.GetCheckByIds(v.DetectId)
@@ -1193,3 +1214,14 @@
return &bhomeclient.Reply{Success: true, Msg: "鑾峰彇鎴愬姛", Data: tasks}
}
+
+// 鑾峰彇鎵�鏈�
+func (cc CameraController) GetAllTasks(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
+ //缁戝畾json鍜岀粨鏋勪綋
+
+ var tasks []models.TaskAggregate
+ tasks, _ = models.GetAllTask()
+
+ return &bhomeclient.Reply{Success: true, Msg: "鑾峰彇鎴愬姛", Data: tasks}
+
+}
--
Gitblit v1.8.0