From 05f41513a5e51fb66691f6d8ba2a8adef2a415a5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 14 九月 2023 20:46:42 +0800
Subject: [PATCH] 获取工艺参数时异步刷新plc地址
---
api/v1/plc.go | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/api/v1/plc.go b/api/v1/plc.go
index cba0bbd..a837e7a 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -2,10 +2,14 @@
import (
"apsClient/constvar"
+ "apsClient/model/request"
"apsClient/model/response"
_ "apsClient/model/response"
"apsClient/pkg/contextx"
+ "apsClient/pkg/ecode"
+ "apsClient/pkg/plc"
"apsClient/service"
+ "fmt"
"github.com/gin-gonic/gin"
"github.com/spf13/cast"
)
@@ -16,18 +20,38 @@
// @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) {
- ctx, ok := contextx.NewContext(c, nil)
+ var params request.GetProductProgress
+ ctx, ok := contextx.NewContext(c, ¶ms)
if !ok {
return
}
- finishNumber, _ := service.PlcCacheGet(constvar.PlcCacheKeyFinishNumber)
- totalNumber, _ := service.PlcCacheGet(constvar.PlcCacheKeyTotalNumber)
+ 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)
+
+ conn, err := plc.GetModbusConnection(ipAddr)
+ if err == nil && conn.IsConnected() {
+ if resp.FinishNumber > 0 { //鐢熶骇
+ plcStatus = 2
+ } else { //寰呮満
+ plcStatus = 3
+ }
+ }
+ resp.PlcStatus = plcStatus
+
ctx.OkWithDetailed(resp)
}
--
Gitblit v1.8.0