From c6173b62e0fea3116075d56692b73cc0bc624815 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 27 八月 2023 00:54:56 +0800
Subject: [PATCH] 逻辑修改
---
api/v1/task.go | 96 +++++++++++++++---------------------------------
1 files changed, 30 insertions(+), 66 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 901592e..c84a110 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -18,6 +18,7 @@
"errors"
"fmt"
"github.com/gin-gonic/gin"
+ "gorm.io/gorm"
"time"
)
@@ -35,7 +36,7 @@
return
}
var resp response.TaskCountdown
- workOrder, err := service.NewTaskService().GetComingTask()
+ workOrder, err := service.NewTaskService().GetCurrentTask()
if err == nil {
seconds := workOrder.StartTime - time.Now().Unix()
resp.CountDownHour = seconds / 3600
@@ -88,8 +89,8 @@
ctx.Fail(code)
return
}
- if procedure.Status != model.ProcedureStatusUnFinished {
- ctx.FailWithMsg(ecode.ParamsErr, "璇ュ伐搴忓凡缁撴潫")
+ if procedure.Status != model.ProcedureStatusWaitProcess {
+ ctx.FailWithMsg(ecode.ParamsErr, "璇ュ伐搴忕姸鎬佷笉鏄湭寮�濮�")
return
}
@@ -98,19 +99,6 @@
ctx.Fail(ecode.UnknownErr)
return
}
- //params := service.GetProcessModelParams{
- // WorkOrder: procedure.WorkOrderID,
- // OrderId: procedure.OrderID,
- // Product: order.ProductName,
- // Procedure: procedure.ProceduresInfo.ProcedureName,
- // Device: procedure.ProceduresInfo.DeviceName,
- //}
- //resp, err := service.ProcessModel{}.GetProcessModel(params)
- //if err != nil {
- // logx.Errorf("TaskStart GetProcessModel error: %v", err.Error())
- // ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
- // return
- //}
caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicProcessParamsRequest, conf.Conf.NsqConf.NodeId), fmt.Sprintf(constvar.NsqTopicProcessParamsResponse, conf.Conf.NsqConf.NodeId))
var result common.ResponseProcessParams
@@ -170,7 +158,7 @@
ctx.Fail(code)
return
}
- err := service.NewTaskService().UpdateProcedureStatus(id, model.ProcedureStatusFinished)
+ err := service.NewTaskService().UpdateProcedureStatus(nil, id, model.ProcedureStatusFinished)
if err != nil {
logx.Errorf("UpdateProcedureStatus err: %v", err.Error())
ctx.Fail(ecode.UnknownErr)
@@ -228,64 +216,40 @@
return
}
- //fmt.Println("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
- //for k, v := range resp.ParamsMap {
- // fmt.Println(fmt.Sprintf("%v : %v", k, v))
- // time.Sleep(time.Millisecond * 300)
- //}
- //fmt.Println("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
-
- //err = SendParams(resp.ParamsMap)
- //if err != nil {
- // logx.Errorf("SendProcessParams: %v", err.Error())
- // ctx.Fail(ecode.UnknownErr)
- // return
- //}
+ err = model.WithTransaction(func(db *gorm.DB) error {
+ err = service.NewTaskService().UpdateProcedureStatus(db, id, model.ProcedureStatusProcessing)
+ if err != nil {
+ return err
+ }
+ err = service.NewTaskService().UpdateOrderStatus(db, order.ID, model.OrderStatusProcessing)
+ if err != nil {
+ return err
+ }
+ return nil
+ })
+ if err != nil {
+ logx.Errorf("SendProcessParams update order and procedure status error:%v", err.Error())
+ ctx.FailWithMsg(ecode.DBErr, "鏇存敼宸ュ崟鐘舵�佸け璐�")
+ return
+ }
safe.Go(func() {
- err = SendParams2(result.ParamsMap, 0)
+ err = SendParams(result.ParamsMap, 0)
if err != nil {
logx.Errorf("SendProcessParams: %v", err.Error())
return
}
+ plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
+ if code != ecode.OK {
+ logx.Errorf("get plcConfig err: %v", err.Error())
+ return
+ }
+ _ = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, order.Amount.IntPart())
})
ctx.Ok()
}
-func SendParams(paramsMap map[string]interface{}) error {
- if len(paramsMap) == 0 {
- return errors.New("empty params")
- }
- plcAddressMap := make(map[string]*int, len(conf.Conf.PLCAddresses))
- for _, item := range conf.Conf.PLCAddresses {
- plcAddressMap[item.FieldName] = &item.Address
- }
-
- plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
- if code != ecode.OK {
- return errors.New("璇峰厛閰嶇疆PLC")
- }
- conn, err := plc.GetModbusConnection(fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port))
- if err != nil {
- return errors.New(fmt.Sprintf("杩炴帴plc澶辫触: %v", err.Error()))
- }
-
- logx.Info("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
- for k, v := range paramsMap {
- if plcAddressMap[k] != nil {
- result, err := plc.WriteHoldingRegister(conn, *plcAddressMap[k], v)
- if err != nil {
- logx.Errorf("WriteHoldingRegister err:%v, address: %v, key: %v value: %v", err.Error(), *plcAddressMap[k], k, v)
- } else {
- logx.Infof("WriteHoldingRegister ok: key: %v, value: %v, result: %v", k, v, result)
- }
- }
- }
- logx.Info("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
- return nil
-}
-
-func SendParams2(paramsMap map[string]interface{}, tryTimes int) error {
+func SendParams(paramsMap map[string]interface{}, tryTimes int) error {
if len(paramsMap) == 0 {
return errors.New("empty params")
}
@@ -326,7 +290,7 @@
return err
}
tryTimes++
- return SendParams2(paramsMap, tryTimes)
+ return SendParams(paramsMap, tryTimes)
}
logx.Info("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
return nil
--
Gitblit v1.8.0