From 429bc159b230ed31092aed3b8c4893c20e52f5c6 Mon Sep 17 00:00:00 2001 From: Junjie <xjj@123> Date: 星期六, 16 三月 2024 15:47:02 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java | 5 +++++ src/main/java/com/zy/asrs/controller/MonitorController.java | 13 ++++++++----- src/main/java/com/zy/core/thread/NyShuttleThread.java | 2 ++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java index 45b88d9..8751548 100644 --- a/src/main/java/com/zy/asrs/controller/MonitorController.java +++ b/src/main/java/com/zy/asrs/controller/MonitorController.java @@ -319,11 +319,14 @@ } HashMap<String, Object> map = new HashMap<>(); if (shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.OFFLINE)) { - //璁惧绂荤嚎涓� - map.put("deviceNo", shuttleProtocol.getShuttleNo());//璁惧鍙�-灏忚溅鍙� - map.put("errorMsg", "璁惧绂荤嚎");//寮傚父淇℃伅 - map.put("device", "鍥涘悜杞�");//寮傚父淇℃伅 - list.add(map); + if (System.currentTimeMillis() - shuttleProtocol.getLastOnlineTime() > 1000 * 60 * 5) { + //绂荤嚎瓒呰繃浜斿垎閽� + //璁惧绂荤嚎涓� + map.put("deviceNo", shuttleProtocol.getShuttleNo());//璁惧鍙�-灏忚溅鍙� + map.put("errorMsg", "璁惧绂荤嚎");//寮傚父淇℃伅 + map.put("device", "鍥涘悜杞�");//寮傚父淇℃伅 + list.add(map); + } } if (shuttleProtocol.getErrState() == 1) { diff --git a/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java index 9961293..4e60dab 100644 --- a/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java +++ b/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java @@ -254,6 +254,11 @@ */ private Long deviceDataLog = System.currentTimeMillis(); + /** + * 鏈�杩戜竴娆″湪绾挎椂闂� + */ + private Long lastOnlineTime = System.currentTimeMillis(); + //鎬婚噷绋嬫暟 @Data public static class StatusSumClass { diff --git a/src/main/java/com/zy/core/thread/NyShuttleThread.java b/src/main/java/com/zy/core/thread/NyShuttleThread.java index d5f4ae2..c382847 100644 --- a/src/main/java/com/zy/core/thread/NyShuttleThread.java +++ b/src/main/java/com/zy/core/thread/NyShuttleThread.java @@ -172,6 +172,8 @@ shuttleProtocol.setStatusSum(jsonObject.getObject("statusSum", NyShuttleProtocol.StatusSumClass.class)); //闈炶嚜鍔ㄧ姸鎬佹椂闂磋鏃� shuttleProtocol.setErrTime(jsonObject.getInteger("errTime")); + //鏈�杩戜竴娆″湪绾挎椂闂� + shuttleProtocol.setLastOnlineTime(System.currentTimeMillis()); //灏忚溅澶勪簬杩愯涓紝灏嗘爣璁扮疆涓篺alse if (shuttleProtocol.getFree() == 0) { -- Gitblit v1.9.1