From 4b99b584209f5d0aedf2cb23660e2b9dfc00fca0 Mon Sep 17 00:00:00 2001
From: yfh <yuan.fenghua@free-sun.com.cn>
Date: Mon, 24 Feb 2025 22:53:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=AF=E8=8A=82=E5=A4=84=E7=90=86=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=89=B9=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 et_Info/InfoHandler.go | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/et_Info/InfoHandler.go b/et_Info/InfoHandler.go
index 2f46137..570d509 100644
--- a/et_Info/InfoHandler.go
+++ b/et_Info/InfoHandler.go
@@ -3,9 +3,9 @@ package et_Info
 import (
 	"gitea.anxinyun.cn/container/common_models"
 	"gitea.anxinyun.cn/container/common_utils"
-	"gitea.anxinyun.cn/container/common_utils/configLoad"
 	"log"
 	"node/stages"
+	"sync"
 )
 
 type InfoHandler struct {
@@ -13,13 +13,13 @@ type InfoHandler struct {
 	stage        *stages.Stage
 }
 
-func NewInfoHandler() *InfoHandler {
-	redisAddr := configLoad.LoadConfig().GetString("redis.address")
+func NewInfoHandler(configHelper *common_utils.ConfigHelper) *InfoHandler {
+	//redisAddr := configLoad.LoadConfig().GetString("redis.address")
 	the := &InfoHandler{
-		configHelper: common_utils.NewConfigHelper(redisAddr),
+		configHelper: configHelper, //common_utils.NewConfigHelper(redisAddr),
 		stage:        stages.NewStage("测点信息获取"),
 	}
-	the.stage.AddProcess(the.getStationInfo)
+	the.stage.AddProcess(the.getStationInfos)
 	return the
 }
 
@@ -27,8 +27,20 @@ func (the *InfoHandler) GetStage() stages.Stage {
 	return *the.stage
 }
 
-func (the *InfoHandler) getStationInfo(p *common_models.ProcessData) *common_models.ProcessData {
+func (the *InfoHandler) getStationInfos(data []*common_models.ProcessData) []*common_models.ProcessData {
+	var wg sync.WaitGroup // 初始化 WaitGroup
+	for _, processData := range data {
+		wg.Add(1)
+		go func(pd *common_models.ProcessData) {
+			defer wg.Done()
+			the.getStationInfo(pd)
+		}(processData)
+	}
+	wg.Wait()
+	return data
+}
 
+func (the *InfoHandler) getStationInfo(p *common_models.ProcessData) *common_models.ProcessData {
 	s, err := the.configHelper.GetDeviceStationObjs(p.DeviceData.DeviceId)
 	if err == nil && s != nil {
 		p.Stations = s