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.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.java
index 6bea098..de6fce9 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.java
@@ -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;
@@ -26,11 +28,26 @@
/**
* 查询当前任务未接通的人员信息（包含水库编号）--MYSQL
- * @param taskId
+ * @param taskIdList
* @param callId
* @return
*/
@DS("znwh")
- List<Map<String, Object>> getNotConnectPatrolPersonList(@Param("taskId") String taskId,
+ List<Map<String, Object>> getNotConnectPatrolPersonList(@Param("taskIdList") List<String> taskIdList,
@Param("callId") String callId);
+
+ /**
+ * 查询符合当前时间外呼任务id集合
+ * @param time
+ * @return
+ */
+ List<String> getTaskIdListByTime(@Param("time") String time);
+
+ /**
+ * 获取短信类型树（当为告警是显示告警规则名称）
+ *
+ * @return
+ */
+ @MapKey("id")
+ Map<String, TreeNode> getSmsTypeTree();
}
--
Gitblit v1.9.3