From 847e73ca2be7cb0b0df2eef425f4adedda20a874 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 08 十月 2023 11:16:01 +0800
Subject: [PATCH] 多个新任务只能第一个可以开始
---
api/v1/task.go | 86 +++++++++++++++++++++---------------------
1 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index e93f396..4cf4808 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -20,6 +20,7 @@
"github.com/gin-gonic/gin"
"gorm.io/gorm"
"sort"
+ "sync"
"time"
)
@@ -67,19 +68,28 @@
return
}
+ taskCount := service.NewTaskService().NewTaskCount()
params.Page = 1
-
- if params.Page <= 0 {
- params.PageSize = channelAmount
+ if params.PageSize <= 0 {
+ if params.TaskMode == constvar.TaskModeUnStarted {
+ params.PageSize = int(taskCount)
+ } else {
+ 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
@@ -88,7 +98,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
@@ -101,43 +111,20 @@
return taskResponse.Tasks[i].Channel < taskResponse.Tasks[i].Channel
})
+ nowTs := time.Now().Unix()
+
+ flagMap := make(map[int32]struct{}, 0)
+
for _, task := range taskResponse.Tasks {
- if task.Procedure.Status == model.ProcedureStatusWaitProcess {
+ if _, ok := flagMap[task.Channel]; !ok && !service.TaskFlagGet(task.Channel) && task.Procedure.StartTime <= nowTs {
task.CanStarted = true
}
}
taskResponse.Prompt = conf.Conf.Prompt
taskResponse.ChannelAmount = channelAmount
+ taskResponse.TaskCount = taskCount
- 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, ¶ms)
- 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)
}
@@ -167,13 +154,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
}
@@ -224,6 +211,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,8 +240,12 @@
logx.Errorf("send task status update msg error:%v", err.Error())
}
+ service.TaskFlagUnset(procedure.Channel)
+
ctx.Ok()
}
+
+var mutex sync.Mutex
// TaskStart
// @Tags Task
@@ -256,6 +255,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, ¶ms)
if !ok {
@@ -274,10 +275,9 @@
}
if procedure.Status == model.ProcedureStatusProcessing {
- ctx.FailWithMsg(ecode.ParamsErr, "璇ュ伐搴忓凡寮�濮嬬敓浜�")
+ ctx.Ok()
return
}
-
processModel, err := taskService.GetProcessParams(procedure, order)
if err != nil || processModel == nil || processModel.ParamsMap == nil {
ctx.Fail(ecode.UnknownErr)
@@ -298,7 +298,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()
@@ -322,7 +322,7 @@
}
return nil
})
- ctx.FailWithMsg(ecode.NeedConfirmedErr, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
return
}
if code != ecode.OK {
@@ -332,7 +332,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
}
@@ -349,7 +349,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