2025-12-08 zwy 整理hms,设备拼接匹配规则；

zhaowenyu

2025-12-08 b20c288d812ff40acd5d3d9cc961aad6332f3f31

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

@@ -1,5 +1,6 @@
package com.ard.sample.manage.service.impl;

import com.ard.sample.manage.model.enums.DeviceDomainEnum;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -26,6 +27,7 @@
import com.ard.sample.manage.service.IDeviceHmsService;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.integration.mqtt.support.MqttHeaders;
@@ -47,6 +49,7 @@
 * @version 1.1
 * @date 2022/7/6
 */
@Slf4j
@Service
@Transactional
public class DeviceHmsServiceImpl implements IDeviceHmsService {
@@ -96,7 +99,7 @@
                new TypeReference<List<DeviceHmsReceiver>>() {})
                .forEach(hmsReceiver -> {
                    final DeviceHmsEntity hms = entity.clone();
                    this.fillEntity(hms, hmsReceiver);
                    this.fillEntity(hms, hmsReceiver, device);
                    // The same unread hms are no longer incremented.
                    if (hmsMap.contains(hms.getHmsKey())) {
                        return;
@@ -184,7 +187,10 @@

        return new PaginationData<DeviceHmsDTO>(deviceHmsList, new Pagination(pagination));

        // region 原代码注释备份一份

    }

    // region 原代码注释备份一份
//        LambdaQueryWrapper<DeviceHmsEntity> queryWrapper = new LambdaQueryWrapper<DeviceHmsEntity>()
//                .and(wrapper -> param.getDeviceSn().forEach(sn -> wrapper.eq(DeviceHmsEntity::getSn, sn).or()))
//                .between(param.getBeginTime() != null && param.getEndTime() != null,
@@ -208,8 +214,7 @@
//        List<DeviceHmsDTO> deviceHmsList = pagination.getRecords().stream().map(this::entity2Dto).collect(Collectors.toList());
//
//        return new PaginationData<DeviceHmsDTO>(deviceHmsList, new Pagination(pagination));
        // endregion
    }
    // endregion

    @Override
    public void updateUnreadHms(String deviceSn) {
@@ -238,8 +243,8 @@
                .module(entity.getModule())
                .messageEn(entity.getMessageEn())
                .messageZh(entity.getMessageZh())
                .in_the_sky(entity.getIn_the_sky())
                .device_type(entity.getDevice_type())
                .inTheSky(entity.getInTheSky())
                .deviceType(entity.getDeviceType())
                .build();
    }

@@ -248,23 +253,29 @@
     * @param dto
     * @param receiver
     */
    private void fillEntity(DeviceHmsEntity dto, DeviceHmsReceiver receiver) {
    private void fillEntity(DeviceHmsEntity dto, DeviceHmsReceiver receiver, DeviceDTO deviceDTO) {
        dto.setLevel(receiver.getLevel());
        dto.setModule(receiver.getModule());
        dto.setHmsId(UUID.randomUUID().toString());
        dto.setIn_the_sky(receiver.getInTheSky());
        dto.setDevice_type(receiver.getDeviceType());
        dto.setInTheSky(receiver.getInTheSky());
        dto.setDeviceType(receiver.getDeviceType());

        if (HmsEnum.DomainType.DRONE_NEST.getDomain().equals(receiver.getDomainType())) {
        if(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;
        }
//        if (HmsEnum.DomainType.DRONE_NEST.getDomain().equals(receiver.getDomainType())) {
//            dto.setHmsKey(HmsEnum.HmsFaqIdEnum.DOCK_TIP.getText() + receiver.getCode());
//            return;
//        }
        StringBuilder key = new StringBuilder(HmsEnum.HmsFaqIdEnum.FPV_TIP.getText()).append(receiver.getCode());

        if (receiver != null && HmsEnum.IN_THE_SKY.getVal() == (receiver.getInTheSky() != null ? receiver.getInTheSky() : -1)) {
            key.append(HmsEnum.IN_THE_SKY.getText());
        }
        dto.setHmsKey(key.toString());
        log.info("SN:{}的Hms匹配拼接规则值为：{}",deviceDTO.getDeviceSn(), key.toString());
    }

    /**