merge master

zhangqian

2023-10-09 468ceb8a9bfe9e15e3be470b23809dde83a11f0d

 router/index.go

@@ -39,6 +39,7 @@
      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)        // 完成工序
   }

@@ -55,14 +56,14 @@
   plcGroup := v1Group.Group("plc")
   {
      plcGroup.POST("productProgress", plcApi.GetProductProgress)                 // 获取生产进度
      plcGroup.POST("productProgressRealTime", plcApi.GetProductProgressRealTime) // 实时获取生产进度
      //plcGroup.POST("productProgressRealTime", plcApi.GetProductProgressRealTime) // 实时获取生产进度
      plcGroup.POST("setProductNumber", plcApi.SetProductNumber)                  // 下发生产总量
   }

   processModelApi := new(v1.ProcessModelApi)
   processModelGroup := v1Group.Group("processModel")
   {
      processModelGroup.GET("list", processModelApi.List) // 新任务倒计时
      processModelGroup.GET("list", processModelApi.List) // 工艺参数列表
   }

   //eventsApi := new(v1.EventsApi)