水肥机、墒情站、气象站增、改、查、删功能实现

liurunyu

2025-06-19 b042d6a5ae1959ad79b489e1d0b01c057b68d5f6

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/MqttSubMsgSdV1.java

@@ -24,8 +24,8 @@
    public MqttSubMsgSdV1(MqttTopic subTopic, String msg) {
        this.deviceId = subTopic.devId ;
        this.protocol = subTopic.protocol ;
        this.topic = subTopic.topic ;
        this.msg = msg ;
        this.topic = subTopic ;
        this.metaData = msg ;
    }
    public String toString(){
        StringBuilder sb = new StringBuilder();
@@ -35,24 +35,25 @@
                    .append("\n") ;
        }
        sb.append("主题:")
                .append(topic)
                .append("\n") ;
        sb.append("消息:")
                .append(msg)
                .append(topic.longName())
                .append("\n") ;
        if(vo4Up != null){
            sb.append("数据:")
                    .append(vo4Up.toString())
                    .append("\n") ;
        }else{
            sb.append("元数据:")
                    .append(metaData)
                    .append("\n") ;
        }

        return sb.toString() ;
    }

    public boolean subMsgMatchPubMsg(MqttPubMsg pubMsg){
        if (pubMsg instanceof MqttPubMsgSdV1) {
            MqttPubMsgSdV1 pubMsgSdV1 = (MqttPubMsgSdV1) pubMsg;
            //MqttPubMsgSdV1 pubMsgSdV1 = (MqttPubMsgSdV1) pubMsg;
            if(this.vo4Up != null && this.vo4Up instanceof StateVo){
                //只要上报的是状态数据，说明设备响应了命令
                return true ;
            }
        }
@@ -64,7 +65,7 @@
        if (topic == null || topic.isEmpty()) {
            return false;
        }
        if (msg == null || msg.isEmpty()) {
        if (metaData == null || metaData.isEmpty()) {
            return false;
        }
        return true;