|
@@ -1,6 +1,7 @@
|
|
|
package com.ruoyi.system.service.impl;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.LinkedHashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
@@ -476,27 +477,34 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
*/
|
|
|
@Override
|
|
|
public AjaxResult sendSms(Map<String,Object> map) {
|
|
|
- StringBuilder nikeName = new StringBuilder("发送失败的人:");
|
|
|
- ArrayList<SysUser> userList = (ArrayList<SysUser>)map.get("userList");
|
|
|
+ StringBuilder nickNames = new StringBuilder("发送失败的人:");
|
|
|
+ ArrayList<LinkedHashMap> userList = (ArrayList<LinkedHashMap>)map.get("userList");
|
|
|
String content = String.valueOf(map.get("content"));
|
|
|
if (userList.size() > 0){
|
|
|
StringBuilder sb = new StringBuilder();
|
|
|
- for (SysUser sysUser : userList) {
|
|
|
- String phone = sysUser.getPhonenumber();
|
|
|
+ for (LinkedHashMap sysUser : userList) {
|
|
|
+ String phone = String.valueOf(sysUser.get("phonenumber"));
|
|
|
if (StringUtils.isNotBlank(phone)){
|
|
|
sb.append(phone).append(",");
|
|
|
}else {
|
|
|
- nikeName.append(sysUser.getNickName()).append(",");
|
|
|
+ String nikeName = sysUser.get("nickName").toString();
|
|
|
+ if(!"null".equals(nikeName)){
|
|
|
+ nickNames.append(sysUser.get("nickName")).append(",");
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- sb.replace(sb.length() - 1, sb.length(), "");
|
|
|
- nikeName.replace(nikeName.length() - 1, nikeName.length(), "");
|
|
|
- try {
|
|
|
+ if (StringUtils.isNotBlank(sb)){
|
|
|
+ sb.replace(sb.length() - 1, sb.length(), "");
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotBlank(nickNames)){
|
|
|
+ nickNames.replace(nickNames.length() - 1, nickNames.length(), "");
|
|
|
+ }
|
|
|
+/* try {
|
|
|
SendSmsUtils.sendSms(sb.toString(),content);
|
|
|
} catch (ClientException e) {
|
|
|
e.printStackTrace();
|
|
|
- }
|
|
|
+ }*/
|
|
|
}
|
|
|
- return AjaxResult.success(nikeName);
|
|
|
+ return AjaxResult.success(nickNames);
|
|
|
}
|
|
|
}
|