From 02a84fb6fb2a39bfe7fc5cf6c0137bbf231b17fe Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 09 十一月 2023 14:14:17 +0800
Subject: [PATCH] 设备列表返回是否设置工艺参数字段

---
 router/index.go |   45 ++++++++++++++++++++++++++++++++++-----------
 1 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/router/index.go b/router/index.go
index 1e2f69c..df7e1dd 100644
--- a/router/index.go
+++ b/router/index.go
@@ -35,11 +35,13 @@
 	taskApi := new(v1.TaskApi)
 	taskGroup := v1Group.Group("task")
 	{
-		taskGroup.GET("countdown", taskApi.TaskCountdown)      // 鏂颁换鍔″�掕鏃�
-		taskGroup.GET("get", taskApi.TaskGet)                  // 鑾峰彇宸ュ簭
-		taskGroup.GET("start/:id", taskApi.GetProcessParams)   // 鑾峰彇宸ヨ壓鍙傛暟
-		taskGroup.POST("sendProcessParams", taskApi.TaskStart) // 涓嬪彂宸ヨ壓鍙傛暟骞跺紑濮嬪伐搴�
-		taskGroup.PUT("finish/:id", taskApi.TaskFinish)        // 瀹屾垚宸ュ簭
+		taskGroup.GET("countdown", taskApi.TaskCountdown)                  // 鏂颁换鍔″�掕鏃�
+		taskGroup.GET("get", taskApi.TaskGet)                              // 鑾峰彇宸ュ簭
+		taskGroup.GET("start/:id", taskApi.GetProcessParams)               // 鑾峰彇宸ヨ壓鍙傛暟
+		taskGroup.POST("sendProcessParams", taskApi.TaskStart)             // 涓嬪彂宸ヨ壓鍙傛暟骞跺紑濮嬪伐搴�
+		taskGroup.POST("updateProcessParams", taskApi.UpdateProcessParams) // 鏇存柊宸ヨ壓鍙傛暟
+		taskGroup.PUT("finish/:id", taskApi.TaskFinish)                    // 瀹屾垚宸ュ簭
+		taskGroup.GET("list", taskApi.TaskListByChannel)                   //鎸夐�氶亾鍙峰拰鏌ヨ绫诲瀷鏌ヨ浠诲姟鍒楄〃
 	}
 
 	configApi := new(v1.ConfigApi)
@@ -54,17 +56,38 @@
 	plcApi := new(v1.PlcApi)
 	plcGroup := v1Group.Group("plc")
 	{
-		plcGroup.POST("productProgress", plcApi.GetProductProgress)                 // 鑾峰彇鐢熶骇杩涘害
-		plcGroup.POST("productProgressRealTime", plcApi.GetProductProgressRealTime) // 瀹炴椂鑾峰彇鐢熶骇杩涘害
-		plcGroup.POST("setProductNumber", plcApi.SetProductNumber)                  // 涓嬪彂鐢熶骇鎬婚噺
+		plcGroup.POST("productProgress", plcApi.GetProductProgress) // 鑾峰彇鐢熶骇杩涘害
+		//plcGroup.POST("productProgressRealTime", plcApi.GetProductProgressRealTime) // 瀹炴椂鑾峰彇鐢熶骇杩涘害
+		plcGroup.POST("setProductNumber", plcApi.SetProductNumber) // 涓嬪彂鐢熶骇鎬婚噺
+		//plcGroup.POST("setSerfEvent", plcApi.SetSerfEvent)         // 涓嬪彂鐢熶骇鎬婚噺
 	}
 
-	eventsApi := new(v1.EventsApi)
-	eventsGroup := v1Group.Group("events")
+	processModelApi := new(v1.ProcessModelApi)
+	processModelGroup := v1Group.Group("processModel")
 	{
-		eventsGroup.GET("", eventsApi.Events) // 鎺ㄩ�佹暟鎹�
+		processModelGroup.GET("list", processModelApi.List) // 宸ヨ壓鍙傛暟鍒楄〃
 	}
 
+	deviceApi := new(v1.DeviceApi)
+	deviceGroup := v1Group.Group("device")
+	{
+		deviceGroup.GET("list", deviceApi.DeviceList)                        // 鍙�夎澶囧垪琛�
+		deviceGroup.POST("setCurrentDeviceId", deviceApi.SetCurrentDeviceId) // 鍒囨崲璁惧ID
+		deviceGroup.POST("config", deviceApi.Config)                         // 閰嶇疆涓�浜涘瓧娈�
+	}
+
+	systemApi := new(v1.SystemApi)
+	systemGroup := v1Group.Group("system")
+	{
+		systemGroup.GET("problemList", systemApi.ProblemList) // 闂璇婃柇鍒楄〃
+	}
+
+	//eventsApi := new(v1.EventsApi)
+	//eventsGroup := v1Group.Group("events")
+	//{
+	//	eventsGroup.GET("", eventsApi.Events) // 鎺ㄩ�佹暟鎹�
+	//}
+
 	InitPlcBrandRouter(v1Group)
 
 	return Router

--
Gitblit v1.8.0