From 1882999b4ee899b79fa5e064238796f1e315d963 Mon Sep 17 00:00:00 2001
From: qixiaoning <jony.kee@outlook.com>
Date: 星期三, 30 七月 2025 15:01:46 +0800
Subject: [PATCH] 修改算力管理，统计信息以及增加摄像机关联任务描述事件等级
---
camera-common/models/task.go | 8 ++++++++
appcenter-service/models/app.go | 2 +-
chanmanage-service/models/camera.go | 5 +++--
chanmanage-service/controllers/pollSet.go | 4 ++--
chanmanage-service/service/pollSetService.go | 4 ++++
camera-common/vo/camera.go | 6 +++---
6 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/appcenter-service/models/app.go b/appcenter-service/models/app.go
index c85f291..8a5e933 100644
--- a/appcenter-service/models/app.go
+++ b/appcenter-service/models/app.go
@@ -102,7 +102,7 @@
}
return rows, nil
} else {
- if err := db.Table(a.TableName()).Find(&rows).Error; err != nil {
+ if err := db.Table(a.TableName()).Order("create_time asc").Find(&rows).Error; err != nil {
return nil, err
}
return rows, nil
diff --git a/camera-common/models/task.go b/camera-common/models/task.go
index 82a66d6..7c2bfc7 100644
--- a/camera-common/models/task.go
+++ b/camera-common/models/task.go
@@ -6,11 +6,19 @@
)
// 鏅烘煡浠诲姟
+
type Task struct {
TaskId int64 `db:"task_id" json:"taskId"`
TaskName string `db:"task_name" json:"taskName"`
}
+type TaskM struct {
+ TaskId int64 `db:"task_id" json:"taskId"`
+ TaskName string `db:"task_name" json:"taskName"`
+ TaskDescription string `db:"task_description" json:"taskDescription"`
+ EventName string `db:"event_name" json:"eventName"`
+}
+
// 瑙嗛
type Video struct {
VideoIds []string `json:"videoIds"`
diff --git a/camera-common/vo/camera.go b/camera-common/vo/camera.go
index ade66dd..f45c53f 100644
--- a/camera-common/vo/camera.go
+++ b/camera-common/vo/camera.go
@@ -34,9 +34,9 @@
models.Camera
RunServerName string `json:"runServerName"`
// Tasks []CameraRunTask `json:"tasks"`
- AllTasks []models.Task `json:"allTasks"`
- Status int `json:"status"`
- LinkCams [][]LinkCam `json:"linkCams"` //涓庢鎽勫儚鏈鸿仈鍔ㄧ殑鎵�鏈夎仈鍔ㄦ憚鍍忔満淇℃伅,鍒嗙粍
+ AllTasks []models.TaskM `json:"allTasks"`
+ Status int `json:"status"`
+ LinkCams [][]LinkCam `json:"linkCams"` //涓庢鎽勫儚鏈鸿仈鍔ㄧ殑鎵�鏈夎仈鍔ㄦ憚鍍忔満淇℃伅,鍒嗙粍
}
type LinkCam struct {
diff --git a/chanmanage-service/controllers/pollSet.go b/chanmanage-service/controllers/pollSet.go
index a0d3514..49488b2 100644
--- a/chanmanage-service/controllers/pollSet.go
+++ b/chanmanage-service/controllers/pollSet.go
@@ -280,13 +280,13 @@
// } else {
// cri.Tasks = []vo.CameraRunTask{}
// }
- var ids []string
+ var ids []string = []string{}
ids = append(ids, cE.Id)
cri.AllTasks, _ = models.GetListTask(ids)
//澶勭悊鎽勫儚鏈虹殑鐘舵��
if cE.RunType == commonModel.TYPE_RUNTYPE_POLL || cE.RunType == commonModel.TYPE_RUNTYPE_REALTIME {
- if crInfo, ok := ruleM[cE.Id]; ok && crInfo.Rules != nil && len(crInfo.Rules) > 0 {
+ if cri.AllTasks != nil && len(cri.AllTasks) > 0 {
if cE.IsRunning {
cri.Status = commonModel.Camera_Status_Doing
} else {
diff --git a/chanmanage-service/models/camera.go b/chanmanage-service/models/camera.go
index dc3e3a7..7bb51cd 100644
--- a/chanmanage-service/models/camera.go
+++ b/chanmanage-service/models/camera.go
@@ -7,16 +7,17 @@
)
// 鏌ヨ鍒楄〃鏁版嵁
-func GetListTask(ids []string) (items []models.Task, err error) {
+func GetListTask(ids []string) (items []models.TaskM, err error) {
//idList := strings.Join(ids, ",")
idList := "'" + strings.Join(ids, "','") + "'"
// 涓绘煡璇QL
//sqlStr := `select c.task_id, c.task_name from mal_task_video_link a left join mal_smart_task c on a.task_id = c.task_id where a.video_id in(?) ORDER BY a.task_id desc`
sqlStr := fmt.Sprintf(`
- SELECT c.task_id, c.task_name
+ SELECT c.task_id, c.task_name,c.task_description,b.dict_value as event_name
FROM mal_task_video_link a
LEFT JOIN mal_smart_task c ON a.task_id = c.task_id
+ LEFT JOIN mal_dict_type b ON b.dict_id = c.event_level
WHERE a.video_id IN (%s)
ORDER BY a.task_id DESC
`, idList)
diff --git a/chanmanage-service/service/pollSetService.go b/chanmanage-service/service/pollSetService.go
index 2ce32ea..32c0845 100644
--- a/chanmanage-service/service/pollSetService.go
+++ b/chanmanage-service/service/pollSetService.go
@@ -205,6 +205,10 @@
// }
}
}
+
+ //鎬荤畻閲屾殏鏃跺彧缁熻瀹炴椂绠楀姏
+ v.ChannelTotal = rTotal
+
v.RealTotal = rTotal
v.PollTotal = pTotal
logger.Debug("statisticRunInfo 鑾峰彇瀹孍xistRunningTask鑰楁椂锛�", time.Since(timeStart))
--
Gitblit v1.8.0