From 34a3ff0830f606dcd20d012ce14cc3472397fc45 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 26 九月 2023 17:48:00 +0800
Subject: [PATCH] 下发任务加个锁

---
 api/v1/task.go |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/api/v1/task.go b/api/v1/task.go
index e93f396..5765d4d 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"
 )
 
@@ -69,7 +70,7 @@
 
 	params.Page = 1
 
-	if params.Page <= 0 {
+	if params.PageSize <= 0 {
 		params.PageSize = channelAmount
 	}
 
@@ -167,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
 	}
 
@@ -248,6 +249,8 @@
 	ctx.Ok()
 }
 
+var mutex sync.Mutex
+
 // TaskStart
 // @Tags      Task
 // @Summary   涓嬪彂宸ヨ壓鍙傛暟锛堝紑濮嬩换鍔★級
@@ -256,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 {
@@ -274,7 +279,7 @@
 	}
 
 	if procedure.Status == model.ProcedureStatusProcessing {
-		ctx.FailWithMsg(ecode.ParamsErr, "璇ュ伐搴忓凡寮�濮嬬敓浜�")
+		ctx.Ok()
 		return
 	}
 
@@ -322,7 +327,7 @@
 			}
 			return nil
 		})
-		ctx.FailWithMsg(ecode.NeedConfirmedErr, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
+		ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
 		return
 	}
 	if code != ecode.OK {

--
Gitblit v1.8.0