From fc85945b34f5051635aacf90446e8061a683fb2f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 15 九月 2023 14:22:53 +0800
Subject: [PATCH] plc新建连接失败记录日志

---
 api/v1/plc.go |  100 ++++++++++++++++++++++---------------------------
 1 files changed, 45 insertions(+), 55 deletions(-)

diff --git a/api/v1/plc.go b/api/v1/plc.go
index bec602d..782e28c 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -2,79 +2,69 @@
 
 import (
 	"apsClient/constvar"
+	"apsClient/model/request"
 	"apsClient/model/response"
 	_ "apsClient/model/response"
 	"apsClient/pkg/contextx"
 	"apsClient/pkg/ecode"
-	"apsClient/pkg/logx"
 	"apsClient/pkg/plc"
 	"apsClient/service"
-	"encoding/json"
+	"fmt"
 	"github.com/gin-gonic/gin"
+	"github.com/spf13/cast"
 )
 
 type PlcApi struct{}
 
 // GetProductProgress
-// @Tags      鑾峰彇鍔ㄦ�佹暟鎹�
+// @Tags      鐢熶骇鏁伴噺
 // @Summary   鑾峰彇鐢熶骇杩涘害
 // @Produce   application/json
+// @Param     object  body    request.SendProcessParams true  "鏌ヨ鍙傛暟"
 // @Success   200   {object}  contextx.Response{data=response.ProductProgress}  "鎴愬姛"
-// @Router    /v1/plc/productProgress [get]
+// @Router    /v1/plc/productProgress [post]
 func (slf *PlcApi) GetProductProgress(c *gin.Context) {
+	var params request.GetProductProgress
+	ctx, ok := contextx.NewContext(c, &params)
+	if !ok {
+		return
+	}
+	finishNumber, _ := service.PlcCacheGet(params.Position, constvar.PlcCacheKeyFinishNumber)
+	totalNumber, _ := service.PlcCacheGet(params.Position, constvar.PlcCacheKeyTotalNumber)
+	resp := new(response.ProductProgress)
+	resp.FinishNumber = cast.ToInt(finishNumber)
+	resp.TotalNumber = cast.ToInt(totalNumber)
+
+	plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
+	if code != ecode.OK {
+		return
+	}
+	plcStatus := 1 //鏂紑杩炴帴
+	ipAddr := fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)
+
+	_, err := plc.GetModbusConnection(ipAddr)
+	if err == nil {
+		if resp.FinishNumber > 0 { //鐢熶骇
+			plcStatus = 2
+		} else { //寰呮満
+			plcStatus = 3
+		}
+	}
+	resp.PlcStatus = plcStatus
+
+	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
 	}
-
-	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
-	}
-
-	if startAddress == 0 || valueType == "" {
-		ctx.FailWithMsg(ecode.UnknownErr, "璇峰厛閰嶇疆PLC")
-		return
-	}
-
-	conn, err := plc.NewModbusConnection(ipAddr)
-	defer conn.Close()
-	if err != nil {
-		ctx.FailWithMsg(ecode.UnknownErr, "杩炴帴plc澶辫触")
-		logx.Errorf("GetProductProgress 杩炴帴plc澶辫触: %v", err.Error())
-		return
-	}
-
-	raw, err := plc.ReadHoldingRegister(conn, startAddress, dataLength)
-	if err != nil {
-		ctx.FailWithMsg(ecode.UnknownErr, "鑾峰彇plc鏁版嵁澶辫触")
-		logx.Errorf("GetProductProgress 鑾峰彇plc鏁版嵁澶辫触: %v", err.Error())
-		return
-	}
-	var finishNumber int
-	err = json.Unmarshal(raw, &finishNumber)
-	if err != nil {
-		ctx.FailWithMsg(ecode.UnknownErr, "鑾峰彇鐢熶骇杩涘害鏁版嵁瑙ｆ瀽澶辫触")
-		logx.Errorf("GetProductProgress 鑾峰彇鐢熶骇杩涘害鏁版嵁瑙ｆ瀽澶辫触: %v, data: %v, valueType:%v", err.Error(), raw, valueType)
-		return
-	}
-	resp := response.ProductProgress{
-		FinishNumber: finishNumber,
-	}
-	ctx.OkWithDetailed(resp)
+	ctx.Ok()
 }

--
Gitblit v1.8.0