From 7788cb0ea88354718b2ad04ac29aea24e0b64911 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 22 九月 2023 20:19:29 +0800
Subject: [PATCH] 增加当前时间可以开始但是未开始的任务接口，增加是否可以开始字段

---
 api/v1/task.go |   73 ++++++++++++++++++++++++++++++++++--
 1 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/api/v1/task.go b/api/v1/task.go
index 9da9503..8fbc448 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -12,6 +12,7 @@
 	"apsClient/pkg/convertx"
 	"apsClient/pkg/ecode"
 	"apsClient/pkg/logx"
+	"apsClient/pkg/safe"
 	"apsClient/service"
 	"apsClient/service/plc_address"
 	"errors"
@@ -65,7 +66,49 @@
 		params.PageSize = 1
 	}
 
-	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize)
+	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeCurrent) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
+	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
+		}
+	}
+
+	for _, task := range taskResponse.Tasks {
+		if task.Procedure.Status == model.ProcedureStatusWaitProcess {
+			task.CanStarted = true
+		}
+	}
+
+	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 {
+		return
+	}
+	if params.Page <= 0 {
+		params.Page = 1
+	}
+	if params.PageSize <= 0 {
+		params.PageSize = 1
+	}
+
+	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeUnStarted) //鏃堕棿鍒颁簡鏈紑濮嬬殑
 	if code != ecode.OK {
 		ctx.Fail(code)
 		return
@@ -105,7 +148,7 @@
 
 	processModel, err := service.NewTaskService().GetProcessParams(procedure, order)
 	if err != nil || processModel == nil || processModel.ParamsMap == nil {
-		ctx.Fail(ecode.UnknownErr)
+		ctx.FailWithMsg(ecode.ParamsErr, "璇峰厛閰嶇疆宸ヨ壓鍙傛暟")
 		return
 	}
 
@@ -116,6 +159,16 @@
 			Value: v,
 		})
 	}
+
+	safe.Go(func() {
+		caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicGetPlcAddress, conf.Conf.NsqConf.NodeId), fmt.Sprintf(constvar.NsqTopicSendPlcAddress, conf.Conf.NsqConf.NodeId))
+		var addressResult common.ResponsePlcAddress
+		err := caller.Call(common.RequestPlcAddress{DeviceId: conf.Conf.System.DeviceId}, &addressResult, time.Second*3)
+		if err != nil {
+			logx.Infof("get plc address err: %v", err.Error())
+		}
+	})
+
 	resp := response.ProcessParamsResponse{
 		Number: processModel.Number,
 		Params: processParamsArr,
@@ -176,7 +229,7 @@
 // @Produce   application/json
 // @Param     object  body    request.SendProcessParams true  "鏌ヨ鍙傛暟"
 // @Success   200   {object}  contextx.Response{service.GetProcessModel}  "鎴愬姛"
-// @Router    /v1/task/sendProcessParams/{id} [post]
+// @Router    /v1/task/sendProcessParams [post]
 func (slf *TaskApi) TaskStart(c *gin.Context) {
 	var params request.SendProcessParams
 	ctx, ok := contextx.NewContext(c, &params)
@@ -216,7 +269,7 @@
 		if err != nil {
 			return err
 		}
-		return service.NewProgressService().AddProgress(db, procedure, order)
+		return service.NewProgressService().Add(db, procedure, order)
 	})
 	if err != nil {
 		logx.Errorf("SendProcessParams update order and procedure status error:%v", err.Error())
@@ -232,6 +285,18 @@
 	err = SendParams(processModel.ParamsMap, plcConfig)
 	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)
+			if err != nil {
+				return err
+			}
+			procedure.Position = params.Position
+			err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusWaitProcess)
+			if err != nil {
+				return err
+			}
+			return nil
+		})
 		ctx.FailWithMsg(ecode.NeedConfirmedErr, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
 		return
 	}

--
Gitblit v1.8.0