From eac932eb827c93e2e998ac1210c3f5e548af0dbf Mon Sep 17 00:00:00 2001
From: qixiaoning <jony.kee@outlook.com>
Date: 星期四, 28 八月 2025 09:10:14 +0800
Subject: [PATCH] 推送回显地址bug,实时监控接口摄像机名称直接取video_point_name,
---
push-service/controllers/pushSet.go | 179 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 93 insertions(+), 86 deletions(-)
diff --git a/push-service/controllers/pushSet.go b/push-service/controllers/pushSet.go
index a7c59a8..a8f967c 100644
--- a/push-service/controllers/pushSet.go
+++ b/push-service/controllers/pushSet.go
@@ -1,10 +1,11 @@
package controllers
import (
- "basic.com/valib/bhomeclient.git"
- "basic.com/valib/logger.git"
"vamicro/config"
"vamicro/push-service/vo"
+
+ "basic.com/valib/bhomeclient.git"
+ "basic.com/valib/logger.git"
)
type PushSetController struct {
@@ -31,23 +32,37 @@
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"},
},
}
- sceneInfoSet := vo.PushSetMenu{
- Id: "alarmRules", //鎶ヨ瑙勫垯
- Name: "鍦烘櫙淇℃伅",
- Alias: "alarmRules",
+ // sceneInfoSet := vo.PushSetMenu{
+ // Id: "alarmRules", //鎶ヨ瑙勫垯
+ // Name: "鍦烘櫙淇℃伅",
+ // Alias: "alarmRules",
+ // Checked: true,
+ // Children: []vo.PushSetMenu{
+ // {Checked: true, Id: "taskId", Name: "鍦烘櫙ID", Alias: "taskId"},
+ // {Checked: true, Id: "taskName", Name: "鍦烘櫙鍚嶇О", Alias: "taskName"},
+ // {Checked: true, Id: "alarmRules.#.alarmLevel", Name: "浜嬩欢绛夌骇", Alias: "alarmLevel"},
+ // {Checked: true, Id: "alarmRules.#.ruleText", Name: "鍦烘櫙鎻忚堪", Alias: "groupText"},
+ // {Checked: true, Id: "alarmRules.#.linkInfo", Name: "鑱斿姩淇℃伅", Alias: "linkInfo"},
+ // {Checked: true, Id: "alarmRules.#.groupId", Name: "鎶ヨ瑙勫垯缁刬d", Alias: "groupId"},
+ // },
+ // }
+ taskInfoSet := vo.PushSetMenu{
+ Id: "aiTasks", //ai浠诲姟
+ Name: "浠诲姟淇℃伅",
+ 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: "alarmRules.#.alarmLevel", Name: "浜嬩欢绛夌骇", Alias: "alarmLevel"},
- {Checked: true, Id: "alarmRules.#.ruleText", Name: "鍦烘櫙鎻忚堪", Alias: "groupText"},
- {Checked: true, Id: "alarmRules.#.linkInfo", Name: "鑱斿姩淇℃伅", Alias: "linkInfo"},
- {Checked: true, Id: "alarmRules.#.groupId", Name: "鎶ヨ瑙勫垯缁刬d", Alias: "groupId"},
+ {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{
@@ -56,9 +71,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{
@@ -68,76 +83,68 @@
Checked: true,
Children: []vo.PushSetMenu{
{Checked: true, Id: "id", Name: "涓婚敭ID", Alias: "id"},
- {Checked: true, Id: "isDelete", Name: "鏄惁鍒犻櫎", Alias: "isDelete"},
- {Checked: true, Id: "likeDate", Name: "姣斿鏃堕棿", Alias: "likeDate"},
- {Checked: true, Id: "picDate", Name: "鎶撴媿鏃堕棿", Alias: "picDate"},
- {Checked: true, Id: "updateTime", Name: "鏇存柊鏃堕棿", Alias: "updateTime"},
- {Checked: true, Id: "picMaxUrl", Name: "鍛婅鍏ㄦ櫙鍥惧湴鍧�", Alias: "picMaxUrl"},
- {Checked: true, Id: "picSrcUrl", Name: "鍘熷鍏ㄦ櫙鍥惧湴鍧�", Alias: "picSrcUrl"},
- {Checked: true, Id: "picId", Name: "鍥剧墖ID", Alias: "picId"},
- {Checked: true, Id: "picWH.picH", Name: "鍥剧墖楂�", Alias: "picH"},
- {Checked: true, Id: "picWH.picW", Name: "鍥剧墖瀹�", Alias: "picW"},
- {Checked: true, Id: "sdkName", Name: "sdk绫诲瀷", Alias: "sdkName"},
- {Checked: true, Id: "videoUrl", Name: "褰曞儚鍦板潃", Alias: "videoUrl"},
- {Checked: true, Id: "content", Name: "鍦烘櫙鍚嶇О", Alias: "content"},
- {Checked: true, Id: "linkTag", Name: "鑱斿姩浠诲姟鏍囧織", Alias: "linkTag"},
- {Checked: true, Id: "otherLabels", Name: "鍏朵粬鏍囩", Alias: "otherLebels"},
- {Checked: true, Id: "showLabels", Name: "绠楁硶鏍囩", Alias: "showLabels"},
- {Checked: true, Id: "version", Name: "绱㈠紩鐗堟湰", Alias: "version"},
- {Checked: true, Id: "isAlarm", Name: "鏄惁鎶ヨ", Alias: "isAlarm"},
+ {Checked: true, Id: "detect_time", Name: "鍒涘缓鏃堕棿", Alias: "detect_time"},
+ {Checked: true, Id: "zh_desc_class", Name: "涓枃鎻忚堪", Alias: "zh_desc_class"},
+ {Checked: true, Id: "image_path", Name: "鍥惧儚鍦板潃", Alias: "image_path"},
+ {Checked: true, Id: "video_path", Name: "褰曞儚鍦板潃", Alias: "video_path"},
+ {Checked: true, Id: "event_level_name", Name: "浜嬩欢绛夌骇", Alias: "event_level_name"},
+ {Checked: true, Id: "suggestion", Name: "澶勭悊寤鸿", Alias: "suggestion"},
+ {Checked: true, Id: "risk_description", Name: "闅愭偅鎻忚堪", Alias: "risk_description"},
+ {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"},
- },
- }
- dtSet := vo.PushSetMenu{
- Id: "tableInfo",
- Name: "搴曞簱淇℃伅",
- Alias: "tableInfo",
- Checked: true,
- Children: []vo.PushSetMenu{
- {Checked: true, Id: "baseInfo.#.tableId", Name: "搴曞簱ID", Alias: "tableId"},
- {Checked: true, Id: "baseInfo.#.tableName", Name: "搴曞簱鍚嶇О", Alias: "tableName"},
- {Checked: true, Id: "baseInfo.#.bwType", Name: "榛戠櫧鍚嶅崟", Alias: "bwType"},
- {Checked: true, Id: "baseInfo.#.targetPicUrl", Name: "鐩爣鎶撴媿鍥剧墖", Alias: "targetPicUrl"},
- {Checked: true, Id: "baseInfo.#.compareScore", Name: "鐩镐技搴�", Alias: "compareScore"},
- {Checked: true, Id: "baseInfo.#.content", Name: "鍐呭", Alias: "content"},
- },
- }
- dbpInfo := vo.PushSetMenu{
- Id: "baseInfo",
- Name: "搴曞簱浜哄憳淇℃伅",
- Alias: "baseInfo",
- Checked: true,
- Children: []vo.PushSetMenu{
- {Checked: true, Id: "baseInfo.#.targetId", Name: "鐩爣ID", Alias: "targetId"},
- {Checked: true, Id: "baseInfo.#.targetName", Name: "濮撳悕", Alias: "targetName"},
- {Checked: true, Id: "baseInfo.#.sex", Name: "鎬у埆", Alias: "sex"},
- {Checked: true, Id: "baseInfo.#.idCard", Name: "韬唤璇佸彿", Alias: "idCard"},
- {Checked: true, Id: "baseInfo.#.phoneNum", Name: "鎵嬫満鍙�", Alias: "phoneNum"},
- {Checked: true, Id: "baseInfo.#.monitorLevel", Name: "浜哄憳绛夌骇", Alias: "monitorLevel"},
- },
- }
- set = append(set, camInfoSet, sceneInfoSet, serverSet, dataSet, detectAreaSet, targetSet, dtSet, dbpInfo)
+ // 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"},
+ // },
+ // }
+ // dtSet := vo.PushSetMenu{
+ // Id: "tableInfo",
+ // Name: "搴曞簱淇℃伅",
+ // Alias: "tableInfo",
+ // Checked: true,
+ // Children: []vo.PushSetMenu{
+ // {Checked: true, Id: "baseInfo.#.tableId", Name: "搴曞簱ID", Alias: "tableId"},
+ // {Checked: true, Id: "baseInfo.#.tableName", Name: "搴曞簱鍚嶇О", Alias: "tableName"},
+ // {Checked: true, Id: "baseInfo.#.bwType", Name: "榛戠櫧鍚嶅崟", Alias: "bwType"},
+ // {Checked: true, Id: "baseInfo.#.targetPicUrl", Name: "鐩爣鎶撴媿鍥剧墖", Alias: "targetPicUrl"},
+ // {Checked: true, Id: "baseInfo.#.compareScore", Name: "鐩镐技搴�", Alias: "compareScore"},
+ // {Checked: true, Id: "baseInfo.#.content", Name: "鍐呭", Alias: "content"},
+ // },
+ // }
+ // dbpInfo := vo.PushSetMenu{
+ // Id: "baseInfo",
+ // Name: "搴曞簱浜哄憳淇℃伅",
+ // Alias: "baseInfo",
+ // Checked: true,
+ // Children: []vo.PushSetMenu{
+ // {Checked: true, Id: "baseInfo.#.targetId", Name: "鐩爣ID", Alias: "targetId"},
+ // {Checked: true, Id: "baseInfo.#.targetName", Name: "濮撳悕", Alias: "targetName"},
+ // {Checked: true, Id: "baseInfo.#.sex", Name: "鎬у埆", Alias: "sex"},
+ // {Checked: true, Id: "baseInfo.#.idCard", Name: "韬唤璇佸彿", Alias: "idCard"},
+ // {Checked: true, Id: "baseInfo.#.phoneNum", Name: "鎵嬫満鍙�", Alias: "phoneNum"},
+ // {Checked: true, Id: "baseInfo.#.monitorLevel", Name: "浜哄憳绛夌骇", Alias: "monitorLevel"},
+ // },
+ // }
+ // set = append(set, camInfoSet, sceneInfoSet, serverSet, dataSet, detectAreaSet, targetSet, dtSet, dbpInfo)
+ set = append(set, camInfoSet, taskInfoSet, serverSet, dataSet)
return &bhomeclient.Reply{Success: true, Data: set}
}
--
Gitblit v1.8.0