From 3f8ef1823382da7080711e596ee11219c4ac3d89 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 19 八月 2023 20:40:13 +0800
Subject: [PATCH] 去掉mysql 保
---
api/v1/task.go | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 2e01370..17c8dba 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -2,6 +2,7 @@
import (
"apsClient/model"
+ "apsClient/model/response"
_ "apsClient/model/response"
"apsClient/pkg/contextx"
"apsClient/pkg/convertx"
@@ -40,7 +41,7 @@
// @Summary 浠诲姟寮�濮�
// @Produce application/json
// @Param id path int true "宸ュ簭id"
-// @Success 200 {object} contextx.Response{service.GetProcessModel} "鎴愬姛"
+// @Success 200 {object} contextx.Response{data=response.ProcessParamsResponse} "鎴愬姛"
// @Router /v1/task/start/{id} [get]
func (slf *TaskApi) TaskStart(c *gin.Context) {
ctx, ok := contextx.NewContext(c, nil)
@@ -58,29 +59,46 @@
ctx.Fail(code)
return
}
- order, err := service.NewTaskService().GetOrderByOrderId(procedure.OrderID)
+
+ if procedure.Status != model.ProcedureStatusUnFinished {
+ ctx.FailWithMsg(ecode.ParamsErr, "璇ュ伐搴忓凡缁撴潫")
+ return
+ }
+
+ order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
if err != nil {
ctx.Fail(ecode.UnknownErr)
return
}
params := service.GetProcessModelParams{
- WorkOrder: "",
+ WorkOrder: procedure.WorkOrderID,
OrderId: procedure.OrderID,
Product: order.ProductName,
Procedure: procedure.ProceduresInfo.ProcedureName,
- Device: procedure.ProceduresInfo.DeviceID,
+ Device: procedure.ProceduresInfo.DeviceName,
}
resp, err := service.ProcessModel{}.GetProcessModel(params)
if err != nil {
logx.Errorf("TaskStart Notice GetProcessModel error: %v", err.Error())
- ctx.Fail(ecode.UnknownErr)
+ ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
return
}
+ processParamsArr := make([]response.ProcessParams, 0, len(resp.ParamsMap))
+ for k, v := range resp.ParamsMap {
+ processParamsArr = append(processParamsArr, response.ProcessParams{
+ Key: k,
+ Value: v,
+ })
+ }
+ response := response.ProcessParamsResponse{
+ Number: resp.Number,
+ Params: processParamsArr,
+ }
logx.Infof("TaskStart Notice GetProcessModel: %+v", resp)
- ctx.OkWithDetailed(resp)
+ ctx.OkWithDetailed(response)
}
// TaskFinish
@@ -138,7 +156,7 @@
ctx.Fail(code)
return
}
- order, err := service.NewTaskService().GetOrderByOrderId(procedure.OrderID)
+ order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
if err != nil {
ctx.Fail(ecode.UnknownErr)
return
--
Gitblit v1.8.0