From 14fc2f577e2c0b7b146c1a430e9438f317ad5b0c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 23 九月 2023 14:14:27 +0800
Subject: [PATCH] 任务接收增加channel字段，postion字段改为channel

---
 api/v1/task.go |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/api/v1/task.go b/api/v1/task.go
index 11a1332..2a15943 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -66,7 +66,51 @@
 		params.PageSize = 1
 	}
 
-	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize)
+	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeCurrent) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
+	if code != ecode.OK {
+		ctx.Fail(code)
+		return
+	}
+	if len(taskResponse.Tasks) == 0 {
+		taskResponse, code = service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeLastFinished) //鍙栦笂涓�涓畬鎴愮殑
+		if code != ecode.OK {
+			ctx.Fail(code)
+			return
+		}
+	}
+
+	for _, task := range taskResponse.Tasks {
+		if task.Procedure.Status == model.ProcedureStatusWaitProcess {
+			task.CanStarted = true
+		}
+	}
+
+	taskResponse.Prompt = conf.Conf.Prompt
+
+	ctx.OkWithDetailed(taskResponse)
+}
+
+// TaskGetUnStarted
+// @Tags      Task
+// @Summary   鑾峰彇鏈紑濮嬬殑浠诲姟
+// @Produce   application/json
+// @Param     object  query    request.TaskList true  "鏌ヨ鍙傛暟"
+// @Success   200   {object}  contextx.Response{data=response.TaskData}  "鎴愬姛"
+// @Router    /v1/task/get/unStarted [get]
+func (slf *TaskApi) TaskGetUnStarted(c *gin.Context) {
+	var params request.TaskList
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+	if params.Page <= 0 {
+		params.Page = 1
+	}
+	if params.PageSize <= 0 {
+		params.PageSize = 100
+	}
+
+	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeUnStarted) //鏃堕棿鍒颁簡鏈紑濮嬬殑
 	if code != ecode.OK {
 		ctx.Fail(code)
 		return
@@ -157,7 +201,7 @@
 		ctx.Fail(code)
 		return
 	}
-	err := service.NewTaskService().UpdateProcedureStatus(nil, id, model.ProcedureStatusFinished, procedure.Position)
+	err := service.NewTaskService().UpdateProcedureStatus(nil, id, model.ProcedureStatusFinished, procedure.Channel)
 	if err != nil {
 		logx.Errorf("UpdateProcedureStatus err: %v", err.Error())
 		ctx.Fail(ecode.UnknownErr)
@@ -218,11 +262,11 @@
 	}
 
 	err = model.WithTransaction(func(db *gorm.DB) error {
-		err = taskService.UpdateProcedureStatusAndPosition(db, params.ProcedureId, model.ProcedureStatusProcessing, params.Position)
+		err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, params.Channel)
 		if err != nil {
 			return err
 		}
-		procedure.Position = params.Position
+		procedure.Channel = params.Channel
 		err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusProcessing)
 		if err != nil {
 			return err
@@ -244,11 +288,11 @@
 	if err != nil {
 		logx.Errorf("SendProcessParams: %v", err.Error())
 		err = model.WithTransaction(func(db *gorm.DB) error {
-			err = taskService.UpdateProcedureStatusAndPosition(db, params.ProcedureId, model.ProcedureStatusWaitProcess, params.Position)
+			err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusWaitProcess, params.Channel)
 			if err != nil {
 				return err
 			}
-			procedure.Position = params.Position
+			procedure.Channel = params.Channel
 			err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusWaitProcess)
 			if err != nil {
 				return err
@@ -263,7 +307,7 @@
 		return
 	}
 	plcConfig.CurrentTryTimes = 0
-	err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, params.Position, order.Amount.IntPart())
+	err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, params.Channel, order.Amount.IntPart())
 	if err != nil {
 		ctx.FailWithMsg(ecode.NeedConfirmedErr, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
 		return

--
Gitblit v1.8.0