From cdbda5e3895814b688bcc0e6b34b6067b0b9b773 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 21 九月 2023 20:17:08 +0800
Subject: [PATCH] fix

---
 api/v1/task.go |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/api/v1/task.go b/api/v1/task.go
index 9da9503..11a1332 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"
@@ -105,7 +106,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 +117,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 +187,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 +227,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 +243,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