From 9b17a8dcbc1f94eb117a37b3b24ca9dae0d2d588 Mon Sep 17 00:00:00 2001
From: qixiaoning <jony.kee@outlook.com>
Date: 星期三, 29 十月 2025 09:40:54 +0800
Subject: [PATCH] 摄像机相关接口跳转，推送配置修改，系统权限菜单修改
---
camera-service/controllers/camera.go | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/camera-service/controllers/camera.go b/camera-service/controllers/camera.go
index e90ed77..2029bfc 100644
--- a/camera-service/controllers/camera.go
+++ b/camera-service/controllers/camera.go
@@ -90,6 +90,7 @@
if b, err := sv.CameraUpdate(camVo); b {
//鏇存柊鍒嗚鲸鐜�
if ok {
+ //
logger.Debug("DoPostRequest:", camVo)
if cam.IsRunning && (cam.ResolutionWidth != camVo.ResolutionWidth && cam.ResolutionHeight != camVo.ResolutionHeight) {
header := map[string]string{}
@@ -99,6 +100,18 @@
"videoType": 0,
}
res, err := util.DoPostRequest("http://127.0.0.1:8088/v1/task/openAnalysis", util.CONTENT_TYPE_JSON, paramBody, nil, header, time.Second*10)
+ if err != nil {
+ logger.Debug("DoPostRequest err:", err)
+ }
+ logger.Debug("DoPostRequest:", res)
+ }
+ //鏇存柊鐘舵��
+ if cam.IsRunning {
+ header := map[string]string{}
+ paramBody := map[string]interface{}{
+ "state": 1,
+ }
+ res, err := util.DoPostRequest("http://127.0.0.1:8088/v1/task/updateAllStatus?state=1", util.CONTENT_TYPE_JSON, paramBody, nil, header, time.Second*10)
if err != nil {
logger.Debug("DoPostRequest err:", err)
}
@@ -131,15 +144,24 @@
}
//鍒ゆ柇鏄惁鏈夐厤缃换鍔�
- total, _ := models.GetTaskTotal(cid)
- if total > 0 {
- return &bhomeclient.Reply{Success: false, Msg: "璇峰厛鍒犻櫎閰嶇疆鐨勪换鍔�"}
- }
+ // total, _ := models.GetTaskTotal(cid)
+ // if total > 0 {
+ // return &bhomeclient.Reply{Success: false, Msg: "璇峰厛鍒犻櫎閰嶇疆鐨勪换鍔�"}
+ // }
rows, _ := cam.Delete(cid)
if rows == 0 {
return &bhomeclient.Reply{Success: true, Msg: "璁板綍涓嶅瓨鍦�"}
}
+
+ //鍒犻櫎浠诲姟
+ items, _ := models.GetTaskTotal(cid)
+ if len(items) > 0 {
+ for _, item := range items {
+ cam.DelLink(item.ID)
+ }
+ }
+
pMsg := protomsg.DbChangeMessage{ //闇�瑕侀噸鏂拌绠楃畻鍔涘崰鐢ㄦ儏鍐�
Table: protomsg.TableChanged_T_Camera,
Action: protomsg.DbAction_Delete,
@@ -1125,9 +1147,9 @@
if len(TaskName) > 0 {
quotedNames := make([]string, len(TaskName))
for i, name := range TaskName {
- quotedNames[i] = "'" + name + "'" // 姣忎釜鍏冪礌鍔犲崟寮曞彿
+ quotedNames[i] = " task_name like '%%" + name + "%%' " // 姣忎釜鍏冪礌鍔犲崟寮曞彿
}
- filter += fmt.Sprintf(" and %s in [%s]", "task_name", strings.Join(quotedNames, ","))
+ filter += " and (" + strings.Join(quotedNames, "or") + ")"
} else {
if Warning > 0 {
return &bhomeclient.Reply{Success: true, Msg: "鑾峰彇鎴愬姛", Data: nil}
--
Gitblit v1.8.0