瀏覽代碼

fit: debug

gaoyagang 1 年之前
父節點
當前提交
7cad708614

+ 13 - 14
app/cmd/organization/internal/logic/handler/chest.go

@@ -6,7 +6,6 @@ import (
 	"GtDataStore/app/model"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
-	"sync"
 	"time"
 )
 
@@ -17,19 +16,19 @@ func DeviceChest(ctx context.Context, task *job.Task, technologyName string) err
 		return err
 	}
 	// 2. 获得点位信息
-	var wg sync.WaitGroup
-	wg.Add(len(devices))
-	for _, device := range devices {
-		device := device
-		go func() {
-			defer wg.Done()
-			if err := device.Items.FillCurrentValue(); err != nil {
-				logx.Errorf("DeviceChest device.Items.FillCurrentValue error: %s", err.Error())
-			}
-		}()
-	}
-
-	wg.Wait()
+	//var wg sync.WaitGroup
+	//wg.Add(len(devices))
+	//for _, device := range devices {
+	//	device := device
+	//	go func() {
+	//		defer wg.Done()
+	//		if err := device.Items.FillCurrentValue(); err != nil {
+	//			logx.Errorf("DeviceChest device.Items.FillCurrentValue error: %s", err.Error())
+	//		}
+	//	}()
+	//}
+	//
+	//wg.Wait()
 
 	// 3. 转换为存储对象
 	workings, err := transDeviceChestData(devices)

+ 13 - 14
app/cmd/organization/internal/logic/handler/mf.go

@@ -6,7 +6,6 @@ import (
 	"GtDataStore/app/model"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
-	"sync"
 	"time"
 )
 
@@ -17,19 +16,19 @@ func DeviceMf(ctx context.Context, task *job.Task, technologyName string) error
 		return err
 	}
 	// 2. 获得点位信息
-	var wg sync.WaitGroup
-	wg.Add(len(devices))
-	for _, device := range devices {
-		device := device
-		go func() {
-			defer wg.Done()
-			if err := device.Items.FillCurrentValue(); err != nil {
-				logx.Errorf("DeviceMf device.Items.FillCurrentValue error: %s", err.Error())
-			}
-		}()
-	}
-
-	wg.Wait()
+	//var wg sync.WaitGroup
+	//wg.Add(len(devices))
+	//for _, device := range devices {
+	//	device := device
+	//	go func() {
+	//		defer wg.Done()
+	//		if err := device.Items.FillCurrentValue(); err != nil {
+	//			logx.Errorf("DeviceMf device.Items.FillCurrentValue error: %s", err.Error())
+	//		}
+	//	}()
+	//}
+	//
+	//wg.Wait()
 
 	// 3. 转换为存储对象
 	workings, err := transDeviceMfData(devices)

+ 13 - 14
app/cmd/organization/internal/logic/handler/nf.go

@@ -6,7 +6,6 @@ import (
 	"GtDataStore/app/model"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
-	"sync"
 	"time"
 )
 
@@ -17,19 +16,19 @@ func DeviceNf(ctx context.Context, task *job.Task, technologyName string) error
 		return err
 	}
 	// 2. 获得点位信息
-	var wg sync.WaitGroup
-	wg.Add(len(devices))
-	for _, device := range devices {
-		device := device
-		go func() {
-			defer wg.Done()
-			if err := device.Items.FillCurrentValue(); err != nil {
-				logx.Errorf("DeviceNf device.Items.FillCurrentValue error: %s", err.Error())
-			}
-		}()
-	}
-
-	wg.Wait()
+	//var wg sync.WaitGroup
+	//wg.Add(len(devices))
+	//for _, device := range devices {
+	//	device := device
+	//	go func() {
+	//		defer wg.Done()
+	//		if err := device.Items.FillCurrentValue(); err != nil {
+	//			logx.Errorf("DeviceNf device.Items.FillCurrentValue error: %s", err.Error())
+	//		}
+	//	}()
+	//}
+	//
+	//wg.Wait()
 
 	// 3. 转换为存储对象
 	workings, err := transDeviceNfData(devices)

+ 13 - 14
app/cmd/organization/internal/logic/handler/pump.go

@@ -6,7 +6,6 @@ import (
 	"GtDataStore/app/model"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
-	"sync"
 	"time"
 )
 
@@ -17,19 +16,19 @@ func DevicePump(ctx context.Context, task *job.Task, technologyName string) erro
 		return err
 	}
 	// 2. 获得点位信息
-	var wg sync.WaitGroup
-	wg.Add(len(devices))
-	for _, device := range devices {
-		device := device
-		go func() {
-			defer wg.Done()
-			if err := device.Items.FillCurrentValue(); err != nil {
-				logx.Errorf("DevicePump device.Items.FillCurrentValue error: %s", err.Error())
-			}
-		}()
-	}
-
-	wg.Wait()
+	//var wg sync.WaitGroup
+	//wg.Add(len(devices))
+	//for _, device := range devices {
+	//	device := device
+	//	go func() {
+	//		defer wg.Done()
+	//		if err := device.Items.FillCurrentValue(); err != nil {
+	//			logx.Errorf("DevicePump device.Items.FillCurrentValue error: %s", err.Error())
+	//		}
+	//	}()
+	//}
+	//
+	//wg.Wait()
 
 	// 3. 转换为存储对象
 	workings, err := transDevicePumpData(devices)

+ 13 - 14
app/cmd/organization/internal/logic/handler/ro.go

@@ -6,7 +6,6 @@ import (
 	"GtDataStore/app/model"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
-	"sync"
 	"time"
 )
 
@@ -17,19 +16,19 @@ func DeviceRo(ctx context.Context, task *job.Task, technologyName string) error
 		return err
 	}
 	// 2. 获得点位信息
-	var wg sync.WaitGroup
-	wg.Add(len(devices))
-	for _, device := range devices {
-		device := device
-		go func() {
-			defer wg.Done()
-			if err := device.Items.FillCurrentValue(); err != nil {
-				logx.Errorf("DeviceRo device.Items.FillCurrentValue error: %s", err.Error())
-			}
-		}()
-	}
-
-	wg.Wait()
+	//var wg sync.WaitGroup
+	//wg.Add(len(devices))
+	//for _, device := range devices {
+	//	device := device
+	//	go func() {
+	//		defer wg.Done()
+	//		if err := device.Items.FillCurrentValue(); err != nil {
+	//			logx.Errorf("DeviceRo device.Items.FillCurrentValue error: %s", err.Error())
+	//		}
+	//	}()
+	//}
+	//
+	//wg.Wait()
 
 	// 3. 转换为存储对象
 	workings, err := transDeviceRoData(devices)

+ 13 - 14
app/cmd/organization/internal/logic/handler/uf.go

@@ -6,7 +6,6 @@ import (
 	"GtDataStore/app/model"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
-	"sync"
 	"time"
 )
 
@@ -17,19 +16,19 @@ func DeviceUf(ctx context.Context, task *job.Task, technologyName string) error
 		return err
 	}
 	// 2. 获得点位信息
-	var wg sync.WaitGroup
-	wg.Add(len(devices))
-	for _, device := range devices {
-		device := device
-		go func() {
-			defer wg.Done()
-			if err := device.Items.FillCurrentValue(); err != nil {
-				logx.Errorf("DeviceUf device.Items.FillCurrentValue error: %s", err.Error())
-			}
-		}()
-	}
-
-	wg.Wait()
+	//var wg sync.WaitGroup
+	//wg.Add(len(devices))
+	//for _, device := range devices {
+	//	device := device
+	//	go func() {
+	//		defer wg.Done()
+	//		if err := device.Items.FillCurrentValue(); err != nil {
+	//			logx.Errorf("DeviceUf device.Items.FillCurrentValue error: %s", err.Error())
+	//		}
+	//	}()
+	//}
+	//
+	//wg.Wait()
 
 	// 3. 转换为存储对象
 	workings, err := transDeviceUfData(devices)

+ 13 - 14
app/cmd/organization/internal/logic/handler/valve.go

@@ -6,7 +6,6 @@ import (
 	"GtDataStore/app/model"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
-	"sync"
 	"time"
 )
 
@@ -17,19 +16,19 @@ func DeviceValve(ctx context.Context, task *job.Task, technologyName string) err
 		return err
 	}
 	// 2. 获得点位信息
-	var wg sync.WaitGroup
-	wg.Add(len(devices))
-	for _, device := range devices {
-		device := device
-		go func() {
-			defer wg.Done()
-			if err := device.Items.FillCurrentValue(); err != nil {
-				logx.Errorf("DeviceValve device.Items.FillCurrentValue error: %s", err.Error())
-			}
-		}()
-	}
-
-	wg.Wait()
+	//var wg sync.WaitGroup
+	//wg.Add(len(devices))
+	//for _, device := range devices {
+	//	device := device
+	//	go func() {
+	//		defer wg.Done()
+	//		if err := device.Items.FillCurrentValue(); err != nil {
+	//			logx.Errorf("DeviceValve device.Items.FillCurrentValue error: %s", err.Error())
+	//		}
+	//	}()
+	//}
+	//
+	//wg.Wait()
 
 	// 3. 转换为存储对象
 	workings, err := transDeviceValveData(devices)