From b3d87ae859f20f3bfb4d2e495d7a0f316900b670 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 28 十一月 2023 17:12:21 +0800
Subject: [PATCH] 获取生产进度接口有工序id参数从数据库查询实际开始时间和实际结束时间
---
nsq/nsq.go | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/nsq/nsq.go b/nsq/nsq.go
index 847da9a..c447e8b 100644
--- a/nsq/nsq.go
+++ b/nsq/nsq.go
@@ -9,6 +9,7 @@
"context"
"errors"
"fmt"
+ "github.com/shirou/gopsutil/net"
"sync"
"sync/atomic"
)
@@ -37,7 +38,6 @@
}
var topics = []string{
constvar.NsqTopicScheduleTask,
- constvar.NsqTopicSendPlcAddress,
constvar.NsqTopicApsProcessParams,
constvar.NsqTopicDeviceUpdate,
constvar.NsqTopicPullDataResponse,
@@ -72,6 +72,9 @@
}
func (c *consumerManager) stop() {
+ if !atomic.CompareAndSwapInt32(&c.initFlag, 1, 0) {
+ return
+ }
c.clients.Range(func(key, value any) bool {
if consumer, ok := value.(*nsqclient.NsqConsumer); ok {
nsqclient.DestroyNsqConsumer(consumer)
@@ -83,10 +86,30 @@
})
}
+func (c *consumerManager) ping() bool {
+ connections, err := net.Connections("inet")
+ if err != nil {
+ fmt.Println("Error:", err)
+ return false
+ }
+ for _, conn := range connections {
+ ipPort := fmt.Sprintf("%s:%d", conn.Raddr.IP, conn.Raddr.Port)
+ fmt.Println("net.Connections ipPort", ipPort)
+ if ipPort == conf.Conf.NsqConf.NsqdAddr && conn.Status == "ESTABLISHED" {
+ return true
+ }
+ }
+ return false
+}
+
func Init() error {
return defaultConsumerManager.init()
}
+func Ping() bool {
+ return defaultConsumerManager.ping()
+}
+
func Stop() {
defaultConsumerManager.stop()
StopProducer()
--
Gitblit v1.8.0