From ef7d02ce56e98e8cbc5ed6ec746ea39bf0b8c9e2 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 16 九月 2023 22:44:58 +0800
Subject: [PATCH] 增加实时获取生产进度接口

---
 api/v1/task.go |   53 ++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/api/v1/task.go b/api/v1/task.go
index ae11df0..bbb328d 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,14 +66,10 @@
 		params.PageSize = 1
 	}
 
-	taskDataList, count, code := service.NewTaskService().GetTask(params.Page, params.PageSize)
+	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize)
 	if code != ecode.OK {
 		ctx.Fail(code)
 		return
-	}
-	taskResponse := &response.TaskResponse{
-		Tasks:     taskDataList,
-		TaskCount: count,
 	}
 	ctx.OkWithDetailed(taskResponse)
 }
@@ -120,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,
@@ -150,7 +157,7 @@
 		ctx.Fail(code)
 		return
 	}
-	err := service.NewTaskService().UpdateProcedureStatus(nil, id, model.ProcedureStatusFinished)
+	err := service.NewTaskService().UpdateProcedureStatus(nil, id, model.ProcedureStatusFinished, procedure.Position)
 	if err != nil {
 		logx.Errorf("UpdateProcedureStatus err: %v", err.Error())
 		ctx.Fail(ecode.UnknownErr)
@@ -178,22 +185,17 @@
 // @Tags      Task
 // @Summary   涓嬪彂宸ヨ壓鍙傛暟锛堝紑濮嬩换鍔★級
 // @Produce   application/json
-// @Param     id  path    int true  "宸ュ簭id"
+// @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) {
-	ctx, ok := contextx.NewContext(c, nil)
+	var params request.SendProcessParams
+	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
-	idx := c.Param("id")
-	if idx == "" {
-		ctx.Fail(ecode.ParamsErr)
-		return
-	}
-	id := convertx.Atoi(idx)
 	taskService := service.NewTaskService()
-	procedure, code := taskService.GetProcedureById(id)
+	procedure, code := taskService.GetProcedureById(params.ProcedureId)
 	if code != ecode.OK {
 		ctx.Fail(code)
 		return
@@ -216,15 +218,16 @@
 	}
 
 	err = model.WithTransaction(func(db *gorm.DB) error {
-		err = taskService.UpdateProcedureStatus(db, id, model.ProcedureStatusProcessing)
+		err = taskService.UpdateProcedureStatusAndPosition(db, params.ProcedureId, model.ProcedureStatusProcessing, params.Position)
 		if err != nil {
 			return err
 		}
+		procedure.Position = params.Position
 		err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusProcessing)
 		if err != nil {
 			return err
 		}
-		return service.NewProgressService().AddProgress(db, procedure, order)
+		return service.NewProgressService().Upsert(db, procedure, order)
 	})
 	if err != nil {
 		logx.Errorf("SendProcessParams update order and procedure status error:%v", err.Error())
@@ -240,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
 	}
@@ -248,7 +263,7 @@
 		return
 	}
 	plcConfig.CurrentTryTimes = 0
-	err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, order.Amount.IntPart())
+	err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, params.Position, order.Amount.IntPart())
 	if err != nil {
 		ctx.FailWithMsg(ecode.NeedConfirmedErr, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
 		return

--
Gitblit v1.8.0