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 | 50 ++++++++++++++++++++++++++++++++------------------
1 files changed, 32 insertions(+), 18 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 3602d3d..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,20 +14,32 @@
private ParseParamsForDownV202404 downCpParams ;
private Boolean reportOrResponse_trueOrFalse = null ;
- private String rtuAddrInData = null ;
public DriverV202404(){
upCpParams = new ParseParamsForUpV202404() ;
downCpParams = new ParseParamsForDownV202404() ;
}
+ /**
+ * 娓呯┖鑷繁
+ */
+ @Override
+ public void clear() {
+ if(this.upCpParams != null){
+ this.upCpParams.clear();
+ }
+ if(this.downCpParams != null){
+ this.downCpParams.clear();
+ }
+ this.reportOrResponse_trueOrFalse = null ;
+ }
/**
* 鎵弿璇嗗埆鍔熻兘鐮佹敞瑙ｇ被
*/
@Override
public void scanAnnotationCode() throws Exception{
- super.doScanAnnotationCode(this, ProtocolConstantV206V1_0_0.protocolName, scanRootPackage) ;
+ super.doScanAnnotationCode(this, ProtocolConstantV206V1.protocolName, scanRootPackage) ;
}
/**
@@ -44,7 +53,7 @@
*/
@Override
public MidResult[] parseData(Boolean isLowPower, String rtuAddr, byte[] upBuffer, String upHex, DriverParserDataCallback callback, Object... params) {
- reportOrResponse_trueOrFalse = null ;
+ this.clear();
boolean isFail = false ;
String upCode = null ;
try{
@@ -64,19 +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.clear();
- this.upCpParams.setValue(ProtocolConstantV206V202404.protocolName,
+ this.upCpParams.setValue(ProtocolConstantV206V202404.protocolName,
+ ProtocolConstantV206V202404.protocolVer,
rtuAddr,
upCode,
upHex,
@@ -90,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) {
}
});
}
@@ -99,7 +112,7 @@
isFail = true ;
return new MidResult[]{(new MidResultError(ProtocolConstantV206V202404.protocolName, rtuAddr, "涓ラ噸閿欒锛屽垎鏋怰tu鏁版嵁鍑洪敊锛佹暟鎹负锛�" + upHex + (e.getMessage() == null?"":("锛屽嚭閿欎俊鎭細" + e.getMessage())), e))} ;
} finally{
- callback.callback(rtuAddr, upCode, CodeV202404.getCodeName(upCode), upHex, reportOrResponse_trueOrFalse, isFail, rtuAddrInData);
+ callback.callback(rtuAddr, upCode, CodeV202404.getCodeName(upCode), upHex, reportOrResponse_trueOrFalse, isFail, rtuAddr);
}
}
@@ -111,6 +124,7 @@
*/
@Override
public MidResult[] createCommand(Boolean isLowPower, Command command, Object... params) {
+ this.clear();
String RtuResultSendWebUrl = command.getRtuResultSendWebUrl() ;
if(RtuResultSendWebUrl == null || RtuResultSendWebUrl.trim().equals("")){
return new MidResult[]{(new MidResultError(ProtocolConstantV206V202404.protocolName, null, "涓ラ噸閿欒锛屽懡浠や腑rtu杩斿洖鍛戒护缁撴灉鍙戝悜鐩殑鍦皐eb URL涓虹┖锛屼笉鑳芥瀯寤轰换浣曞懡浠わ紒", null))} ;
@@ -122,10 +136,10 @@
try {
String commandCode = command.getCode() ;
- this.downCpParams.clear();
this.downCpParams.setValue(
RtuResultSendWebUrl,
- ProtocolConstantV206V202404.protocolName,
+ ProtocolConstantV206V202404.protocolName,
+ command.protocolVersion==null?ProtocolConstantV206V202404.protocolVer:command.protocolVersion,
rtuAddr,
command.getId(),
commandCode,
--
Gitblit v1.8.0