From ad4ad76f4cd6db55ddceedcff5bf588547786f31 Mon Sep 17 00:00:00 2001
From: qixiaoning <jony.kee@outlook.com>
Date: 星期一, 11 八月 2025 13:47:24 +0800
Subject: [PATCH] 推送配置相关接口修改调整字段设置，数据关联
---
camera-common/models/task.go | 8 ++
camera-service/controllers/camera.go | 2
push-service/service/eventPushService.go | 10 +++
push-service/controllers/eventPush.go | 75 ++++++++++++------------
push-service/vo/eventPush.go | 6 +
push-service/controllers/pushSet.go | 25 ++-----
6 files changed, 67 insertions(+), 59 deletions(-)
diff --git a/camera-common/models/task.go b/camera-common/models/task.go
index 125a838..e17a7c7 100644
--- a/camera-common/models/task.go
+++ b/camera-common/models/task.go
@@ -12,6 +12,12 @@
TaskName string `db:"task_name" json:"taskName"`
}
+type TaskAggregate struct {
+ ID int64 `gorm:"column:task_id" json:"id"`
+ Name string `gorm:"column:task_name" json:"name"`
+ IsDelete int8 `json:"isDelete"`
+}
+
type TaskM struct {
TaskId int64 `db:"task_id" json:"taskId"`
TaskName string `db:"task_name" json:"taskName"`
@@ -46,7 +52,7 @@
}
// 鏌ヨ鍒楄〃鏁版嵁
-func GetAllTask() (items []Task, err error) {
+func GetAllTask() (items []TaskAggregate, err error) {
// 涓绘煡璇QL
sqlStr := fmt.Sprintf(`
SELECT task_id, task_name
diff --git a/camera-service/controllers/camera.go b/camera-service/controllers/camera.go
index ab1785d..51aa2cd 100644
--- a/camera-service/controllers/camera.go
+++ b/camera-service/controllers/camera.go
@@ -1216,7 +1216,7 @@
func (cc CameraController) GetAllTasks(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
//缁戝畾json鍜岀粨鏋勪綋
- var tasks []models.Task
+ var tasks []models.TaskAggregate
tasks, _ = models.GetAllTask()
return &bhomeclient.Reply{Success: true, Msg: "鑾峰彇鎴愬姛", Data: tasks}
diff --git a/push-service/controllers/eventPush.go b/push-service/controllers/eventPush.go
index 89e11d9..048a46d 100644
--- a/push-service/controllers/eventPush.go
+++ b/push-service/controllers/eventPush.go
@@ -1,16 +1,15 @@
package controllers
import (
- "basic.com/valib/bhomeclient.git"
- "basic.com/valib/logger.git"
"vamicro/push-service/service"
"vamicro/push-service/vo"
+
+ "basic.com/valib/bhomeclient.git"
+ "basic.com/valib/logger.git"
)
type EventPushController struct {
-
}
-
// @Summary 浜嬩欢鎺ㄩ�佷繚瀛�
// @Description 浜嬩欢鎺ㄩ�佷繚瀛�
@@ -19,16 +18,16 @@
// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
// @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
// @Router /data/api-v/eventPush/save [post]
-func (epc EventPushController) Save(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply{
+func (epc EventPushController) Save(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
var saveBody vo.EventPushVo
- if err := c.BindJSON(&saveBody);err !=nil {
- return &bhomeclient.Reply{ Success: false, Msg: "鍙傛暟鏈夎"}
+ if err := c.BindJSON(&saveBody); err != nil {
+ return &bhomeclient.Reply{Success: false, Msg: "鍙傛暟鏈夎"}
}
sv := service.NewEventPushService(h.Bk)
if sv.Save(&saveBody) {
- return &bhomeclient.Reply{ Success: true, Data: saveBody }
+ return &bhomeclient.Reply{Success: true, Data: saveBody}
} else {
- return &bhomeclient.Reply{ Success: false, Msg: "淇濆瓨澶辫触"}
+ return &bhomeclient.Reply{Success: false, Msg: "淇濆瓨澶辫触"}
}
}
@@ -41,19 +40,19 @@
// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
// @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
// @Router /data/api-v/eventPush/findByEventTopic [get]
-func (epc EventPushController) FindByEventTopic(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply{
+func (epc EventPushController) FindByEventTopic(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
topic := c.Query("topic")
childType := c.Query("type")
- if topic == ""{
- return &bhomeclient.Reply{ Success: false, Msg: "鍙傛暟鏈夎"}
+ if topic == "" {
+ return &bhomeclient.Reply{Success: false, Msg: "鍙傛暟鏈夎"}
}
sv := service.NewEventPushService(h.Bk)
list, err := sv.FindByEventTopic(topic, childType)
if err == nil {
- return &bhomeclient.Reply{ Success: true, Data: list }
+ return &bhomeclient.Reply{Success: true, Data: list}
} else {
- return &bhomeclient.Reply{ Success: false, Msg: err.Error() }
+ return &bhomeclient.Reply{Success: false, Msg: err.Error()}
}
}
@@ -68,11 +67,11 @@
func (epc EventPushController) FindAll(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
name := c.Query("name")
sv := service.NewEventPushService(h.Bk)
- flag,data := sv.FindAll(name)
+ flag, data := sv.FindAll(name)
if flag {
- return &bhomeclient.Reply{ Success: true, Data: data }
- } else{
- return &bhomeclient.Reply{ Success: false, Msg: "鏌ヨ澶辫触"}
+ return &bhomeclient.Reply{Success: true, Data: data}
+ } else {
+ return &bhomeclient.Reply{Success: false, Msg: "鏌ヨ澶辫触"}
}
}
@@ -80,7 +79,7 @@
func (epc EventPushController) FindAllDetails(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
sv := service.NewEventPushService(h.Bk)
data := sv.FindAllDetails()
- return &bhomeclient.Reply{ Success: true, Data: data }
+ return &bhomeclient.Reply{Success: true, Data: data}
}
// @Summary 浜嬩欢鎺ㄩ�佺紪杈�
@@ -94,22 +93,22 @@
func (epc EventPushController) GetById(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
id := c.Query("id")
logger.Debug("id:", id)
- if id == ""{
- return &bhomeclient.Reply{ Success: false, Msg: "鍙傛暟鏈夎"}
+ if id == "" {
+ return &bhomeclient.Reply{Success: false, Msg: "鍙傛暟鏈夎"}
}
sv := service.NewEventPushService(h.Bk)
- flag,data := sv.GetById(id)
+ flag, data := sv.GetById(id)
logger.Debug("getByID FLAG:", flag, " data:", data)
if flag {
- return &bhomeclient.Reply{ Success: true, Data: data}
- } else{
- return &bhomeclient.Reply{ Success:false, Msg: "鏌ヨ澶辫触"}
+ return &bhomeclient.Reply{Success: true, Data: data}
+ } else {
+ return &bhomeclient.Reply{Success: false, Msg: "鏌ヨ澶辫触"}
}
}
type ChangeStatusVo struct {
- Id string `json:"id"`
- Enable bool `json:"enable"`
+ Id string `json:"id"`
+ Enable bool `json:"enable"`
}
// @Summary 鏀瑰彉enable鐘舵��
@@ -123,14 +122,14 @@
func (epc EventPushController) ChangeStatus(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
var statusBody ChangeStatusVo
err := c.BindJSON(&statusBody)
- if err !=nil {
- return &bhomeclient.Reply{ Success: false, Msg: "鍙傛暟鏈夎"}
+ if err != nil {
+ return &bhomeclient.Reply{Success: false, Msg: "鍙傛暟鏈夎"}
}
sv := service.NewEventPushService(h.Bk)
- if sv.ChangeStatus(statusBody.Id,statusBody.Enable){
- return &bhomeclient.Reply{ Success:true, Msg: "淇敼鎴愬姛"}
+ if sv.ChangeStatus(statusBody.Id, statusBody.Enable) {
+ return &bhomeclient.Reply{Success: true, Msg: "淇敼鎴愬姛"}
} else {
- return &bhomeclient.Reply{ Success:false, Msg: "淇敼澶辫触"}
+ return &bhomeclient.Reply{Success: false, Msg: "淇敼澶辫触"}
}
}
@@ -145,13 +144,13 @@
// @Router /data/api-v/eventPush/delete [post]
func (epc EventPushController) Delete(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply {
id := c.PostForm("id")
- if id ==""{
- return &bhomeclient.Reply{ Success: false, Msg: "鍙傛暟鏈夎"}
+ if id == "" {
+ return &bhomeclient.Reply{Success: false, Msg: "鍙傛暟鏈夎"}
}
sv := service.NewEventPushService(h.Bk)
- if sv.DeleteById(id){
- return &bhomeclient.Reply{ Success:true, Msg: "鍒犻櫎鎴愬姛"}
+ if sv.DeleteById(id) {
+ return &bhomeclient.Reply{Success: true, Msg: "鍒犻櫎鎴愬姛"}
} else {
- return &bhomeclient.Reply{ Success:false, Msg: "鍒犻櫎澶辫触"}
+ return &bhomeclient.Reply{Success: false, Msg: "鍒犻櫎澶辫触"}
}
-}
\ No newline at end of file
+}
diff --git a/push-service/controllers/pushSet.go b/push-service/controllers/pushSet.go
index 1387a8e..b2aa7ab 100644
--- a/push-service/controllers/pushSet.go
+++ b/push-service/controllers/pushSet.go
@@ -83,23 +83,14 @@
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{
diff --git a/push-service/service/eventPushService.go b/push-service/service/eventPushService.go
index ce7fccb..fa16fe4 100644
--- a/push-service/service/eventPushService.go
+++ b/push-service/service/eventPushService.go
@@ -11,6 +11,7 @@
"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"
)
@@ -83,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
}
}
@@ -102,6 +105,7 @@
EventPushId: eventPushE.Id,
}
if err = tx.Table("event_push_server").Create(&ipPortE).Error; err != nil {
+ logger.Debug(err)
return false
}
}
@@ -110,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
}
}
diff --git a/push-service/vo/eventPush.go b/push-service/vo/eventPush.go
index 95e3628..28a4414 100644
--- a/push-service/vo/eventPush.go
+++ b/push-service/vo/eventPush.go
@@ -41,8 +41,10 @@
}
type EventUrlVo struct {
- Url string `json:"url"`
- Enable bool `json:"enable"`
+ Url string `json:"url"`
+ ServerIp string `json:"server_ip"`
+ Port int `json:"port"`
+ Enable bool `json:"enable"`
}
func (epv *EventPushVo) SetFiltRename() {
--
Gitblit v1.8.0