From cf96f6bc1fb484fde16bd5ed6d49534c96958022 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 25 九月 2023 15:43:12 +0800
Subject: [PATCH] fix

---
 api/v1/task.go |   85 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 76 insertions(+), 9 deletions(-)

diff --git a/api/v1/task.go b/api/v1/task.go
index 11a1332..480a58f 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -19,6 +19,7 @@
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
+	"sort"
 	"time"
 )
 
@@ -51,9 +52,75 @@
 // @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
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+
+	channelAmount, err := service.NewDevicePlcService().GetDeviceChannelAmount()
+	if err != nil {
+		ctx.FailWithMsg(ecode.NeedConfirmedErr, err.Error())
+		return
+	}
+
+	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) < 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 {
+			task.CanStarted = true
+		}
+	}
+
+	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 {
@@ -63,10 +130,10 @@
 		params.Page = 1
 	}
 	if params.PageSize <= 0 {
-		params.PageSize = 1
+		params.PageSize = 100
 	}
 
-	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize)
+	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeUnStarted, nil) //鏃堕棿鍒颁簡鏈紑濮嬬殑
 	if code != ecode.OK {
 		ctx.Fail(code)
 		return
@@ -157,7 +224,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 +285,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 +311,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 +330,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