Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2026-01-06 4e8a1c02b45f72f6377603778e8c8746ed82f374

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

@@ -274,7 +274,8 @@
        dto.setInTheSky(receiver.getInTheSky());
        dto.setDeviceType(receiver.getDeviceType());

        if(deviceDTO.getDomain() == DeviceDomainEnum.DOCK.getVal()) {
        // 不知道什么原因，在程序替换jar包重新启动时，报了个空指针异常，排查应该是因为 DeviceDTO对象为空，没有从redis中读取到设备信息。增加判断
        if(deviceDTO !=null && deviceDTO.getDomain() == DeviceDomainEnum.DOCK.getVal()) {
            dto.setHmsKey(HmsEnum.HmsFaqIdEnum.DOCK_TIP.getText() + receiver.getCode());
//            log.info("SN:{}的Hms匹配拼接规则值为：{}",deviceDTO.getDeviceSn(), HmsEnum.HmsFaqIdEnum.DOCK_TIP.getText() + receiver.getCode());
            return;