From 04cea6ec858be6ddef3982dcecabf6b3205a1f8b Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 22 八月 2023 19:23:01 +0800
Subject: [PATCH] fix
---
api/v1/task.go | 171 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 148 insertions(+), 23 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 1278e5b..cf295c5 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -1,14 +1,21 @@
package v1
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"
"time"
@@ -41,7 +48,7 @@
// @Summary 浠诲姟寮�濮�
// @Produce application/json
// @Param id path int true "宸ュ簭id"
-// @Success 200 {object} contextx.Response{data=[]response.ProcessParams} "鎴愬姛"
+// @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)
@@ -59,7 +66,6 @@
ctx.Fail(code)
return
}
-
if procedure.Status != model.ProcedureStatusUnFinished {
ctx.FailWithMsg(ecode.ParamsErr, "璇ュ伐搴忓凡缁撴潫")
return
@@ -70,31 +76,53 @@
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
+ //}
- params := service.GetProcessModelParams{
+ caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicProcessParamsRequest, conf.Conf.NsqConf.NodeId), fmt.Sprintf(constvar.NsqTopicProcessParamsResponse, conf.Conf.NsqConf.NodeId))
+ var result common.ResponseProcessParams
+
+ err = caller.Call(common.RequestProcessParams{
WorkOrder: procedure.WorkOrderID,
OrderId: procedure.OrderID,
Product: order.ProductName,
Procedure: procedure.ProceduresInfo.ProcedureName,
- Device: procedure.ProceduresInfo.DeviceName,
- }
-
- resp, err := service.ProcessModel{}.GetProcessModel(params)
-
+ Device: procedure.ProceduresInfo.DeviceName}, &result, time.Second*5)
if err != nil {
- logx.Errorf("TaskStart Notice GetProcessModel error: %v", err.Error())
+ logx.Errorf("TaskStart GetProcessModel error:%v", err.Error())
ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
return
}
- processParamsArr := make([]*response.ProcessParams, 0, len(resp.ParamsMap))
- for k, v := range resp.ParamsMap {
- processParamsArr = append(processParamsArr, &response.ProcessParams{
+ if result.ParamsMap == nil {
+ logx.Errorf("TaskStart GetProcessModel response miss process params:%v", result)
+ ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
+ return
+ }
+
+ processParamsArr := make([]response.ProcessParams, 0, len(result.ParamsMap))
+ for k, v := range result.ParamsMap {
+ processParamsArr = append(processParamsArr, response.ProcessParams{
Key: k,
Value: v,
})
}
- logx.Infof("TaskStart Notice GetProcessModel: %+v", resp)
- ctx.OkWithDetailed(processParamsArr)
+ data := response.ProcessParamsResponse{
+ Number: result.Number,
+ Params: processParamsArr,
+ }
+ logx.Infof("TaskStart Notice GetProcessModel: %+v", result)
+ ctx.OkWithDetailed(data)
}
// TaskFinish
@@ -159,11 +187,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)
@@ -172,11 +200,108 @@
ctx.Fail(ecode.UnknownErr)
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 {
+ // logx.Errorf("SendProcessParams: %v", err.Error())
+ // ctx.Fail(ecode.UnknownErr)
+ // 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
+ }
+
+ 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("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
+ 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 {
+ 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