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;
@@ -1072,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();
@@ -1079,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())) {
@@ -1116,6 +1149,15 @@

    }

//    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;