From 007bb91e70a5129304de1837f60161c6f5f3ad4f Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 31 十月 2024 10:25:41 +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/p206V1_0_0/parse/Cd_83_Up.java | 61 +++++++++++++++++++-----------
1 files changed, 39 insertions(+), 22 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 d51fa90..60cf969 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
@@ -30,7 +30,7 @@
para.upCode,
para.data) ;
}
- log.info("鍒嗘瀽涓婅鏁版嵁<" + CodeV1_0_1.getCodeName(para.upCode) + " RTU鍦板潃=" + para.rtuAddr + ">:\n" + para.data.toString());
+ log.info("\n鍒嗘瀽涓婅鏁版嵁<" + CodeV1_0_1.getCodeName(para.upCode) + " RTU鍦板潃=" + para.rtuAddr + ">:\n" + para.data.toString());
MidResultFromRtu midRs = new MidResultFromRtu() ;
midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
@@ -60,6 +60,7 @@
confirmCommand.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
confirmCommand.commandId = Command.defaultId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
confirmCommand.downCode = confirmComCode ;//涓嬭鍛戒护鍔熻兘鐮�;
+ confirmCommand.downCodeName = CodeV1_0_1.getCodeName(confirmComCode) ;//涓嬭鍛戒护鍔熻兘鐮佸悕绉�;
confirmCommand.downBuffer = data ;//涓嬭鍛戒护鏁版嵁
confirmCommand.downBufHex = ByteUtil.bytes2Hex(data, true) ;//涓嬭鍛戒护鏁版嵁鍗佸叚杩涘埗褰㈠紡
confirmCommand.hasResponse = false ;//鏄惁鏈夊簲绛�
@@ -84,12 +85,14 @@
* @throws Exception 寮傚父
*/
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
- byte opType = bs[ProtocolConstantV206V1_0_0.dataIndex];
+ byte opType = (byte)ByteUtil.BCD2Int_LE(bs[ProtocolConstantV206V1_0_0.dataIndex]) ;
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);
+ }else{
+ throw new Exception("寮�鍏抽榾绫诲瀷[" + ByteUtil.bytes2Hex(new byte[]{opType}, false) + "(hex)]涓嶅彲璇嗗埆" ) ;
}
}
private void doParseOpen(byte opType, byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
@@ -121,25 +124,12 @@
//鐢ㄦ按鎴风敤姘村紑濮嬫椂闂达細6瀛楄妭BCD鐮侊紝椤哄簭鏄勾鏈堟棩鏃跺垎绉掞紝鍏朵腑鍏厓骞�=2000+骞淬��
cdData.openDt = GlParse.parseTp(bs, index) ;
- 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++ ;
- */
+ //index += 6 ;
//鎺у埗鍣ㄦ椂閽�
- cdData.rtuDt = GlParse.parseTp(bs, index) ;
+ //cdData.rtuDt = GlParse.parseTp(bs, index) ;
+ //2024-10-27 鍒樻鼎鐜夛細鑻忔湁鍕嬫妸鍗忚涓殑鎺у埗鍣ㄦ椂閽熺粰鍒犻櫎鎺変簡锛堢洰鐨勬槸鑺傜害瀛樺偍绌洪棿锛�
+ //澶勭悊鍔炴硶鏄妸寮�闃�鏃堕棿浣滀负鎺у埗鍣ㄦ椂閽燂紝杩欎袱涓椂闂寸浉宸笉鍒颁竴鍒嗛挓
+ cdData.rtuDt = cdData.openDt;
//index += 6 ;
}
@@ -201,9 +191,36 @@
index += 2 ;
cdData.cardType = bs[index] ;
- index++ ;
+ //index++ ;
//鎺у埗鍣ㄦ椂閽�
- cdData.rtuDt = GlParse.parseTp(bs, index) ;
+ //cdData.rtuDt = GlParse.parseTp(bs, index) ;
+ //2024-10-27 鍒樻鼎鐜夛細鑻忔湁鍕嬫妸鍗忚涓殑鎺у埗鍣ㄦ椂閽熺粰鍒犻櫎鎺変簡锛堢洰鐨勬槸鑺傜害瀛樺偍绌洪棿锛�
+ //澶勭悊鍔炴硶鏄妸鍏抽榾鏃堕棿浣滀负鎺у埗鍣ㄦ椂閽燂紝杩欎袱涓椂闂寸浉宸笉鍒颁竴鍒嗛挓
+ cdData.rtuDt = cdData.closeDt ;
//index += 6 ;
}
+
+ public static void main(String[] args) throws Exception {
+ Cd_83_Up obj = new Cd_83_Up() ;
+ //涓嬮潰涓ゆ潯涓婃姤鏁版嵁锛孖C鍗＄紪鐮侀兘鏄潪BCD缂栫爜鑰屽紓甯�
+ //String hex = "683C68B08485353448830200000000001000282353FE739444000001000313000101211615000101210000000000000000000200019000011518000101210A7B16";
+ String hex = "683C68B05301154CEA8306001000000004343638483BBBB9E0001000001603000101215907000101210000000000000000000500019000015308000101210AF716";
+ byte[] bs = ByteUtil.hex2Bytes(hex) ;
+
+ Data data = new Data() ;
+ data.setSubData(new DataV1_0_1()) ;
+
+ int bsLen = new CommonV1_0_1().parseDataLen(bs) ;
+ if(bsLen > 0){
+ try {
+ obj.doParse(bs,
+ bsLen,
+ "83",
+ data) ;
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ System.out.println("data = " + data);
+ }
}
--
Gitblit v1.8.0