From 0d3d5a03d100614e0216249ec5ebbbbef8ff174c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 16 九月 2023 19:13:54 +0800
Subject: [PATCH] fix
---
api/v1/plc.go | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/api/v1/plc.go b/api/v1/plc.go
index a837e7a..5f3b279 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -6,10 +6,8 @@
"apsClient/model/response"
_ "apsClient/model/response"
"apsClient/pkg/contextx"
- "apsClient/pkg/ecode"
- "apsClient/pkg/plc"
+ "apsClient/pkg/plc/apacheplc4x"
"apsClient/service"
- "fmt"
"github.com/gin-gonic/gin"
"github.com/spf13/cast"
)
@@ -35,15 +33,9 @@
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() {
+ isConnect := apacheplc4x.IsConnect()
+ if isConnect {
if resp.FinishNumber > 0 { //鐢熶骇
plcStatus = 2
} else { //寰呮満
--
Gitblit v1.8.0