From 63f25d9b1989f37b1a07bb59359d2091d480ff4e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 25 Sep 2023 16:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsTemplateServiceImpl.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsTemplateServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsTemplateServiceImpl.java
index 553390b..2a312f6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsTemplateServiceImpl.java
+++ b/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;
@@ -39,11 +41,34 @@
/**
* 查询当前任务未接通的人员信息（包含水库编号）
* @param taskId
+ * @param callId
* @return
*/
@Override
@DS("znwh")
- public List<Map<String, Object>> getNotConnectPatrolPersonList(String taskId) {
- return baseMapper.getNotConnectPatrolPersonList(taskId);
+ public List<Map<String, Object>> getNotConnectPatrolPersonList(List<String> taskId,String callId) {
+ return baseMapper.getNotConnectPatrolPersonList(taskId,callId);
+ }
+
+ /**
+ * 查询符合当前时间外呼任务id集合
+ * @param time
+ * @return
+ */
+ @Override
+ public List<String> getTaskIdListByTime(String time) {
+ return baseMapper.getTaskIdListByTime(time);
+ }
+
+ /**
+ * 获取短信类型树（当为告警是显示告警规则名称）
+ *
+ * @return
+ */
+ @Override
+ public Object getSmsTypeTree() {
+ List<TreeNode> nodeTree = NodeTreeUtil.getNodeTree(baseMapper.getSmsTypeTree());
+ // 返回
+ return nodeTree;
}
}
--
Gitblit v1.9.3