skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRecordVO.java
@@ -37,6 +37,11 @@ private String createAlarmType; /** * 校验规则名称 */ private String ruleName; /** * 是否导出 */ private Integer isExport; skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRuleController.java
@@ -173,4 +173,26 @@ return R.data(alarmRuleService.getDetail(id)); } /** * 通过告警规则类型查询生成告警规则类型 * @param alarmRuleType * @return */ @ApiOperation(value="通过告警规则类型查询生成告警规则类型", notes="通过告警规则类型查询生成告警规则类型") @GetMapping(value = "/getCreateRuleType") public R getCreateRuleType(String alarmRuleType) { return R.data(alarmRuleService.getCreateRuleType(alarmRuleType)); } /** * 通过成告警规则类型查询告警规则名称 * @param createAlarmType * @return */ @ApiOperation(value="通过成告警规则类型查询告警规则名称", notes="通过成告警规则类型查询告警规则名称") @GetMapping(value = "/getAlarmRuleName") public R getAlarmRuleName(String createAlarmType) { return R.data(alarmRuleService.getAlarmRuleName(createAlarmType)); } } skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml
@@ -6,7 +6,7 @@ <select id="selectAlarmRecordPage" resultType="cn.gistack.alerts.alarmRule.vo.AlarmRecordVO"> select sar.*, sar1.type,sar1.alarm_rule_type as alarmRuleType,sar1.create_alarm_type as createAlarmType, sar1.type,sar1.alarm_rule_type as alarmRuleType,sar1.create_alarm_type as createAlarmType,sar1.rule_name as ruleName, arb."name" as reservoirName,aab."ad_name" as areaName from YWXT.sm_alarm_record sar left join YWXT.sm_alarm_rule sar1 on sar.alarm_rule_id = sar1.id and sar1.is_deleted = 0 @@ -25,6 +25,9 @@ <if test="alarmRecord.createAlarmType!=null and alarmRecord.createAlarmType!=''"> and sar1.create_alarm_type = #{alarmRecord.createAlarmType} </if> <if test="alarmRecord.ruleName!=null and alarmRecord.ruleName!=''"> and sar1.rule_name = #{alarmRecord.ruleName} </if> order by sar.id desc </select>
@@ -3,6 +3,7 @@ import cn.gistack.alerts.alarmRule.entity.AlarmRule; import cn.gistack.alerts.alarmRule.vo.AlarmRuleDetailVO; import cn.gistack.alerts.alarmRule.vo.AlarmRuleVO; import cn.gistack.system.entity.DictBiz; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; @@ -44,4 +45,18 @@ * @return */ List<String> getAlarmRuleDetailListByAlarmRuleId(@Param("id") String alarmRuleId); /** * 通过告警规则类型查询生成告警规则类型 * @param alarmRuleType * @return */ List<DictBiz> getCreateRuleType(@Param("alarmRuleType") String alarmRuleType); /** * 通过成告警规则类型查询告警规则名称 * @param createAlarmType * @return */ List<DictBiz> getAlarmRuleName(@Param("createAlarmType") String createAlarmType); } skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.xml
@@ -19,6 +19,9 @@ <if test="alarmRule.ruleName!=null and alarmRule.ruleName!=''"> and sar.rule_name like concat(concat('%',#{alarmRule.ruleName}),'%') </if> <if test="alarmRule.target!=null and alarmRule.target!=''"> and sar.target = #{alarmRule.target} </if> </select> <!--通过id查询--> @@ -40,4 +43,20 @@ where sard.alarm_rule_id = #{id} </select> <!--通过告警规则类型查询生成告警规则类型--> <select id="getCreateRuleType" resultType="cn.gistack.system.entity.DictBiz"> select create_alarm_type as dictValue,create_alarm_type as dictKey from sm_alarm_rule where is_deleted =0 and alarm_rule_type = #{alarmRuleType} group by create_alarm_type </select> <!--通过成告警规则类型查询告警规则名称--> <select id="getAlarmRuleName" resultType="cn.gistack.system.entity.DictBiz"> select rule_name as dictValue,rule_name as dictKey from sm_alarm_rule where is_deleted =0 and create_alarm_type = #{createAlarmType} group by rule_name </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRuleService.java
@@ -35,4 +35,18 @@ * @return */ List<String> getAlarmRuleDetailList(String alarmRuleId); /** * 通过告警规则类型查询生成告警规则类型 * @param alarmRuleType * @return */ Object getCreateRuleType(String alarmRuleType); /** * 通过成告警规则类型查询告警规则名称 * @param createAlarmType * @return */ Object getAlarmRuleName(String createAlarmType); } skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java
@@ -62,4 +62,24 @@ public List<String> getAlarmRuleDetailList(String alarmRuleId) { return baseMapper.getAlarmRuleDetailListByAlarmRuleId(alarmRuleId); } /** * 通过告警规则类型查询生成告警规则类型 * @param alarmRuleType * @return */ @Override public Object getCreateRuleType(String alarmRuleType) { return baseMapper.getCreateRuleType(alarmRuleType); } /** * 通过成告警规则类型查询告警规则名称 * @param createAlarmType * @return */ @Override public Object getAlarmRuleName(String createAlarmType) { return baseMapper.getAlarmRuleName(createAlarmType); } } skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java
@@ -848,6 +848,112 @@ }); } // /** // * 发送合并水库名短信 // * @param smsRequestTemplate // */ // @Override // public void sendMergeSignMsg(SmsRequestTemplate smsRequestTemplate) { // // 取出数据 // SMSSendRequest request = new SMSSendRequest(); // SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate(); // request.setTemplateId(smsTemplate.getTemplateId()); // List<List<String>> templateContent = smsRequestTemplate.getTemplateContent(); // List<Temp> tempList = new ArrayList<>(); // // 合并数据 // for (List<String> list : templateContent) { // Temp temp = new Temp(); // temp.setPhone(list.get(1)); // temp.setReservoirCode(list.get(0)); // temp.setReservoirName(list.get(3)); // temp.setAlarmRecordId(list.get(list.size()-1)); // // 放入临时集合 // tempList.add(temp); // } // // 按手机号分组 // Map<String, List<Temp>> listMap = tempList.stream().collect(Collectors.groupingBy(Temp::getPhone)); // // 短信发送行数据 // List<String> rowList = new ArrayList<>(); // // 告警记录详情数据 // List<AlarmRecordDetailVO> alarmRecordDetailList = new ArrayList<>(); // // 遍历 map 发送短信，组装数据 // listMap.forEach((s, temps) -> { // StringBuilder builder = new StringBuilder(); // StringBuilder smsRecordBuilder = new StringBuilder(); // builder.append(s).append(","); // // 如果一人对应水库数量超过30个，则分批发送 // List<List<Temp>> lists = Lists.partition(new ArrayList<>(temps), 30); // for (List<Temp> list : lists) { // // 遍历 // for (Temp temp : list) { // builder.append(temp.getReservoirName()).append("，"); // smsRecordBuilder.append(temp.getReservoirName()).append("，"); // AlarmRecordDetailVO alarmRecordDetail = new AlarmRecordDetailVO(); // alarmRecordDetail.setReservoirNumber(temp.getReservoirCode()); // alarmRecordDetail.setAlarmRecordId(Long.parseLong(temp.getAlarmRecordId())); // alarmRecordDetail.setAlarmMode("短信"); // alarmRecordDetail.setPhone(temp.getPhone()); // alarmRecordDetail.setReservoirName(temp.getReservoirName()); // // 加入集合 // alarmRecordDetailList.add(alarmRecordDetail); // } // String row = builder.substring(0, builder.length() - 1); // rowList.add(row); // } // }); // // 批量发送短信 // mergeBatchSendSms(smsRequestTemplate,request,smsTemplate,rowList,alarmRecordDetailList); // } /** * 批量发送合并水库的短信 */ public void mergeBatchSendSms(SmsRequestTemplate smsRequestTemplate, SMSSendRequest request, SmsTemplate smsTemplate, List<String> rowList, List<AlarmRecordDetailVO> alarmRecordDetailList) { // 组装数据 String[] titleArr = smsRequestTemplate.getTitle().split(","); String[][] dyns = new String[rowList.size() + 1][titleArr.length]; dyns[0] = titleArr; int rowNum = 1; for (String row : rowList) { String[] cols = row.split(","); dyns[rowNum++] = cols; } //请求参数 ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(smsTemplate.getTemplateId(), dyns); // 先保存结果记录 SmsResult smsResult = saveSendResult(resultComResult.getCode().toString(),resultComResult.getMsg(),request, rowList.size()); List<AlarmRecordDetail> alarmRecordDetailArrayList = new ArrayList<>(); // 遍历 for (AlarmRecordDetailVO alarmRecordDetailVO : alarmRecordDetailList) { // 设置手机号 request.setUserNumber(alarmRecordDetailVO.getPhone()); // 内容处理 String str = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s"); // 格式转换 String formatContent = String.format(str, alarmRecordDetailVO.getReservoirName().split(",")); // 设置内容 request.setMessageContent(formatContent); // 保存短信发送记录 SmsRecord smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId()); AlarmRecordDetail alarmRecordDetail1 = new AlarmRecordDetail(); // 短信内容拼接（完成发送的结果信息） alarmRecordDetail1.setAlarmContent(formatContent); alarmRecordDetail1.setSendRecordId(smsRecord.getId()); alarmRecordDetail1.setCreateTime(new Date()); alarmRecordDetail1.setReservoirNumber(alarmRecordDetailVO.getReservoirNumber()); alarmRecordDetail1.setAlarmRecordId(alarmRecordDetailVO.getAlarmRecordId()); alarmRecordDetail1.setAlarmMode(alarmRecordDetailVO.getAlarmMode()); alarmRecordDetail1.setPhone(alarmRecordDetailVO.getPhone()); alarmRecordDetailArrayList.add(alarmRecordDetail1); } // 保存告警记录详情信息 boolean save = alarmRecordDetailService.saveBatch(alarmRecordDetailArrayList); } /** * 批量发送短信（集合数据） * @param map (保护参数 1:短信模板id 2:数据集合 list<Map<String,Object>>)
