skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsResultVO.java
@@ -33,6 +33,6 @@ /** * 短信类型 */ private Integer smsType; private String smsType; } skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.java
@@ -37,4 +37,11 @@ * @return */ List<AlarmRuleDetailVO> getAlarmRuleDetailList(@Param("id") String id); /** * 查询对应的短信模板ID 集合 * @param alarmRuleId * @return */ List<String> getAlarmRuleDetailListByAlarmRuleId(@Param("id") String alarmRuleId); } skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.xml
@@ -33,4 +33,11 @@ where sard.alarm_rule_id = #{id} </select> <!--通过id查询对应的短信模板ID 集合--> <select id="getAlarmRuleDetailListByAlarmRuleId" resultType="java.lang.String"> select sst.template_id from sm_alarm_rule_detail sard left join sm_sms_template sst on sst.id = sard.template_id where sard.alarm_rule_id = #{id} </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRuleService.java
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import java.util.List; /** * 告警规则服务层 * @author zhongrj @@ -26,4 +28,11 @@ * @return */ AlarmRuleVO getDetail(String id); /** * 查询对应的短信模板ID 集合 * @param alarmRuleId * @return */ List<String> getAlarmRuleDetailList(String alarmRuleId); } skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java
@@ -52,4 +52,14 @@ // 返回 return alarmRule; } /** * 查询对应的短信模板ID 集合 * @param alarmRuleId * @return */ @Override public List<String> getAlarmRuleDetailList(String alarmRuleId) { return baseMapper.getAlarmRuleDetailListByAlarmRuleId(alarmRuleId); } } skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsTemplateController.java
@@ -116,4 +116,14 @@ return R.data(SmsTemplate); } /** * 获取短信类型树（当为告警是显示告警规则名称） * * @return */ @GetMapping(value = "/getSmsTypeTree") public R getSmsTypeTree() { return R.data(smsTemplateService.getSmsTypeTree()); } } skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.java
@@ -18,7 +18,10 @@ * 自定义分页列表查询 * @param page 分页查询对象 * @param smsResult * @param list * @return */ List<SmsResultVO> selectSmsResultPage(IPage<SmsResultVO> page,@Param("smsResult") SmsResultVO smsResult); List<SmsResultVO> selectSmsResultPage(IPage<SmsResultVO> page, @Param("smsResult") SmsResultVO smsResult, @Param("list") List<String> list); } skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml
@@ -20,9 +20,15 @@ <if test="smsResult.endTime!=null and smsResult.endTime!=''"> and date_format(ssr.create_time,'%Y-%m-%d') <= #{smsResult.endTime} </if> <if test="smsResult.smsType!=null"> <if test="smsResult.smsType!=null and smsResult.smsType!=''"> and sst.sms_type = #{smsResult.smsType} </if> <if test="list!=null and list.size()>0"> and sst.template_id in <foreach collection="list" item="id" separator ="," open="(" close=")"> #{id} </foreach> </if> order by id desc </select>
@@ -2,9 +2,11 @@ import cn.gistack.alerts.sms.entity.SmsTemplate; import cn.gistack.alerts.sms.vo.SmsTemplateVO; import cn.gistack.common.node.TreeNode; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -40,4 +42,12 @@ * @return */ List<String> getTaskIdListByTime(@Param("time") String time); /** * 获取短信类型树（当为告警是显示告警规则名称） * * @return */ @MapKey("id") Map<String, TreeNode> getSmsTypeTree(); } skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.xml
@@ -54,4 +54,14 @@ and date_format(start_time,'%Y-%m-%d %H:%i:%s') <= #{time} and date_format(end_time,'%Y-%m-%d %H:%i:%s') >= #{time} </select> <!--获取短信类型树（当为告警是显示告警规则名称）--> <select id="getSmsTypeTree" resultType="cn.gistack.common.node.TreeNode"> select dict_key as id, parent_id as parentId, dict_value as name, 1 as level from YWXT.blade_dict_biz WHERE 1=1 and code = 'SMS_TYPE' and parent_id > 0 and is_sealed = 0 and is_deleted = 0 union all select id,'2' as parentId ,rule_name as name,2 as level from YWXT.sm_alarm_rule where 1=1 and is_deleted = 0 </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/ISmsTemplateService.java
@@ -39,4 +39,11 @@ * @return */ List<String> getTaskIdListByTime(String time); /** * 获取短信类型树（当为告警是显示告警规则名称） * * @return */ Object getSmsTypeTree(); } skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java
@@ -1,12 +1,19 @@ package cn.gistack.alerts.sms.service.impl; import cn.gistack.alerts.alarmRule.entity.AlarmRule; import cn.gistack.alerts.alarmRule.service.AlarmRuleService; import cn.gistack.alerts.sms.entity.SmsResult; import cn.gistack.alerts.sms.mapper.SmsResultMapper; import cn.gistack.alerts.sms.service.ISmsResultService; import cn.gistack.alerts.sms.vo.SmsResultVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.jdbc.Null; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; /** * 短信发送结果 @@ -14,6 +21,9 @@ */ @Service public class SmsResultServiceImpl extends BaseServiceImpl<SmsResultMapper, SmsResult> implements ISmsResultService { @Autowired private AlarmRuleService alarmRuleService; /** * 自定义分页列表查询 @@ -23,11 +33,19 @@ */ @Override public Object selectSmsResultPage(IPage<SmsResultVO> page, SmsResultVO smsResult) { List<String> list = new ArrayList<>(); // 判断是否为一级目录 if (null!=smsResult.getSmsType() && smsResult.getSmsType().length()>1){ // 查询对应的短信模板ID 集合 list = alarmRuleService.getAlarmRuleDetailList(smsResult.getSmsType()); // 设置类型为null smsResult.setSmsType(""); } if (null!=smsResult.getIsExport()){ // 导出，不分页 return baseMapper.selectSmsResultPage(null,smsResult); return baseMapper.selectSmsResultPage(null,smsResult,list); } // 查询返回 return page.setRecords(baseMapper.selectSmsResultPage(page,smsResult)); return page.setRecords(baseMapper.selectSmsResultPage(page,smsResult,list)); } } skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsTemplateServiceImpl.java
@@ -4,6 +4,8 @@ import cn.gistack.alerts.sms.mapper.SmsTemplateMapper; import cn.gistack.alerts.sms.service.ISmsTemplateService; import cn.gistack.alerts.sms.vo.SmsTemplateVO; import cn.gistack.common.node.TreeNode; import cn.gistack.common.utils.NodeTreeUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; @@ -57,4 +59,16 @@ public List<String> getTaskIdListByTime(String time) { return baseMapper.getTaskIdListByTime(time); } /** * 获取短信类型树（当为告警是显示告警规则名称） * * @return */ @Override public Object getSmsTypeTree() { List<TreeNode> nodeTree = NodeTreeUtil.getNodeTree(baseMapper.getSmsTypeTree()); // 返回 return nodeTree; } }
