From b15920d5a66d379c9fd9cb15fcc48f0f078e7c77 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 28 十月 2024 14:52:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorSv.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorSv.java
index a59a207..a85672a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorSv.java
@@ -5,7 +5,6 @@
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.CommandBackParam;
-import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com99Vo;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
@@ -81,12 +80,12 @@
BaseResponse res = sendCom2Mw(restTemplate, comSendUrl, com) ;
if(res != null){
if(res.isSuccess()){
- Command reCom = JSON.parseObject(res.getContent() == null ? null : ((JSONObject)res.getContent()).toJSONString(), Command.class) ;
- CommandBackParam bakParam = JSON.parseObject((reCom== null || reCom.param == null) ? null : ((JSONObject)reCom.param).toJSONString(), CommandBackParam.class) ;
+ Command reCom = JSON.parseObject(res.getContent() == null ? null : JSON.toJSONString(res.getContent()), Command.class) ;
+ CommandBackParam bakParam = JSON.parseObject((reCom== null || reCom.param == null) ? null : JSON.toJSONString(reCom.param), CommandBackParam.class) ;
if(bakParam != null){
if(bakParam.getSuccess().booleanValue()){
//閫氫俊涓棿浠舵垚鍔熻繑鍥炲懡浠ょ粨鏋�
- HashMap<String, Boolean> onLineMap = JSON.parseObject(((JSONObject)reCom.getAttachment()).toJSONString(), HashMap.class);
+ HashMap<String, Boolean> onLineMap = JSON.parseObject(JSON.toJSONString(reCom.getAttachment()), HashMap.class);
for(VoOnLineIntake rVo : rsVo.obj){
if(onLineMap.containsKey(rVo.getRtuAddr())) {
rVo.setIsOnLine(onLineMap.get(rVo.getRtuAddr()));
@@ -119,12 +118,12 @@
BaseResponse res = sendCom2Mw(restTemplate, comSendUrl, com) ;
if(res != null){
if(res.isSuccess()){
- Command reCom = JSON.parseObject(res.getContent() == null ? null : ((JSONObject)res.getContent()).toJSONString(), Command.class) ;
- CommandBackParam bakParam = JSON.parseObject((reCom== null || reCom.param == null) ? null : ((JSONObject)reCom.param).toJSONString(), CommandBackParam.class) ;
+ Command reCom = JSON.parseObject(res.getContent() == null ? null : JSON.toJSONString(res.getContent()), Command.class) ;
+ CommandBackParam bakParam = JSON.parseObject((reCom== null || reCom.param == null) ? null : JSON.toJSONString(reCom.param), CommandBackParam.class) ;
if(bakParam != null){
if(bakParam.getSuccess().booleanValue()){
//閫氫俊涓棿浠舵垚鍔熻繑鍥炲懡浠ょ粨鏋�
- HashMap<String, Boolean> onLineMap = JSON.parseObject(((JSONObject)reCom.getAttachment()).toJSONString(), HashMap.class);
+ HashMap<String, Boolean> onLineMap = JSON.parseObject(JSON.toJSONString(reCom.getAttachment()), HashMap.class);
JSONArray jsonArray = new JSONArray();
for (Map.Entry<String, Boolean> entry : onLineMap.entrySet()) {
JSONObject jsonObject = new JSONObject();
--
Gitblit v1.8.0