From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:58:17 +0800
Subject: [PATCH] fix
---
router/index.go | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/router/index.go b/router/index.go
index 0ee36bb..5139964 100644
--- a/router/index.go
+++ b/router/index.go
@@ -5,6 +5,7 @@
"apsClient/conf"
_ "apsClient/docs"
"github.com/gin-contrib/cors"
+ "github.com/gin-contrib/pprof"
"github.com/gin-gonic/gin"
swaggerFiles "github.com/swaggo/files"
ginSwagger "github.com/swaggo/gin-swagger"
@@ -15,6 +16,9 @@
gin.SetMode(gin.ReleaseMode)
Router := gin.Default()
+
+ pprof.Register(Router) // 鎬ц兘
+
Router.Use(gin.Recovery())
if conf.Conf.System.Env == "develop" {
Router.Use(gin.Logger())
@@ -35,11 +39,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/:id", 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,10 +60,51 @@
plcApi := new(v1.PlcApi)
plcGroup := v1Group.Group("plc")
{
- plcGroup.GET("productProgress", plcApi.GetProductProgress) // 鑾峰彇缃戠粶閰嶇疆
+ plcGroup.POST("productProgress", plcApi.GetProductProgress) // 鑾峰彇鐢熶骇杩涘害
+ //plcGroup.POST("productProgressRealTime", plcApi.GetProductProgressRealTime) // 瀹炴椂鑾峰彇鐢熶骇杩涘害
plcGroup.POST("setProductNumber", plcApi.SetProductNumber) // 涓嬪彂鐢熶骇鎬婚噺
+ //plcGroup.POST("setSerfEvent", plcApi.SetSerfEvent) // 涓嬪彂鐢熶骇鎬婚噺
}
+ processModelApi := new(v1.ProcessModelApi)
+ processModelGroup := v1Group.Group("processModel")
+ {
+ 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) // 闂璇婃柇鍒楄〃
+ }
+
+ reportWorkApi := new(v1.ReportWorkApi)
+ reportWorkGroup := v1Group.Group("reportWork")
+ {
+ reportWorkGroup.POST("report", reportWorkApi.Report) // 鎶ュ伐
+ reportWorkGroup.GET("list", reportWorkApi.ReportList) // 鎶ュ伐鍒楄〃
+ }
+
+ dashboardApi := new(v1.DashboardApi)
+ dashboardGroup := v1Group.Group("dashboard")
+ {
+ dashboardGroup.POST("dashboard", dashboardApi.Dashboard) //椹鹃┒鑸�
+ }
+
+ //eventsApi := new(v1.EventsApi)
+ //eventsGroup := v1Group.Group("events")
+ //{
+ // eventsGroup.GET("", eventsApi.Events) // 鎺ㄩ�佹暟鎹�
+ //}
+
InitPlcBrandRouter(v1Group)
return Router
--
Gitblit v1.8.0