From 9619e60e3075a432d692f3cd8b76787568c53aad Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 07 五月 2025 15:56:58 +0800
Subject: [PATCH] 1、完善代码；2、禁止输出SpringBoot启动时Banner。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java | 249 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 249 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java
new file mode 100644
index 0000000..1ea1bc0
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java
@@ -0,0 +1,249 @@
+package com.dy.common.mw.protocol.p206V2.parse;
+
+import com.dy.common.mw.protocol.*;
+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.DataCd83CloseVo;
+import com.dy.common.mw.protocol.p206V2.upVos.DataCd83OpenVo;
+import com.dy.common.mw.protocol.rtuState.ValveStateInfo;
+import com.dy.common.util.ByteUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+@AnnotationCodeUp(ifAny={
+ CodeV2.cd_83
+})
+@SuppressWarnings("unused")
+public class Cd_83_Up implements CodeParse {
+
+ private static final Logger log = LogManager.getLogger(Cd_83_Up.class);
+
+ /**
+ * 鍒嗘瀽涓婅鏁版嵁
+ */
+ @Override
+ public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback)throws Exception {
+ ParseParamsForUpV2 para = (ParseParamsForUpV2)params ;
+ int bsLen = new CommonV2().parseDataLen4P206(para.upBuffer) ;
+ if(bsLen > 0){
+ this.doParse(para.upBuffer,
+ bsLen,
+ para.upCode,
+ para.data) ;
+ }
+ log.info("\n鍒嗘瀽涓婅鏁版嵁<" + CodeV2.getCodeName(para.upCode) + " RTU鍦板潃=" + para.rtuAddr + ">:\n" + para.data.toString());
+
+ MidResultFromRtu midRs = new MidResultFromRtu() ;
+ midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
+ midRs.protocolVersion = para.protocolVersion ;//鍗忚鐗堟湰鍙�
+ midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
+ midRs.upCode = para.upCode ;//涓婅鏁版嵁涓殑鍔熻兘鐮�
+ midRs.upHex = para.upHex ;//涓婅鏁版嵁鍗佸叚杩涘埗褰㈠紡
+ midRs.upBuffer = para.upBuffer ;//涓婅鏁版嵁瀛楄妭鏁扮粍
+ midRs.data = para.data ;//瑙ｆ瀽鍚庣殑鏁版嵁
+
+ midRs.reportOrResponse_trueOrFalse = true ;//涓诲姩涓婃姤
+
+ String confirmComCode = para.upCode ;
+ ParseParamsForDownV2 downCpParams = new ParseParamsForDownV2() ;
+ downCpParams.setValue(
+ null,
+ ProtocolConstantV206V2.protocolName,
+ para.protocolVersion,
+ para.rtuAddr,
+ Command.defaultId,
+ confirmComCode,
+ null,
+ null);
+ //鏋勯�犲簲绛�
+ byte[] data = new Cd_83_Down().doParse(downCpParams) ;
+
+ MidResultToRtu confirmCommand = new MidResultToRtu() ;
+ confirmCommand.protocolName = para.protocolName ;//鍗忚鍚嶇О
+ confirmCommand.protocolVersion = para.protocolVersion ;//鍗忚鐗堟湰鍙�
+ confirmCommand.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
+ confirmCommand.commandId = Command.defaultId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
+ confirmCommand.downCode = confirmComCode ;//涓嬭鍛戒护鍔熻兘鐮�;
+ confirmCommand.downCodeName = CodeV2.getCodeName(confirmComCode) ;//涓嬭鍛戒护鍔熻兘鐮佸悕绉�;
+ confirmCommand.downBuffer = data ;//涓嬭鍛戒护鏁版嵁
+ confirmCommand.downBufHex = ByteUtil.bytes2Hex(data, true) ;//涓嬭鍛戒护鏁版嵁鍗佸叚杩涘埗褰㈠紡
+ confirmCommand.hasResponse = false ;//鏄惁鏈夊簲绛�
+ confirmCommand.maxSendTimes = 1 ;//鍛戒护鏈�澶у彂閫佹鏁�(褰撴敹涓嶅埌搴旂瓟鏃讹紝灏嗛噸鍙�2娆�)锛屽鏋滀笉璁剧疆锛屽懡浠ょ紦瀛樺櫒杩涜琛ュ厖璁剧疆
+ confirmCommand.isCachForOffLine = false ;//RTU涓嶅湪绾匡紝鍛戒护鏄惁缂撳瓨
+
+ confirmCommand.isSendFirst = true ;//纭鍛戒护锛屼紭鍏堝彂閫�
+ if(isLowPower != null && isLowPower.booleanValue()){
+ //浣庡姛鑰楁椂锛屽敖蹇彂閫�
+ confirmCommand.isQuickSend = true ;
+ }
+
+ callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV2)(para.data.subData)).subData);
+ if(para.data != null && para.data.getSubData() != null){
+ Object subData = ((DataV2)para.data.getSubData()).subData ;
+ if(subData instanceof DataCd83OpenVo){
+ callback.notify(new ValveStateInfo(true));
+ }else if(subData instanceof DataCd83CloseVo){
+ callback.notify(new ValveStateInfo(false));
+ }
+ }
+ return new MidResult[]{confirmCommand, midRs} ;
+ }
+ /**
+ * 鎵ц鍒嗘瀽
+ * @param bs 瀛楄妭鏁扮粍
+ * @param bsLen 瀛楄妭闀垮害锛堟�诲寘闀匡紝鍖呮嫭鍖呭ご鍜屽寘灏撅級
+ * @param dataCode 鍔熻兘鐮�
+ * @param data 鏁版嵁
+ * @throws Exception 寮傚父
+ */
+ protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
+ byte opType = (byte)ByteUtil.BCD2Int_LE(bs[ProtocolConstantV206V2.dataIndex]) ;
+ Boolean isCloseType = CommonV2.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 {
+ DataV2 dV2 = (DataV2)data.getSubData() ;
+ DataCd83OpenVo cdData = new DataCd83OpenVo() ;
+ dV2.subData = cdData ;
+
+ cdData.type = opType ;
+
+ short index = ProtocolConstantV206V2.dataIndex + 1 ;
+ //绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99999999.99锛屽崟浣嶄负m3銆�
+ long tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
+ cdData.totalAmount = tpLong/100.0 ;
+
+ index += 5 ;
+ //鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�8瀛楄妭浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗銆�
+ if(ByteUtil.bytesIsAll0xFF(bs, index, 8)){
+ throw new Exception("IC鍗″彿鏁版嵁鏍煎紡閿欒锛�8瀛楄妭鍏ㄩ儴涓�0xFF锛岃垗寮冩暟鎹�") ;
+ }cdData.icCardNo = GlParse.parseIcCardNo(bs, index) ;
+
+ index += 8 ;
+ //IC鍗″彿鏍煎紡锛�4瀛楄妭HEX鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
+ if(ByteUtil.bytesIsAll0xFF(bs, index, 4)){
+ throw new Exception("IC鍦板潃鏁版嵁鏍煎紡閿欒锛�4瀛楄妭鍏ㄩ儴涓�0xFF锛岃垗寮冩暟鎹�") ;
+ }
+ cdData.icCardAddr = ByteUtil.bytes2Hex_LE(bs, false, index, 4) ;
+
+ index += 4 ;
+ //鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
+ int tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
+ cdData.remainMoney = tpInt/100.0 ;
+
+ index += 4 ;
+ //鐢ㄦ按鎴风敤姘村紑濮嬫椂闂达細6瀛楄妭BCD鐮侊紝椤哄簭鏄勾鏈堟棩鏃跺垎绉掞紝鍏朵腑鍏厓骞�=2000+骞淬��
+ cdData.openDt = GlParse.parseTp(bs, index) ;
+
+ //index += 6 ;
+ //鎺у埗鍣ㄦ椂閽�
+ //cdData.rtuDt = GlParse.parseTp(bs, index) ;
+ //2024-10-27 鍒樻鼎鐜夛細鑻忔湁鍕嬫妸鍗忚涓殑鎺у埗鍣ㄦ椂閽熺粰鍒犻櫎鎺変簡锛堢洰鐨勬槸鑺傜害瀛樺偍绌洪棿锛�
+ //澶勭悊鍔炴硶鏄妸寮�闃�鏃堕棿浣滀负鎺у埗鍣ㄦ椂閽燂紝杩欎袱涓椂闂寸浉宸笉鍒颁竴鍒嗛挓
+ cdData.rtuDt = cdData.openDt;
+ //index += 6 ;
+ }
+
+ private void doParseClose(byte opType, byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
+ DataV2 dV2 = (DataV2)data.getSubData() ;
+ DataCd83CloseVo cdData = new DataCd83CloseVo() ;
+ dV2.subData = cdData ;
+
+ cdData.type = opType ;
+
+ short index = ProtocolConstantV206V2.dataIndex + 1 ;
+ //绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
+ long tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
+ cdData.totalAmount = tpLong/100.0 ;
+
+ index += 5 ;
+ //鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�8瀛楄妭浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗銆�
+ if(ByteUtil.bytesIsAll0xFF(bs, index, 8)){
+ throw new Exception("IC鍗″彿鏁版嵁鏍煎紡閿欒锛�8瀛楄妭鍏ㄩ儴涓�0xFF锛岃垗寮冩暟鎹�") ;
+ }
+ cdData.icCardNo = GlParse.parseIcCardNo(bs, index) ;
+
+ index += 8 ;
+ //IC鍗″彿鏍煎紡锛�4瀛楄妭HEX鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
+ if(ByteUtil.bytesIsAll0xFF(bs, index, 4)){
+ throw new Exception("IC鍦板潃鏁版嵁鏍煎紡閿欒锛�4瀛楄妭鍏ㄩ儴涓�0xFF锛岃垗寮冩暟鎹�") ;
+ }
+ cdData.icCardAddr = ByteUtil.bytes2Hex_LE(bs, false, index, 4) ;
+
+ index += 4 ;
+ //鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
+ tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 3) ;
+ cdData.remainMoney = tpLong/100.0 ;
+
+ index += 4 ;
+ //鐢ㄦ按鎴风敤姘村紑濮嬫椂闂达細6瀛楄妭BCD鐮侊紝椤哄簭鏄勾鏈堟棩鏃跺垎绉掞紝鍏朵腑鍏厓骞�=2000+骞淬��
+ cdData.openDt = GlParse.parseTp(bs, index) ;
+
+ index += 6 ;
+ //鐢ㄦ按鎴风敤姘寸粨鏉熸椂闂达細6瀛楄妭BCD鐮侊紝椤哄簭鏄勾鏈堟棩鏃跺垎绉掞紝鍏朵腑鍏厓骞�=2000+骞淬��
+ cdData.closeDt = GlParse.parseTp(bs, index) ;
+
+ index += 6 ;
+ //鐢ㄦ按鎴锋湰娆＄敤姘撮噺锛氱疮璁℃祦閲�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
+ tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
+ cdData.thisAmount = tpLong/100.0 ;
+
+ index += 5 ;
+ //鐢ㄦ按鎴锋湰娆℃秷璐归噾棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
+ tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 3) ;
+ cdData.thisMoney = tpLong/100.0 ;
+
+ index += 4 ;
+ //鐢ㄦ按鎴锋湰娆＄敤姘存椂闀匡細鐢ㄦ按鏃堕暱2瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999锛屽崟浣嶄负鍒嗛挓銆�
+ int tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
+ cdData.thisTime = tpInt;
+
+ index += 2 ;
+ cdData.priceType = bs[index] ;
+
+ index++ ;
+ tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
+ cdData.price = tpInt/100.0 ;
+
+ index += 2 ;
+ cdData.cardType = bs[index] ;
+
+ //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 DataV2()) ;
+
+ int bsLen = new CommonV2().parseDataLen4P206(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