|
@@ -255,16 +255,17 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
|
|
|
List<String> mails = new ArrayList<>();
|
|
|
SbInfo sbInfo = sbInfoService.getModelById(model.getSbId());
|
|
|
|
|
|
- String receiver = "";
|
|
|
+ List<String> receiverList = new ArrayList<String>();
|
|
|
if(StringUtils.isNotBlank(sbInfo.getRepairUser())){
|
|
|
SysUserVO user = sysUserService.selectUserVO(sbInfo.getRepairUser());
|
|
|
- receiver = user.getPhone();
|
|
|
+ receiverList.add(user.getPhone());
|
|
|
userIds.add(sbInfo.getRepairUser());
|
|
|
openIds.add(user.getWxOpenid());
|
|
|
mails.add(user.getEmail());
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(sbInfo.getRepairUserSecond())){
|
|
|
SysUserVO user = sysUserService.selectUserVO(sbInfo.getRepairUserSecond());
|
|
|
+ receiverList.add(user.getPhone());
|
|
|
userIds.add(sbInfo.getRepairUserSecond());
|
|
|
openIds.add(user.getWxOpenid());
|
|
|
mails.add(user.getEmail());
|
|
@@ -298,8 +299,8 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
|
|
|
/* for(String openId : openIds){
|
|
|
WeChatMessageUtil.repairMessage( openId, repairUrl,model,sb);
|
|
|
}*/
|
|
|
- // 发送短信通知给第一维修人,省钱,其他人不发短信
|
|
|
- if(StringUtils.isNotBlank(receiver)){
|
|
|
+ // 发送短信通知给第一维修人,和第二维修人,其他人不发短信
|
|
|
+ if(CollectionUtil.isNotEmpty(receiverList)){
|
|
|
// String templateParas_repair = "[\"C-001\",\"1号车间\",\"熊超\"]";
|
|
|
String no = sb.getNo();
|
|
|
if(StringUtils.isNotBlank(no)){
|
|
@@ -314,24 +315,26 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
|
|
|
actualUser = "未知";
|
|
|
}
|
|
|
String templateParas_repair = "[\"" + no + "\",\"" + sbCph + "\",\""+ actualUser + "\"]";
|
|
|
- try {
|
|
|
- String numStr = RedisUtils.getString(RedisKeyConstants.HW_SMS+ receiver);
|
|
|
- boolean isSend = false;
|
|
|
- if(StringUtils.isBlank(numStr)){
|
|
|
- isSend =true;
|
|
|
- RedisUtils.setString(RedisKeyConstants.HW_SMS + receiver, "1",24, TimeUnit.HOURS);
|
|
|
- }else if( Integer.valueOf(numStr)<5){
|
|
|
- isSend =true;
|
|
|
- RedisUtils.setString(RedisKeyConstants.HW_SMS + receiver, String.valueOf(Integer.valueOf(numStr) + 1),24, TimeUnit.HOURS);
|
|
|
+ for(String receiver: receiverList){
|
|
|
+ try {
|
|
|
+ String numStr = RedisUtils.getString(RedisKeyConstants.HW_SMS+ receiver);
|
|
|
+ boolean isSend = false;
|
|
|
+ if(StringUtils.isBlank(numStr)){
|
|
|
+ isSend =true;
|
|
|
+ RedisUtils.setString(RedisKeyConstants.HW_SMS + receiver, "1",24, TimeUnit.HOURS);
|
|
|
+ }else if( Integer.valueOf(numStr)<5){
|
|
|
+ isSend =true;
|
|
|
+ RedisUtils.setString(RedisKeyConstants.HW_SMS + receiver, String.valueOf(Integer.valueOf(numStr) + 1),24, TimeUnit.HOURS);
|
|
|
+ }
|
|
|
+ if(isSend){
|
|
|
+ System.out.println("templateParas_repair: " + templateParas_repair);
|
|
|
+ String template = "[\"369751\"]";
|
|
|
+ //SendSms.sendCodeSms(receiver, template);
|
|
|
+ SendSms.sendRepairSms(receiver, templateParas_repair);
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
}
|
|
|
- if(isSend){
|
|
|
- System.out.println("templateParas_repair: " + templateParas_repair);
|
|
|
- String template = "[\"369751\"]";
|
|
|
- //SendSms.sendCodeSms(receiver, template);
|
|
|
- SendSms.sendRepairSms(receiver, templateParas_repair);
|
|
|
- }
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
}
|
|
|
}
|
|
|
|