2025-11-6 zwy 调整静音模式功能BUG

zhaowenyu

2025-11-06 3eb98b88c32d8c50d096d59c1b71e6bcfe8f074a

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

@@ -36,6 +36,7 @@
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -351,6 +352,7 @@
        // subDevice.setPayloadsList(payloadService.getDevicePayloadEntitiesByDeviceSn(gateway.getChildDeviceSn()));
    }

    //region 单独写一个方法做权限验证，由于有好多定时任务也在实时获取设备列表，原方法不适用再添加权限注解
    @Override
    public List<DeviceDTO> getDockList() {
        List<DeviceDTO> devicesList = this.getDockListByParams(
@@ -368,27 +370,21 @@

    @Override
    public void spliceDeviceTopoPer(DeviceDTO gateway) {

        gateway.setStatus(RedisOpsUtils.checkExist(RedisConst.DEVICE_ONLINE_PREFIX + gateway.getDeviceSn()));

        // sub device
        if (!StringUtils.hasText(gateway.getChildDeviceSn())) {
            return;
        }

        DeviceDTO subDevice =
                getDevicesByParams(DeviceQueryParam.builder().deviceSn(gateway.getChildDeviceSn()).build()).get(0);
        subDevice.setStatus(RedisOpsUtils.checkExist(RedisConst.DEVICE_ONLINE_PREFIX + subDevice.getDeviceSn()));
        gateway.setChildren(subDevice);

        // payloads
        // subDevice.setPayloadsList(payloadService.getDevicePayloadEntitiesByDeviceSn(gateway.getChildDeviceSn()));
    }

    //@DataScope(deptAlias = "d")

    @Override
    public List<DeviceDTO> getDockListByParams(DeviceQueryParam param){

        // 在mapper中添加查询方法做权限验证
        return mapper.selectListPer(
                        new LambdaQueryWrapper<DeviceEntity>()
                                .eq(StringUtils.hasText(param.getDeviceSn()),
@@ -412,6 +408,7 @@
                .map(this::deviceEntityConvertToDTO)
                .collect(Collectors.toList());
    }
    //endregion

    @Override
    public Optional<TopologyDeviceDTO> getDeviceTopoForPilot(String sn) {
@@ -1076,6 +1073,16 @@
            this.deviceOnePropertySet(topic, propertyEnum, Map.entry(propertyEnum.getProperty(), param));
            return;
        }

        if(param.size()==1){
            this.deviceOnePropertySetSilent(topic,propertyEnum,param);
            return;
        }
//        if(Objects.equals(param.fieldNames().next(), "silent_mode"))
//        {
//            this.deviceOnePropertySet(topic, propertyEnum, Map.entry(propertyEnum.getProperty(), param.get("silent_mode")));
//            return;
//        }
        // If there are multiple parameters, set them separately.
        for (Iterator<Map.Entry<String, JsonNode>> filed = param.fields(); filed.hasNext(); ) {
            Map.Entry<String, JsonNode> node = filed.next();
@@ -1083,12 +1090,34 @@
            if (!isPublish) {
                continue;
            }

            this.deviceOnePropertySet(topic, propertyEnum, Map.entry(propertyEnum.getProperty(), node));
        }

    }

    /**
     * 为静音模式单独列出来一个方法，只有一个值的时候都可以调用，不限于静音模式
     * */
    @Override
    public void deviceOnePropertySetSilent(String topic, DeviceSetPropertyEnum propertyEnum,
                                     JsonNode value) {
//        if (Objects.isNull(value) || Objects.isNull(value.getValue())) {
//            throw new IllegalArgumentException(CommonErrorEnum.ILLEGAL_ARGUMENT.getErrorMsg());
//        }

        Map reply = messageSender.publishWithReply(
                Map.class, topic,
                CommonTopicResponse.builder()
                        .bid(UUID.randomUUID().toString())
                        .tid(UUID.randomUUID().toString())
                        .timestamp(System.currentTimeMillis())
                        .data(value)
                        .build(),
                2);
    }

        @Override
    public void deviceOnePropertySet(String topic, DeviceSetPropertyEnum propertyEnum,
                                     Map.Entry<String, Object> value) {
        if (Objects.isNull(value) || Objects.isNull(value.getValue())) {
@@ -1105,21 +1134,30 @@
                        .build(),
                2);

        while (true) {
            reply = (Map<String, Object>) reply.get(value.getKey());
            if (value.getValue() instanceof JsonNode) {
                break;
            }
            value = (Map.Entry) value.getValue();
        }

        SetReply setReply = objectMapper.convertValue(reply, SetReply.class);
        if (SetReplyStatusResultEnum.SUCCESS.getVal() != setReply.getResult()) {
            throw new RuntimeException("Failed to set " + value.getKey() + "; Error Code: " + setReply.getResult());
        }
// 接收返回信息在serviceReply中，订阅thing/product/7CTDLCE00A1UPE/property/set_reply上报的信息，此处不处理
//        while (true) {
//            reply = (Map<String, Object>) reply.get(value.getKey());
//            if (value.getValue() instanceof JsonNode) {
//                break;
//            }
//            value = (Map.Entry) value.getValue();
//        }
//        SetReply setReply = objectMapper.convertValue(reply, SetReply.class);
//        if (SetReplyStatusResultEnum.SUCCESS.getVal() != setReply.getResult()) {
//            throw new RuntimeException("Failed to set " + value.getKey() + "; Error Code: " + setReply.getResult());
//        }

    }

//    public JsonNode getJsonNode(JsonNode jsonNode) {
//        ObjectNode parentNode = objectMapper.createObjectNode();
//        parentNode.put("bid", UUID.randomUUID().toString());
//        parentNode.set("data", jsonNode);
//        parentNode.put("tid", UUID.randomUUID().toString());
//        parentNode.put("timestamp", System.currentTimeMillis());
//        return parentNode;
//    }

    @Override
    public Boolean checkDeviceOnline(String sn) {
        String key = RedisConst.DEVICE_ONLINE_PREFIX + sn;