From 2fc94ba7b517125a7ed9771b48bb5d383021bc91 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期日, 20 十月 2024 01:57:09 +0800
Subject: [PATCH] 优化楼层数据获取
---
repository/subscribeRepo.go | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/repository/subscribeRepo.go b/repository/subscribeRepo.go
index ec3bb73..5f3d256 100644
--- a/repository/subscribeRepo.go
+++ b/repository/subscribeRepo.go
@@ -53,6 +53,43 @@
return err
}
+
+func (s *SubscribeRepository) CancelSubscribe(sid string, req *vo.Subscribe) error {
+ var subscribeMsg vo.RequestCancelSubscribe
+ subscribeMsg.SubscribeObject = *req
+
+ if req.SubscribeID == "" {
+ return errors.New("璁㈤槄娑堟伅涓婚涓虹┖")
+ }
+
+ // 鏌ユ壘涓嬬骇
+ var platform models.SubPlatform
+ err := platform.FindById(sid)
+ if err != nil {
+ return err
+ }
+
+ uri := fmt.Sprintf("http://%s:%d/VIID/Subscribes/%s", platform.RemoteIP, platform.RemotePort, req.SubscribeID)
+ body, _ := json.Marshal(subscribeMsg)
+ if client.UpdateSubscribe(uri, body) != vo.StatusSuccess {
+ return errors.New("鍙戦�佽闃呮秷鎭け璐�")
+ }
+
+ var sub = models.Subscribe{
+ Id: req.SubscribeID,
+ Status: req.SubscribeStatus,
+ FromId: sid,
+ Ext: *req,
+ }
+
+ err = sub.Save()
+ if err != nil {
+ return err
+ }
+
+ return err
+}
+
func (s *SubscribeRepository) UpdateSubscribe(sid string, req *vo.Subscribe) error {
var subscribeMsg vo.RequestSubscribe
subscribeMsg.SubscribeListObject.SubscribeObject = []vo.Subscribe{*req}
@@ -85,6 +122,19 @@
return err
}
+func (s *SubscribeRepository) RemoteList(sid string) ([]byte, error) {
+ // 鏌ユ壘涓嬬骇
+ var platform models.SubPlatform
+ err := platform.FindById(sid)
+ if err != nil {
+ return nil, err
+ }
+
+ uri := fmt.Sprintf("http://%s:%d/VIID/Subscribes", platform.RemoteIP, platform.RemotePort)
+
+ return client.GetSubscribes(uri)
+}
+
func (s *SubscribeRepository) SaveReceiveSubscribe(fromId string, subscribe *vo.Subscribe) error {
var sub = models.Subscribe{
Id: subscribe.SubscribeID,
@@ -98,7 +148,7 @@
return err
}
- service.UpdateTaskProcs(sub.Id, vo.Msg_Type_Create_Subscribe, &sub)
+ service.UpdateNotificationTask(sub.Id, vo.Msg_Type_Create_Subscribe, &sub)
return err
}
@@ -113,7 +163,7 @@
sub.Status = subscribe.SubscribeStatus
sub.Ext = *subscribe
- service.UpdateTaskProcs(subscribe.SubscribeID, vo.Msg_Type_Update_Subscribe, nil)
+ service.UpdateNotificationTask(subscribe.SubscribeID, vo.Msg_Type_Update_Subscribe, &sub)
return sub.Save()
}
@@ -125,7 +175,7 @@
return err
}
- service.UpdateTaskProcs(id, vo.Msg_Type_Delete_Subscribe, nil)
+ service.UpdateNotificationTask(id, vo.Msg_Type_Delete_Subscribe, nil)
return err
}
--
Gitblit v1.8.0