From 799a22cda35de94ad5658aa6283f1d80db132ba4 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 05 九月 2023 17:09:51 +0800
Subject: [PATCH] fix todo
---
nsq/msg_handler.go | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 00c63d5..c5d5bf9 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -102,6 +102,14 @@
logx.Errorf("ScheduleTask HandleMessage Unmarshal json err: %v", err.Error())
return nil
}
+ if resp.DeviceId != conf.Conf.System.DeviceId {
+ return nil
+ }
+ //閫氱煡鍥炲鏀跺埌
+ ReceivedMessageChan <- &ReceivedMessage{
+ Topic: slf.Topic,
+ Message: data,
+ }
if len(resp.KeyData) == 0 || len(resp.AddressData) == 0 {
return nil
}
@@ -129,11 +137,6 @@
address := cast.ToInt(strings.ReplaceAll(addresses[i], "\r", ""))
plc_address.Set(key, address)
logx.Infof("plc address set ok: key:%v, address:%v", key, address)
- }
- //閫氱煡鍥炲鏀跺埌
- ReceivedMessageChan <- &ReceivedMessage{
- Topic: slf.Topic,
- Message: data,
}
return nil
}
@@ -179,7 +182,7 @@
logx.Infof("unmarshal process params sync err :%s", err)
return err
}
- err = model.NewProcessModelSearch().Create(&processModel)
+ err = model.NewProcessModelSearch().Save(&processModel)
if err != nil {
logx.Infof("save process params sync err :%s", err)
return err
--
Gitblit v1.8.0