From b331c9990a0396301e934daffe095f99d62d1c89 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 27 九月 2023 15:58:49 +0800
Subject: [PATCH] 任务获取修改，状态2只返回已开始和已结束的

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

diff --git a/api/v1/task.go b/api/v1/task.go
index 5765d4d..a03a4f0 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -74,13 +74,18 @@
 		params.PageSize = channelAmount
 	}
 
-	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeCurrent, nil) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
+	taskMode := constvar.TaskModeCurrent
+	if params.TaskMode == constvar.TaskModeUnStarted {
+		taskMode = params.TaskMode
+	}
+
+	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, taskMode, nil) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
 	if code != ecode.OK {
 		ctx.Fail(code)
 		return
 	}
 
-	if len(taskResponse.Tasks) < channelAmount {
+	if len(taskResponse.Tasks) < channelAmount && taskMode == constvar.TaskModeCurrent {
 		var existsChannel = make(map[int32]bool, channelAmount)
 		for _, task := range taskResponse.Tasks {
 			existsChannel[task.Channel] = true
@@ -89,7 +94,7 @@
 			if existsChannel[int32(i)] {
 				continue
 			}
-			taskResponseTemp, code := service.NewTaskService().GetTask(params.Page, 1, service.TaskModeLastFinished, []int32{int32(i)}) //鍙栦笂涓�涓畬鎴愮殑
+			taskResponseTemp, code := service.NewTaskService().GetTask(params.Page, 1, constvar.TaskModeLastFinished, []int32{int32(i)}) //鍙栦笂涓�涓畬鎴愮殑
 			if code != ecode.OK {
 				ctx.Fail(code)
 				return
@@ -103,7 +108,7 @@
 	})
 
 	for _, task := range taskResponse.Tasks {
-		if task.Procedure.Status == model.ProcedureStatusWaitProcess {
+		if !service.TaskFlagGet(task.Channel) {
 			task.CanStarted = true
 		}
 	}
@@ -111,34 +116,6 @@
 	taskResponse.Prompt = conf.Conf.Prompt
 	taskResponse.ChannelAmount = channelAmount
 
-	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, nil) //鏃堕棿鍒颁簡鏈紑濮嬬殑
-	if code != ecode.OK {
-		ctx.Fail(code)
-		return
-	}
 	ctx.OkWithDetailed(taskResponse)
 }
 
@@ -225,6 +202,14 @@
 		ctx.Fail(code)
 		return
 	}
+	if procedure.Status == model.ProcedureStatusFinished {
+		ctx.Ok()
+		return
+	}
+	if procedure.Status != model.ProcedureStatusProcessing {
+		ctx.Fail(ecode.ParamsErr)
+		return
+	}
 	err := service.NewTaskService().UpdateProcedureStatus(nil, id, model.ProcedureStatusFinished, procedure.Channel)
 	if err != nil {
 		logx.Errorf("UpdateProcedureStatus err: %v", err.Error())
@@ -245,6 +230,8 @@
 	if err != nil {
 		logx.Errorf("send task status update msg error:%v", err.Error())
 	}
+
+	service.TaskFlagUnset(procedure.Channel)
 
 	ctx.Ok()
 }
@@ -282,7 +269,6 @@
 		ctx.Ok()
 		return
 	}
-
 	processModel, err := taskService.GetProcessParams(procedure, order)
 	if err != nil || processModel == nil || processModel.ParamsMap == nil {
 		ctx.Fail(ecode.UnknownErr)
@@ -303,7 +289,7 @@
 	})
 	if err != nil {
 		logx.Errorf("SendProcessParams update order and procedure status error:%v", err.Error())
-		ctx.FailWithMsg(ecode.NeedConfirmedErr, "鏇存敼宸ュ崟鐘舵�佸け璐�")
+		ctx.FailWithMsg(ecode.DBErr, "鏇存敼宸ュ崟鐘舵�佸け璐�")
 		return
 	}
 	plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
@@ -337,7 +323,7 @@
 	plcConfig.CurrentTryTimes = 0
 	err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, params.Channel, order.Amount.IntPart())
 	if err != nil {
-		ctx.FailWithMsg(ecode.NeedConfirmedErr, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
+		ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆")
 		return
 	}
 
@@ -354,7 +340,7 @@
 	if err != nil {
 		logx.Errorf("send task status update msg error:%v", err.Error())
 	}
-
+	service.TaskFlagSet(procedure.Channel)
 	ctx.Ok()
 }
 

--
Gitblit v1.8.0