From a04797899856a822c792530d0d65e88b3622ddd7 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 09 五月 2024 13:43:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_30_Down.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_30_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_30_Down.java
index aeca6dc..86a520f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_30_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_30_Down.java
@@ -4,13 +4,12 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V202404.CodeV202404;
import com.dy.common.mw.protocol.p206V202404.ParseParamsForDownV202404;
-import com.dy.common.mw.protocol.p206V202404.downVos.ComCd22Vo;
-import com.dy.common.mw.protocol.p206V202404.downVos.ComCd30Vo;
+import com.dy.common.mw.protocol.p206V202404.downVos.ComCdXyVo;
import com.dy.common.mw.protocol.p206V202404.parse.global.GlCreate;
import com.dy.common.util.ByteUtil;
@AnnotationCodeDown(ifAny={
- CodeV202404.cd_16
+ CodeV202404.cd_30
})
public class Cd_30_Down implements CodeParse {
@@ -48,9 +47,9 @@
byte[] bytes = GlCreate.createStart2Cd(para.rtuAddr, para.commandCode);
if(para.param != null){
String json = (String)para.param;
- ComCd30Vo cvo = JSON.parseObject(json, ComCd30Vo.class) ;
+ ComCdXyVo cvo = JSON.parseObject(json, ComCdXyVo.class) ;
if(cvo == null){
- throw new Exception("json杞珻omCd30Vo涓簄ull") ;
+ throw new Exception("json杞珻omCdXyVo涓簄ull") ;
}
byte[] bs = new byte[9] ;
int index = 0 ;
--
Gitblit v1.8.0