From c7c8554e2b9809bc90ac4a43fdaa39dfe16f4ab0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 09 五月 2025 14:09:32 +0800
Subject: [PATCH] “远程测控”功能返回数据中增加protocol和protocolVersion属性，以备前端做多协议兼容。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java | 130 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 130 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java
new file mode 100644
index 0000000..eb8179b
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java
@@ -0,0 +1,130 @@
+package com.dy.common.mw.protocol.p206V202404.parse;
+
+
+import com.dy.common.mw.protocol.*;
+import com.dy.common.mw.protocol.p206V202404.*;
+import com.dy.common.mw.protocol.p206V202404.parse.global.GlParse;
+import com.dy.common.mw.protocol.p206V202404.upVos.DataCd65Vo;
+import com.dy.common.util.ByteUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@AnnotationCodeUp(ifAny={
+ CodeV202404.cd_65
+})
+@SuppressWarnings("unused")
+public class Cd_65_Up implements CodeParse{
+
+ private static final Logger log = LogManager.getLogger(Cd_65_Up.class);
+
+ /**
+ * 鍒嗘瀽涓婅鏁版嵁
+ */
+ @Override
+ public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback)throws Exception {
+ ParseParamsForUpV202404 para = (ParseParamsForUpV202404)params ;
+ int bsLen = new CommonV202404().parseDataLen4P202404(para.upBuffer) ;
+ if(bsLen > 0){
+ this.doParse(para.upBuffer,
+ bsLen,
+ para.upCode,
+ para.data) ;
+ }
+ log.info("\n鍒嗘瀽鍛戒护搴旂瓟鏁版嵁<" + CodeV202404.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 = false ;
+
+ callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV202404)(para.data.subData)).subData);
+ return new MidResult[]{midRs} ;
+ }
+ /**
+ * 鎵ц鍒嗘瀽
+ * @param bs 瀛楄妭鏁扮粍
+ * @param bsLen 瀛楄妭闀垮害锛堟�诲寘闀匡紝鍖呮嫭鍖呭ご鍜屽寘灏撅級
+ * @param dataCode 鍔熻兘鐮�
+ * @param data 鏁版嵁
+ * @throws Exception 寮傚父
+ */
+ protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
+ DataV202404 dV202404 = (DataV202404)data.getSubData() ;
+
+ int index = ProtocolConstantV206V202404.dataIndex ;
+ String controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ;
+
+ index++ ;
+ Integer projectNo = (int)bs[index];
+
+ index++ ;
+ byte hasRecord = bs[index];
+ if(hasRecord == 1){
+ //鏈夎褰�
+ List<DataCd65Vo> list = new ArrayList<>() ;
+ index++ ;
+ DataCd65Vo vo = this.doParseData(bs, index, bsLen, dataCode, controllerType, projectNo) ;
+ while(vo != null){
+ index += 43 ;
+ list.add(vo) ;
+ vo = this.doParseData(bs, index, bsLen, dataCode, controllerType, projectNo) ;
+ }
+ dV202404.subData = list ;
+ }else{
+ //鏃犺褰�
+ }
+ }
+
+ private DataCd65Vo doParseData(byte[] bs, int index, int bsLen, String dataCode, String controllerType,Integer projectNo) throws Exception{
+ //姣忔潯鏁版嵁鍗�43瀛楄妭
+ if(bsLen - index > 43){
+ DataCd65Vo cdData = new DataCd65Vo(CodeV202404.getCodeName(dataCode)) ;
+
+ cdData.controllerType = controllerType ;
+ cdData.projectNo = projectNo ;
+
+ cdData.icCardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ;
+
+ index += 4 ;
+ cdData.icCardNo = GlParse.parseIcCardNo(bs, index, 6, 2) ;
+
+ index += 8 ;
+ Long moneyRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
+ cdData.moneyRemain = moneyRemain/100.0D;
+
+ index += 5 ;
+ Long waterRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
+ cdData.waterRemain = waterRemain/100.0D;
+
+ index += 5 ;
+ int thisEle = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
+ cdData.thisEle = thisEle/100.0D;
+
+ index += 4 ;
+ int thisWater = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
+ cdData.thisWater = thisWater/100.0D;
+
+ index += 4 ;
+ cdData.rtuStartDt = GlParse.parseRtuDt(bs, index) ;
+
+ index += 6 ;
+ cdData.rtuEndDt = GlParse.parseRtuDt(bs, index) ;
+
+ index += 6 ;
+ cdData.useWaterType = bs[index];
+
+ return cdData ;
+ }else{
+ return null ;
+ }
+ }
+}
--
Gitblit v1.8.0