zhongrj
2023-08-01 0efd88e08bfb1cc911fa41319f10853d84ee444e
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java
@@ -305,15 +305,15 @@
         if (alarmRuleDetailList.size()>0){
            // 遍历
            for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
//               if (alarmRuleDetail.getAlarmMode().equals("短信")) {
//                  asyncNoticeHandle.waterComeDesignHandleBySms(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList1,true, adCode, false,uuid);
//               }
               if (alarmRuleDetail.getAlarmMode().equals("电话")) {
                  asyncNoticeHandle.waterComeDesignHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList2,true, adCode, false,uuid);
               if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                  asyncNoticeHandle.waterComeDesignHandleBySms(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList1,true, adCode, false,uuid);
               }
//               if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
//                  asyncNoticeHandle.waterComeDesignHandleStation(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList3,true, adCode, true,uuid);
//               }
               if (alarmRuleDetail.getAlarmMode().equals("电话")) {
                  asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList2,true, adCode, false,uuid);
               }
               if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                  asyncNoticeHandle.waterComeDesignHandleStation(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList3,true, adCode, true,uuid);
               }
            }
         }
      }
@@ -344,9 +344,9 @@
               if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                  asyncNoticeHandle.waterMoreDesignHandle(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreDesignList,true, adCode, false,uuid);
               }
//               if (alarmRuleDetail.getAlarmMode().equals("电话")) {
//                  asyncNoticeHandle.waterMoreDesignHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreDesignList,true, adCode, false,uuid);
//               }
               if (alarmRuleDetail.getAlarmMode().equals("电话")) {
                  asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreDesignList,true, adCode, false,uuid);
               }
            }
         }
      }
@@ -378,9 +378,9 @@
               if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                  asyncNoticeHandle.waterMoreCheckHandle(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreCheckList,true, adCode, false,uuid);
               }
//               if (alarmRuleDetail.getAlarmMode().equals("电话")) {
//                  asyncNoticeHandle.waterMoreCheckHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreCheckList,true, adCode, false,uuid);
//               }
               if (alarmRuleDetail.getAlarmMode().equals("电话")) {
                  asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreCheckList,true, adCode, false,uuid);
               }
            }
         }
      }
@@ -561,9 +561,9 @@
               if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                  asyncNoticeHandle.sixHourRainHandle(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.sixHourRainList,true, adCode, false,uuid);
               }
//               if (alarmRuleDetail.getAlarmMode().equals("电话")) {
//                  asyncNoticeHandle.sixHourRainHandleByCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.sixHourRainList,true, adCode, false,uuid);
//               }
               if (alarmRuleDetail.getAlarmMode().equals("电话")) {
                  asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.sixHourRainList,true, adCode, false,uuid);
               }
            }
         }
      }