From e586b5c608bd8b8c75d254e9d2b1f432ce1e3169 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 18 十一月 2024 14:56:29 +0800
Subject: [PATCH] RTU模拟器，模块上报数据，代码优化
---
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/PipIrrMwTestRtuApplication.java | 4 +
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpClUnit.java | 75 ++++++++++++++++++-------------------
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/resources/Config.xml | 2
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/Server.java | 9 +++-
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/说明.txt | 2
5 files changed, 48 insertions(+), 44 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/PipIrrMwTestRtuApplication.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/PipIrrMwTestRtuApplication.java
index 5391201..f3daf97 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/PipIrrMwTestRtuApplication.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/PipIrrMwTestRtuApplication.java
@@ -1,6 +1,7 @@
package com.dy.pipIrrMwTestRtu;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -22,7 +23,8 @@
"com.dy.common.mybatis..*",
"com.dy.common.singleDataSource..*",
"com.dy.common.webFilter..*",
- "com.dy.common.webListener..*"
+ "com.dy.common.webListener..*",
+ "com.dy.pipIrrGlobal.webCtrls..*"
})
}
)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/Server.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/Server.java
index cc02dfc..5c7b0ba 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/Server.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/Server.java
@@ -6,6 +6,7 @@
import com.dy.pipIrrMwTestRtu.tcpClient.TcpClUnitConfigVo;
import org.jdom2.Document;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.ResourceLoader;
import org.springframework.stereotype.Component;
@@ -22,6 +23,10 @@
public class Server {
@Autowired
protected ResourceLoader resourceLoader ;
+ @Value("${server.port}")
+ private Integer webPort ;
+ @Value("${server.servlet.context-path}")
+ private String webContext ;
private ConfigXml4Springboot conf = null ;
private Document doc = null ;
@@ -76,11 +81,11 @@
System.out.println("@@@@@@$ O@@@@@@@@@ &@@@@@@@@") ;
if(this.mwServerUrl != null){
- System.out.println("@@@@@@$ O@@@@@@@@@ &@@@@@@@@ 涓棿浠舵湇鍔＄ " + this.mwServerUrl ) ;
+ System.out.println("@@@@@@$ O@@@@@@@@@ &@@@@@@@@ 杩滅▼涓棿浠舵湇鍔＄ " + this.mwServerUrl ) ;
}else{
System.out.println("@@@@@@$ O@@@@@@@@@ &@@@@@@@@") ;
}
- System.out.println("@@@@@@$ #@@@@@@@@@$ &@@@@@@@@" ) ;
+ System.out.println("@@@@@@$ #@@@@@@@@@$ &@@@@@@@@ 鏈湴web鏈嶅姟绔痟ttp://[ip]:" + this.webPort + this.webContext ) ;
System.out.println("@@@@@@@@@@@@@@@@@@@@@@# &@@@@@@@@ Runing in standalone mode" ) ;
System.out.println("@@@@@@@@@@@@@@@@@@@@@& &@@@@@@@@ Startup in " + (System.currentTimeMillis() - start) + " MS" ) ;
System.out.println("@@@@@@@@@@@@@@@@@@@# &@@@@@@@@ " + company) ;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpClUnit.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpClUnit.java
index 6fd95b1..e711393 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpClUnit.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/tcpClient/TcpClUnit.java
@@ -54,49 +54,46 @@
}
private void doStart(){
- new Thread(new Runnable(){
- @Override
- public void run() {
- Exception ex = null ;
- while(true){
- ex = null ;
- try {
- new TcpConnect().createSession(
- confVo.mwServerIp,
- confVo.mwServerPort,
- confVo.connectTimeout,
- new TcpHandler(),
- new Callback() {
- @Override
- public void call(Object obj) {
- if (obj == null) {
- log.error("鍒涘缓缃戠粶浼氳瘽杩斿洖涓簄ull");
- } else {
- TcpClUnit.session = (IoSession) obj;
- log.info("鎴愬姛鍒涘缓涓庨�氫俊涓棿浠剁殑缃戠粶杩炴帴");
- UpData.setSession(TcpClUnit.session);
- heartBeat() ;
- }
+ new Thread(() -> {
+ Exception ex ;
+ while(true){
+ ex = null ;
+ try {
+ new TcpConnect().createSession(
+ confVo.mwServerIp,
+ confVo.mwServerPort,
+ confVo.connectTimeout,
+ new TcpHandler(),
+ new Callback() {
+ @Override
+ public void call(Object obj) {
+ if (obj == null) {
+ log.error("鍒涘缓缃戠粶浼氳瘽杩斿洖涓簄ull");
+ } else {
+ TcpClUnit.session = (IoSession) obj;
+ log.info("鎴愬姛鍒涘缓涓庨�氫俊涓棿浠剁殑缃戠粶杩炴帴");
+ UpData.setSession(TcpClUnit.session);
+ heartBeat() ;
}
+ }
- @Override
- public void call(Object... objs) {
- }
+ @Override
+ public void call(Object... objs) {
+ }
- @Override
- public void exception(Exception e) {
- }
- });
+ @Override
+ public void exception(Exception e) {
+ }
+ });
+ }catch (Exception e){
+ ex = e ;
+ }
+ if(ex == null){
+ break ;
+ }else{
+ try{
+ Thread.sleep(100);
}catch (Exception e){
- ex = e ;
- }
- if(ex == null){
- break ;
- }else{
- try{
- Thread.sleep(100);
- }catch (Exception e){
- }
}
}
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/resources/Config.xml b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/resources/Config.xml
index 29e1d44..1333994 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/resources/Config.xml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/resources/Config.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<config>
- <server name="RTU妯℃嫙鍣�" showStartInfo="true" company="http://www.dyjs.com"/>
+ <server name="RTU鍗囩骇妯℃嫙鍣�" showStartInfo="true" company="http://www.dyjs.com"/>
<base rtuAddr="532328059995" onlyOneHeartBeat="true" icCardAddr="3B7D1E1A" icCardNo="61181622830147821"></base>
<!-- -->
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/\350\257\264\346\230\216.txt" "b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/\350\257\264\346\230\216.txt"
index dae77e1..ab97857 100644
--- "a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/\350\257\264\346\230\216.txt"
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/\350\257\264\346\230\216.txt"
@@ -1 +1 @@
-RTU妯℃嫙鍣�
\ No newline at end of file
+RTU妯℃嫙鍣紝鍏跺疄鐜癛estfull鎺ュ彛锛岀敱web绔皟鐢ㄨЕ鍙戜娇鍏舵ā鎷烺TU涓婃姤鎸囧畾鐨勫姛鑳界爜鏁版嵁
\ No newline at end of file
--
Gitblit v1.8.0