From b483b294741920e90815c2d1f4c6827d9921310c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 22 八月 2023 16:24:54 +0800
Subject: [PATCH] plc写入地址文件通过nsq从云端获取
---
api/v1/task.go | 87 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 72 insertions(+), 15 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 893106b..b0719bc 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -2,15 +2,19 @@
import (
"apsClient/conf"
+ "apsClient/constvar"
"apsClient/model"
+ "apsClient/model/common"
"apsClient/model/response"
- _ "apsClient/model/response"
+ "apsClient/nsq"
"apsClient/pkg/contextx"
"apsClient/pkg/convertx"
"apsClient/pkg/ecode"
"apsClient/pkg/logx"
"apsClient/pkg/plc"
+ "apsClient/pkg/safe"
"apsClient/service"
+ "apsClient/service/plc_address"
"errors"
"fmt"
"github.com/gin-gonic/gin"
@@ -62,7 +66,6 @@
ctx.Fail(code)
return
}
-
if procedure.Status != model.ProcedureStatusUnFinished {
ctx.FailWithMsg(ecode.ParamsErr, "璇ュ伐搴忓凡缁撴潫")
return
@@ -73,7 +76,6 @@
ctx.Fail(ecode.UnknownErr)
return
}
-
params := service.GetProcessModelParams{
WorkOrder: procedure.WorkOrderID,
OrderId: procedure.OrderID,
@@ -81,9 +83,7 @@
Procedure: procedure.ProceduresInfo.ProcedureName,
Device: procedure.ProceduresInfo.DeviceName,
}
-
resp, err := service.ProcessModel{}.GetProcessModel(params)
-
if err != nil {
logx.Errorf("TaskStart Notice GetProcessModel error: %v", err.Error())
ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
@@ -96,12 +96,12 @@
Value: v,
})
}
- response := response.ProcessParamsResponse{
+ data := response.ProcessParamsResponse{
Number: resp.Number,
Params: processParamsArr,
}
logx.Infof("TaskStart Notice GetProcessModel: %+v", resp)
- ctx.OkWithDetailed(response)
+ ctx.OkWithDetailed(data)
}
// TaskFinish
@@ -166,11 +166,11 @@
}
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)
@@ -180,12 +180,12 @@
return
}
- fmt.Println("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
- for k, v := range resp.ParamsMap {
- fmt.Println(fmt.Sprintf("%v : %v", k, v))
- time.Sleep(time.Millisecond * 300)
- }
- fmt.Println("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
+ //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 {
@@ -194,10 +194,20 @@
// return
//}
+ safe.Go(func() {
+ err = SendParams2(resp.ParamsMap, 0)
+ if err != nil {
+ logx.Errorf("SendProcessParams: %v", err.Error())
+ return
+ }
+ })
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
@@ -227,3 +237,50 @@
logx.Info("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
return nil
}
+
+func SendParams2(paramsMap map[string]interface{}, tryTimes int) error {
+ if len(paramsMap) == 0 {
+ return errors.New("empty params")
+ }
+ if tryTimes > 2 {
+ return errors.New("beyond max try time")
+ }
+ plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
+ if code != ecode.OK {
+ return errors.New("璇峰厛閰嶇疆PLC")
+ }
+ conn, err := plc.NewModbusConnection(plcConfig.Address)
+ if err != nil {
+ return errors.New(fmt.Sprintf("杩炴帴plc澶辫触: %v", err.Error()))
+ }
+ defer conn.Close()
+
+ logx.Info("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
+ var missNumbers int
+ for k, v := range paramsMap {
+ if address, ok := plc_address.Get(k); ok {
+ result, err := plc.WriteHoldingRegister(conn, address, v)
+ if err != nil {
+ logx.Errorf("WriteHoldingRegister err:%v, address: %v, key: %v value: %v", err.Error(), address, k, v)
+ } else {
+ delete(paramsMap, k)
+ logx.Infof("WriteHoldingRegister ok: key: %v, value: %v, result: %v", k, v, result)
+ }
+ } else {
+ missNumbers++
+ }
+ }
+ if missNumbers >= 1 {
+ 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*2)
+ if err != nil {
+ logx.Infof("SendParams2 err: %v", err.Error())
+ return err
+ }
+ tryTimes++
+ return SendParams2(paramsMap, tryTimes)
+ }
+ logx.Info("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
+ return nil
+}
--
Gitblit v1.8.0