From dbb4ac17ff70578662af99c6b1772b5c0641d005 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 20 十一月 2024 18:48:23 +0800
Subject: [PATCH] 1、基于Timer实现定时执行的任务,并在满足条件下结束定时任务,为此实现抽象类TimerTaskJob类,并在UpgradeManager类中应用; 2、TreadJob类由TimerTaskJob替换,弃用TreadJob类。

---
 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorSv.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 fc42896..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
@@ -85,7 +85,7 @@
                     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()));
@@ -123,7 +123,7 @@
                 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