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 | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 4f3b574..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)
}
@@ -211,7 +207,7 @@
}
err = model.WithTransaction(func(db *gorm.DB) error {
- err = taskService.UpdateProcedureStatus(db, params.ProcedureId, model.ProcedureStatusProcessing)
+ err = taskService.UpdateProcedureStatusAndPosition(db, params.ProcedureId, model.ProcedureStatusProcessing, params.Position)
if err != nil {
return err
}
--
Gitblit v1.8.0