From ef7d02ce56e98e8cbc5ed6ec746ea39bf0b8c9e2 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 16 九月 2023 22:44:58 +0800
Subject: [PATCH] 增加实时获取生产进度接口

---
 nsq/nsq.go |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/nsq/nsq.go b/nsq/nsq.go
index c4bdcf2..3454269 100644
--- a/nsq/nsq.go
+++ b/nsq/nsq.go
@@ -2,9 +2,13 @@
 
 import (
 	"apsClient/conf"
+	"apsClient/constvar"
+	"apsClient/model/common"
+	"apsClient/pkg/logx"
 	"apsClient/pkg/safe"
 	"errors"
 	"fmt"
+	"time"
 )
 
 func Init() error {
@@ -17,7 +21,40 @@
 	}
 
 	safe.Go(func() {
-		_ = Consume(fmt.Sprintf("aps.%v.scheduleTask", conf.Conf.NsqConf.NodeId), "sensor01")
+		caller := NewCaller(fmt.Sprintf(constvar.NsqTopicGetPlcAddress, conf.Conf.NsqConf.NodeId), fmt.Sprintf(constvar.NsqTopicSendPlcAddress, conf.Conf.NsqConf.NodeId))
+		var addressResult common.ResponsePlcAddress
+		err := caller.Call(common.RequestPlcAddress{DeviceId: conf.Conf.System.DeviceId}, &addressResult, time.Second*3)
+		if err != nil {
+			logx.Infof("get plc address err: %v", err.Error())
+		}
+	})
+
+	safe.Go(func() {
+		err := Consume(fmt.Sprintf(constvar.NsqTopicScheduleTask, conf.Conf.NsqConf.NodeId), conf.Conf.System.DeviceId)
+		if err != nil {
+			logx.Fatalf("start nsq consume err: %v", err)
+		}
+	})
+
+	safe.Go(func() {
+		err := Consume(fmt.Sprintf(constvar.NsqTopicSendPlcAddress, conf.Conf.NsqConf.NodeId), conf.Conf.System.DeviceId)
+		if err != nil {
+			logx.Fatalf("start nsq consume err: %v", err)
+		}
+	})
+
+	safe.Go(func() {
+		err := Consume(fmt.Sprintf(constvar.NsqTopicProcessParamsResponse, conf.Conf.NsqConf.NodeId), conf.Conf.System.DeviceId)
+		if err != nil {
+			logx.Fatalf("start nsq consume err: %v", err)
+		}
+	})
+
+	safe.Go(func() {
+		err := Consume(fmt.Sprintf(constvar.NsqTopicApsProcessParams, conf.Conf.NsqConf.NodeId), conf.Conf.System.DeviceId)
+		if err != nil {
+			logx.Fatalf("start nsq consume err: %v", err)
+		}
 	})
 
 	return nil

--
Gitblit v1.8.0