From ac34819ca4dadb4dfc14215c31f76db6e3defdd1 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 27 十一月 2023 09:27:47 +0800
Subject: [PATCH] 提交了才能重新拉
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/OnLineV1_0_1.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/pMeterV1_0_1/OnLineV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/OnLineV1_0_1.java
similarity index 73%
rename from pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/pMeterV1_0_1/OnLineV1_0_1.java
rename to pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/OnLineV1_0_1.java
index 2e56566..69d63a1 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/pMeterV1_0_1/OnLineV1_0_1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/OnLineV1_0_1.java
@@ -1,11 +1,12 @@
-package com.dy.common.mw.protocol.pMeterV1_0_1;
+package com.dy.common.mw.protocol.p206V1_0_0;
import com.dy.common.mw.protocol.AnnotationOnLine;
import com.dy.common.mw.protocol.OnLine;
@AnnotationOnLine(
- protocolName = ProtocolConstantV1_0_1.protocolName,
- priority = ProtocolConstantV1_0_1.priority)
+ protocolName = ProtocolConstantV206V1_0_0.protocolName,
+ priority = ProtocolConstantV206V1_0_0.priority)
+@SuppressWarnings("unused")
public class OnLineV1_0_1 implements OnLine{
/**
@@ -22,18 +23,15 @@
//鍑洪敊
olr.result = OnLine.OnLineAction_fail ;
olr.rtuAddr = null ;
- olr.meterNo = null ;
}else if(!flag.booleanValue()){
//涓嶆槸鏈崗璁暟鎹�
olr.result = OnLine.OnLineAction_success_noMe ;
olr.rtuAddr = null ;
- olr.meterNo = null ;
}else{
//鏄湰鍗忚鏁版嵁
olr.result = OnLine.OnLineAction_success ;
olr.rtuAddr = cp.parseRtuAddr(upBuf) ;
- olr.meterNo = cp.parseMeterNo(upBuf) ;
- olr.protocolName = ProtocolConstantV1_0_1.protocolName ;
+ olr.protocolName = ProtocolConstantV206V1_0_0.protocolName ;
}
return olr;
}
--
Gitblit v1.8.0