|
@@ -128,16 +128,13 @@ public class IncidentController {
|
|
|
|
|
|
// User user = userService.get(subject);
|
|
|
// SimpleDateFormat sdfDetail = new SimpleDateFormat("yyyy年MM月dd日");
|
|
|
- String templateId = "";
|
|
|
String MessageContent = "";
|
|
|
//发送跟踪专班短信
|
|
|
- templateId = "2431012137069";
|
|
|
- MessageContent = String.format("您有一条待办提醒(批次:%s,序号:%s),请登录双优督办平台手机端查看。(http://39.104.144.104/excellent-mobile)",incident.getBatch(),incident.getSerialNo());
|
|
|
- sendSMSing(MessageContent, templateId, null, incident.getSpecialClassId(), "");
|
|
|
+ MessageContent = String.format("【双优督办】您有一条待办提醒(批次:%s,序号:%s),请登录双优督办平台手机端查看。(http://39.104.144.104/excellent-mobile)",incident.getBatch(),incident.getSerialNo());
|
|
|
+ sendSMSing(MessageContent, null, incident.getSpecialClassId(), null);
|
|
|
//发送交办单位短信
|
|
|
- templateId = "2431012137069";
|
|
|
- MessageContent = String.format("您有一条待办提醒(批次:%s,序号:%s),请登录双优督办平台电脑端查看。(http://39.104.144.104/excellent-portal)",incident.getBatch(),incident.getSerialNo());
|
|
|
- sendSMSing(MessageContent, templateId, incident.getOrgId(), null, "");
|
|
|
+ MessageContent = String.format("【双优督办】您有一条待办提醒(批次:%s,序号:%s),请登录双优督办平台电脑端查看。(http://39.104.144.104/excellent-portal)",incident.getBatch(),incident.getSerialNo());
|
|
|
+ sendSMSing(MessageContent, incident.getOrgId(), null, null);
|
|
|
|
|
|
msgResult.setResult(true);
|
|
|
msgResult.setData(incident);
|
|
@@ -305,16 +302,13 @@ public class IncidentController {
|
|
|
|
|
|
// User user = userService.get(subject);
|
|
|
// SimpleDateFormat sdfDetail = new SimpleDateFormat("yyyy年MM月dd日");
|
|
|
- String templateId = "";
|
|
|
String MessageContent = "";
|
|
|
//发送跟踪专班短信
|
|
|
- templateId = "2431012152806";
|
|
|
- MessageContent = String.format("您有一条待办提醒(批次:%s,序号:%s),请登录双优督办平台手机端查看。(http://39.104.144.104/excellent-mobile)",incident.getBatch(),incident.getSerialNo());
|
|
|
- sendSMSing(MessageContent, templateId, null, incident.getSpecialClassId(), "");
|
|
|
+ MessageContent = String.format("【双优督办】您有一条待办提醒(批次:%s,序号:%s),请登录双优督办平台手机端查看。(http://39.104.144.104/excellent-mobile)",incident.getBatch(),incident.getSerialNo());
|
|
|
+ sendSMSing(MessageContent, null, incident.getSpecialClassId(), null);
|
|
|
//发送交办单位短信
|
|
|
- templateId = "2431012152806";
|
|
|
- MessageContent = String.format("您有一条待办提醒(批次:%s,序号:%s),请登录双优督办平台电脑端查看。(http://39.104.144.104/excellent-portal)",incident.getBatch(),incident.getSerialNo());
|
|
|
- sendSMSing(MessageContent, templateId, incident.getOrgId(), null, "");
|
|
|
+ MessageContent = String.format("【双优督办】您有一条待办提醒(批次:%s,序号:%s),请登录双优督办平台电脑端查看。(http://39.104.144.104/excellent-portal)",incident.getBatch(),incident.getSerialNo());
|
|
|
+ sendSMSing(MessageContent, incident.getOrgId(), null, null);
|
|
|
|
|
|
msgResult.setResult(true);
|
|
|
msgResult.setData(incident);
|
|
@@ -384,12 +378,10 @@ public class IncidentController {
|
|
|
}
|
|
|
|
|
|
if(StringUtils.isNotEmpty(incident.getSpecialClassId())) {
|
|
|
- String templateId = "";
|
|
|
String MessageContent = "";
|
|
|
//发送跟踪专班短信
|
|
|
- templateId = "2431012153083";
|
|
|
- MessageContent = String.format("%s责任单位已上传文档(批次:%s,序号:%s),请查阅。",organization.getName(),incident.getBatch(),incident.getSerialNo());
|
|
|
- sendSMSing(MessageContent, templateId, null, incident.getSpecialClassId(), "");
|
|
|
+ MessageContent = String.format("【双优督办】%s责任单位已上传文档(批次:%s,序号:%s),请查阅。",organization.getName(),incident.getBatch(),incident.getSerialNo());
|
|
|
+ sendSMSing(MessageContent, null, incident.getSpecialClassId(), null);
|
|
|
}
|
|
|
|
|
|
msgResult.setResult(true);
|
|
@@ -1297,16 +1289,13 @@ public class IncidentController {
|
|
|
|
|
|
incidentService.insert(incident);
|
|
|
|
|
|
- String templateId = "";
|
|
|
String MessageContent = "";
|
|
|
//发送跟踪专班短信
|
|
|
- templateId = "2431012137069";
|
|
|
- MessageContent = String.format("您有一条待办提醒(批次:%s,序号:%s),请登录双优督办平台手机端查看。(http://39.104.144.104/excellent-mobile)",incident.getBatch(),incident.getSerialNo());
|
|
|
- sendSMSing(MessageContent, templateId, null, incident.getSpecialClassId(), "");
|
|
|
+ MessageContent = String.format("【双优督办】您有一条待办提醒(批次:%s,序号:%s),请登录双优督办平台手机端查看。(http://39.104.144.104/excellent-mobile)",incident.getBatch(),incident.getSerialNo());
|
|
|
+ sendSMSing(MessageContent, null, incident.getSpecialClassId(), null);
|
|
|
//发送交办单位短信
|
|
|
- templateId = "2431012137069";
|
|
|
- MessageContent = String.format("您有一条待办提醒(批次:%s,序号:%s),请登录双优督办平台电脑端查看。(http://39.104.144.104/excellent-portal)",incident.getBatch(),incident.getSerialNo());
|
|
|
- sendSMSing(MessageContent, templateId, incident.getOrgId(), null, "");
|
|
|
+ MessageContent = String.format("【双优督办】您有一条待办提醒(批次:%s,序号:%s),请登录双优督办平台电脑端查看。(http://39.104.144.104/excellent-portal)",incident.getBatch(),incident.getSerialNo());
|
|
|
+ sendSMSing(MessageContent, incident.getOrgId(), null, null);
|
|
|
|
|
|
affectCount++;
|
|
|
}
|
|
@@ -1423,34 +1412,38 @@ public class IncidentController {
|
|
|
}
|
|
|
|
|
|
//发送短信
|
|
|
- private void sendSMSing(String MessageContent, String templateId, String orgIds, String specialClassIds, String ScheduleTime){
|
|
|
+ private void sendSMSing(String MessageContent, String orgIds, String specialClassIds, String ScheduleTime){
|
|
|
SimpleDateFormat sfDate = new SimpleDateFormat("yyyyMMddHHmmssSSS");
|
|
|
String strDate = sfDate.format(new Date());
|
|
|
String random = String.valueOf((int)((Math.random()*9+1)*100));
|
|
|
String SerialNumber = strDate + random;
|
|
|
|
|
|
if(com.jpsoft.excellent.modules.common.utils.StringUtils.isNotEmpty(orgIds)) {
|
|
|
+ List<String> phones = new ArrayList<>();
|
|
|
String[] orgIdArray = orgIds.split(",");
|
|
|
for(String orgId : orgIdArray){
|
|
|
List<User> userList = userService.findListByOrgId(orgId);
|
|
|
for(User user : userList){
|
|
|
if(StringUtils.isNotEmpty(user.getPhone())) {
|
|
|
- SMSUtil.sendSMS(MessageContent, user.getPhone(), templateId, SerialNumber, ScheduleTime);
|
|
|
+ phones.add(user.getPhone().replace(" ",""));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ SMSUtil.sendSMS(MessageContent, StringUtils.join(phones.toArray(), ","), ScheduleTime);
|
|
|
}
|
|
|
|
|
|
if(com.jpsoft.excellent.modules.common.utils.StringUtils.isNotEmpty(specialClassIds)) {
|
|
|
+ List<String> phones = new ArrayList<>();
|
|
|
String[] specialClassIdArray = specialClassIds.split(",");
|
|
|
for(String specialClassId : specialClassIdArray){
|
|
|
List<User> userList = userService.findListBySpecialClassId(specialClassId);
|
|
|
for(User user : userList){
|
|
|
if(StringUtils.isNotEmpty(user.getPhone())) {
|
|
|
- SMSUtil.sendSMS(MessageContent, user.getPhone(), templateId, SerialNumber, ScheduleTime);
|
|
|
+ phones.add(user.getPhone().replace(" ",""));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ SMSUtil.sendSMS(MessageContent, StringUtils.join(phones.toArray(), ","), ScheduleTime);
|
|
|
}
|
|
|
}
|
|
|
|