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/service/eventPushService.go | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/push-service/service/eventPushService.go b/push-service/service/eventPushService.go
index c36b6b9..2b01a84 100644
--- a/push-service/service/eventPushService.go
+++ b/push-service/service/eventPushService.go
@@ -1,16 +1,18 @@
package service
import (
- "basic.com/pubsub/protomsg.git"
- "basic.com/valib/bhomeclient.git"
- "basic.com/valib/bhomedbapi.git"
"encoding/json"
"errors"
- "github.com/satori/go.uuid"
"vamicro/extend/util"
"vamicro/push-service/models"
"vamicro/push-service/vo"
sysModel "vamicro/system-service/models"
+
+ "basic.com/pubsub/protomsg.git"
+ "basic.com/valib/bhomeclient.git"
+ "basic.com/valib/bhomedbapi.git"
+ "basic.com/valib/logger.git"
+ uuid "github.com/satori/go.uuid"
)
type EventPushService struct {
@@ -82,10 +84,12 @@
} else { //鏂板
if er > 0 {
err = errors.New("鍚嶇О涓嶅厑璁搁噸澶�")
+ logger.Debug(err)
return false
}
eventPushE.Id = uuid.NewV4().String()
if err = tx.Table("event_push").Create(&eventPushE).Error; err != nil {
+ logger.Debug(err)
return false
}
}
@@ -101,6 +105,7 @@
EventPushId: eventPushE.Id,
}
if err = tx.Table("event_push_server").Create(&ipPortE).Error; err != nil {
+ logger.Debug(err)
return false
}
}
@@ -109,18 +114,24 @@
Id: uuid.NewV4().String(),
Enable: urlVo.Enable,
Url: urlVo.Url,
+ ServerIp: urlVo.ServerIp,
+ Port: urlVo.Port,
Type: models.PUSH_URL_TYPE,
EventPushId: eventPushE.Id,
}
if err = tx.Table("event_push_server").Create(&urlE).Error; err != nil {
+ logger.Debug(err)
return false
}
}
+
+ logger.Debug("hhhhhhh")
for _, rule := range body.Rules {
rule.Id = uuid.NewV4().String()
rule.EventPushId = eventPushE.Id
if err = tx.Table("event_push_rule").Create(&rule).Error; err != nil {
+ logger.Debug(err)
return false
}
}
@@ -265,8 +276,10 @@
})
} else if pushServer.Type == models.PUSH_URL_TYPE {
resultVo.Urls = append(resultVo.Urls, vo.EventUrlVo{
- Enable: pushServer.Enable,
- Url: pushServer.Url,
+ Enable: pushServer.Enable,
+ Url: pushServer.Url,
+ ServerIp: pushServer.ServerIp,
+ Port: pushServer.Port,
})
}
}
--
Gitblit v1.8.0