From 2b2193e255e55fe55dedf7dce0e6bdc22f4860ee Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 19 八月 2023 19:39:11 +0800
Subject: [PATCH] 修改网络设调用禁用或停用脚本
---
api/v1/plc.go | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/api/v1/plc.go b/api/v1/plc.go
index 2a93a15..0d91e0e 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -11,7 +11,6 @@
"apsClient/service"
"encoding/json"
"github.com/gin-gonic/gin"
- "github.com/spf13/cast"
)
type PlcApi struct{}
@@ -48,8 +47,10 @@
ipAddr = plcConfig.Address
}
+ resp := new(response.ProductProgress)
if startAddress == 0 || valueType == "" {
- ctx.FailWithMsg(ecode.UnknownErr, "璇峰厛閰嶇疆PLC")
+ ctx.OkWithDetailed(resp)
+ logx.Warnf("璇峰厛閰嶇疆PLC")
return
}
conn, err := plc.NewModbusConnection(ipAddr)
@@ -58,26 +59,23 @@
}
if err != nil {
- ctx.FailWithMsg(ecode.UnknownErr, "杩炴帴plc澶辫触")
+ ctx.OkWithDetailed(resp)
logx.Errorf("GetProductProgress 杩炴帴plc澶辫触: %v", err.Error())
return
}
rawData, err := plc.ReadHoldingRegister(conn, startAddress, dataLength)
if err != nil {
- ctx.FailWithMsg(ecode.UnknownErr, "鑾峰彇plc鏁版嵁澶辫触")
+ ctx.OkWithDetailed(resp)
logx.Errorf("GetProductProgress 鑾峰彇plc鏁版嵁澶辫触: %v", err.Error())
return
}
var finishNumber interface{}
err = json.Unmarshal(rawData, &finishNumber)
if err != nil {
- ctx.FailWithMsg(ecode.UnknownErr, "鑾峰彇鐢熶骇杩涘害鏁版嵁瑙ｆ瀽澶辫触")
+ ctx.OkWithDetailed(resp)
logx.Errorf("GetProductProgress 鑾峰彇鐢熶骇杩涘害鏁版嵁瑙ｆ瀽澶辫触: %v, data: %v, valueType:%v", err.Error(), rawData, valueType)
return
- }
- resp := response.ProductProgress{
- FinishNumber: cast.ToInt(finishNumber),
}
ctx.OkWithDetailed(resp)
}
--
Gitblit v1.8.0