From 539a78196da60eb97cf7057c5c85dfaa9b240741 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期五, 11 十月 2024 16:21:32 +0800
Subject: [PATCH] 添加A3平层传感器数据获取方式

---
 vo/subscribe.go |   67 +++++++++++++++++++++++++--------
 1 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/vo/subscribe.go b/vo/subscribe.go
index 96eca70..7fd2300 100644
--- a/vo/subscribe.go
+++ b/vo/subscribe.go
@@ -8,22 +8,25 @@
 
 type Subscribe struct {
 	SubscribeID           string `json:"SubscribeID"`
-	Title                 string `json:"Title"`
-	SubscribeDetail       string `json:"SubscribeDetail"`
-	ResourceURI           string `json:"ResourceURI"`
-	ApplicantName         string `json:"ApplicantName"`
-	ApplicantOrg          string `json:"ApplicantOrg"`
-	BeginTime             string `json:"BeginTime"` // Kept as string for direct compatibility
-	EndTime               string `json:"EndTime"`   // Kept as string for direct compatibility
-	ReceiveAddr           string `json:"ReceiveAddr"`
-	ReportInterval        int    `json:"ReportInterval"`
-	Reason                string `json:"Reason"`
-	OperateType           int    `json:"OperateType"`
-	SubscribeStatus       int    `json:"SubscribeStatus"`
-	SubscribeCancelOrg    string `json:"SubscribeCancelOrg"`
-	SubscribeCancelPerson string `json:"SubscribeCancelPerson"`
-	CancelTime            string `json:"CancelTime"` // Kept as string for direct compatibility
-	CancelReason          string `json:"CancelReason"`
+	Title                 string `json:"Title" binding:"required"`
+	SubscribeDetail       string `json:"SubscribeDetail" binding:"required"`
+	ResourceURI           string `json:"ResourceURI" binding:"required"`
+	ApplicantName         string `json:"ApplicantName" binding:"required"`
+	ApplicantOrg          string `json:"ApplicantOrg" binding:"required"`
+	BeginTime             string `json:"BeginTime" binding:"required"`
+	EndTime               string `json:"EndTime" binding:"required"`
+	ReceiveAddr           string `json:"ReceiveAddr" binding:"required"`
+	ReportInterval        int    `json:"ReportInterval" binding:"required"`
+	Reason                string `json:"Reason" binding:"required"`
+	OperateType           int    `json:"OperateType" `                    // 0锛氳闃咃紱1锛氬彇娑堣闃�
+	SubscribeStatus       int    `json:"SubscribeStatus" `                // 0锛氳闃呬腑 1锛氬凡鍙栨秷璁㈤槄 2锛氳闃呭埌鏈� 9锛氭湭璁㈤槄
+	ResourceClass         int    `json:"ResourceClass" `                  //
+	ResultImageDeclare    string `json:"ResultImageDeclare" `             // 瀵瑰簲subImage 鐨� type, -1 涓嶄紶
+	ResultFeatureDeclare  int    `json:"ResultFeatureDeclare" `           //
+	SubscribeCancelOrg    string `json:"SubscribeCancelOrg,omitempty"`    // 浠呭湪鍙栨秷璁㈤槄鏃朵娇鐢�
+	SubscribeCancelPerson string `json:"SubscribeCancelPerson,omitempty"` // 浠呭湪鍙栨秷璁㈤槄鏃朵娇鐢�
+	CancelTime            string `json:"CancelTime,omitempty"`            // 浠呭湪鍙栨秷璁㈤槄鏃朵娇鐢�
+	CancelReason          string `json:"CancelReason,omitempty"`          // 浠呭湪鍙栨秷璁㈤槄鏃朵娇鐢�
 }
 
 func (s *Subscribe) Scan(value interface{}) error {
@@ -50,9 +53,19 @@
 	} `json:"SubscribeListObject"`
 }
 
+type RequestCancelSubscribe struct {
+	SubscribeObject Subscribe `json:"SubscribeObject"`
+}
+
 type RequestSubscribeNotification struct {
 	SubscribeNotificationListObject struct {
 		SubscribeNotificationObject []interface{} `json:"SubscribeNotificationObject"`
+	} `json:"SubscribeNotificationListObject"`
+}
+
+type RequestSubscribeNotificationBind struct {
+	SubscribeNotificationListObject struct {
+		SubscribeNotificationObject []Notification `json:"SubscribeNotificationObject"`
 	} `json:"SubscribeNotificationListObject"`
 }
 
@@ -75,3 +88,25 @@
 	ExecuteOperation int
 	FaceObjectList   NotificationFaceList
 }
+
+type PersonNotification struct {
+	NotificationID   string
+	SubscribeID      string
+	Title            string
+	TriggerTime      string
+	InfoIDs          string
+	ExecuteOperation int
+	PersonObjectList NotificationPersonList
+}
+
+type Notification struct {
+	NotificationID   string
+	SubscribeID      string
+	Title            string
+	TriggerTime      string
+	InfoIDs          string
+	ExecuteOperation int
+	DeviceList       NotificationApeList
+	FaceObjectList   NotificationFaceList
+	PersonObjectList NotificationPersonList
+}

--
Gitblit v1.8.0