From db88628e7bb03f334fa65826bd655c27859a9973 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 03 十一月 2024 16:52:04 +0800
Subject: [PATCH] 1、协议版本号增加到协议解析与命令构造中； 2、增加RTU状态记录功能，为RTU远程升级做准备。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_5B_Down.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_5B_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_5B_Down.java
index 0cb1ab5..ecb3840 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_5B_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_5B_Down.java
@@ -1,11 +1,9 @@
package com.dy.common.mw.protocol.p206V202404.parse;
-import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
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.ComCd50Vo;
-import com.dy.common.mw.protocol.p206V202404.downVos.ComCd5BVo;
import com.dy.common.mw.protocol.p206V202404.parse.global.GlCreate;
import com.dy.common.util.ByteUtil;
@@ -21,9 +19,12 @@
MidResultToRtu midRs = new MidResultToRtu() ;
midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
+ midRs.protocolVersion = para.protocolVersion ;//鍗忚鐗堟湰鍙�
+ midRs.rtuResultSendWebUrl = para.rtuResultSendWebUrl ;
midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
midRs.commandId = para.commandId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
midRs.downCode = para.commandCode ;//涓嬭鍛戒护鍔熻兘鐮�;
+ midRs.downCodeName = CodeV202404.getCodeName(para.commandCode) ;//涓嬭鍛戒护鍔熻兘鐮佸悕绉�;
midRs.downBuffer = bs ;//涓嬭鍛戒护鏁版嵁
midRs.downBufHex = ByteUtil.bytes2Hex(bs, true) ;//涓嬭鍛戒护鏁版嵁鍗佸叚杩涘埗褰㈠紡
midRs.hasResponse = true ;//鏄惁鏈夊簲绛�
@@ -47,17 +48,16 @@
public byte[] doParse(ParseParamsForDownV202404 para) throws Exception {
byte[] bytes = GlCreate.createStart2Cd(para.rtuAddr, para.commandCode);
if(para.param != null){
- String json = (String)para.param;
- ComCd5BVo cvo = JSON.parseObject(json, ComCd5BVo.class) ;
- if(cvo == null){
- throw new Exception("json杞珻omCd5BVo涓簄ull") ;
- }
+ JSONObject obj = (JSONObject)para.param;
+ String controllerType = (String)obj.get("controllerType");
+ Integer projectNo = (Integer)obj.get("projectNo") ;
+
byte[] bs = new byte[2] ;
int index = 0 ;
- bs[index] = (byte)(Integer.parseInt(cvo.controllerType, 16));
+ bs[index] = (byte)(Integer.parseInt(controllerType, 16));
index ++ ;
- bs[index] = cvo.projectNo.byteValue() ;
+ bs[index] = projectNo.byteValue() ;
bytes = ByteUtil.bytesMerge(bytes, bs) ;
}else{
--
Gitblit v1.8.0