From 800efd2012f9b86f0aad57ccd40eb3811b370c1b Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 29 Jun 2023 19:32:08 +0800
Subject: [PATCH] 外呼调整
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java
index ded52ca..4d0527e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java
@@ -11,6 +11,7 @@
import cn.gistack.alerts.sms.entity.SmsRecord;
import cn.gistack.alerts.sms.entity.SmsResult;
import cn.gistack.alerts.sms.entity.SmsTemplate;
+import cn.gistack.alerts.sms.excel.SendRainSmsExcel;
import cn.gistack.alerts.sms.service.ISmsRecordService;
import cn.gistack.alerts.sms.service.ISmsResultService;
import cn.gistack.alerts.sms.service.ISmsTemplateService;
@@ -20,6 +21,7 @@
import cn.gistack.common.cache.CacheNames;
import cn.gistack.sm.intelligentCall.entity.CallNotFillRecord;
import cn.gistack.sm.intelligentCall.feign.OutCallClient;
+import cn.gistack.sm.sjztmd.feign.IAttResManagePersonClient;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import org.jetbrains.annotations.NotNull;
@@ -61,6 +63,9 @@
@Autowired
private OutCallClient outCallClient;
+
+ @Autowired
+ private IAttResManagePersonClient attResManagePersonClient;
/**
* 发送 xx 变量模板短信
@@ -353,7 +358,7 @@
// 获取任务id
String redisByTaskId = bladeRedis.get(MinConstant.is_send_prefix + map.get("callId").toString());
// 如果为null,并且不能匹配，加入发送短信集合
- if (redisByTaskId == null || !StringUtil.equalsIgnoreCase(redisByTaskId, taskId)) {
+ if (redisByTaskId == null) {
newList.add(map);
}
}
@@ -523,4 +528,23 @@
// 没有，已过期
return map;
}
+
+ /**
+ * 导入表格发送降雨短信
+ * @param list 导入的excel 集合数据
+ * @param startTime 短信内容填报起始时间
+ * @param endTime 短信内容填报截止时间
+ * @return
+ */
+ @Override
+ public Object importSendRainSms(List<SendRainSmsExcel> list,String startTime,String endTime) {
+ // 获取水库个数
+ Integer size = list.size();
+ // 通过水库代码获取巡查责任人及技术责任人手机号
+// Set<String> personList = attResManagePersonClient.getPersonListByWaterCodeList(list);
+
+
+ // 返回
+ return null;
+ }
}
--
Gitblit v1.9.3