湖北水库项目
parent: 57531a57 | patch | commit | ignore whitespace
aix
2024-07-23 4473911c8f1040b72fa91bfe62c7dc247376f9ff 
预警规则修改成预警记录生成，站内信在指定时间生效
2 files modified
137 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java 64 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java 73 ●●●●● patch | view | raw | blame | history 
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java


@@ -16,6 +16,7 @@


import org.springframework.scheduling.annotation.Async;


import org.springframework.stereotype.Component;




import java.time.LocalTime;


import java.util.HashMap;


import java.util.List;


import java.util.Map;


@@ -165,6 +166,8 @@


                    list.add(alarmRecord.getId().toString());


                }


            }




            if(!isTimeSend()) return;


            // 保存站内信记录信息


            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);


        }


@@ -518,6 +521,8 @@


                    list.add(alarmRecord.getId().toString());


                }


            }




            if(!isTimeSend()) return map;


            List<String> list = noticeHandle.createOutCallTaskByAlarm(smsRequestTemplate);


            map.put("list", list);


            // 调用短信服务


@@ -564,6 +569,8 @@


                    list.add(alarmRecord.getId().toString());


                }


            }




            if (!isTimeSend()) return;


            // 保存站内信记录信息


            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);


        }


@@ -1093,7 +1100,7 @@


                }


            }


            //如果参数是day，表示是每天生成告警，不需要发信息


            if (isDay.equals("day")) return map;


            if (isDay.equals("day") || !isTimeSend()) return map;


            map = smsService.sendSignMsgMergeCd(smsRequestTemplate);


            // 调用短信服务


            return map;


@@ -1122,7 +1129,7 @@


            }




            //如果参数是day，表示是每天生成告警，不需要发信息


            if (isDay.equals("day")) return;


            if (isDay.equals("day") || !isTimeSend()) return;


            // 保存站内信记录信息


            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);




@@ -1146,7 +1153,7 @@


                }


            }


            //如果参数是day，表示是每天生成告警，不需要发信息


            if (isDay.equals("day")) return;


            if (isDay.equals("day") || !isTimeSend()) return;


            // 需要合并水库保存站内信记录信息


            noticeHandle.saveInStationInfoMerge(smsRequestTemplate, alarmRule);


        }


@@ -1274,7 +1281,7 @@


                    list.add(alarmRecord.getId().toString());


                }


            }


            if (isDay.equals("day")) return;


            if (isDay.equals("day") || !isTimeSend()) return;


            // 保存站内信记录信息


            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);


        }


@@ -1349,7 +1356,7 @@


                    list.add(alarmRecord.getId().toString());


                }


            }


            if (isDay.equals("day")) return;


            if (isDay.equals("day") || !isTimeSend()) return;


            // 保存站内信记录信息


            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);


        }


@@ -1422,7 +1429,7 @@


                    list.add(alarmRecord.getId().toString());


                }


            }


            if (isDay.equals("day")) return;


            if (isDay.equals("day") || !isTimeSend()) return;


            // 保存站内信记录信息


            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);


        }


@@ -1494,7 +1501,7 @@


                    list.add(alarmRecord.getId().toString());


                }


            }


            if (isDay.equals("day")) return;


            if (isDay.equals("day") || !isTimeSend()) return;


            // 保存站内信记录信息


            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);


        }


@@ -1568,7 +1575,7 @@


                    list.add(alarmRecord.getId().toString());


                }


            }


            if (isDay.equals("day")) return;


            if (isDay.equals("day") || !isTimeSend()) return;


            // 保存站内信记录信息


            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);


        }


@@ -1674,7 +1681,7 @@


                    list.add(alarmRecord.getId().toString());


                }


            }


            if (isDay.equals("day")) return;


            if (isDay.equals("day") || !isTimeSend()) return;


            // 保存站内信记录信息


            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);


        }


@@ -1765,7 +1772,7 @@


                    list.add(alarmRecord.getId().toString());


                }


            }


            if (isDay.equals("day")) return;


            if (isDay.equals("day") || !isTimeSend()) return;


            // 保存站内信记录信息


            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);


        }


@@ -1848,7 +1855,7 @@


                    list.add(alarmRecord.getId().toString());


                }


            }


            if (isDay.equals("day")) return;


            if (isDay.equals("day") || !isTimeSend()) return;


            // 保存站内信记录信息


            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);


        }


@@ -1933,7 +1940,7 @@


                    list.add(alarmRecord.getId().toString());


                }


            }


            if (isDay.equals("day")) return;


            if (isDay.equals("day") || !isTimeSend()) return;


            // 保存站内信记录信息


            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);


        }


@@ -2017,7 +2024,7 @@


                    list.add(alarmRecord.getId().toString());


                }


            }


            if (isDay.equals("day")) return;


            if (isDay.equals("day") || !isTimeSend()) return;


            // 保存站内信记录信息


            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);


        }


@@ -2109,7 +2116,7 @@


                    list.add(alarmRecord.getId().toString());


                }


            }


            if (isDay.equals("day")) return;


            if (isDay.equals("day") || !isTimeSend()) return;


            // 保存站内信记录信息


            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);


        }


@@ -2189,7 +2196,7 @@


                }


            }


            //如果参数是day，表示是每天生成告警，不需要发信息


            if (isDay.equals("day")) return;


            if (isDay.equals("day") || !isTimeSend()) return;


            // 保存站内信记录信息


            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);


        }


@@ -2275,7 +2282,7 @@


                }


            }


            //如果参数是day，表示是每天生成告警，不需要发信息


            if (isDay.equals("day")) return;


            if (isDay.equals("day") || !isTimeSend()) return;


            // 保存站内信记录信息


            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);


        }


@@ -2307,7 +2314,7 @@


                }


            }


            //如果参数是day，表示是每天生成告警，不需要发信息


            if (isDay.equals("day")) return;


            if (isDay.equals("day") || !isTimeSend()) return;


            // 保存站内信记录信息


            noticeHandle.saveInStationInfoMergeNoCd(smsRequestTemplate, alarmRule);


        }


@@ -2341,7 +2348,7 @@


            }




            //如果参数是day，表示是每天生成告警，不需要发信息


            if (isDay.equals("day")) return;


            if (isDay.equals("day") || !isTimeSend()) return;


            // 保存站内信记录信息


            noticeHandle.saveInStationInfoMergeVideo(smsRequestTemplate, alarmRule);


        }


@@ -2442,9 +2449,28 @@


            }




            //如果参数是day，表示是每天生成告警，不需要发信息


            if (isDay.equals("day")) return;


            if (isDay.equals("day") || !isTimeSend()) return;


            // 保存站内信记录信息


            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);


        }


    }




    /**


     * 是否在时间范围内发送


     * @return


     */


    private boolean isTimeSend(){


        boolean flag = false;


        // 判断时间范围


        // 开始时间


        LocalTime startTime = LocalTime.parse("08:00");


        // 结束时间


        LocalTime endTime = LocalTime.parse("22:00");


        // 当前时间


        LocalTime now = LocalTime.now();


        // 比较


        flag = !now.isBefore(startTime) && !now.isAfter(endTime);


        // 返回


        return flag;


    }


}




 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java


@@ -186,7 +186,7 @@


                // 遍历


                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {


                    // 电话，站内信需满足规定时间范围内才发送


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.waterComeOverHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.waterComeOverList, true, adCode, true);


                    }


                }


@@ -360,7 +360,7 @@


//                        asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList2,true, adCode, false,uuid);


//                    }


                    // 电话，站内信需满足规定时间范围内才发送


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.waterComeDesignHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.waterComeDesignList3, true, adCode, true, uuid);


                    }


                }


@@ -647,7 +647,7 @@


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.sixHourRainHandle(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.sixHourRainList, false, adCode, false, uuid);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("电话") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("电话")) {


                        asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, whztData,ZtApiDataColumnConstant.sixHourRainList,false, adCode, false,uuid);


                    }


                }


@@ -680,7 +680,7 @@


            if (alarmRuleDetailList.size() > 0) {


                // 遍历


                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {


                    if (alarmRuleDetail.getAlarmMode().equals("短信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.damSafetyHandle(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.damSafetyList, true, adCode, false, uuid,arg2);


                    }


                }


@@ -716,7 +716,7 @@


            if (alarmRuleDetailList.size() > 0) {


                // 遍历


                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetySyHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetySyList, true, adCode, true, uuid,arg2);


                    }


                }


@@ -754,7 +754,7 @@


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.damSafetyHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, false, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid,arg2);


                    }


                }


@@ -790,7 +790,7 @@


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.damSafetyHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, false, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid,arg2);


                    }


                }


@@ -826,7 +826,7 @@


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.damSafetyHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, true, adCode, false, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid,arg2);


                    }


                }


@@ -861,7 +861,7 @@


            if (alarmRuleDetailList.size() > 0) {


                // 遍历


                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetySyDataMissingHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syDataMissingList, false, adCode, true, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("短信")){


@@ -897,7 +897,7 @@


            if (alarmRuleDetailList.size() > 0) {


                // 遍历


                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetySyDataMissingHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.bxDataMissingList, false, adCode, true, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("短信")){


@@ -938,7 +938,7 @@


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.damSafetySyLessThenPipeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syLessThenPipe, true, adCode, false, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetySyLessThenPipeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syLessThenPipe, true, adCode, true, uuid,arg2);


                    }


                }


@@ -980,7 +980,7 @@


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.damSafetySyHigherThenNozzleHandleSms(alarmRule, alarmRuleDetail, resultData,ZtApiDataColumnConstant.syHigherThenNozzle,true, adCode, false,uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetySyHigherThenNozzleHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenNozzle, true, adCode, true, uuid,arg2);


                    }


                }


@@ -1020,7 +1020,7 @@


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.damSafetySyHigherThenBdElevationHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenBdElevation, true, adCode, false, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetySyHigherThenBdElevationHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenBdElevation, true, adCode, true, uuid,arg2);


                    }


                }


@@ -1058,7 +1058,7 @@


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.damSafetySyHigherThenWaterLevelHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenWaterLevel, true, adCode, false, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetySyHigherThenWaterLevelHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenWaterLevel, true, adCode, true, uuid,arg2);


                    }


                }


@@ -1100,7 +1100,7 @@


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.damSafetySyYellowChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syYellowRzChange, true, adCode, false, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetySyYellowChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syYellowRzChange, true, adCode, true, uuid,arg2);


                    }


                }


@@ -1139,7 +1139,7 @@


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.damSafetySyOrangeChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syOrangeRzChange, true, adCode, false, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetySyOrangeChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syOrangeRzChange, true, adCode, true, uuid,arg2);


                    }


                }


@@ -1178,7 +1178,7 @@


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.damSafetySyRedChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRedRzChange, true, adCode, false, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetySyRedChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRedRzChange, true, adCode, true, uuid,arg2);


                    }


                }


@@ -1216,7 +1216,7 @@


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.damSafetySyRz1hChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRz1hChange, true, adCode, false, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetySyRz1hChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRz1hChange, true, adCode, true, uuid,arg2);


                    }


                }


@@ -1255,7 +1255,7 @@


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.damSafetyWyOver2Less5HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver2Less5, true, adCode, false, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetyWyOver2Less5HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver2Less5, true, adCode, true, uuid,arg2);


                    }


                }


@@ -1296,7 +1296,7 @@


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.damSafetyWyOver5Less10HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver5Less10, true, adCode, false, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetyWyOver5Less10HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver5Less10, true, adCode, true, uuid,arg2);


                    }


                }


@@ -1338,7 +1338,7 @@


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.damSafetyWyOver10HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver10, true, adCode, false, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetyWyOver10HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver10, true, adCode, true, uuid,arg2);


                    }


                }


@@ -1377,7 +1377,7 @@


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.damSafetyWy1hChangeOver10HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, false, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetyWy1hChangeOver10HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, true, uuid,arg2);


                    }


                }


@@ -1419,7 +1419,7 @@


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.slOverLess, true, adCode, false, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.slOverLess, true, adCode, true, uuid,arg2);


                    }


                }


@@ -1460,7 +1460,7 @@


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.slOverLess, true, adCode, false, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.slOverLess, true, adCode, true, uuid,arg2);


                    }


                }


@@ -1503,7 +1503,7 @@


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


                        asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.slOverLess, true, adCode, false, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.slOverLess, true, adCode, true, uuid,arg2);


                    }


                }


@@ -1535,7 +1535,7 @@


            if (alarmRuleDetailList.size() > 0) {


                // 遍历


                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.videoOfflineHandleStation(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.videoOffline, false, adCode, true, uuid,arg2);


                    }


                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {


@@ -1571,7 +1571,7 @@


            if (alarmRuleDetailList.size() > 0) {


                // 遍历


                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {


                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {


                        asyncNoticeHandle.topLevOfFloAlertHandleStation(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.topLevOfFloAlertList, true, adCode, true, uuid,arg2);


                    }


                }


@@ -1896,22 +1896,5 @@


        return result;


    }




    /**


     * 是否在时间范围内发送


     * @return


     */


    public boolean isTimeSend(){


        boolean flag = false;


        // 判断时间范围


        // 开始时间


        LocalTime startTime = LocalTime.parse("08:00");


        // 结束时间


        LocalTime endTime = LocalTime.parse("22:00");


        // 当前时间


        LocalTime now = LocalTime.now();


        // 比较


        flag = !now.isBefore(startTime) && !now.isAfter(endTime);


        // 返回


        return flag;


    }




}