#
Junjie
2024-03-16 429bc159b230ed31092aed3b8c4893c20e52f5c6
#
3个文件已修改
20 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/MonitorController.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/NyShuttleThread.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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) {
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 {
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());
                //小车处于运行中,将标记置为false
                if (shuttleProtocol.getFree() == 0) {