Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
Z
zhmes-agecal
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
耿迪迪
zhmes-agecal
Commits
0f8f8576
Commit
0f8f8576
authored
Sep 24, 2025
by
wanghao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "1 测试 上电后通信 和 最终完成 定时任务功能"
parent
9406e0a9
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
6 deletions
+1
-6
DeviceStatusReaderAndTimeSetter.java
...stem/modbus/business/DeviceStatusReaderAndTimeSetter.java
+1
-6
No files found.
zhmes-agecal-system/src/main/java/com/zehong/system/modbus/business/DeviceStatusReaderAndTimeSetter.java
View file @
0f8f8576
...
@@ -172,7 +172,7 @@ public class DeviceStatusReaderAndTimeSetter {
...
@@ -172,7 +172,7 @@ public class DeviceStatusReaderAndTimeSetter {
TcpMaster
tcpMaster
=
(
TcpMaster
)
master
;
TcpMaster
tcpMaster
=
(
TcpMaster
)
master
;
try
{
try
{
// 1. 关键:内部类路径用 "$" 连接外部类(必须与你的Modbus4j版本匹配)
// 1. 关键:内部类路径用 "$" 连接外部类(必须与你的Modbus4j版本匹配)
String
transportClassName
=
"
sun.rmi.transport.tcp.TcpTransport
"
;
String
transportClassName
=
"
com.serotonin.modbus4j.ip.tcp.TcpMaster
"
;
Class
<?>
transportClass
=
Class
.
forName
(
transportClassName
);
Class
<?>
transportClass
=
Class
.
forName
(
transportClassName
);
log
.
debug
(
"成功加载TcpMaster内部类:{}"
,
transportClassName
);
log
.
debug
(
"成功加载TcpMaster内部类:{}"
,
transportClassName
);
...
@@ -259,11 +259,6 @@ public class DeviceStatusReaderAndTimeSetter {
...
@@ -259,11 +259,6 @@ public class DeviceStatusReaderAndTimeSetter {
try
{
try
{
// 1. 创建独立连接(每个设备任务一个连接,避免复用泄漏)
// 1. 创建独立连接(每个设备任务一个连接,避免复用泄漏)
threadMaster
=
createModbusMaster
(
ip
,
port
);
threadMaster
=
createModbusMaster
(
ip
,
port
);
if
(
threadMaster
==
null
)
{
log
.
error
(
"设备{}: Modbus连接创建失败,终止任务"
,
devId
);
recordAlarm
(
"03"
,
"ip:"
+
ip
+
",port:"
+
port
+
",deviceId:"
+
devId
,
"连接创建失败"
);
return
;
}
// 2. 读取数据(带重试和异常处理)
// 2. 读取数据(带重试和异常处理)
int
[]
result
=
readWithConditionalRetry
(
threadMaster
,
ip
,
port
,
devId
,
stopCondition
);
int
[]
result
=
readWithConditionalRetry
(
threadMaster
,
ip
,
port
,
devId
,
stopCondition
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment