From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 26 三月 2025 14:24:50 +0800 Subject: [PATCH] 1、git同步冲突引起文件丢失,进行系统恢复,并屏蔽一个非git提交的模块; 2、增加文件《增加一个单位(orgTag)》。 --- 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