From 57f9815260b6d23c5a626efa9f75fb2ead989da6 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 20 六月 2024 09:33:42 +0800
Subject: [PATCH] 2024-06-20 朱宝民 迁移2个微信小程序接口
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java | 73 ++++++++++++++++++++++++++++--------
1 files changed, 56 insertions(+), 17 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java
index 296dc3c..e8e34f4 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java
@@ -3,6 +3,8 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlParse;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83CloseVo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83OpenVo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -40,9 +42,10 @@
midRs.reportOrResponse_trueOrFalse = true ;//涓诲姩涓婃姤
- String confirmComCode = CodeV1_0_1.cd_C0 ;
+ String confirmComCode = para.upCode ;
ParseParamsForDownV1_0_1 downCpParams = new ParseParamsForDownV1_0_1() ;
downCpParams.setValue(
+ null,
ProtocolConstantV206V1_0_0.protocolName,
para.rtuAddr,
Command.defaultId,
@@ -61,8 +64,13 @@
confirmCommand.downBufHex = ByteUtil.bytes2Hex(data, true) ;//涓嬭鍛戒护鏁版嵁鍗佸叚杩涘埗褰㈠紡
confirmCommand.hasResponse = false ;//鏄惁鏈夊簲绛�
confirmCommand.maxSendTimes = 1 ;//鍛戒护鏈�澶у彂閫佹鏁�(褰撴敹涓嶅埌搴旂瓟鏃讹紝灏嗛噸鍙�2娆�)锛屽鏋滀笉璁剧疆锛屽懡浠ょ紦瀛樺櫒杩涜琛ュ厖璁剧疆
- confirmCommand.isSendFirst = true ;//纭鍛戒护锛屼紭鍏堝彂閫�
confirmCommand.isCachForOffLine = false ;//RTU涓嶅湪绾匡紝鍛戒护鏄惁缂撳瓨
+
+ confirmCommand.isSendFirst = true ;//纭鍛戒护锛屼紭鍏堝彂閫�
+ if(isLowPower != null && isLowPower.booleanValue()){
+ //浣庡姛鑰楁椂锛屽敖蹇彂閫�
+ confirmCommand.isQuickSend = true ;
+ }
callback.callback(midRs.reportOrResponse_trueOrFalse);
return new MidResult[]{midRs, confirmCommand} ;
@@ -76,18 +84,18 @@
* @throws Exception 寮傚父
*/
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
- short index = ProtocolConstantV206V1_0_0.dataIndex ;
byte opType = bs[ProtocolConstantV206V1_0_0.dataIndex];
- if(opType == 1 || opType == 3 || opType == 8){
- this.doParseOpen(opType, bs, bsLen, dataCode, data);
- }else{
+ Boolean isCloseType = CommonV1_0_1.isCloseValveType(opType) ;
+ if(isCloseType != null && isCloseType.booleanValue()){
this.doParseClose(opType, bs, bsLen, dataCode, data);
+ }else if(isCloseType != null && !isCloseType.booleanValue()){
+ this.doParseOpen(opType, bs, bsLen, dataCode, data);
}
}
private void doParseOpen(byte opType, byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ;
DataCd83OpenVo cdData = new DataCd83OpenVo() ;
- dV1.dataCd83OpenVo = cdData ;
+ dV1.subData = cdData ;
cdData.type = opType ;
@@ -111,11 +119,11 @@
cdData.totalAmount += tpInt * 100000000.0 ;
//鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�5瀛楄妭BCD鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
- cdData.clientNum = ByteUtil.BCD2String_LE(bs, index, index + 4) ;
+ cdData.icCardNo = ByteUtil.BCD2String_LE(bs, index, index + 4) ;
index += 5 ;
//IC鍗″彿鏍煎紡锛�4瀛楄妭HEX鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
- cdData.clientNum = ByteUtil.bytesToHex(bs, index, index + 3) ;
+ cdData.icCardAddr = ByteUtil.bytesToHex(bs, index, index + 3) ;
index += 4 ;
//鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
@@ -135,8 +143,24 @@
//鐢ㄦ按鎴风敤姘村紑濮嬫椂闂达細6瀛楄妭BCD鐮侊紝椤哄簭鏄勾鏈堟棩鏃跺垎绉掞紝鍏朵腑鍏厓骞�=2000+骞淬��
cdData.openDt = GlParse.parseTp(bs, index) ;
- index += 6 ;
+ index += 6 ;
+ /* 寮�闃�鏃讹紝姝ら儴鍒嗘病鏈�
+ cdData.priceType = bs[index] ;
+
+ index++ ;
+ cdData.price = 0.0D ;
+ tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
+ index++ ;
+ cdData.price += tpInt/100.0 ;
+ tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
+ index++ ;
+ cdData.price += tpInt;
+
+ cdData.cardType = bs[index] ;
+
+ index++ ;
+ */
//鎺у埗鍣ㄦ椂閽�
cdData.rtuDt = GlParse.parseTp(bs, index) ;
//index += 6 ;
@@ -145,7 +169,7 @@
private void doParseClose(byte opType, byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ;
DataCd83CloseVo cdData = new DataCd83CloseVo() ;
- dV1.dataCd83CloseVo = cdData ;
+ dV1.subData = cdData ;
cdData.type = opType ;
@@ -169,11 +193,11 @@
cdData.totalAmount += tpInt * 100000000.0 ;
//鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�5瀛楄妭BCD鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
- cdData.clientNum = ByteUtil.BCD2String_LE(bs, index, index + 4) ;
+ cdData.icCardNo = ByteUtil.BCD2String_LE(bs, index, index + 4) ;
index += 5 ;
//IC鍗″彿鏍煎紡锛�4瀛楄妭HEX鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
- cdData.clientNum = ByteUtil.bytesToHex(bs, index, index + 3) ;
+ cdData.closeDt = ByteUtil.bytesToHex(bs, index, index + 3) ;
index += 4 ;
//鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
@@ -203,7 +227,10 @@
cdData.thisAmount = 0.0D ;
tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
index++ ;
- cdData.thisAmount += tpInt;
+ cdData.thisAmount += tpInt/100.0 ;
+ tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
+ index++ ;
+ cdData.thisAmount += tpInt ;
tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
index++ ;
cdData.thisAmount += tpInt * 100.0 ;
@@ -213,9 +240,6 @@
tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
index++ ;
cdData.thisAmount += tpInt * 1000000.0 ;
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
- index++ ;
- cdData.thisAmount += tpInt * 100000000.0 ;
//鐢ㄦ按鎴锋湰娆℃秷璐归噾棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
cdData.thisMoney = 0.0D ;
@@ -241,6 +265,21 @@
index++ ;
cdData.thisTime += tpInt * 100 ;
+
+ cdData.priceType = bs[index] ;
+
+ index++ ;
+ cdData.price = 0.0D ;
+ tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
+ index++ ;
+ cdData.price += tpInt/100.0 ;
+ tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
+ index++ ;
+ cdData.price += tpInt;
+
+ cdData.cardType = bs[index] ;
+
+ index++ ;
//鎺у埗鍣ㄦ椂閽�
cdData.rtuDt = GlParse.parseTp(bs, index) ;
//index += 6 ;
--
Gitblit v1.8.0