粮情协议优化

vince

2024-04-26 b1c572949997a5d82d9b609163ff280a1c49627d

 src/main/java/com/fzzy/api/Constant.java

@@ -325,7 +325,7 @@

    public static ApiCommonDevice getCommonDeviceCache(String sn) {
        if (null == sn) return null;
        log.info("在线设备：" + JSON.toJSONString(contextDeviceMap));
        //log.info("在线设备：" + JSON.toJSONString(contextDeviceMap));
        return contextDeviceMap.get(sn);
    }

@@ -333,7 +333,7 @@
        if (null == ip) return null;

        if (contextDeviceMap.isEmpty()) return null;
        log.info("在线设备：" + JSON.toJSONString(contextDeviceMap));
        //log.info("在线设备：" + JSON.toJSONString(contextDeviceMap));
        for (ApiCommonDevice device : contextDeviceMap.values()) {
            if (ip.equals(device.getIp())) return device;
        }
@@ -360,6 +360,8 @@
        device.setStatus(Constant.YN_Y);
        device.setCode("SUCCESS");
        device.setMsg("设备上线");
        device.setSn(device.getSn());
        device.setId(device.getId());
        device.setOnlineTime(new Date());
        contextDeviceMap.put(device.getIp(), device);
        log.info("设备上线：" + ip);
@@ -377,6 +379,7 @@
        device.setStatus(Constant.YN_N);
        device.setCode("ERROR");
        device.setMsg("设备离线");
        device.setId(device.getId());
        contextDeviceMap.put(device.getIp(), device);

        return device;