From 7d885c1d4c86f40927af50e6e7bfa13aac0c2180 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 21 十二月 2023 21:47:15 +0800
Subject: [PATCH] 1、common模块优化代码，Command命令中增加RTU命令结果返回webRul; 2、通信中间件增加了接收http下发RTU命令和内部命令的Controler； 3、RTU模拟器和控制器增加了上报完数据是否关闭TCP连接的控制。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/FromRtuComResultConstantTask.java | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/FromRtuConstantTask.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/FromRtuComResultConstantTask.java
similarity index 66%
copy from pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/FromRtuConstantTask.java
copy to pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/FromRtuComResultConstantTask.java
index fbf4b7c..9c056ca 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/FromRtuConstantTask.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/FromRtuComResultConstantTask.java
@@ -1,7 +1,7 @@
package com.dy.aceMw.server.tasks;
-import com.dy.aceMw.server.rtuData.RtuDataNode;
-import com.dy.aceMw.server.rtuData.RtuDataCache;
+import com.dy.aceMw.server.rtuData.RtuComResultNode;
+import com.dy.aceMw.server.rtuData.RtuComResultCache;
import com.dy.common.mw.core.CoreTask;
import com.dy.common.queue.Node;
import org.apache.logging.log4j.LogManager;
@@ -10,8 +10,8 @@
/**
* 瀵筊TU涓婅鏁版嵁杩涜涓氬姟澶勭悊
*/
-public class FromRtuConstantTask extends CoreTask {
- private static final Logger log = LogManager.getLogger(FromRtuConstantTask.class.getName());
+public class FromRtuComResultConstantTask extends CoreTask {
+ private static final Logger log = LogManager.getLogger(FromRtuComResultConstantTask.class.getName());
/**
* 鍦ㄥ崟绾跨▼鐜涓繍琛�
@@ -19,21 +19,21 @@
@Override
public Integer execute() {
try{
- dealRtuUpData() ;
+ dealRtuComResult() ;
}catch(Exception e){
log.error(e);
}
- return RtuDataCache.size()>0?0:1 ;
+ return RtuComResultCache.size()>0?0:1 ;
}
/**
- * 澶勭悊涓婅鏁版嵁
+ * 澶勭悊涓婅鍛戒护缁撴灉
*/
- public void dealRtuUpData() {
- Node first = RtuDataCache.getFirstQueueNode() ;
+ public void dealRtuComResult() {
+ Node first = RtuComResultCache.getFirstQueueNode() ;
if(first != null){
- Node last = RtuDataCache.getLastQueueNode() ;
+ Node last = RtuComResultCache.getLastQueueNode() ;
while (last != null){
- last = this.doDealRtuUpData(first, last);
+ last = this.doDealRtuComResult(first, last);
}
}
}
@@ -43,7 +43,7 @@
* @param first 绗竴涓妭鐐�
* @param last 鏈�鍚庝竴涓妭鐐�
*/
- private Node doDealRtuUpData(Node first, Node last){
+ private Node doDealRtuComResult(Node first, Node last){
if(last != null){
//鍦╠ealNode鏂规硶涓紝鍙兘瑕佹妸last浠庨槦鍒椾腑绉婚櫎锛岃繖鏃秎ast.pre涓虹┖锛屾墍浠ユ彁鍓嶆妸last.pre鍙栧嚭鏉�
Node pre = last.pre ;
@@ -68,12 +68,12 @@
/**
* 澶勭悊涓婅鏁版嵁
*/
- public Integer dealRtuUpData_() {
- Node first = RtuDataCache.getFirstQueueNode() ;
+ public Integer dealRtuComResult_() {
+ Node first = RtuComResultCache.getFirstQueueNode() ;
if(first != null){
- Integer count = RtuDataCache.size() ;
- Node last = RtuDataCache.getLastQueueNode() ;
- this.doDealRtuUpData_(first, last);
+ Integer count = RtuComResultCache.size() ;
+ Node last = RtuComResultCache.getLastQueueNode() ;
+ this.doDealRtuComResult_(first, last);
return count ;
}
return null ;
@@ -84,13 +84,13 @@
* @param first 绗竴涓妭鐐�
* @param last 鏈�鍚庝竴涓妭鐐�
*/
- private void doDealRtuUpData_(Node first, Node last){
+ private void doDealRtuComResult_(Node first, Node last){
if(last != null){
//鍦╠ealNode鏂规硶涓紝鍙兘瑕佹妸last浠庨槦鍒椾腑绉婚櫎锛岃繖鏃秎ast.pre涓虹┖锛屾墍浠ユ彁鍓嶆妸last.pre鍙栧嚭鏉�
Node pre = last.pre ;
dealNode(last) ;
if(first != last){
- doDealRtuUpData(first, pre) ;
+ doDealRtuComResult_(first, pre) ;
}else{
//鍋滄
}
@@ -103,9 +103,9 @@
*/
private void dealNode(Node node){
if(node != null && node.obj != null){
- RtuDataNode obj = (RtuDataNode)node.obj ;
+ RtuComResultNode obj = (RtuComResultNode)node.obj ;
obj.dealSelf() ;
- RtuDataCache.removeNode(node);
+ RtuComResultCache.removeNode(node);
}
}
--
Gitblit v1.8.0