From b16bb22a803b1ec2960822f08b30503a732ab3af Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 09 八月 2024 10:10:09 +0800
Subject: [PATCH] 通信中间件实现上行数据任务:恢复虚拟卡在取水口上占用状态为非占用状态

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

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Down.java
index dd396de..d08a594 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_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;
@@ -20,6 +21,7 @@
 
         MidResultToRtu midRs = new MidResultToRtu() ;
         midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
+        midRs.rtuResultSendWebUrl = para.rtuResultSendWebUrl ;
         midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
         midRs.commandId = para.commandId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
         midRs.downCode = para.commandCode ;//涓嬭鍛戒护鍔熻兘鐮�;
@@ -46,7 +48,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();
             ComCd65Vo cvo = JSON.parseObject(json, ComCd65Vo.class) ;
             if(cvo == null){
                 throw new Exception("json杞珻omCd65Vo涓簄ull") ;

--
Gitblit v1.8.0