From b483b294741920e90815c2d1f4c6827d9921310c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 22 八月 2023 16:24:54 +0800
Subject: [PATCH] plc写入地址文件通过nsq从云端获取

---
 test/msg_handler_test.go |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/test/msg_handler_test.go b/test/msg_handler_test.go
index c6a2c54..d2b0566 100644
--- a/test/msg_handler_test.go
+++ b/test/msg_handler_test.go
@@ -1,7 +1,7 @@
 package test
 
 import (
-	"apsClient/model/request"
+	"apsClient/model/common"
 	"apsClient/nsq"
 	"encoding/json"
 	"fmt"
@@ -13,30 +13,30 @@
 
 func TestHandleMessage(t *testing.T) {
 	Init()
-	var tasks = make([]*request.DeliverScheduleTask, 0)
-	startTime, _ := time.ParseInLocation("2006-01-02 15:04", "2023-08-19 08:00", time.Local)
-	endTime, _ := time.ParseInLocation("2006-01-02 15:04", "2023-08-20 12:00", time.Local)
+	var tasks = make([]*common.DeliverScheduleTask, 0)
+	startTime, _ := time.ParseInLocation("2006-01-02 15:04", "2023-08-22 08:00", time.Local)
+	endTime, _ := time.ParseInLocation("2006-01-02 15:04", "2023-08-23 12:00", time.Local)
 	fmt.Println(startTime)
 	fmt.Println(startTime.Unix())
-	startTime1, _ := time.ParseInLocation("2006-01-02 15:04", "2023-08-19 08:00", time.Local)
-	endTime1, _ := time.ParseInLocation("2006-01-02 15:04", "2023-08-19 18:00", time.Local)
+	startTime1, _ := time.ParseInLocation("2006-01-02 15:04", "2023-08-22 08:00", time.Local)
+	endTime1, _ := time.ParseInLocation("2006-01-02 15:04", "2023-08-22 18:00", time.Local)
 
-	startTime2, _ := time.ParseInLocation("2006-01-02 15:04", "2023-08-19 18:00", time.Local)
-	endTime2, _ := time.ParseInLocation("2006-01-02 15:04", "2023-08-20 06:00", time.Local)
+	startTime2, _ := time.ParseInLocation("2006-01-02 15:04", "2023-08-22 18:00", time.Local)
+	endTime2, _ := time.ParseInLocation("2006-01-02 15:04", "2023-08-23 06:00", time.Local)
 
-	inputMaterials := []*request.ProcedureMaterial{{
+	inputMaterials := []*common.ProcedureMaterial{{
 		MaterialID:   "MaterialID 1",
 		MaterialName: "杩欐槸涓�涓緭鍏ョ墿鏂欏悕",
 		Amount:       decimal.NewFromFloat(100),
 		Unit:         "浠�",
 	}}
-	outputMaterials := []*request.ProcedureMaterial{{
+	outputMaterials := []*common.ProcedureMaterial{{
 		MaterialID:   "MaterialID",
 		MaterialName: "杩欐槸涓�涓緭鍑虹墿鏂欏悕",
 		Amount:       decimal.NewFromFloat(20),
 		Unit:         "浠�",
 	}}
-	workers := []*request.ProcedureWorker{{
+	workers := []*common.ProcedureWorker{{
 		WorkerID:   "WorkerID 1",
 		WorkerName: "寮犱笁",
 		PhoneNum:   "18800000000",
@@ -51,8 +51,8 @@
 			EndTime:    endTime2.Unix(),
 		}}
 
-	task1 := request.DeliverScheduleTask{
-		WorkOrder: request.WorkOrder{
+	task1 := common.DeliverScheduleTask{
+		WorkOrder: common.WorkOrder{
 			WorkOrderID: "WorkOrderID 1",
 			OrderID:     "OrderID 1",
 			ProductID:   "ProductID 1",
@@ -66,10 +66,10 @@
 			StartTime:   startTime.Unix(),
 			EndTime:     endTime.Unix(),
 		},
-		Procedures: []*request.ProductProcedure{{
+		Procedures: []*common.ProductProcedure{{
 			ProcedureID:     "ProcedureID 1",
 			ProcedureName:   "ProcedureName 1",
-			DeviceID:        "DeviceID 1",
+			DeviceID:        "DeviceID1",
 			DeviceName:      "DeviceName 1",
 			StartTime:       startTime.Unix(),
 			EndTime:         endTime.Unix(),
@@ -79,7 +79,7 @@
 			Workers:         workers,
 		}, {ProcedureID: "ProcedureID 2",
 			ProcedureName:   "ProcedureName 2",
-			DeviceID:        "DeviceID 1",
+			DeviceID:        "DeviceID1",
 			DeviceName:      "DeviceName 1",
 			StartTime:       startTime.Unix(),
 			EndTime:         endTime.Unix(),
@@ -89,8 +89,8 @@
 			Workers:         workers,
 		}},
 	}
-	task2 := request.DeliverScheduleTask{
-		WorkOrder: request.WorkOrder{
+	task2 := common.DeliverScheduleTask{
+		WorkOrder: common.WorkOrder{
 			WorkOrderID: "WorkOrderID 2",
 			OrderID:     "OrderID 2",
 			ProductID:   "ProductID 2",
@@ -104,10 +104,10 @@
 			StartTime:   startTime.Unix(),
 			EndTime:     endTime.Unix(),
 		},
-		Procedures: []*request.ProductProcedure{{
+		Procedures: []*common.ProductProcedure{{
 			ProcedureID:     "ProcedureID 3",
 			ProcedureName:   "ProcedureName 3",
-			DeviceID:        "DeviceID 1",
+			DeviceID:        "DeviceID1",
 			DeviceName:      "DeviceName 1",
 			StartTime:       startTime.Unix(),
 			EndTime:         endTime.Unix(),
@@ -118,7 +118,7 @@
 		}, {
 			ProcedureID:     "ProcedureID 4",
 			ProcedureName:   "ProcedureName 4",
-			DeviceID:        "DeviceID 1",
+			DeviceID:        "DeviceID1",
 			DeviceName:      "DeviceName 1",
 			StartTime:       startTime.Unix(),
 			EndTime:         endTime.Unix(),

--
Gitblit v1.8.0