From 9b17a8dcbc1f94eb117a37b3b24ca9dae0d2d588 Mon Sep 17 00:00:00 2001
From: qixiaoning <jony.kee@outlook.com>
Date: 星期三, 29 十月 2025 09:40:54 +0800
Subject: [PATCH] 摄像机相关接口跳转，推送配置修改，系统权限菜单修改
---
chanmanage-service/controllers/pollSet.go | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/chanmanage-service/controllers/pollSet.go b/chanmanage-service/controllers/pollSet.go
index a0d3514..275584e 100644
--- a/chanmanage-service/controllers/pollSet.go
+++ b/chanmanage-service/controllers/pollSet.go
@@ -280,13 +280,25 @@
// } else {
// cri.Tasks = []vo.CameraRunTask{}
// }
- var ids []string
+ var ids []string = []string{}
ids = append(ids, cE.Id)
- cri.AllTasks, _ = models.GetListTask(ids)
+ tasks, _ := models.GetListTask(ids)
+ //rules
+ ruleMap := models.GetAllRule()
+
+ cri.AllTasks = []commonModel.TaskM{}
+ for _, item := range tasks {
+ temp := &commonModel.TaskM{
+ TaskName: item.TaskName,
+ EventName: item.EventName,
+ TaskDescription: ruleMap[item.TaskId],
+ }
+ cri.AllTasks = append(cri.AllTasks, *temp)
+ }
//澶勭悊鎽勫儚鏈虹殑鐘舵��
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 {
--
Gitblit v1.8.0