From cb7ca191bf7dfe5db4dc30f1576f8c5362761154 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 16 五月 2024 18:38:02 +0800
Subject: [PATCH] 修改bug，协议中报警及状态是4个字节，程序实现中当2个字节
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_56_Down.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_56_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_56_Down.java
index bfcd94d..e5cc52f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_56_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_56_Down.java
@@ -1,6 +1,7 @@
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;
@@ -46,17 +47,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;
- ComCdXyVo cvo = JSON.parseObject(json, ComCdXyVo.class) ;
- if(cvo == null){
- throw new Exception("json杞珻omCdXyVo涓簄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