From acf384f3d6653f4696446b113177140f491c4e38 Mon Sep 17 00:00:00 2001
From: gongshangguo <gongshangguo@admin.com>
Date: 星期二, 12 四月 2022 09:58:10 +0800
Subject: [PATCH] 更新aiot
---
server/clienter.go | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/server/clienter.go b/server/clienter.go
index 1db2fa0..018ce34 100644
--- a/server/clienter.go
+++ b/server/clienter.go
@@ -1,10 +1,9 @@
package server
import (
- "basic.com/valib/logger.git"
+ "basic.com/valib/go-aiot.git/aiotProto/aiot"
+ "basic.com/valib/go-aiot.git/client"
"errors"
- "go-aiot/aiotProto/aiot"
- "go-aiot/client"
"go.uber.org/zap"
)
@@ -19,7 +18,7 @@
// 閿欒淇℃伅
errMsg := "Cluster have not registered"
// 璁板綍鏃ュ織
- logger.Error(errMsg, zap.Any("msg", msg))
+ cli.Logger.Error(errMsg, zap.Any("msg", msg))
cli.Close()
// 绉婚櫎闆嗙兢
Srv.RemoveCluster(msg.SenderId)
@@ -29,7 +28,7 @@
msg.SenderId = Srv.serverId
msg.Receiver = aiot.RECEIVER_TO_MASTER
msg.ReqType = aiot.REQ_TYPE_RESPONSE
- msg.MsgProto = cli.GetMsgProto(msg.MsgProto.MsgId)
+ msg.MsgProto = client.GetMsgProto(msg.MsgProto.MsgId)
_ = cli.WriteBody(msg)
// 涓婃姤鍒版湇鍔＄
go Srv.serverCallBack.OnHeartBeat(cli, msg)
@@ -38,8 +37,18 @@
// 瀹炵幇OnRegister
func (c *Clients) OnRegister(cli *client.Client, msg *aiot.Protocol) error {
- Srv.RegisterDevice(msg, cli)
+ Srv.RegisterDevice(cli, msg)
go Srv.serverCallBack.OnRegister(cli, msg)
+ msgFeedBack := &aiot.Protocol{
+ Receiver: aiot.RECEIVER_TO_MASTER,
+ SenderId: Srv.serverId,
+ DeviceProto: msg.DeviceProto,
+ MsgType: aiot.MSG_TYPE_REGISTER,
+ ReqType: aiot.REQ_TYPE_RESPONSE,
+ MsgProto: client.GetMsgProto(msg.MsgProto.MsgId),
+ Data: msg.Data,
+ }
+ _ = cli.WriteBody(msgFeedBack)
return nil
}
@@ -55,15 +64,6 @@
return nil
}
-// 瀹炵幇OnClose
-func (c *Clients) OnClose(cli *client.Client) {
- if Srv.IsMasterOnline(cli.GetDeviceId()) {
- Srv.RemoveCluster(cli.GetDeviceId())
- }
- go Srv.serverCallBack.OnClose(cli)
- return
-}
-
// 瀹炵幇OnDataReport
func (c *Clients) OnDataReport(cli *client.Client, msg *aiot.Protocol) error {
go Srv.serverCallBack.OnDataReport(cli, msg)
@@ -75,3 +75,12 @@
go Srv.serverCallBack.OnDeviceControl(cli, msg)
return nil
}
+
+// 瀹炵幇OnClose
+func (c *Clients) OnClose(cli *client.Client) {
+ if Srv.IsMasterOnline(cli.GetDeviceId()) {
+ Srv.RemoveCluster(cli.GetDeviceId())
+ }
+ go Srv.serverCallBack.OnClose(cli)
+ return
+}
--
Gitblit v1.8.0