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
73af4b1e
Commit
73af4b1e
authored
Sep 25, 2025
by
wanghao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1 指令指令完成,但是 没有检测到机械臂完成。
parent
55fd6f3e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
logback.xml
zhmes-agecal-admin/src/main/resources/logback.xml
+10
-1
ModbusMasterPool.java
.../java/com/zehong/system/modbus/util/ModbusMasterPool.java
+1
-3
No files found.
zhmes-agecal-admin/src/main/resources/logback.xml
View file @
73af4b1e
...
@@ -12,7 +12,16 @@
...
@@ -12,7 +12,16 @@
</encoder>
</encoder>
</appender>
</appender>
<!-- 开启Quartz核心包的DEBUG日志 -->
<logger
name=
"org.quartz"
level=
"DEBUG"
additivity=
"false"
>
<appender-ref
ref=
"CONSOLE"
/>
<!-- 输出到控制台 -->
<appender-ref
ref=
"FILE"
/>
<!-- 输出到文件 -->
</logger>
<!-- 开启Spring与Quartz集成的DEBUG日志 -->
<logger
name=
"org.springframework.scheduling.quartz"
level=
"DEBUG"
additivity=
"false"
>
<appender-ref
ref=
"CONSOLE"
/>
<appender-ref
ref=
"FILE"
/>
</logger>
<!-- 按照每天生成日志文件 -->
<!-- 按照每天生成日志文件 -->
<appender
name=
"logfile"
class=
"ch.qos.logback.core.rolling.RollingFileAppender"
>
<appender
name=
"logfile"
class=
"ch.qos.logback.core.rolling.RollingFileAppender"
>
...
...
zhmes-agecal-system/src/main/java/com/zehong/system/modbus/util/ModbusMasterPool.java
View file @
73af4b1e
package
com
.
zehong
.
system
.
modbus
.
util
;
package
com
.
zehong
.
system
.
modbus
.
util
;
import
org.springframework.stereotype.Component
;
import
com.serotonin.modbus4j.ModbusMaster
;
import
com.serotonin.modbus4j.ModbusMaster
;
import
com.serotonin.modbus4j.exception.ModbusInitException
;
import
com.serotonin.modbus4j.ip.IpParameters
;
import
com.serotonin.modbus4j.ip.IpParameters
;
import
com.serotonin.modbus4j.ip.tcp.TcpMaster
;
import
com.serotonin.modbus4j.ip.tcp.TcpMaster
;
import
org.apache.commons.pool2.BasePooledObjectFactory
;
import
org.apache.commons.pool2.BasePooledObjectFactory
;
...
@@ -17,7 +15,6 @@ import org.springframework.stereotype.Component;
...
@@ -17,7 +15,6 @@ import org.springframework.stereotype.Component;
import
javax.annotation.PostConstruct
;
import
javax.annotation.PostConstruct
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.concurrent.TimeUnit
;
/**
/**
* @author lenovo
* @author lenovo
...
@@ -218,6 +215,7 @@ public class ModbusMasterPool {
...
@@ -218,6 +215,7 @@ public class ModbusMasterPool {
*/
*/
@PostConstruct
@PostConstruct
public
void
init
()
{
public
void
init
()
{
log
.
info
(
"ModbusMasterPool初始化成功"
);
// JVM关闭钩子:确保容器关闭时销毁所有池
// JVM关闭钩子:确保容器关闭时销毁所有池
Runtime
.
getRuntime
().
addShutdownHook
(
new
Thread
(()
->
{
Runtime
.
getRuntime
().
addShutdownHook
(
new
Thread
(()
->
{
log
.
info
(
"开始销毁所有Modbus连接池"
);
log
.
info
(
"开始销毁所有Modbus连接池"
);
...
...
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