优化架次和媒体

liusuyi

2025-12-26 c5695db0d767fea3a24ecb1757a832314a3aa382

 ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java

@@ -10,12 +10,17 @@
import com.ard.system.authorize.service.AuthorizeService;
import com.ard.work.domain.dto.BoxSettingsDTO;
import com.ard.work.domain.entity.ArdDroneInfo;
import com.ard.work.domain.entity.ArdServerInfo;
import com.ard.work.domain.event.DeviceStatusEvent;
import com.ard.work.domain.receiver.BoxInfoReceiver;
import com.ard.work.domain.receiver.BoxStreamUrlReceiver;
import com.ard.work.mapper.ArdDroneInfoMapper;
import com.ard.work.service.IArdDroneInfoService;
import com.ard.work.service.IArdServerInfoService;
import com.ard.work.service.ITyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;

@@ -45,6 +50,13 @@

    @Resource
    private RedisCache redisCache;

    @Autowired
    private IArdServerInfoService ardServerInfoService;

    // 自动注入 ApplicationEventPublisher
    @Autowired
    private ApplicationEventPublisher eventPublisher;

    /**
     * 查询无人机盒子
@@ -113,7 +125,8 @@
     */
    @Override
    public int updateArdDrone(ArdDroneInfo ArdDroneInfo) {
        Boolean b = tyService.updateBoxSettings(BoxSettingsDTO.builder().boxSn(ArdDroneInfo.getBoxSn()).boxName(ArdDroneInfo.getBoxName()).build());
        Boolean b =
                tyService.updateBoxSettings(BoxSettingsDTO.builder().boxSn(ArdDroneInfo.getBoxSn()).boxName(ArdDroneInfo.getBoxName()).build());
        if (!b) {
            throw new ServiceException("修改无人机盒子名称失败");
        }
@@ -151,7 +164,7 @@
     * @return 成功插入的记录数
     */
    @Override
    public int insertArdDroneLs(String[] boxSn, Long deptId) {
    public int insertArdDroneLs(String[] boxSn,Long deptId,String serverId) {
        // 参数校验
        if (boxSn == null || boxSn.length == 0) {
            log.warn("传入的盒子编码为空");
@@ -163,10 +176,12 @@
        try {
            // 1. 检查已存在的无人机盒子
            List<ArdDroneInfo> existingDrones = getExistingDrones(boxSn);
            // 1.1 新增时不能添加重复的boxSn
            checkDuplicateBox(existingDrones, boxSn);
            // 2. 授权数量验证
            validateAuthorization(existingDrones.size(), boxSn.length);
            // 3. 获取并组装新的无人机信息
            List<ArdDroneInfo> newDrones = assembleNewDrones(boxSn, deptId);
            List<ArdDroneInfo> newDrones = assembleNewDrones(boxSn,deptId,serverId);
            // 4. 批量插入
            return batchInsertDrones(newDrones);
        } catch (Exception e) {
@@ -191,6 +206,29 @@
                .map(ArdDroneInfoMapper::selectArdDroneByBoxSn)
                .filter(Objects::nonNull)
                .collect(Collectors.toList());
    }

    /**
     * 检查是否有重复的盒子编码
     */
    private void checkDuplicateBox(List<ArdDroneInfo> existingDrone,String[] boxSn) {
        Set<String> existingBoxSnSet = new HashSet<>();
        for (ArdDroneInfo droneInfo : existingDrone) {
            existingBoxSnSet.add(droneInfo.getBoxSn());
        }

        // 检查是否有重复的盒子编码
        List<String> duplicateBoxSns = new ArrayList<>();
        for (String sn : boxSn) {
            if (existingBoxSnSet.contains(sn)) {
                duplicateBoxSns.add(sn);
            }
        }

        if (!duplicateBoxSns.isEmpty()) {
            log.warn("存在重复的无人机盒子编码: {}", duplicateBoxSns);
            throw new ServiceException("以下无人机盒子编码已存在: " + String.join(", ", duplicateBoxSns));
        }
    }

    /**
@@ -223,19 +261,19 @@
    /**
     * 组装新的无人机信息
     */
    private List<ArdDroneInfo> assembleNewDrones(String[] boxSn, Long deptId) {
    private List<ArdDroneInfo> assembleNewDrones(String[] boxSn,Long deptId,String serverId) {
        List<BoxInfoReceiver> allBoxes = tyService.getBoxList();
        Set<String> targetBoxSnSet = new HashSet<>(Arrays.asList(boxSn));
        return allBoxes.stream()
                .filter(box -> targetBoxSnSet.contains(box.getBoxSn()))
                .map(box -> createDroneInfo(box, deptId))
                .map(box -> createDroneInfo(box, deptId, serverId))
                .collect(Collectors.toList());
    }

    /**
     * 创建无人机信息对象
     */
    private ArdDroneInfo createDroneInfo(BoxInfoReceiver box, Long deptId) {
    private ArdDroneInfo createDroneInfo(BoxInfoReceiver box, Long deptId ,String serverId) {
        ArdDroneInfo drone = new ArdDroneInfo();
        drone.setId(IdUtils.simpleUUID());
        drone.setBoxSn(box.getBoxSn());
@@ -246,21 +284,13 @@
        drone.setVideoPort(box.getVideoPort());
        drone.setLastTaskId(box.getLastTaskId());
        drone.setDeptId(deptId);

        // 设置创建信息和更新信息
        setCreateAndUpdateInfo(drone);

        drone.setCreateTime(new Date());
        drone.setUpdateTime(new Date());
        drone.setServerId(serverId);
        drone.setBoxVersion(box.getBoxVersion());
        return drone;
    }

    /**
     * 设置创建和更新信息
     */
    private void setCreateAndUpdateInfo(ArdDroneInfo drone) {
        Date currentTime = new Date();
        drone.setCreateTime(currentTime);
        drone.setUpdateTime(currentTime);
    }

    /**
     * 批量插入无人机信息
@@ -275,48 +305,89 @@
    /**
     * 同步盒子属性
     */
    @Scheduled(fixedRate = 1000 * 5)
    @Scheduled(fixedRate = 5000)
    public void syncBoxInfo() {
        List<ArdDroneInfo> localList = selectArdDroneList(new ArdDroneInfo() {{
            setUseDataScope(false);
        }});
        Map<String, ArdDroneInfo> localMap = localList.stream()
                .collect(Collectors.toMap(ArdDroneInfo::getBoxSn, drone -> drone));
        ArdServerInfo ardServerInfo = new ArdServerInfo();
        ardServerInfo.setUseDataScope(false);
        List<ArdServerInfo> servers = ardServerInfoService.selectArdServerInfoList(ardServerInfo);

        tyService.getBoxList().forEach(remote -> {
            String boxSn = remote.getBoxSn();
        for (ArdServerInfo server : servers) {
            ArdDroneInfo droneInfo = new ArdDroneInfo();
            droneInfo.setServerId(server.getId());
            droneInfo.setUseDataScope(false);
            List<ArdDroneInfo> localList = selectArdDroneList(droneInfo);
            Map<String, ArdDroneInfo> localMap = localList.stream().collect(Collectors.toMap(ArdDroneInfo::getBoxSn,
                    d -> d));
            List<BoxInfoReceiver> boxList = tyService.getBoxList(server.getId());
            // server 没有返回设备列表 → 全部离线
            if (boxList == null || boxList.isEmpty()) {
                for (ArdDroneInfo local : localList) {
                    if (local.getOnLine() != 0) { // 仅当状态变化才更新
                        local.setOnLine(0);
                        ArdDroneInfoMapper.updateArdDrone(local);
                        eventPublisher.publishEvent(new DeviceStatusEvent(local.getBoxSn(), false));
                        redisCache.deleteObject(CacheConstants.UAV_ONLINE_KEY + local.getBoxSn());
                    }
                }
                continue;
            }
            // server 返回设备列表 →  通过缓存判断状态
            for (BoxInfoReceiver remote : boxList) {
                String boxSn = remote.getBoxSn();
                String redisKey = CacheConstants.UAV_ONLINE_KEY + boxSn;
                boolean currentOnline = remote.getOnLine() == 1;

            // ✅ 维护在线状态缓存
            // 只有在线的无人机才存 Redis
            String redisKey = CacheConstants.UAV_ONLINE_KEY + boxSn;
            if (remote.getOnLine() == 1) {
                redisCache.setCacheObject(redisKey, remote, 30, TimeUnit.SECONDS);
            } else {
                redisCache.deleteObject(CacheConstants.UAV_ONLINE_KEY + boxSn);
                ArdDroneInfo local = localMap.get(boxSn);
                boolean dbOnline = local != null && local.getOnLine() == 1;
                boolean needUpdate = (dbOnline != currentOnline);

                // 如果状态变化才更新
                if (needUpdate){
                    // 更新 Redis
                    if (currentOnline) {
                        redisCache.setCacheObject(redisKey, remote);
                    } else {
                        redisCache.deleteObject(redisKey);
                    }
                    // 发布事件
                    eventPublisher.publishEvent(new DeviceStatusEvent(boxSn, currentOnline));
                    // 更新数据库
                    if (local != null) {
                        local.setOnLine(currentOnline ? 1 : 0);
                        updateArdDrone(local);
                    }
                }
            }
            // 数据库同步
            ArdDroneInfo local = localMap.get(boxSn);
            if (local != null && !local.isSameAs(remote)) {
                updateChangedAttributes(local, remote);
                updateArdDrone(local);
            }
        });
        }
    }

    // 更新变化的属性
    private void updateChangedAttributes(ArdDroneInfo localBoxInfo, BoxInfoReceiver remoteArdDrone) {

    /**
     * 更新 localBoxInfo 的字段，如果有变化返回 true，否则返回 false
     */
    private boolean updateChangedAttributes(ArdDroneInfo localBoxInfo, BoxInfoReceiver remoteArdDrone) {
        boolean changed = false;

        if (!Objects.equals(localBoxInfo.getBoxName(), remoteArdDrone.getBoxName())) {
            localBoxInfo.setBoxName(remoteArdDrone.getBoxName());
            changed = true;
        }
        if (!Objects.equals(localBoxInfo.getBoxVersion(), remoteArdDrone.getBoxVersion())) {
            localBoxInfo.setBoxVersion(remoteArdDrone.getBoxVersion());
            changed = true;
        }
        if (!Objects.equals(localBoxInfo.getLastTaskId(), remoteArdDrone.getLastTaskId())) {
            localBoxInfo.setLastTaskId(remoteArdDrone.getLastTaskId());
            changed = true;
        }
        if (!Objects.equals(localBoxInfo.getOnLine(), remoteArdDrone.getOnLine())) {
            localBoxInfo.setOnLine(remoteArdDrone.getOnLine());
            changed = true;
        }
        // 更新其他属性

        // TODO: 更新其他属性时，如果变化也设置 changed = true

        return changed;
    }

}