From 3051a98788b91eb192ebb971858d053ce3d7292e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 01 十一月 2024 11:34:08 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/DriverV202404.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 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..6f95d48 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 {
@@ -44,7 +41,7 @@
*/
@Override
public void scanAnnotationCode() throws Exception{
- super.doScanAnnotationCode(this, ProtocolConstantV206V1_0_0.protocolName, scanRootPackage) ;
+ super.doScanAnnotationCode(this, ProtocolConstantV206V1.protocolName, scanRootPackage) ;
}
/**
@@ -78,16 +75,17 @@
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,
rtuAddr,
@@ -103,7 +101,7 @@
@Override
public void callback(Boolean flag) {
reportOrResponse_trueOrFalse = flag ;
- rtuAddrInData = dV1_0_1.getRtuAddr() ;
+ rtuAddrInData = dV201.getRtuAddr() ;
}
});
}
--
Gitblit v1.8.0