From 95d00bea6287620ffd8ef304ba4a78512c1e8938 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 18 十一月 2024 14:52:53 +0800
Subject: [PATCH] Maven编译打包时会产生一些警告信息,进行一个类的注解,消除这些警告信息

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_97_Up.java |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_97_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_97_Up.java
index 9f276fb..cb40710 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_97_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_97_Up.java
@@ -3,16 +3,10 @@
 
 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.DataCd50Vo;
-import com.dy.common.mw.protocol.p206V202404.upVos.DataCd65Vo;
-import com.dy.common.mw.protocol.p206V202404.upVos.DataCd97Vo;
+import com.dy.common.mw.protocol.p206V202404.upVos.DataCdXyVo;
 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_97
@@ -35,10 +29,11 @@
                     para.upCode,
                     para.data) ;
         }
-        log.info("鍒嗘瀽涓婅鏁版嵁<" + CodeV202404.getCodeName(para.upCode) + " RTU鍦板潃=" + para.rtuAddr + ">:\n" + para.data.toString());
+        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 ;//涓婅鏁版嵁鍗佸叚杩涘埗褰㈠紡
@@ -60,13 +55,13 @@
      */
     protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
         DataV202404 dV1 = (DataV202404)data.getSubData() ;
-        DataCd97Vo cdData = new DataCd97Vo() ;
+        DataCdXyVo cdData = new DataCdXyVo(CodeV202404.getCodeName(dataCode)) ;
         dV1.subData = cdData ;
         int index = ProtocolConstantV206V202404.dataIndex ;
         cdData.controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ;
 
         index++ ;
-        cdData.projectNo = 0 + bs[index];
+        cdData.projectNo = (int)bs[index];
 
         index++ ;
         byte result = bs[index];

--
Gitblit v1.8.0