From e78af8510a56008ebc5939e4a30883fe6238d509 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 07 九月 2023 18:46:04 +0800
Subject: [PATCH] 优化气体采集配置
---
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ModbusUtil2.java | 28 ++++++++--------------------
1 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ModbusUtil2.java b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ModbusUtil2.java
index d4385be..4eb27c7 100644
--- a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ModbusUtil2.java
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ModbusUtil2.java
@@ -10,9 +10,6 @@
import com.serotonin.modbus4j.locator.BaseLocator;
import com.serotonin.modbus4j.msg.*;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
/**
* @Desc: 宸ュ叿绫�
@@ -25,13 +22,10 @@
//浠庢満榛樿鍊�
private static Integer slaveId = 1;
- private static HashMap<String, ModbusMaster> masterMap = new HashMap<>();
-
/**
* 宸ュ巶
*/
static ModbusFactory modbusFactory;
- //static ModbusMaster modbusMaster;
static {
if (modbusFactory == null) {
@@ -46,23 +40,17 @@
* @return
*/
public static ModbusMaster getMaster(String ip, int port) throws ModbusInitException, InterruptedException {
- String key = ip;
-// ModbusMaster modbusMaster = masterMap.get(key);
-// if (modbusMaster == null || !modbusMaster.isConnected()) {
- IpParameters ipParameters = new IpParameters();
- ipParameters.setHost(ip);
- ipParameters.setPort(port);
+
+ IpParameters ipParameters = new IpParameters();
+ ipParameters.setHost(ip);
+ ipParameters.setPort(port);
ModbusMaster modbusMaster = modbusFactory.createTcpMaster(ipParameters, false);
- modbusMaster.init();
+ modbusMaster.init();
- //鍒濆鍖栦箣鍚庣瓑寰咃紝閬垮厤鍑虹幇杩炴帴鏈垱寤�
- Thread.sleep(2500);
+ //鍒濆鍖栦箣鍚庣瓑寰咃紝閬垮厤鍑虹幇杩炴帴鏈垱寤�
+ Thread.sleep(2500);
-// masterMap.put(key, modbusMaster);
-
- return modbusMaster;
-// }
-// return modbusMaster;
+ return modbusMaster;
}
--
Gitblit v1.9.3