From 64d61b14ad0cade842493f7dfdcf1dc8f548a517 Mon Sep 17 00:00:00 2001
From: XM-GO <93296511+XM-GO@users.noreply.github.com>
Date: Fri, 1 Sep 2023 16:47:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 default.log                 |  0
 fatal.log                   |  6 ------
 iothub/hook.go              |  2 --
 iothub/hook_message_work.go |  5 ++---
 iothub/reverse_control.go   | 25 -------------------------
 5 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 default.log
 delete mode 100644 fatal.log
 delete mode 100644 iothub/reverse_control.go

diff --git a/default.log b/default.log
deleted file mode 100644
index e69de29..0000000
diff --git a/fatal.log b/fatal.log
deleted file mode 100644
index 1f675ed..0000000
--- a/fatal.log
+++ /dev/null
@@ -1,6 +0,0 @@
-
-2023-08-22 15:15:49--------------------------------
-
-2023-08-22 15:51:54--------------------------------
-
-2023-08-23 16:11:33--------------------------------
diff --git a/iothub/hook.go b/iothub/hook.go
index c60dcd4..7d00b9b 100644
--- a/iothub/hook.go
+++ b/iothub/hook.go
@@ -146,8 +146,6 @@ func (s *HookService) OnClientDisconnected(ctx context.Context, in *exhook.Clien
 		Datas:    string(v),
 		Type:     message.DisConnectMes,
 	}
-	// todo 网关掉线子设备全部离线状态，更改设备下线状态
-
 	s.messageCh <- data
 	return &exhook.EmptySuccess{}, nil
 }
diff --git a/iothub/hook_message_work.go b/iothub/hook_message_work.go
index d80e80c..30e6e64 100644
--- a/iothub/hook_message_work.go
+++ b/iothub/hook_message_work.go
@@ -104,17 +104,16 @@ func getRuleChain(etoken *tool.DeviceAuth) *ruleEntity.RuleDataJson {
 	return &ruleData
 }
 
-func buildRuleMessage(etoken *tool.DeviceAuth, dei *DeviceEventInfo, msgType string) message.Message {
+func buildRuleMessage(etoken *tool.DeviceAuth, dei *DeviceEventInfo, msgType string) *message.Message {
 	metadataVals := map[string]interface{}{
 		"deviceId":   etoken.DeviceId,
 		"deviceName": etoken.Name,
 		"deviceType": etoken.DeviceType,
 		"productId":  etoken.ProductId,
 	}
-	metadata := message.NewDefaultMetadata(metadataVals)
 	msgVals := make(map[string]interface{})
 	json.Unmarshal([]byte(dei.Datas), &msgVals)
-	return message.NewMessageWithDetail(etoken.User, msgType, msgVals, metadata)
+	return message.NewMessage(etoken.User, msgType, msgVals, metadataVals)
 }
 
 func SendZtWebsocket(deviceId, message string) {
diff --git a/iothub/reverse_control.go b/iothub/reverse_control.go
deleted file mode 100644
index ef5d0c5..0000000
--- a/iothub/reverse_control.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package iothub
-
-// 指令下发
-/*func Control(assets, thingModel, device_name, parameter string, operation bool) error {
-	topic := fmt.Sprintf("control/%s/%s", assets, device_name)
-	log.Println(topic)
-	payload := fmt.Sprintf(`{"method":"control","data":{"parameter": "%s","operation":%t}}`, parameter, operation)
-	//Publish(*global.GVA_MQTT, topic, 1, payload)
-	return nil
-}
-
-func ControlState(assets, thingModel, device_name string) (map[string]interface{}, error) {
-	topic := fmt.Sprintf("control/%s/%s", assets, device_name)
-	payload := fmt.Sprintf(`{"method":"state","data":{}}`)
-	if Publish(*global.GVA_MQTT, topic, 1, payload) != nil {
-		return nil, errors.New("下发获取状态参数指令失败")
-	}
-	select {
-	case state := <-controlState:
-		return state, nil
-	case <-time.After(10 * time.Second):
-		return nil, errors.New("请求指令状态超时")
-	}
-}
-*/