From c8b03d3da4e29fc3fb9a42ca157738256c331a00 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 13 Mar 2024 13:55:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.xml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.xml
index 6f94d55..004b6a6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.xml
@@ -17,5 +17,54 @@
<if test="smsTemplate.type!=null and smsTemplate.type!=''">
and type = #{smsTemplate.type}
</if>
+ <if test="smsTemplate.smsType!=null">
+ and sms_type = #{smsTemplate.smsType}
+ </if>
+ <if test="smsTemplate.noticeMode!=null and smsTemplate.noticeMode!=''">
+ and notice_mode = #{smsTemplate.noticeMode}
+ </if>
+ </select>
+
+ <!--查询当前任务未接通的人员信息（包含水库编号）-MYSQL-->
+ <select id="getNotConnectPatrolPersonList" resultType="java.util.Map">
+ select ctc.callee_number as userPhone,ctc.task_id as taskId,ctc.call_id callId,
+ TRIM(BOTH '"' FROM JSON_EXTRACT(ctc.call_task_callee_content,'$."$水库编码$"')) as waterCode,
+ TRIM(BOTH '"' FROM JSON_EXTRACT(ctc.call_task_callee_content,'$."$水库名称$"')) as waterName,
+ TRIM(BOTH '"' FROM JSON_EXTRACT(ctc.call_task_callee_content,'$."$用户名$"')) as userName
+ from call_task_callee ctc left join call_task_result ctr on ctc.call_id = ctr.call_id
+ where 1=1
+ and ctr.call_result!='200000'
+ <choose>
+ <when test="taskIdList != null and taskIdList.size()>0">
+ and ctc.task_id in
+ <foreach collection="taskIdList" item="id" separator ="," open="(" close=")">
+ #{id}
+ </foreach>
+ </when>
+ <otherwise>
+ and ctc.task_id in ('')
+ </otherwise>
+ </choose>
+ <if test="callId!=null and callId!=''">
+ and ctc.call_id = #{callId}
+ </if>
+ </select>
+
+ <!--查询符合当前时间外呼任务id集合-->
+ <select id="getTaskIdListByTime" resultType="java.lang.String">
+ select task_id from sm_call_sms_notice_task
+ where 1=1
+ 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>
--
Gitblit v1.9.3