pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java
@@ -26,13 +26,13 @@
            txt += "蓄电池电压报警" ;
        }
        if(meter != null && meter == 1){
            txt += ",流量计故障报警" ;
            txt += "、流量计故障报警" ;
        }
        if(valve != null && valve == 1){
            txt += ",阀门故障报警" ;
            txt += "、阀门故障报警" ;
        }
       if(loss != null && loss == 1){
            txt += ",漏损报警" ;
            txt += "、漏损报警" ;
        }
        return txt ;
    }
@@ -41,16 +41,16 @@
        StringBuilder str = new StringBuilder() ;
        str.append("      报警:\n");
        str.append("         蓄电池电压:");
        str.append(batteryVolt==null?"":(batteryVolt==1?"报警":"正常"));
        str.append(batteryVolt==null?"":(batteryVolt==1?"报警(1)":"正常(0)"));
        str.append("\n");
        str.append("         漏损:     ");
        str.append(loss==null?"":(loss==1?"报警":"正常"));
        str.append(loss==null?"":(loss==1?"报警(1)":"正常(0)"));
        str.append("\n");
        str.append("         流量计故障:");
        str.append(meter==null?"":(meter==1?"报警":"正常"));
        str.append(meter==null?"":(meter==1?"报警(1)":"正常(0)"));
        str.append("\n");
        str.append("         阀门:     ");
        str.append(valve==null?"":(valve==1?"报警":"正常"));
        str.append(valve==null?"":(valve==1?"报警(1)":"正常(0)"));
        return str.toString() ;
    }
}