From 672c74b56e067d18256fddcdcfdd0ee3cc67aadf Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Mon, 05 Aug 2024 11:30:47 +0800
Subject: [PATCH] 视频预警信息接收不到水库名称前面加区县乡镇名称

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java |  482 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 467 insertions(+), 15 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 a36b5da..14ee9e2 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
@@ -18,6 +18,7 @@
 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.excel.SendSmsExcel;
 import cn.gistack.alerts.sms.service.ISmsRecordService;
 import cn.gistack.alerts.sms.service.ISmsResultService;
 import cn.gistack.alerts.sms.service.ISmsTemplateService;
@@ -27,12 +28,14 @@
 import cn.gistack.alerts.sms.vo.SmsResponseVO;
 import cn.gistack.alerts.sms.vo.Temp;
 import cn.gistack.sm.intelligentCall.entity.CallNotFillRecord;
+import cn.gistack.sm.intelligentCall.excel.CallExcel;
 import cn.gistack.sm.intelligentCall.feign.OutCallClient;
 import cn.gistack.sm.message.entity.MessageRecord;
 import cn.gistack.sm.sjztmd.feign.IAttResManagePersonClient;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import org.jetbrains.annotations.NotNull;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -84,6 +87,11 @@
 	@Autowired
 	private NoticeHandle noticeHandle;
 
+	@Override
+	public  ComResult<DynSMSSendDataResult> testSend(String tempId, String[][] strss) {
+		return sendDynSMSSendDataResultComResult(tempId,strss);
+	}
+
 	/**
 	 * 发送 xx 变量模板短信
 	 * @param phoneNumbers 手机号集合
@@ -95,7 +103,7 @@
 		List<ComResult<SMSSendDataResult>> list = new ArrayList<>();
 		if (phoneNumbers.size()>0){
 			// 先保存结果记录
-			SmsResult smsResult = saveSendResult(null,null,request, phoneNumbers.size());
+			SmsResult smsResult = saveSendResult(null,null,null,request, phoneNumbers.size());
 			// 遍历发送
 			for (String phone : phoneNumbers) {
 				request.setUserNumber(phone);
@@ -205,6 +213,7 @@
 		SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
 		request.setTemplateId(smsTemplate.getTemplateId());
 		List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
+		AlarmRule alarmRule = smsRequestTemplate.getAlarmRule();
 		// 是否同时发送站内信
 		Boolean isSendStation = false;
 		if (null!=smsRequestTemplate.getIsSendStation()){
@@ -221,7 +230,7 @@
 			int count = Integer.parseInt(map.get("errCount").toString());
 			ComResult<DynSMSSendDataResult> resultComResult =(ComResult<DynSMSSendDataResult>) map.get("resultComResult");
 			// 保存短信结果记录
-			SmsResult smsResult = saveSendResult(resultComResult.getCode().toString(),resultComResult.getMsg(),request, list.size() - count);
+			SmsResult smsResult = saveSendResult(alarmRule.getId(),resultComResult.getCode().toString(),resultComResult.getMsg(),request, list.size() - count);
 			// 保存详情记录(短信详情,告警详情)
 			List<SmsRecord> smsRecordList = saveAlertsAndSmsDetail(smsResult,resultComResult,smsRequestTemplate.getSmsTemplate(),
 				templateList,request,smsRequestTemplate.getAlarmRule(),isSendStation);
@@ -297,7 +306,7 @@
 					messageRecord.setRecipient(list.get(0));
 					// 设置手机号
 					request.setUserNumber(list.get(0));
-					// 内容处理
+					// 内容处理,把括号内容换成%s,后面用format替换,因此括号内容要和list的个数一样
 					String s = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
 					// 短信内容拼接(完成发送的结果信息)
 					// 需要删除最前面的手机号
@@ -417,13 +426,14 @@
 	 * @param number 号码个数
 	 */
 	@Override
-	public SmsResult saveSendResult(String code,String msg, SMSSendRequest request, Integer number) {
+	public SmsResult saveSendResult(Long alarmRuleId,String code,String msg, SMSSendRequest request, Integer number) {
 		// 先保存结果表
 		SmsResult smsResult = new SmsResult();
 		smsResult.setTemplateId(request.getTemplateId());
 		smsResult.setNumber(number);
 		smsResult.setResCode(code);
 		smsResult.setResMsg(msg);
+		smsResult.setAlarmRuleId(alarmRuleId);
 		//插入记录
 		boolean save = smsResultService.save(smsResult);
 		if (save){
@@ -549,7 +559,7 @@
 		SMSSendRequest request = new SMSSendRequest();
 		request.setTemplateId(templateId);
 		// 先保存结果记录
-		return saveSendResult(code,msg,request, rows.length);
+		return saveSendResult(null,code,msg,request, rows.length);
 	}
 
 	/**
@@ -694,7 +704,7 @@
 	}
 
 	/**
-	 * 批量发送动态短信
+	 * 批量发送动态短信--该方法只适合除手机号外只有一个动态参数并且是内容一致的情况
 	 * @param phoneList
 	 * @param titleArr 示例: [手机号码,水库名称,水位值]
 	 * @param param 示例: ***水库,15.12
@@ -767,13 +777,14 @@
 		SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
 		request.setTemplateId(smsTemplate.getTemplateId());
 		List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
+		AlarmRule alarmRule = smsRequestTemplate.getAlarmRule();
 		List<Temp> tempList = new ArrayList<>();
 		// 合并数据
 		for (List<String> list : templateContent) {
 			Temp temp = new Temp();
 			temp.setPhone(list.get(1));
 			temp.setReservoirCode(list.get(0));
-			temp.setReservoirName(list.get(3));
+			temp.setReservoirName(list.get(2));
 			temp.setAlarmRecordId(list.get(list.size()-1));
 			// 放入临时集合
 			tempList.add(temp);
@@ -812,7 +823,7 @@
 				//请求参数
 				ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(smsTemplate.getTemplateId(), dyns);
 				// 先保存结果记录
-				SmsResult smsResult = saveSendResult(resultComResult.getCode().toString(),resultComResult.getMsg(),request, 1);
+				SmsResult smsResult = saveSendResult(alarmRule.getId(),resultComResult.getCode().toString(),resultComResult.getMsg(),request, 1);
 				// 设置手机号
 				request.setUserNumber(s);
 				// 内容处理
@@ -848,6 +859,354 @@
 		});
 	}
 
+
+
+	@Override
+	public Map<String, Object> sendSignMsgMergeCd(SmsRequestTemplate smsRequestTemplate) {
+
+		// 取出数据
+		SMSSendRequest request = new SMSSendRequest();
+		SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
+		request.setTemplateId(smsTemplate.getTemplateId());
+		List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
+		AlarmRule alarmRule = smsRequestTemplate.getAlarmRule();
+		List<Temp> tempList = new ArrayList<>();
+		// 合并数据
+		for (List<String> list : templateContent) {
+			Temp temp = new Temp();
+			temp.setPhone(list.get(1));
+			temp.setReservoirCode(list.get(0));
+			temp.setReservoirName(list.get(2));
+			temp.setCdNm(list.get(3));
+			temp.setAlarmRecordId(list.get(list.size()-1));
+			// 放入临时集合
+			tempList.add(temp);
+		}
+		// 按手机号分组
+		Map<String, List<Temp>> listMap = tempList.stream().collect(Collectors.groupingBy(Temp::getPhone));
+		// 遍历 map 发送短信
+		listMap.forEach((s, temps) -> {
+			StringBuilder builder = new StringBuilder();
+			StringBuilder smsRecordBuilder = new StringBuilder();
+			builder.append(s).append(",");
+
+			//按水库再次分组,因为要把测点名称放进水库里
+			Map<String, List<Temp>> resCollectGroup = temps.stream().collect(Collectors.groupingBy(Temp::getReservoirCode));
+
+			//这个集合为了存水库和其多个测站
+			List<Temp> infoList = new ArrayList<>();
+			resCollectGroup.forEach((resCode,temp1)->{
+				Temp temp = new Temp();
+				temp.setPhone(s);
+				temp.setReservoirName(temp1.get(0).getReservoirName());
+				temp.setReservoirCode(resCode);
+				List<String> cdNameList = new ArrayList<>();
+				temp1.forEach(info->{
+					cdNameList.add("测点" + info.getCdNm());
+					temp.setAlarmRecordId(info.getAlarmRecordId());
+				});
+				temp.setCdNm(String.join("、",cdNameList));
+				infoList.add(temp);
+			});
+
+
+			// 如果一人对应水库数量超过30个,则分批发送
+			List<List<Temp>> lists = Lists.partition(new ArrayList<>(infoList), 30);
+			for (List<Temp> list : lists) {
+				List<AlarmRecordDetailVO> alarmRecordDetailList = new ArrayList<>();
+				// 遍历
+				for (Temp temp : list) {
+					builder.append(temp.getReservoirName()+"("+temp.getCdNm() +")").append(",");
+					smsRecordBuilder.append(temp.getReservoirName()+"("+temp.getCdNm() +")").append(",");
+					AlarmRecordDetailVO alarmRecordDetail = new AlarmRecordDetailVO();
+					alarmRecordDetail.setReservoirNumber(temp.getReservoirCode());
+					alarmRecordDetail.setAlarmRecordId(Long.parseLong(temp.getAlarmRecordId()));
+					alarmRecordDetail.setAlarmMode("短信");
+					alarmRecordDetail.setPhone(temp.getPhone());
+					alarmRecordDetail.setReservoirName(temp.getReservoirName());
+					// 加入集合
+					alarmRecordDetailList.add(alarmRecordDetail);
+				}
+
+				String row = builder.substring(0, builder.length() - 1);
+				// 组装数据
+				String[] titleArr = smsRequestTemplate.getTitle().split(",");
+				String[][] dyns = new String[2][titleArr.length];
+				dyns[0] = titleArr;
+				dyns[1] = row.split(",");
+				//请求参数
+				ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(smsTemplate.getTemplateId(), dyns);
+				// 先保存结果记录
+				SmsResult smsResult = saveSendResult(alarmRule.getId(),resultComResult.getCode().toString(),resultComResult.getMsg(),request, 1);
+				// 设置手机号
+				request.setUserNumber(s);
+				// 内容处理
+				String str = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
+				// 短信内容拼接(完成发送的结果信息)
+				String substring = smsRecordBuilder.substring(0, smsRecordBuilder.length() - 1);
+				// 格式转换
+				String format = String.format(str, substring.split(","));
+				// 设置内容
+				request.setMessageContent(format);
+				// 保存短信发送记录
+				SmsRecord smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId());
+				//保存告警记录详情信息
+				if (null != smsRecord) {
+					List<AlarmRecordDetail> alarmRecordDetailArrayList = new ArrayList<>();
+					for (AlarmRecordDetailVO alarmRecordDetail : alarmRecordDetailList) {
+						AlarmRecordDetail alarmRecordDetail1 = new AlarmRecordDetail();
+						// 短信内容拼接(完成发送的结果信息)
+//						String formatContent = String.format(str, alarmRecordDetail.getReservoirName().split(","));
+						String formatContent = format;
+						alarmRecordDetail1.setAlarmContent(formatContent);
+						alarmRecordDetail1.setSendRecordId(smsRecord.getId());
+						alarmRecordDetail1.setCreateTime(new Date());
+						alarmRecordDetail1.setReservoirNumber(alarmRecordDetail.getReservoirNumber());
+						alarmRecordDetail1.setAlarmRecordId(alarmRecordDetail.getAlarmRecordId());
+						alarmRecordDetail1.setAlarmMode(alarmRecordDetail.getAlarmMode());
+						alarmRecordDetail1.setPhone(alarmRecordDetail.getPhone());
+						alarmRecordDetailArrayList.add(alarmRecordDetail1);
+					}
+					// 保存告警记录详情信息
+					try {
+						boolean save = alarmRecordDetailService.saveBatch(alarmRecordDetailArrayList);
+					}catch (Exception e){
+						e.printStackTrace();
+					}
+				}
+			}
+		});
+
+		return null;
+	}
+
+	/**
+	 * 视频数据接收不到
+	 * @param smsRequestTemplate
+	 * @return
+	 */
+	@Override
+	public Map<String, Object> sendSignMsgMergeCdVideo(SmsRequestTemplate smsRequestTemplate) {
+
+		// 取出数据
+		SMSSendRequest request = new SMSSendRequest();
+		SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
+		request.setTemplateId(smsTemplate.getTemplateId());
+		List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
+		AlarmRule alarmRule = smsRequestTemplate.getAlarmRule();
+		List<Temp> tempList = new ArrayList<>();
+		// 合并数据
+		for (List<String> list : templateContent) {
+			Temp temp = new Temp();
+			temp.setPhone(list.get(1));
+			temp.setReservoirCode(list.get(0));
+			temp.setReservoirName(list.get(2));
+			temp.setCdNm(list.get(3));
+			temp.setAlarmRecordId(list.get(list.size()-1));
+			// 放入临时集合
+			tempList.add(temp);
+		}
+		// 按手机号分组
+		Map<String, List<Temp>> listMap = tempList.stream().collect(Collectors.groupingBy(Temp::getPhone));
+		// 遍历 map 发送短信
+		listMap.forEach((s, temps) -> {
+			StringBuilder builder = new StringBuilder();
+			StringBuilder smsRecordBuilder = new StringBuilder();
+			builder.append(s).append(",");
+
+			//按水库再次分组,因为要把测点名称放进水库里
+			Map<String, List<Temp>> resCollectGroup = temps.stream().collect(Collectors.groupingBy(Temp::getReservoirCode));
+
+			//这个集合为了存水库和其多个测站
+			List<Temp> infoList = new ArrayList<>();
+			resCollectGroup.forEach((resCode,temp1)->{
+				Temp temp = new Temp();
+				temp.setPhone(s);
+				temp.setReservoirName(temp1.get(0).getReservoirName());
+				temp.setReservoirCode(resCode);
+				List<String> cdNameList = new ArrayList<>();
+				temp1.forEach(info->{
+					cdNameList.add( info.getCdNm());
+					temp.setAlarmRecordId(info.getAlarmRecordId());
+				});
+				temp.setCdNm(String.join("、",cdNameList));
+				infoList.add(temp);
+			});
+
+
+			// 如果一人对应水库数量超过30个,则分批发送
+			List<List<Temp>> lists = Lists.partition(new ArrayList<>(infoList), 15);
+			for (List<Temp> list : lists) {
+				List<AlarmRecordDetailVO> alarmRecordDetailList = new ArrayList<>();
+				// 遍历
+				for (Temp temp : list) {
+					builder.append(temp.getReservoirName()+"("+temp.getCdNm() +")").append(",");
+					smsRecordBuilder.append(temp.getReservoirName()+"("+temp.getCdNm() +")").append(",");
+					AlarmRecordDetailVO alarmRecordDetail = new AlarmRecordDetailVO();
+					alarmRecordDetail.setReservoirNumber(temp.getReservoirCode());
+					alarmRecordDetail.setAlarmRecordId(Long.parseLong(temp.getAlarmRecordId()));
+					alarmRecordDetail.setAlarmMode("短信");
+					alarmRecordDetail.setPhone(temp.getPhone());
+					alarmRecordDetail.setReservoirName(temp.getReservoirName());
+					// 加入集合
+					alarmRecordDetailList.add(alarmRecordDetail);
+				}
+
+				String row = builder.substring(0, builder.length() - 1);
+				// 组装数据
+				String[] titleArr = smsRequestTemplate.getTitle().split(",");
+				String[][] dyns = new String[2][titleArr.length];
+				dyns[0] = titleArr;
+				dyns[1] = row.split(",");
+				//请求参数
+				ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(smsTemplate.getTemplateId(), dyns);
+				// 先保存结果记录
+				SmsResult smsResult = saveSendResult(alarmRule.getId(),resultComResult.getCode().toString(),resultComResult.getMsg(),request, 1);
+				// 设置手机号
+				request.setUserNumber(s);
+				// 内容处理
+				String str = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
+				// 短信内容拼接(完成发送的结果信息)
+				String substring = smsRecordBuilder.substring(0, smsRecordBuilder.length() - 1);
+				// 格式转换
+				String format = String.format(str, substring.split(","));
+				// 设置内容
+				request.setMessageContent(format);
+				// 保存短信发送记录
+				SmsRecord smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId());
+				//保存告警记录详情信息
+				if (null != smsRecord) {
+					List<AlarmRecordDetail> alarmRecordDetailArrayList = new ArrayList<>();
+					for (AlarmRecordDetailVO alarmRecordDetail : alarmRecordDetailList) {
+						AlarmRecordDetail alarmRecordDetail1 = new AlarmRecordDetail();
+						// 短信内容拼接(完成发送的结果信息)
+//						String formatContent = String.format(str, alarmRecordDetail.getReservoirName().split(","));
+						String formatContent = format;
+						alarmRecordDetail1.setAlarmContent(formatContent);
+						alarmRecordDetail1.setSendRecordId(smsRecord.getId());
+						alarmRecordDetail1.setCreateTime(new Date());
+						alarmRecordDetail1.setReservoirNumber(alarmRecordDetail.getReservoirNumber());
+						alarmRecordDetail1.setAlarmRecordId(alarmRecordDetail.getAlarmRecordId());
+						alarmRecordDetail1.setAlarmMode(alarmRecordDetail.getAlarmMode());
+						alarmRecordDetail1.setPhone(alarmRecordDetail.getPhone());
+						alarmRecordDetailArrayList.add(alarmRecordDetail1);
+					}
+					// 保存告警记录详情信息
+					boolean save = alarmRecordDetailService.saveBatch(alarmRecordDetailArrayList);
+				}
+			}
+		});
+		return null;
+	}
+
+
+//	/**
+//	 * 发送合并水库名短信
+//	 * @param smsRequestTemplate
+//	 */
+//	@Override
+//	public void sendMergeSignMsg(SmsRequestTemplate smsRequestTemplate) {
+//		// 取出数据
+//		SMSSendRequest request = new SMSSendRequest();
+//		SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
+//		request.setTemplateId(smsTemplate.getTemplateId());
+//		List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
+//		List<Temp> tempList = new ArrayList<>();
+//		// 合并数据
+//		for (List<String> list : templateContent) {
+//			Temp temp = new Temp();
+//			temp.setPhone(list.get(1));
+//			temp.setReservoirCode(list.get(0));
+//			temp.setReservoirName(list.get(3));
+//			temp.setAlarmRecordId(list.get(list.size()-1));
+//			// 放入临时集合
+//			tempList.add(temp);
+//		}
+//		// 按手机号分组
+//		Map<String, List<Temp>> listMap = tempList.stream().collect(Collectors.groupingBy(Temp::getPhone));
+//		// 短信发送行数据
+//		List<String> rowList = new ArrayList<>();
+//		// 告警记录详情数据
+//		List<AlarmRecordDetailVO> alarmRecordDetailList = new ArrayList<>();
+//		// 遍历 map 发送短信,组装数据
+//		listMap.forEach((s, temps) -> {
+//			StringBuilder builder = new StringBuilder();
+//			StringBuilder smsRecordBuilder = new StringBuilder();
+//			builder.append(s).append(",");
+//			// 如果一人对应水库数量超过30个,则分批发送
+//			List<List<Temp>> lists = Lists.partition(new ArrayList<>(temps), 30);
+//			for (List<Temp> list : lists) {
+//				// 遍历
+//				for (Temp temp : list) {
+//					builder.append(temp.getReservoirName()).append(",");
+//					smsRecordBuilder.append(temp.getReservoirName()).append(",");
+//					AlarmRecordDetailVO alarmRecordDetail = new AlarmRecordDetailVO();
+//					alarmRecordDetail.setReservoirNumber(temp.getReservoirCode());
+//					alarmRecordDetail.setAlarmRecordId(Long.parseLong(temp.getAlarmRecordId()));
+//					alarmRecordDetail.setAlarmMode("短信");
+//					alarmRecordDetail.setPhone(temp.getPhone());
+//					alarmRecordDetail.setReservoirName(temp.getReservoirName());
+//					// 加入集合
+//					alarmRecordDetailList.add(alarmRecordDetail);
+//				}
+//				String row = builder.substring(0, builder.length() - 1);
+//				rowList.add(row);
+//			}
+//		});
+//		// 批量发送短信
+//		mergeBatchSendSms(smsRequestTemplate,request,smsTemplate,rowList,alarmRecordDetailList);
+//	}
+
+	/**
+	 * 批量发送合并水库的短信
+	 */
+	public void mergeBatchSendSms(SmsRequestTemplate smsRequestTemplate,
+								  SMSSendRequest request,
+								  SmsTemplate smsTemplate,
+								  List<String> rowList,
+								  List<AlarmRecordDetailVO> alarmRecordDetailList) {
+		AlarmRule alarmRule = smsRequestTemplate.getAlarmRule();
+		// 组装数据
+		String[] titleArr = smsRequestTemplate.getTitle().split(",");
+		String[][] dyns = new String[rowList.size() + 1][titleArr.length];
+		dyns[0] = titleArr;
+		int rowNum = 1;
+		for (String row : rowList) {
+			String[] cols = row.split(",");
+			dyns[rowNum++] = cols;
+		}
+		//请求参数
+		ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(smsTemplate.getTemplateId(), dyns);
+		// 先保存结果记录
+		SmsResult smsResult = saveSendResult(alarmRule.getId(),resultComResult.getCode().toString(),resultComResult.getMsg(),request, rowList.size());
+		List<AlarmRecordDetail> alarmRecordDetailArrayList = new ArrayList<>();
+		// 遍历
+		for (AlarmRecordDetailVO alarmRecordDetailVO : alarmRecordDetailList) {
+			// 设置手机号
+			request.setUserNumber(alarmRecordDetailVO.getPhone());
+			// 内容处理
+			String str = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
+			// 格式转换
+			String formatContent = String.format(str, alarmRecordDetailVO.getReservoirName().split(","));
+			// 设置内容
+			request.setMessageContent(formatContent);
+			// 保存短信发送记录
+			SmsRecord smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId());
+			AlarmRecordDetail alarmRecordDetail1 = new AlarmRecordDetail();
+			// 短信内容拼接(完成发送的结果信息)
+			alarmRecordDetail1.setAlarmContent(formatContent);
+			alarmRecordDetail1.setSendRecordId(smsRecord.getId());
+			alarmRecordDetail1.setCreateTime(new Date());
+			alarmRecordDetail1.setReservoirNumber(alarmRecordDetailVO.getReservoirNumber());
+			alarmRecordDetail1.setAlarmRecordId(alarmRecordDetailVO.getAlarmRecordId());
+			alarmRecordDetail1.setAlarmMode(alarmRecordDetailVO.getAlarmMode());
+			alarmRecordDetail1.setPhone(alarmRecordDetailVO.getPhone());
+			alarmRecordDetailArrayList.add(alarmRecordDetail1);
+		}
+		// 保存告警记录详情信息
+		boolean save = alarmRecordDetailService.saveBatch(alarmRecordDetailArrayList);
+	}
+
 	/**
 	 * 批量发送短信(集合数据)
 	 * @param map (保护参数 1:短信模板id  2:数据集合 list<Map<String,Object>>)
@@ -857,13 +1216,106 @@
 	public Object batchSendSms(Map<String, Object> map) {
 		// 获取模板id
 		String templateId = map.get("templateId").toString();
-		// 获取集合数据
-		List<Map<String,Object>> list = (List<Map<String,Object>>) map.get("list");
-		List<String> columnList = (List<String>) map.get("columnList");
-		// 遍历
-		for (Map<String, Object> param : list) {
-			// 放入集合数据
+		// 获取手机号集合
+		List<String> list = (List<String>) map.get("phones");
+		// 获取发送的动态内容(msg)
+		String param = (String) map.get("content");
+		// 创建错误手机号集合
+		List<String> errPhones = new ArrayList<>();
+		// 去重
+		Set<String> hashSet = new HashSet<>(list);
+		// 查询短信模板
+		SmsTemplate smsTemplate = smsTemplateService.getOne(new QueryWrapper<SmsTemplate>().eq("template_id", templateId));
+		// 拼接短信标题数组
+		String [] titleArr = getSmsTitleArr(smsTemplate);
+		// 批量发送短信
+		Map<String, Object> batchSendSmsMap = batchSendSms(hashSet, titleArr, param, smsTemplate,errPhones);
+		// 返回
+		return batchSendSmsMap;
+	}
+
+	/**
+	 * 导入表格发送预警短信
+	 * @param list 集合数据
+	 * @param templateId 模板id
+	 * @param param 通用参数
+	 * @param content 发送内容
+	 * @return
+	 */
+	@Override
+	public Object importSendSms(List<SendSmsExcel> list,String templateId,String param, String content) {
+		// 查询短信模板
+		SmsTemplate smsTemplate = smsTemplateService.getOne(new QueryWrapper<SmsTemplate>().eq("template_id", templateId));
+		// 判断模板是否为具名变量模板(目前已筛选出都是具名变量模板)
+		// 判断模板中是否包含参数,如果无参数,对比是否传参数
+		boolean validate = validatorParam(smsTemplate,param);
+		if (!validate){
+			return R.data(400,"参数个数不对应,请检查后修改导入!",null);
 		}
-		return null;
+		// 转换
+		List<String> stringList = list.stream().map(SendSmsExcel::getPhone).collect(Collectors.toList());
+		// 获取水库个数
+		List<String> errPhones = new ArrayList<>();
+		// 去重
+		Set<String> hashSet = new HashSet<>(stringList);
+		// 拼接短信标题数组
+		String [] titleArr = getSmsTitleArr(smsTemplate);
+		// 批量发送不能超过1000 个号码,需分组发送
+		List<String> arrayList = new ArrayList<>(hashSet);
+		List<List<String>> partition = Lists.partition(arrayList, 1000);
+		int i = 0;
+		String errMsg = "";
+		for (List<String> phoneList : partition) {
+			HashSet<String> sets = new HashSet<>(phoneList);
+			// 批量发送短信
+			Map<String, Object> batchSendSmsMap = batchSendSms(sets, titleArr, param, smsTemplate,errPhones);
+			// 取出发送结果
+			ComResult<DynSMSSendDataResult> resultComResult = (ComResult<DynSMSSendDataResult>) batchSendSmsMap.get("resultComResult");
+			//
+			if(!resultComResult.getCode().equals(0)){
+				i++;
+				errMsg = resultComResult.getMsg();
+				break;
+			}
+		}
+		if (i>0){
+			// 返回resultComResult
+			return R.data(400,"发送失败!" + errMsg,null);
+		}
+		// 返回resultComResult
+		return R.data(200,"发送成功!",null);
+	}
+
+
+	/**
+	 * 校验参数
+	 * @param smsTemplate
+	 * @param param
+	 */
+	private boolean validatorParam(SmsTemplate smsTemplate, String param) {
+		int length = 0;
+		if (null!= param && !param.equals("")) {
+			length = Arrays.asList(param.split(",")).size();
+		}
+		// 解析模板
+		String str = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
+		int countChar = countChar(str, '%');
+		if (length==countChar){
+			return true;
+		}else {
+			return false;
+		}
+	}
+
+	/**
+	 * 计算某个字符在字符串中的个数
+	 * @param str 字符串
+	 * @param target 字符
+	 * @return
+	 */
+	public int countChar(String str, char target) {
+		String targetStr = String.valueOf(target);
+		String replacedStr = str.replaceAll(targetStr, "");
+		return str.length() - replacedStr.length();
 	}
 }

--
Gitblit v1.9.3