From 251f61887e8c26db51df7f8d0c3b5464dc1fa6e3 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 03 十二月 2024 16:59:34 +0800
Subject: [PATCH] （1）升级过程中死掉的RTU经过可配置的一段时间后设置成升级失败； （2）升级状态向Remote模块通知时，当升级任务结束后，仍要向remote模块通知可配置的次数；
---
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/rmiClient/RmiResponseVo.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/rmiClient/RmiResponseVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/rmiClient/RmiResponseVo.java
index 658591a..8d952a7 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/rmiClient/RmiResponseVo.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/rmiClient/RmiResponseVo.java
@@ -1,6 +1,7 @@
package com.dy.testClient.rmiClient;
import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
public class RmiResponseVo {
@@ -9,7 +10,7 @@
public String errorInfo ;
public String code ;
-
+
public Object obj ;
/**
@@ -33,11 +34,10 @@
*/
public static RmiResponseVo jsonToObject(String json, Class<?> clazz)throws Exception{
try{
- return JSON.parseObject(json, RmiResponseVo.class) ;
- //JSONDeserializer<RmiResponseVo> jsonD = new JSONDeserializer<RmiResponseVo>() ;
- //jsonD.use("obj", clazz) ;
- //RmiResponseVo resp = jsonD.deserialize(json, RmiResponseVo.class) ;
- //return resp ;
+ JSONObject jsonObject = JSON.parseObject(json);
+ RmiResponseVo vo = jsonObject.to(RmiResponseVo.class) ;
+ vo.obj = jsonObject.getObject("obj", clazz);
+ return vo ;
}catch(Exception e){
throw new Exception(e.getMessage() , e ) ;
}
--
Gitblit v1.8.0