From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改; 2、RTU升级模拟器增加命令行设置服务端IP和端口功能; 3、应王江海要求,井电双控协议中也实现远程升级功能,因井电双控协议、阀控器协议不同,而双方协议中的升级子协议相同,所以通信中间件做增量开发、适应性修改,以适应这种混合协议情况,同时也提高通信中间件运行效率。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ThreadJob.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ThreadJob.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ThreadJob.java
index aa3d138..cfd912a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ThreadJob.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ThreadJob.java
@@ -2,9 +2,21 @@
 
 
 @SuppressWarnings("unused")
+@Deprecated
 public abstract class ThreadJob {
-    public void start(Callback callback){
-        new Thread(() -> {
+    protected Thread thread ;
+    protected boolean stop = false ;
+    public void stop(){
+        this.stop = true ;
+    }
+    public boolean isStop(){
+        return this.stop ;
+    }
+    public Thread getThread(){
+        return this.thread ;
+    }
+    public void start(Callback callback) throws Exception {
+        this.thread = new Thread(() -> {
             Exception[] exe = {null} ;
             Object[] obj = {null} ;
             try {
@@ -21,9 +33,9 @@
                     }
                 }
             }
-        }).start();
+        });
+        thread.start() ;
     }
-
     public abstract Object execute() throws Exception ;
 }
 

--
Gitblit v1.8.0