From 0718b07276198334437f52aa5c6c07cca2002225 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 10 八月 2023 18:17:32 +0800
Subject: [PATCH] 完善数据上报程序, 添加测试
---
collector/device.go | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/collector/device.go b/collector/device.go
index 9812adc..7444a40 100644
--- a/collector/device.go
+++ b/collector/device.go
@@ -10,7 +10,7 @@
)
func getDeviceList() ([]msg.PLCDevice, error) {
- responseBody, err := util.HttpPost(config.Options.ApsDeviceWebApi, nil)
+ responseBody, err := util.HttpPost(config.Options.DeviceListWebApi, nil)
if err != nil {
logger.Warn("get device list from aps error:%s", err.Error())
return nil, err
@@ -32,16 +32,16 @@
func HandleDeviceUpdate(message []byte) error {
var device msg.PLCDevice
+ logger.Debug("receive device update msg: %s", string(message))
+
err := json.Unmarshal(message, &device)
if err != nil {
logger.Error("unmarshal device update msg error:%s", err.Error())
return err
}
- if task, ok := mapTask.Load(device.DeviceID); ok {
- // 瀛樺湪鐨勪换鍔�, 鍏堝仠姝㈡帀, 鐒跺悗閲嶆柊寮�鍚竴涓�
- task.(collectorProc).cancel()
- }
+ // 鍏堝仠鎺夋鍦ㄦ墽琛岀殑浠诲姟
+ stopTask(&device)
// 鍒ゆ柇鏄惁鏄噸鏂板惎鍔ㄧ殑鐘舵��, 鍚姩涓�涓柊鐨勪换鍔�
if device.Status == 0 {
--
Gitblit v1.8.0