From db88628e7bb03f334fa65826bd655c27859a9973 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 03 十一月 2024 16:52:04 +0800
Subject: [PATCH] 1、协议版本号增加到协议解析与命令构造中； 2、增加RTU状态记录功能，为RTU远程升级做准备。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/DriverV202404.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/DriverV202404.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/DriverV202404.java
index 142836d..8069bf4 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/DriverV202404.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/DriverV202404.java
@@ -1,11 +1,8 @@
package com.dy.common.mw.protocol.p206V202404;
import com.dy.common.mw.protocol.*;
-import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
+import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1;
import com.dy.common.util.DateTime;
-
-import java.net.URI;
-import java.net.URL;
@AnnotationDriver(name= ProtocolConstantV206V202404.protocolName)
public class DriverV202404 extends Driver {
@@ -17,7 +14,6 @@
private ParseParamsForDownV202404 downCpParams ;
private Boolean reportOrResponse_trueOrFalse = null ;
- private String rtuAddrInData = null ;
public DriverV202404(){
upCpParams = new ParseParamsForUpV202404() ;
@@ -36,7 +32,6 @@
this.downCpParams.clear();
}
this.reportOrResponse_trueOrFalse = null ;
- this.rtuAddrInData = null ;
}
/**
@@ -44,7 +39,7 @@
*/
@Override
public void scanAnnotationCode() throws Exception{
- super.doScanAnnotationCode(this, ProtocolConstantV206V1_0_0.protocolName, scanRootPackage) ;
+ super.doScanAnnotationCode(this, ProtocolConstantV206V1.protocolName, scanRootPackage) ;
}
/**
@@ -78,18 +73,20 @@
Data upData = new Data() ;
upData.setRtuAddr(rtuAddr) ;
upData.setProtocol(ProtocolConstantV206V202404.protocolName);
+ upData.setProtocolVer(ProtocolConstantV206V202404.protocolVer);
upData.setCode(upCode) ;
upData.setHex(upHex) ;
- DataV202404 dV1_0_1 = new DataV202404() ;
- //dV1_0_1.version = cp.parseVersion(upBuffer) ;
- dV1_0_1.rtuAddr = rtuAddr ;
- dV1_0_1.dt = DateTime.yyyy_MM_dd_HH_mm_ss() ;
+ DataV202404 dV201 = new DataV202404() ;
+ //dV201.version = cp.parseVersion(upBuffer) ;
+ dV201.rtuAddr = rtuAddr ;
+ dV201.dt = DateTime.yyyy_MM_dd_HH_mm_ss() ;
- upData.setSubData(dV1_0_1) ;
+ upData.setSubData(dV201) ;
this.upCpParams.setValue(ProtocolConstantV206V202404.protocolName,
+ ProtocolConstantV206V202404.protocolVer,
rtuAddr,
upCode,
upHex,
@@ -103,7 +100,10 @@
@Override
public void callback(Boolean flag) {
reportOrResponse_trueOrFalse = flag ;
- rtuAddrInData = dV1_0_1.getRtuAddr() ;
+ //rtuAddrInData = dV201.getRtuAddr() ;
+ }
+ @Override
+ public void notify(NotifyInfo ...infos) {
}
});
}
@@ -138,7 +138,8 @@
this.downCpParams.setValue(
RtuResultSendWebUrl,
- ProtocolConstantV206V202404.protocolName,
+ ProtocolConstantV206V202404.protocolName,
+ command.protocolVersion==null?ProtocolConstantV206V202404.protocolVer:command.protocolVersion,
rtuAddr,
command.getId(),
commandCode,
--
Gitblit v1.8.0