From cd824691bd91525855f2c5e48633ef3caa4740f3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 26 九月 2023 17:49:44 +0800
Subject: [PATCH] update doc

---
 api/v1/task.go |   62 ++++++++++++++++++++++--------
 1 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/api/v1/task.go b/api/v1/task.go
index 2a15943..5765d4d 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -19,6 +19,8 @@
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
+	"sort"
+	"sync"
 	"time"
 )
 
@@ -51,7 +53,7 @@
 // @Summary   鑾峰彇浠诲姟
 // @Produce   application/json
 // @Param     object  query    request.TaskList true  "鏌ヨ鍙傛暟"
-// @Success   200   {object}  contextx.Response{data=response.TaskData}  "鎴愬姛"
+// @Success   200   {object}  contextx.Response{data=response.TaskResponse}  "鎴愬姛"
 // @Router    /v1/task/get [get]
 func (slf *TaskApi) TaskGet(c *gin.Context) {
 	var params request.TaskList
@@ -59,25 +61,46 @@
 	if !ok {
 		return
 	}
-	if params.Page <= 0 {
-		params.Page = 1
-	}
-	if params.PageSize <= 0 {
-		params.PageSize = 1
+
+	channelAmount, err := service.NewDevicePlcService().GetDeviceChannelAmount()
+	if err != nil {
+		ctx.FailWithMsg(ecode.NeedConfirmedErr, err.Error())
+		return
 	}
 
-	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeCurrent) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
+	params.Page = 1
+
+	if params.PageSize <= 0 {
+		params.PageSize = channelAmount
+	}
+
+	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeCurrent, nil) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
 	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
+
+	if len(taskResponse.Tasks) < channelAmount {
+		var existsChannel = make(map[int32]bool, channelAmount)
+		for _, task := range taskResponse.Tasks {
+			existsChannel[task.Channel] = true
+		}
+		for i := 0; i < channelAmount; i++ {
+			if existsChannel[int32(i)] {
+				continue
+			}
+			taskResponseTemp, code := service.NewTaskService().GetTask(params.Page, 1, service.TaskModeLastFinished, []int32{int32(i)}) //鍙栦笂涓�涓畬鎴愮殑
+			if code != ecode.OK {
+				ctx.Fail(code)
+				return
+			}
+			taskResponse.Tasks = append(taskResponse.Tasks, taskResponseTemp.Tasks...)
 		}
 	}
+
+	sort.Slice(taskResponse.Tasks, func(i, j int) bool {
+		return taskResponse.Tasks[i].Channel < taskResponse.Tasks[i].Channel
+	})
 
 	for _, task := range taskResponse.Tasks {
 		if task.Procedure.Status == model.ProcedureStatusWaitProcess {
@@ -86,6 +109,7 @@
 	}
 
 	taskResponse.Prompt = conf.Conf.Prompt
+	taskResponse.ChannelAmount = channelAmount
 
 	ctx.OkWithDetailed(taskResponse)
 }
@@ -110,7 +134,7 @@
 		params.PageSize = 100
 	}
 
-	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeUnStarted) //鏃堕棿鍒颁簡鏈紑濮嬬殑
+	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeUnStarted, nil) //鏃堕棿鍒颁簡鏈紑濮嬬殑
 	if code != ecode.OK {
 		ctx.Fail(code)
 		return
@@ -144,13 +168,13 @@
 
 	order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
 	if err != nil {
-		ctx.Fail(ecode.UnknownErr)
+		ctx.Fail(ecode.DBErr)
 		return
 	}
 
 	processModel, err := service.NewTaskService().GetProcessParams(procedure, order)
 	if err != nil || processModel == nil || processModel.ParamsMap == nil {
-		ctx.FailWithMsg(ecode.ParamsErr, "璇峰厛閰嶇疆宸ヨ壓鍙傛暟")
+		ctx.FailWithMsg(ecode.ParamsErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
 		return
 	}
 
@@ -225,6 +249,8 @@
 	ctx.Ok()
 }
 
+var mutex sync.Mutex
+
 // TaskStart
 // @Tags      Task
 // @Summary   涓嬪彂宸ヨ壓鍙傛暟锛堝紑濮嬩换鍔★級
@@ -233,6 +259,8 @@
 // @Success   200   {object}  contextx.Response{service.GetProcessModel}  "鎴愬姛"
 // @Router    /v1/task/sendProcessParams [post]
 func (slf *TaskApi) TaskStart(c *gin.Context) {
+	mutex.Lock()
+	defer mutex.Unlock()
 	var params request.SendProcessParams
 	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
@@ -251,7 +279,7 @@
 	}
 
 	if procedure.Status == model.ProcedureStatusProcessing {
-		ctx.FailWithMsg(ecode.ParamsErr, "璇ュ伐搴忓凡寮�濮嬬敓浜�")
+		ctx.Ok()
 		return
 	}
 
@@ -299,7 +327,7 @@
 			}
 			return nil
 		})
-		ctx.FailWithMsg(ecode.NeedConfirmedErr, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
+		ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
 		return
 	}
 	if code != ecode.OK {

--
Gitblit v1.8.0