From 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 14:25:58 +0800
Subject: [PATCH] 巡查任务巡查责任人完成任务逻辑修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java | 52 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java
index ab170a7..2e35846 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java
@@ -96,15 +96,18 @@
* 校验手机号码
*/
public static boolean validator(String phone) {
- String regex = "^((13[0-9])|(14[5,7,9])|(15([0-3]|[5-9]))|(166)|(17[0,1,3,5,6,7,8])|(18[0-9])|(19[8|9]))\\d{8}$";
- if (phone.length() != 11) {
- return false;
- } else {
- Pattern p = Pattern.compile(regex);
- Matcher m = p.matcher(phone);
- boolean isMatch = m.matches();
- return isMatch;
+ if (null!=phone && !phone.equals("")) {
+ String regex = "^((13[0-9])|(14[5,7,9])|(15([0-3]|[5-9]))|(166)|(17[0,1,3,5,6,7,8])|(18[0-9])|(19[8|9]))\\d{8}$";
+ if (phone.length() != 11) {
+ return false;
+ } else {
+ Pattern p = Pattern.compile(regex);
+ Matcher m = p.matcher(phone);
+ boolean isMatch = m.matches();
+ return isMatch;
+ }
}
+ return false;
}
/**
@@ -133,20 +136,39 @@
/**
* 发送邮件提醒
- * @param request
+ * @param smsRequest
* @return
*/
@PostMapping("/sendEmailMsg")
- public R sendEmailMsg(@RequestBody SmsRequest request){
+ public R sendEmailMsg(@RequestBody SmsRequest smsRequest){
// 处理数据(可能是多个手机号情况)
- List<String> list = Arrays.asList(request.getPhone().split(","));
+ List<String> list = Arrays.asList(smsRequest.getPhone().split(","));
// 遍历
for (String phone : list) {
DynSMSSendRequest dynSMSSendRequest = new DynSMSSendRequest();
- dynSMSSendRequest.setTemplateId("2431012165350");
- dynSMSSendRequest.setDynData(new String[][]{{"手机号码","标题"},{phone,request.getContent()}});
- // 发送邮件短信
- SmsUtils.dynSendMethod(dynSMSSendRequest);
+ dynSMSSendRequest.setTemplateId("2431012165299");
+ dynSMSSendRequest.setDynData(new String[][]{{"手机号码", "标题"}, {phone, smsRequest.getContent()}});
+ // 手机号校验
+ if(validator(phone)) {
+ // 发送邮件短信
+ String dynSendMsg = SmsUtils.dynSendMethod(dynSMSSendRequest);
+ // 记录保存
+ SMSSendRequest request = new SMSSendRequest();
+ request.setUserNumber(phone);
+ request.setMessageContent(smsRequest.getContent());
+ request.setTemplateId(dynSMSSendRequest.getTemplateId());
+ // 记录发送记录操作
+ saveSendRecord(request, dynSendMsg);
+ }else {
+ // 手机号有误记录
+ // 记录保存
+ SMSSendRequest request = new SMSSendRequest();
+ request.setUserNumber(phone);
+ request.setMessageContent(smsRequest.getContent());
+ request.setTemplateId(dynSMSSendRequest.getTemplateId());
+ // 记录发送记录操作
+ saveSendRecord(request, "手机号错误未发送...");
+ }
}
return R.status(true);
}
--
Gitblit v1.9.3