From 9b17a8dcbc1f94eb117a37b3b24ca9dae0d2d588 Mon Sep 17 00:00:00 2001
From: qixiaoning <jony.kee@outlook.com>
Date: 星期三, 29 十月 2025 09:40:54 +0800
Subject: [PATCH] 摄像机相关接口跳转，推送配置修改，系统权限菜单修改
---
push-service/controllers/pushSet.go | 83 ++++++++++++++++++++++++-----------------
1 files changed, 48 insertions(+), 35 deletions(-)
diff --git a/push-service/controllers/pushSet.go b/push-service/controllers/pushSet.go
index b2aa7ab..13a7a23 100644
--- a/push-service/controllers/pushSet.go
+++ b/push-service/controllers/pushSet.go
@@ -32,9 +32,10 @@
Alias: "camInfo",
Checked: true,
Children: []vo.PushSetMenu{
- {Checked: true, Id: "cameraId", Name: "鎽勫儚鏈篒D", Alias: "cameraId"},
- {Checked: true, Id: "cameraName", Name: "鎽勫儚鏈哄悕绉�", Alias: "cameraName"},
- {Checked: true, Id: "cameraAddr", Name: "鎽勫儚鏈哄湴鍧�", Alias: "cameraAddr"},
+ {Checked: true, Id: "camera_id", Name: "鎽勫儚鏈篒D", Alias: "camera_id"},
+ {Checked: true, Id: "camera_name", Name: "鎽勫儚鏈哄悕绉�", Alias: "camera_name"},
+ {Checked: true, Id: "camera_addr", Name: "鎽勫儚鏈哄湴鍧�", Alias: "camera_addr"},
+ {Checked: true, Id: "camera_rtsp", Name: "RTSP鍦板潃", Alias: "camera_rtsp"},
},
}
// sceneInfoSet := vo.PushSetMenu{
@@ -57,12 +58,12 @@
Alias: "aiTasks",
Checked: true,
Children: []vo.PushSetMenu{
- {Checked: true, Id: "taskId", Name: "浠诲姟id", Alias: "taskId"},
- {Checked: true, Id: "taskName", Name: "浠诲姟鍚嶇О", Alias: "taskName"},
- {Checked: true, Id: "aiTasks.#.eventLevel", Name: "浜嬩欢绛夌骇", Alias: "eventLevel"},
- {Checked: true, Id: "aiTasks.#.workingTime", Name: "鏃堕棿娈�", Alias: "workingTime"},
- {Checked: true, Id: "aiTasks.#.rules", Name: "浠诲姟鎻忚堪", Alias: "rules"},
- {Checked: true, Id: "aiTasks.#.taskDescription", Name: "澶囨敞", Alias: "taskDescription"},
+ {Checked: true, Id: "task_id", Name: "浠诲姟id", Alias: "task_id"},
+ {Checked: true, Id: "task_name", Name: "浠诲姟鍚嶇О", Alias: "task_name"},
+ {Checked: true, Id: "event_level", Name: "浜嬩欢绛夌骇", Alias: "event_level"},
+ {Checked: true, Id: "working_time", Name: "鏃堕棿娈�", Alias: "working_time"},
+ {Checked: true, Id: "rules", Name: "浠诲姟鎻忚堪", Alias: "rules"},
+ {Checked: true, Id: "task_description", Name: "澶囨敞", Alias: "task_description"},
},
}
serverSet := vo.PushSetMenu{
@@ -71,9 +72,9 @@
Alias: "serverInfo",
Checked: true,
Children: []vo.PushSetMenu{
- {Checked: true, Id: "analyServerId", Name: "璁惧ID", Alias: "analyServerId"},
- {Checked: true, Id: "analyServerIp", Name: "璁惧IP", Alias: "analyServerIp"},
- {Checked: true, Id: "analyServerName", Name: "璁惧鍚嶇О", Alias: "analyServerName"},
+ {Checked: true, Id: "analy_server_id", Name: "璁惧ID", Alias: "analy_server_id"},
+ {Checked: true, Id: "analy_server_ip", Name: "璁惧IP", Alias: "analy_server_ip"},
+ {Checked: true, Id: "analy_server_name", Name: "璁惧鍚嶇О", Alias: "analy_server_name"},
},
}
dataSet := vo.PushSetMenu{
@@ -93,28 +94,40 @@
{Checked: true, Id: "is_warning", Name: "鏄惁棰勮", Alias: "is_warning"},
},
}
- // detectAreaSet := vo.PushSetMenu{
- // Id: "detectAreaInfo",
- // Name: "妫�娴嬪尯鍩�",
- // Alias: "detectAreaInfo",
- // Checked: true,
- // Children: []vo.PushSetMenu{
- // {Checked: true, Id: "targetInfo.#.areaId", Name: "妫�娴嬪尯鍩焛d", Alias: "areaId"},
- // {Checked: true, Id: "targetInfo.#.areaName", Name: "妫�娴嬪尯鍩熷悕绉�", Alias: "areaName"},
- // },
- // }
- // targetSet := vo.PushSetMenu{
- // Id: "targetInfo",
- // Name: "鐩爣",
- // Alias: "targetInfo",
- // Checked: true,
- // Children: []vo.PushSetMenu{
- // {Checked: true, Id: "targetInfo.#.attribute", Name: "绠楁硶灞炴��", Alias: "attribute"},
- // {Checked: true, Id: "targetInfo.#.targetLocation", Name: "鐩爣鍧愭爣", Alias: "targetLocation"},
- // {Checked: true, Id: "targetInfo.#.targetScore", Name: "鐩爣缃俊搴�", Alias: "targetScore"},
- // {Checked: true, Id: "targetInfo.#.targetType", Name: "鐩爣绫诲埆", Alias: "targetType"},
- // },
- // }
+ detectAreaSet := vo.PushSetMenu{
+ Id: "areaInfo",
+ Name: "妫�娴嬪尯鍩�",
+ Alias: "areaInfo",
+ Checked: true,
+ Children: []vo.PushSetMenu{
+ {Checked: true, Id: "area_id", Name: "妫�娴嬪尯鍩焛d", Alias: "area_id"},
+ {Checked: true, Id: "area_name", Name: "妫�娴嬪尯鍩熷悕绉�", Alias: "area_name"},
+ {Checked: true, Id: "proportion", Name: "妫�娴嬪尯鍩熷崰姣�", Alias: "proportion"},
+ },
+ }
+ KnowLedgeSet := vo.PushSetMenu{
+ Id: "knowLedgeInfo",
+ Name: "鐭ヨ瘑搴�",
+ Alias: "knowLedgeInfo",
+ Checked: true,
+ Children: []vo.PushSetMenu{
+ {Checked: true, Id: "knowledge_id", Name: "ID", Alias: "knowledge_id"},
+ {Checked: true, Id: "knowledge_name", Name: "鐭ヨ瘑搴撳悕绉�", Alias: "knowledge_name"},
+ {Checked: true, Id: "knowledge_doc", Name: "鐭ヨ瘑搴撴枃妗�", Alias: "knowledge_doc"},
+ },
+ }
+ targetSet := vo.PushSetMenu{
+ Id: "targetInfo",
+ Name: "鐩爣",
+ Alias: "targetInfo",
+ Checked: true,
+ Children: []vo.PushSetMenu{
+ {Checked: true, Id: "attribute", Name: "灞炴��", Alias: "attribute"},
+ {Checked: true, Id: "target_location", Name: "鐩爣鍧愭爣", Alias: "target_location"},
+ {Checked: true, Id: "target_score", Name: "鐩爣缃俊搴�", Alias: "target_score"},
+ {Checked: true, Id: "target_type", Name: "鐩爣绫诲埆", Alias: "target_type"},
+ },
+ }
// dtSet := vo.PushSetMenu{
// Id: "tableInfo",
// Name: "搴曞簱淇℃伅",
@@ -144,7 +157,7 @@
// },
// }
// set = append(set, camInfoSet, sceneInfoSet, serverSet, dataSet, detectAreaSet, targetSet, dtSet, dbpInfo)
- set = append(set, camInfoSet, taskInfoSet, serverSet, dataSet)
+ set = append(set, camInfoSet, taskInfoSet, serverSet, dataSet, detectAreaSet, KnowLedgeSet, targetSet)
return &bhomeclient.Reply{Success: true, Data: set}
}
--
Gitblit v1.8.0