From 3f1ef5cdf9212f912e9cad544387947d158f5d08 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 14 九月 2023 19:26:49 +0800
Subject: [PATCH] 增加plc连接状态
---
api/v1/task.go | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index ae11df0..7eb2142 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -65,14 +65,10 @@
params.PageSize = 1
}
- taskDataList, count, code := service.NewTaskService().GetTask(params.Page, params.PageSize)
+ taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize)
if code != ecode.OK {
ctx.Fail(code)
return
- }
- taskResponse := &response.TaskResponse{
- Tasks: taskDataList,
- TaskCount: count,
}
ctx.OkWithDetailed(taskResponse)
}
@@ -178,22 +174,17 @@
// @Tags Task
// @Summary 涓嬪彂宸ヨ壓鍙傛暟锛堝紑濮嬩换鍔★級
// @Produce application/json
-// @Param id path int true "宸ュ簭id"
+// @Param object body request.SendProcessParams true "鏌ヨ鍙傛暟"
// @Success 200 {object} contextx.Response{service.GetProcessModel} "鎴愬姛"
// @Router /v1/task/sendProcessParams/{id} [post]
func (slf *TaskApi) TaskStart(c *gin.Context) {
- ctx, ok := contextx.NewContext(c, nil)
+ var params request.SendProcessParams
+ ctx, ok := contextx.NewContext(c, ¶ms)
if !ok {
return
}
- idx := c.Param("id")
- if idx == "" {
- ctx.Fail(ecode.ParamsErr)
- return
- }
- id := convertx.Atoi(idx)
taskService := service.NewTaskService()
- procedure, code := taskService.GetProcedureById(id)
+ procedure, code := taskService.GetProcedureById(params.ProcedureId)
if code != ecode.OK {
ctx.Fail(code)
return
@@ -216,7 +207,7 @@
}
err = model.WithTransaction(func(db *gorm.DB) error {
- err = taskService.UpdateProcedureStatus(db, id, model.ProcedureStatusProcessing)
+ err = taskService.UpdateProcedureStatusAndPosition(db, params.ProcedureId, model.ProcedureStatusProcessing, params.Position)
if err != nil {
return err
}
--
Gitblit v1.8.0