From 7e85f7f90911d4bf25821357690d94085a42b36d Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 26 九月 2023 17:39:11 +0800
Subject: [PATCH] 更改一些错误文案，增加plc断开错误文案，重发请求下发任务时直接返回成功
---
api/v1/task.go | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index a34fdc7..8de652b 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"
)
@@ -66,24 +67,39 @@
return
}
- if params.Page <= 0 {
- params.Page = 1
+ params.Page = 1
+
+ if params.PageSize <= 0 {
+ params.PageSize = channelAmount
}
- params.PageSize = channelAmount
-
- taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeCurrent) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
+ 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 {
@@ -117,7 +133,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
@@ -151,13 +167,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
}
@@ -258,7 +274,7 @@
}
if procedure.Status == model.ProcedureStatusProcessing {
- ctx.FailWithMsg(ecode.ParamsErr, "璇ュ伐搴忓凡寮�濮嬬敓浜�")
+ ctx.Ok()
return
}
@@ -306,7 +322,7 @@
}
return nil
})
- ctx.FailWithMsg(ecode.NeedConfirmedErr, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
return
}
if code != ecode.OK {
--
Gitblit v1.8.0