From cf96f6bc1fb484fde16bd5ed6d49534c96958022 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 25 九月 2023 15:43:12 +0800
Subject: [PATCH] fix
---
api/v1/plc.go | 86 +++++++++++++++++++++++++++++++++++-------
1 files changed, 71 insertions(+), 15 deletions(-)
diff --git a/api/v1/plc.go b/api/v1/plc.go
index a837e7a..85624bd 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -1,17 +1,19 @@
package v1
import (
+ "apsClient/conf"
"apsClient/constvar"
"apsClient/model/request"
"apsClient/model/response"
_ "apsClient/model/response"
"apsClient/pkg/contextx"
"apsClient/pkg/ecode"
- "apsClient/pkg/plc"
+ "apsClient/pkg/logx"
+ "apsClient/pkg/plc/apacheplc4x"
"apsClient/service"
- "fmt"
"github.com/gin-gonic/gin"
"github.com/spf13/cast"
+ "time"
)
type PlcApi struct{}
@@ -29,25 +31,20 @@
if !ok {
return
}
- finishNumber, _ := service.PlcCacheGet(params.Position, constvar.PlcCacheKeyFinishNumber)
- totalNumber, _ := service.PlcCacheGet(params.Position, constvar.PlcCacheKeyTotalNumber)
+ finishNumber, _ := service.PlcCacheGet(params.Channel, constvar.PlcCacheKeyFinishNumber)
+ totalNumber, _ := service.PlcCacheGet(params.Channel, 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)
-
- conn, err := plc.GetModbusConnection(ipAddr)
- if err == nil && conn.IsConnected() {
- if resp.FinishNumber > 0 { //鐢熶骇
+ isConnect := service.PlcIsConnect()
+ if isConnect {
+ lastUpdateTime := service.FinishUpdateTimeGet(params.Channel)
+ if time.Now().Unix()-cast.ToInt64(lastUpdateTime) < conf.Conf.PLC.StandbyTime { //鐢熶骇
plcStatus = 2
- } else { //寰呮満
- plcStatus = 3
+ } else {
+ plcStatus = 3 //寰呮満
}
}
resp.PlcStatus = plcStatus
@@ -68,3 +65,62 @@
}
ctx.Ok()
}
+
+// GetProductProgressRealTime
+// @Tags 鐢熶骇鏁伴噺
+// @Summary 瀹炴椂鑾峰彇鐢熶骇杩涘害
+// @Produce application/json
+// @Success 200 {object} contextx.Response{data=response.ProductProgress} "鎴愬姛"
+// @Router /v1/plc/productProgressRealTime [post]
+func (slf *PlcApi) GetProductProgressRealTime(c *gin.Context) {
+ ctx, ok := contextx.NewContext(c, nil)
+ if !ok {
+ return
+ }
+ var finishNumber, totalNumber int64
+ plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
+ if code != ecode.OK {
+ return
+ }
+ for _, addressItem := range plcConfig.Details {
+ if addressItem.FieldName == constvar.PlcStartAddressTypeFinishNumber {
+ value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
+ if err != nil {
+ logx.Infof("plc read finish number err: %v", err)
+ continue
+ }
+ finishNumber = cast.ToInt64(value)
+ logx.Infof("plc read finish number: %v", finishNumber)
+ break
+ }
+ }
+
+ for _, addressItem := range plcConfig.Details {
+ if addressItem.FieldName == constvar.PlcStartAddressTypeTotalNumber {
+ value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
+ if err != nil {
+ logx.Infof("plc read total number err: %v", err)
+ continue
+ }
+ totalNumber = cast.ToInt64(value)
+ logx.Infof("plc read total number: %v", totalNumber)
+ break
+ }
+ }
+ resp := new(response.ProductProgress)
+ resp.FinishNumber = cast.ToInt(finishNumber)
+ resp.TotalNumber = cast.ToInt(totalNumber)
+
+ plcStatus := 1 //鏂紑杩炴帴
+ isConnect := apacheplc4x.IsConnect()
+ if isConnect {
+ if resp.FinishNumber > 0 { //鐢熶骇
+ plcStatus = 2
+ } else { //寰呮満
+ plcStatus = 3
+ }
+ }
+ resp.PlcStatus = plcStatus
+
+ ctx.OkWithDetailed(resp)
+}
--
Gitblit v1.8.0