From 11e217787bf91c7af810d740f30e9275dce990c8 Mon Sep 17 00:00:00 2001
From: dashixiong <zztect_a1@163.com>
Date: Tue, 20 Jan 2026 21:58:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20modbus=20=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E4=B8=BA=203.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xzzn/common/enums/ModBusType.java   | 2 --
 ems-framework/pom.xml                                     | 6 +-----
 pom.xml                                                   | 8 +-------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/ems-common/src/main/java/com/xzzn/common/enums/ModBusType.java b/ems-common/src/main/java/com/xzzn/common/enums/ModBusType.java
index 3d289ee..39bb3d8 100644
--- a/ems-common/src/main/java/com/xzzn/common/enums/ModBusType.java
+++ b/ems-common/src/main/java/com/xzzn/common/enums/ModBusType.java
@@ -35,8 +35,6 @@ public class ModBusType {
         LENGTH.put("FOUR_BYTE_FLOAT",DataType.FOUR_BYTE_FLOAT);
         LENGTH.put("FOUR_BYTE_FLOAT_SWAPPED",DataType.FOUR_BYTE_FLOAT_SWAPPED);
         LENGTH.put("FOUR_BYTE_FLOAT_SWAPPED_INVERTED",DataType.FOUR_BYTE_FLOAT_SWAPPED_INVERTED);
-        LENGTH.put("FOUR_BYTE_FLOAT_INVERTED",DataType.FOUR_BYTE_FLOAT_INVERTED);
-        LENGTH.put("FOUR_BYTE_FLOAT_SWAPPED_SWAPPED",DataType.FOUR_BYTE_FLOAT_SWAPPED_SWAPPED);
         LENGTH.put("EIGHT_BYTE_INT_UNSIGNED",DataType.EIGHT_BYTE_INT_UNSIGNED);
         LENGTH.put("EIGHT_BYTE_INT_SIGNED",DataType.EIGHT_BYTE_INT_SIGNED);
         LENGTH.put("EIGHT_BYTE_INT_UNSIGNED_SWAPPED",DataType.EIGHT_BYTE_INT_UNSIGNED_SWAPPED);
diff --git a/ems-framework/pom.xml b/ems-framework/pom.xml
index 044a5d4..19221ff 100644
--- a/ems-framework/pom.xml
+++ b/ems-framework/pom.xml
@@ -50,11 +50,7 @@
             <groupId>org.eclipse.paho</groupId>
             <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
         </dependency>
-        <!-- 轮询 -->
-        <dependency>
-            <groupId>net.wimpi</groupId>
-            <artifactId>j2mod</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>org.springframework.retry</groupId>
             <artifactId>spring-retry</artifactId>
diff --git a/pom.xml b/pom.xml
index 5679ee0..d56bd7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,17 +165,11 @@
                 <artifactId>spring-integration-mqtt</artifactId>
             </dependency>
 
-            <!-- modbus -->
-            <dependency>
-                <groupId>net.wimpi</groupId>
-                <artifactId>j2mod</artifactId>
-                <version>3.1.0</version> <!-- 提供TCPMasterConnection、SerialConnection等类 -->
-            </dependency>
             <!-- modbus4j -->
             <dependency>
                 <groupId>com.infiniteautomation</groupId>
                 <artifactId>modbus4j</artifactId>
-                <version>3.0.3</version>
+                <version>3.1.0</version>
             </dependency>
             <!-- Resilience4j 断路器核心 -->
             <dependency>