1、发送钉钉的报警消息中去除漏损报警； 2、漏损报警消息产生与发送放于定时报中，漏损量大于配置值时才报警，并把漏损量一并发送出去。

liurunyu

2024-10-10 880273d6b3687ea601ddb6d46acb9b660a9f76de

 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java

@@ -109,19 +109,19 @@
            po.intakeId = controller==null?null:controller.getIntakeId() ;
            po.rtuAddr = rtuAddr ;
            po.valueFrom(dV1_0_1, rtuDt, alarmVo, stateVo);
            if(alarmVo.hasAlarm()){
            if(alarmVo.hasAlarmExcludeLoss()){
                po.sendMsTime = System.currentTimeMillis() ;
                this.sendMessage(controller, alarmVo);
            }
            sv.saveRmAlarmStateLast(po) ;
        }else{
            if(po.sendMsTime == null){
                if(alarmVo.hasAlarm()) {
                if(alarmVo.hasAlarmExcludeLoss()) {
                    po.sendMsTime = System.currentTimeMillis();
                    this.sendMessage(controller, alarmVo);
                }
            }else{
                if(alarmVo.hasAlarm()){
                if(alarmVo.hasAlarmExcludeLoss()){
                    Long now = System.currentTimeMillis() ;
                    if(((now - po.sendMsTime) / (1000 * 60)) > ServerProperties.sendDingDingAlarmMsInterval){
                        //大于规定的间隔时间
@@ -171,7 +171,7 @@
     * @param alarmVo
     */
    private void sendMessage(PrController controller, DataAlarmVo alarmVo){
        String ms = "取水口“" + controller.getIntakeName() + "”产生报警：" + alarmVo.alarmContent() ;
        String ms = "取水口“" + controller.getIntakeName() + "”产生报警：" + alarmVo.alarmContentExcludeLoss() ;
        try{
            SendMsCache.cacheMs(ms);
        }catch (Exception e){