fix:优化检测接口状态获取逻辑

2 files changed, 2 insertions, 10 deletions

diff --git a/src/main/java/com/mesa/reportservice/service/impl/JobServiceImpl.java b/src/main/java/com/mesa/reportservice/service/impl/JobServiceImpl.java
index c60d5e3..df36440 100644
--- a/src/main/java/com/mesa/reportservice/service/impl/JobServiceImpl.java
+++ b/src/main/java/com/mesa/reportservice/service/impl/JobServiceImpl.java
@@ -64,12 +64,9 @@ public class JobServiceImpl extends ServiceImpl<JobMapper, JobEntity> implements
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if(ObjectUtil.isNotEmpty(status.get("nodeStatus"))){
-            numMap.put("nodeStatus",status.get("nodeStatus"));
-        }
         R r = new R();
         r.put("data",numMap);
-        r.put("status",status.get("status"));
+        r.putAll(status);
         return r;
     }
 
diff --git a/src/main/java/com/mesa/reportservice/service/impl/ZookeeperServiceImpl.java b/src/main/java/com/mesa/reportservice/service/impl/ZookeeperServiceImpl.java
index 070231b..123235d 100644
--- a/src/main/java/com/mesa/reportservice/service/impl/ZookeeperServiceImpl.java
+++ b/src/main/java/com/mesa/reportservice/service/impl/ZookeeperServiceImpl.java
@@ -6,6 +6,7 @@ import com.mesa.reportservice.configuration.SchedulerProperties;
 import com.mesa.reportservice.configuration.ZookeeperProperties;
 import com.mesa.reportservice.service.ZookeeperService;
 import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.api.GetChildrenBuilder;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.data.Stat;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,15 +79,10 @@ public class ZookeeperServiceImpl implements ZookeeperService {
         Map<String, Object> status = new HashMap<>();
         status.put("status","UP");
         if (zookeeperProperties.getOpen() == 0) {
-            List<Map> nodeList = new ArrayList<>();
-            Map<String, Object> node = new HashMap<>();
             List<String> children = curatorConnect.getChildren().forPath("/");
             boolean isDown = true;
             for (String child : children) {
                 Stat stat = curatorConnect.checkExists().forPath("/" + child);
-                node.put("url",child);
-                node.put("status",stat != null?"UP":"DOWN");
-                nodeList.add(node);
                 if (stat != null) {
                     isDown = false;
                 }
@@ -94,7 +90,6 @@ public class ZookeeperServiceImpl implements ZookeeperService {
             if(isDown){
                 status.put("status","DOWN");
             }
-            status.put("nodeStatus",nodeList);
         }
         return status;
     }