1. 修改遗漏bug。

Xiajijian

2025-12-13 9d770d2770d4332a36ffc0373abfd8939a418fa7

 ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java

@@ -1,9 +1,7 @@
package com.ard.sample.manage.service.impl;

import com.alibaba.fastjson2.JSON;
import com.ard.common.core.redis.RedisConst;
import com.ard.common.core.redis.RedisOpsUtils;
import com.ard.ossdock.service.impl.OssDockServiceContext;
import com.ard.sample.component.websocket.enums.MessageType;
import com.ard.sample.component.websocket.handler.DockWebSocketHandler;
import com.ard.sample.manage.model.dto.DeviceDTO;
@@ -34,11 +32,8 @@
    @Autowired
    protected ObjectMapper _objectMapper;

    @Resource
    private OssDockServiceContext _ossService;

    /**
     * 定时任务，每5秒取一次机场设备的在线状态，如已离线更新状态
     * 定时任务，每2秒取一次机场设备的在线状态，如已离线更新状态
     * */
    @Scheduled(cron = "0/2 * * * * ?")
    public void cronOnlineTask() {
@@ -49,7 +44,7 @@
            // 更新机场设备状态："3"-"设备已离线"，
            if(!_deviceService.checkDeviceOnline(device.getDeviceSn())){
                _deviceService.updateWorkType(device.getDeviceSn(), 3L);
                RedisOpsUtils.setWithExpire(RedisConst.OSD_STATUS_PREFIX + device.getDeviceSn(), 3, RedisConst.DEVICE_ALIVE_SECOND);
                RedisOpsUtils.set(RedisConst.OSD_STATUS_PREFIX + device.getDeviceSn(), 3);
                RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + device.getDeviceSn());
                RedisOpsUtils.del(RedisConst.COVER_STATE_PREFIX + device.getDeviceSn());
            }
@@ -62,9 +57,9 @@
    }

    /**
     * 定时任务，每5秒读一次redis的机场设备的状态，并发送到websocket客户端
     * 定时任务，每1秒读一次redis的机场设备的状态，并发送到websocket客户端
     * */
    @Scheduled(cron = "0/2 * * * * ?")
    @Scheduled(cron = "0/1 * * * * ?")
    public void sendDeviceStatus(){
        // 测试 机场oss读取文件
//        URL url = _ossService.getObjectUrl("kmz","/2025/11/25/新建航点航线(1)_20251125161322A001.kmz");
@@ -84,7 +79,7 @@
            String json = getJSONString(MessageType.STATE.getType(), device.getDeviceSn(), dockStatus, droneStatus);

            // 发送给websocket客户端
            _dockWebSocketHandler.sendMessageToSubscribers(device.getDeviceSn(), MessageType.STATE.getType(), json);
            _dockWebSocketHandler.sendMessageToSubscribers(device.getDeviceSn(), MessageType.STATE.getType(), json, "");
        }
    }