Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-04-13 1bcef6a688ffbee58c347bbd87e1b5db08075041

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java

@@ -121,6 +121,22 @@
        return listLight;
    }

    /**
     * 获取单个路灯信息
     * @param deviceCode 设备码
     * @return
     */
    public Light getLight(String deviceCode) {
        Light one = getOne(Wrappers.<Light>lambdaQuery().eq(Light::getDeviceCode, deviceCode));
        Object o = redisService.get(LightKey.REPORT_MAC.key(deviceCode));
        if (o != null) {
            one.setOnlineStatus(1);
        }else {
            one.setOnlineStatus(0);
        }
        return one;
    }

    public boolean addRemark(LightRemarkParam param) {
        Light light = getById(param.getLightId());
        if (light == null) {