From 8dfb8feb32bb5e4e460e23dcde42612a26fa2bcb Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 27 八月 2023 01:11:28 +0800
Subject: [PATCH] fix
---
api/v1/plc.go | 71 ++++++++++-------------------------
1 files changed, 20 insertions(+), 51 deletions(-)
diff --git a/api/v1/plc.go b/api/v1/plc.go
index 1ae6174..cba0bbd 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -5,18 +5,15 @@
"apsClient/model/response"
_ "apsClient/model/response"
"apsClient/pkg/contextx"
- "apsClient/pkg/ecode"
- "apsClient/pkg/logx"
- "apsClient/pkg/plc"
"apsClient/service"
- "encoding/binary"
"github.com/gin-gonic/gin"
+ "github.com/spf13/cast"
)
type PlcApi struct{}
// GetProductProgress
-// @Tags 鑾峰彇鍔ㄦ�佹暟鎹�
+// @Tags 鐢熶骇鏁伴噺
// @Summary 鑾峰彇鐢熶骇杩涘害
// @Produce application/json
// @Success 200 {object} contextx.Response{data=response.ProductProgress} "鎴愬姛"
@@ -26,52 +23,24 @@
if !ok {
return
}
-
- plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
- if code != ecode.OK {
- ctx.FailWithMsg(ecode.UnknownErr, "璇峰厛閰嶇疆PLC")
- return
- }
-
- var startAddress int
- var valueType string
- var dataLength int
- var ipAddr string
-
- for _, pc := range plcConfig.Details {
- if pc.FieldName == constvar.PlcStartAddressTypeFinishNumber {
- startAddress = pc.StartAddress
- valueType = pc.Type
- dataLength = pc.Length
- }
- ipAddr = plcConfig.Address
- }
-
+ finishNumber, _ := service.PlcCacheGet(constvar.PlcCacheKeyFinishNumber)
+ totalNumber, _ := service.PlcCacheGet(constvar.PlcCacheKeyTotalNumber)
resp := new(response.ProductProgress)
- if startAddress == 0 || valueType == "" {
- ctx.OkWithDetailed(resp)
- logx.Warnf("璇峰厛閰嶇疆PLC")
- return
- }
- conn, err := plc.NewModbusConnection(ipAddr)
- if err != nil {
- ctx.OkWithDetailed(resp)
- logx.Errorf("GetProductProgress 杩炴帴plc澶辫触: %v", err.Error())
- return
- }
- defer conn.Close()
-
- rawData, err := plc.ReadHoldingRegister(conn, startAddress, dataLength)
- if err != nil {
- ctx.OkWithDetailed(resp)
- logx.Errorf("GetProductProgress 鑾峰彇plc鏁版嵁澶辫触: %v", err.Error())
- return
- }
- resp.FinishNumber = int(binary.BigEndian.Uint16(rawData))
- if err != nil {
- ctx.OkWithDetailed(resp)
- logx.Errorf("GetProductProgress 鑾峰彇鐢熶骇杩涘害鏁版嵁瑙ｆ瀽澶辫触: %v, data: %v, valueType:%v", err.Error(), rawData, valueType)
- return
- }
+ resp.FinishNumber = cast.ToInt(finishNumber)
+ resp.TotalNumber = cast.ToInt(totalNumber)
ctx.OkWithDetailed(resp)
}
+
+// SetProductNumber
+// @Tags 鐢熶骇鏁伴噺
+// @Summary 璁剧疆鐢熶骇鎬婚噺
+// @Produce application/json
+// @Success 200 {object} contextx.Response{} "鎴愬姛"
+// @Router /v1/plc/setProductNumber [post]
+func (slf *PlcApi) SetProductNumber(c *gin.Context) {
+ ctx, ok := contextx.NewContext(c, nil)
+ if !ok {
+ return
+ }
+ ctx.Ok()
+}
--
Gitblit v1.8.0