From 7242faec9cf2574a845e7ce28923f03121c15ff0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 十一月 2024 08:59:17 +0800
Subject: [PATCH] 1、Rtu模拟器编码实现不启动web服务； 2、修改ym:ugTaskSendUrl配置为测试下发远程升级任务； 3、优化代码。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/resources/application.yml | 22 ----------------------
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/Server.java | 2 +-
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/upData/UpHeartBeat.java | 9 ++++++++-
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/PipIrrMwSimulateRtuApplication.java | 6 +++++-
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java | 2 +-
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 2 +-
6 files changed, 16 insertions(+), 27 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 5e8b483..060f8de 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -313,7 +313,7 @@
#鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
ym:
comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
- ugTaskSendUrl: "http://127.0.0.1:8070/rtuMw/com/upgradeRtu"
+ ugTaskSendUrl: "http://192.168.40.132:8070/rtuMw/com/upgradeRtu"
rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
sp:
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/PipIrrMwSimulateRtuApplication.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/PipIrrMwSimulateRtuApplication.java
index dcb167d..9f79fa7 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/PipIrrMwSimulateRtuApplication.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/PipIrrMwSimulateRtuApplication.java
@@ -3,8 +3,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
+import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.FilterType;
@@ -32,7 +34,9 @@
public class PipIrrMwSimulateRtuApplication implements CommandLineRunner {
public static void main(String[] args) {
- SpringApplication.run(PipIrrMwSimulateRtuApplication.class, args);
+ new SpringApplicationBuilder(PipIrrMwSimulateRtuApplication.class)
+ .web(WebApplicationType.NONE)//涓嶅惎鍔╳eb鏈嶅姟
+ .run(args);
}
/**
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/Server.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/Server.java
index c8febb1..eabf255 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/Server.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/Server.java
@@ -71,7 +71,7 @@
}else{
System.out.println("@@@@@@$ O@@@@@@@@@ &@@@@@@@@") ;
}
- System.out.println("@@@@@@$ #@@@@@@@@@$ &@@@@@@@@") ;
+ System.out.println("@@@@@@$ #@@@@@@@@@$ &@@@@@@@@ 鏈琑TU妯℃嫙鍦板潃 " + ServerProperties.rtuAddr ) ;
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-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/upData/UpHeartBeat.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/upData/UpHeartBeat.java
index 944cadb..8185fd2 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/upData/UpHeartBeat.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/upData/UpHeartBeat.java
@@ -14,6 +14,8 @@
private static final Logger log = LogManager.getLogger(UpHeartBeat.class) ;
+ private static boolean isFirst = true ;
+
public static boolean upHeartBeat = true ;//鏄惁鍙互鍙戦�佸績璺�
public static void upCd02Data(String rtuAddr){
@@ -41,7 +43,12 @@
byte[] bytes = creatHead(rtuAddr, "02", (byte)0xB0);
byte[] bs = new byte[1] ;
- bs[0] = (byte)0xF2 ;//鏁版嵁鍩燂細 1 涓瓧鑺傦紝F0 鐧诲綍锛� F1 閫�鍑虹櫥褰曪紝F2 鍦ㄧ嚎淇濇寔銆�
+ if(isFirst){
+ isFirst = false ;
+ bs[0] = (byte)0xF0 ;//鏁版嵁鍩燂細 1 涓瓧鑺傦紝F0 鐧诲綍锛� F1 閫�鍑虹櫥褰曪紝F2 鍦ㄧ嚎淇濇寔銆�
+ }else{
+ bs[0] = (byte)0xF2 ;//鏁版嵁鍩燂細 1 涓瓧鑺傦紝F0 鐧诲綍锛� F1 閫�鍑虹櫥褰曪紝F2 鍦ㄧ嚎淇濇寔銆�
+ }
bytes = ByteUtil.bytesMerge(bytes, bs) ;
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/resources/application.yml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/resources/application.yml
index f4cacb5..d35af25 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/resources/application.yml
@@ -3,25 +3,3 @@
console: UTF-8
config:
classpath: log4j2.yml
-
-#绂佺敤鐧芥爣閿欒椤甸潰
-server:
- error:
- whitelabel:
- enabled: false
- #servlet閰嶇疆
- servlet:
- encoding:
- #鍙栨秷榛樿鐨勫瓧绗﹂泦缂栫爜
- enabled: true
- #璁剧疆寮哄埗浣跨敤鎸囧畾瀛楃缂栫爜闆�
- force: true
- #浣跨敤鐨勫瓧绗︾紪鐮�
- charset: utf-8
- context-path: /simRtu #web璁块棶涓婁笅鏂囪矾寰�
- context-parameters:
- #GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- idSuffix: 0
- #web鏈嶅姟绔彛鍙�
- port: 65530
-
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java
index 459728b..759e430 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java
@@ -220,7 +220,7 @@
}
count = this.sv.execute(id);
} catch (Exception e) {
- log.error("缁撴潫RTU鍗囩骇浠诲姟寮傚父", e);
+ log.error("鎵цRTU鍗囩骇浠诲姟寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
}
if(count <= 0){
--
Gitblit v1.8.0