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 | 100 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 79 insertions(+), 21 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 11a1332..a03a4f0 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,18 +61,61 @@
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)
+ params.Page = 1
+
+ if params.PageSize <= 0 {
+ params.PageSize = channelAmount
+ }
+
+ 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 && taskMode == constvar.TaskModeCurrent {
+ 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, constvar.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 !service.TaskFlagGet(task.Channel) {
+ task.CanStarted = true
+ }
+ }
+
+ taskResponse.Prompt = conf.Conf.Prompt
+ taskResponse.ChannelAmount = channelAmount
+
ctx.OkWithDetailed(taskResponse)
}
@@ -100,13 +145,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
}
@@ -157,7 +202,15 @@
ctx.Fail(code)
return
}
- err := service.NewTaskService().UpdateProcedureStatus(nil, id, model.ProcedureStatusFinished, procedure.Position)
+ 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())
ctx.Fail(ecode.UnknownErr)
@@ -178,8 +231,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
@@ -189,6 +246,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 {
@@ -207,10 +266,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)
@@ -218,11 +276,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
@@ -231,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()
@@ -244,18 +302,18 @@
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
}
return nil
})
- ctx.FailWithMsg(ecode.NeedConfirmedErr, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
return
}
if code != ecode.OK {
@@ -263,9 +321,9 @@
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, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆")
return
}
@@ -282,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