From b9675b8776553828294bc635879d317b7bb83cc2 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 29 十一月 2023 20:09:52 +0800 Subject: [PATCH] 1、meterNo改为rtuAddr; 2、去掉一些main方法; 3、pom.xml中依赖common和global的<scope>provided</scope>改为<scope>compile</scope> 4、pipIrr-mwTest-server一些修改; 5、.gitignore文件提交。 --- pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/busi/TcpUpDataCache.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/busi/TcpUpDataCache.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/busi/TcpUpDataCache.java index d6bec2b..3da1fb8 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/busi/TcpUpDataCache.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/busi/TcpUpDataCache.java @@ -26,7 +26,7 @@ * @throws Exception 寮傚父 */ public static void cacheRtuUpData(boolean reportOrResponse_trueOrFalse, AboutRtuNode node) throws Exception{ - if(node != null && node.data != null){ + if(node != null && node.obj != null){ if(reportOrResponse_trueOrFalse){ cacheQueue.pushHead(node); }else{ -- Gitblit v1.8.0