From 29eab346b55c74fb1ed3212ff7dcb0c24c7662fa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 15 五月 2025 11:22:31 +0800
Subject: [PATCH] 示范区项目，虚拟卡表的占用状态及剩余金额需要设置成默认值，即不占用，不减费。修改原来的实现，增加设备剩余金额为默认值10000，配置项名称也做了达意修改。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_02_Up.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_02_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_02_Up.java
index 509ec47..88f706c 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_02_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_02_Up.java
@@ -2,7 +2,6 @@
import com.dy.common.mw.protocol.*;
-import com.dy.common.mw.protocol.p206V1.upVos.DataCdC0Vo;
import com.dy.common.mw.protocol.p206V2.*;
import com.dy.common.mw.protocol.p206V2.parse.global.GlParse;
import com.dy.common.mw.protocol.p206V2.upVos.DataCd02Vo;
@@ -25,7 +24,7 @@
@Override
public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback)throws Exception {
ParseParamsForUpV2 para = (ParseParamsForUpV2)params ;
- int bsLen = new CommonV2().parseDataLen(para.upBuffer) ;
+ int bsLen = new CommonV2().parseDataLen4P206(para.upBuffer) ;
if(bsLen > 0){
this.doParse(para.upBuffer,
bsLen,
@@ -78,15 +77,15 @@
confirmCommand.isQuickSend = true ;
}
- callback.callback(midRs.reportOrResponse_trueOrFalse);
+ callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV2)(para.data.subData)).subData);
if(para.data != null && para.data.getSubData() != null){
- DataCd02Vo cdData = (DataCd02Vo)para.data.getSubData() ;
+ DataCd02Vo cdData = (DataCd02Vo)((DataV2)para.data.getSubData()).subData ;
if(cdData.stateVo != null && cdData.stateVo.valveState != null){
callback.notify(new ValveStateInfo(cdData.stateVo.valveState.byteValue()== 1?false:true));
}
}
- return new MidResult[]{midRs, confirmCommand} ;
+ return new MidResult[]{confirmCommand, midRs} ;
}
/**
* 鎵ц鍒嗘瀽
--
Gitblit v1.8.0