From fbd4cf5aeb4274938c12030e5d235c65c20c19c3 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 15 五月 2024 16:36:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_21_Down.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_21_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_21_Down.java
index 9e72ed9..5b5760e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_21_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_21_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;
@@ -48,7 +49,8 @@
     public byte[] doParse(ParseParamsForDownV202404 para) throws Exception {
         byte[] bytes = GlCreate.createStart2Cd(para.rtuAddr, para.commandCode);
         if(para.param != null){
-            String json = (String)para.param;
+            JSONObject obj = (JSONObject)para.param;
+            String json = obj.toJSONString();
             ComCd21Vo cvo = JSON.parseObject(json, ComCd21Vo.class) ;
             if(cvo == null){
                 throw new Exception("json杞珻omCd21Vo涓簄ull") ;

--
Gitblit v1.8.0