hbwri/skjcmanager.git

			@@ -694,7 +694,7 @@
			}

			/**
			* 批量发送动态短信
			* 批量发送动态短信--该方法只适合除手机号外只有一个动态参数并且是内容一致的情况
			* @param phoneList
			* @param titleArr 示例： [手机号码,水库名称，水位值]
			* @param param 示例： ***水库，15.12
			@@ -848,6 +848,112 @@
			});
			}

			// /**
			// * 发送合并水库名短信
			// * @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) {
			// 组装数据
			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(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 +963,21 @@
			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) {
			// 放入集合数据
			}
			return null;
			// 获取手机号集合
			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;
			}
			}