|
@@ -5,9 +5,13 @@ import java.util.LinkedHashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
+import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
|
|
|
import com.aliyuncs.exceptions.ClientException;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
+import com.ruoyi.common.utils.DateUtils;
|
|
|
import com.ruoyi.common.utils.SendSmsUtils;
|
|
|
+import com.ruoyi.system.domain.*;
|
|
|
+import com.ruoyi.system.mapper.*;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -20,14 +24,6 @@ import com.ruoyi.common.core.domain.entity.SysUser;
|
|
|
import com.ruoyi.common.exception.CustomException;
|
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
-import com.ruoyi.system.domain.SysPost;
|
|
|
-import com.ruoyi.system.domain.SysUserPost;
|
|
|
-import com.ruoyi.system.domain.SysUserRole;
|
|
|
-import com.ruoyi.system.mapper.SysPostMapper;
|
|
|
-import com.ruoyi.system.mapper.SysRoleMapper;
|
|
|
-import com.ruoyi.system.mapper.SysUserMapper;
|
|
|
-import com.ruoyi.system.mapper.SysUserPostMapper;
|
|
|
-import com.ruoyi.system.mapper.SysUserRoleMapper;
|
|
|
import com.ruoyi.system.service.ISysConfigService;
|
|
|
import com.ruoyi.system.service.ISysUserService;
|
|
|
|
|
@@ -35,12 +31,11 @@ import javax.validation.constraints.Size;
|
|
|
|
|
|
/**
|
|
|
* 用户 业务层处理
|
|
|
- *
|
|
|
+ *
|
|
|
* @author ruoyi
|
|
|
*/
|
|
|
@Service
|
|
|
-public class SysUserServiceImpl implements ISysUserService
|
|
|
-{
|
|
|
+public class SysUserServiceImpl implements ISysUserService {
|
|
|
private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
|
|
|
|
|
|
@Autowired
|
|
@@ -61,60 +56,60 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
@Autowired
|
|
|
private ISysConfigService configService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private TextMessageMapper textMessageMapper;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private TextMessageLogMapper textMessageLogMapper;
|
|
|
+
|
|
|
/**
|
|
|
* 根据条件分页查询用户列表
|
|
|
- *
|
|
|
+ *
|
|
|
* @param user 用户信息
|
|
|
* @return 用户信息集合信息
|
|
|
*/
|
|
|
@Override
|
|
|
@DataScope(deptAlias = "d", userAlias = "u")
|
|
|
- public List<SysUser> selectUserList(SysUser user)
|
|
|
- {
|
|
|
+ public List<SysUser> selectUserList(SysUser user) {
|
|
|
return userMapper.selectUserList(user);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 通过用户名查询用户
|
|
|
- *
|
|
|
+ *
|
|
|
* @param userName 用户名
|
|
|
* @return 用户对象信息
|
|
|
*/
|
|
|
@Override
|
|
|
- public SysUser selectUserByUserName(String userName)
|
|
|
- {
|
|
|
+ public SysUser selectUserByUserName(String userName) {
|
|
|
return userMapper.selectUserByUserName(userName);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 通过用户ID查询用户
|
|
|
- *
|
|
|
+ *
|
|
|
* @param userId 用户ID
|
|
|
* @return 用户对象信息
|
|
|
*/
|
|
|
@Override
|
|
|
- public SysUser selectUserById(Long userId)
|
|
|
- {
|
|
|
+ public SysUser selectUserById(Long userId) {
|
|
|
return userMapper.selectUserById(userId);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 查询用户所属角色组
|
|
|
- *
|
|
|
+ *
|
|
|
* @param userName 用户名
|
|
|
* @return 结果
|
|
|
*/
|
|
|
@Override
|
|
|
- public String selectUserRoleGroup(String userName)
|
|
|
- {
|
|
|
+ public String selectUserRoleGroup(String userName) {
|
|
|
List<SysRole> list = roleMapper.selectRolesByUserName(userName);
|
|
|
StringBuffer idsStr = new StringBuffer();
|
|
|
- for (SysRole role : list)
|
|
|
- {
|
|
|
+ for (SysRole role : list) {
|
|
|
idsStr.append(role.getRoleName()).append(",");
|
|
|
}
|
|
|
- if (StringUtils.isNotEmpty(idsStr.toString()))
|
|
|
- {
|
|
|
+ if (StringUtils.isNotEmpty(idsStr.toString())) {
|
|
|
return idsStr.substring(0, idsStr.length() - 1);
|
|
|
}
|
|
|
return idsStr.toString();
|
|
@@ -122,21 +117,18 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
/**
|
|
|
* 查询用户所属岗位组
|
|
|
- *
|
|
|
+ *
|
|
|
* @param userName 用户名
|
|
|
* @return 结果
|
|
|
*/
|
|
|
@Override
|
|
|
- public String selectUserPostGroup(String userName)
|
|
|
- {
|
|
|
+ public String selectUserPostGroup(String userName) {
|
|
|
List<SysPost> list = postMapper.selectPostsByUserName(userName);
|
|
|
StringBuffer idsStr = new StringBuffer();
|
|
|
- for (SysPost post : list)
|
|
|
- {
|
|
|
+ for (SysPost post : list) {
|
|
|
idsStr.append(post.getPostName()).append(",");
|
|
|
}
|
|
|
- if (StringUtils.isNotEmpty(idsStr.toString()))
|
|
|
- {
|
|
|
+ if (StringUtils.isNotEmpty(idsStr.toString())) {
|
|
|
return idsStr.substring(0, idsStr.length() - 1);
|
|
|
}
|
|
|
return idsStr.toString();
|
|
@@ -144,16 +136,14 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
/**
|
|
|
* 校验用户名称是否唯一
|
|
|
- *
|
|
|
+ *
|
|
|
* @param userName 用户名称
|
|
|
* @return 结果
|
|
|
*/
|
|
|
@Override
|
|
|
- public String checkUserNameUnique(String userName)
|
|
|
- {
|
|
|
+ public String checkUserNameUnique(String userName) {
|
|
|
int count = userMapper.checkUserNameUnique(userName);
|
|
|
- if (count > 0)
|
|
|
- {
|
|
|
+ if (count > 0) {
|
|
|
return UserConstants.NOT_UNIQUE;
|
|
|
}
|
|
|
return UserConstants.UNIQUE;
|
|
@@ -166,12 +156,10 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
|
- public String checkPhoneUnique(SysUser user)
|
|
|
- {
|
|
|
+ public String checkPhoneUnique(SysUser user) {
|
|
|
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
|
|
|
SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
|
|
|
- if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
|
|
|
- {
|
|
|
+ if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
|
|
|
return UserConstants.NOT_UNIQUE;
|
|
|
}
|
|
|
return UserConstants.UNIQUE;
|
|
@@ -184,12 +172,10 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
|
- public String checkEmailUnique(SysUser user)
|
|
|
- {
|
|
|
+ public String checkEmailUnique(SysUser user) {
|
|
|
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
|
|
|
SysUser info = userMapper.checkEmailUnique(user.getEmail());
|
|
|
- if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
|
|
|
- {
|
|
|
+ if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
|
|
|
return UserConstants.NOT_UNIQUE;
|
|
|
}
|
|
|
return UserConstants.UNIQUE;
|
|
@@ -197,28 +183,25 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
/**
|
|
|
* 校验用户是否允许操作
|
|
|
- *
|
|
|
+ *
|
|
|
* @param user 用户信息
|
|
|
*/
|
|
|
@Override
|
|
|
- public void checkUserAllowed(SysUser user)
|
|
|
- {
|
|
|
- if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
|
|
|
- {
|
|
|
+ public void checkUserAllowed(SysUser user) {
|
|
|
+ if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) {
|
|
|
throw new CustomException("不允许操作超级管理员用户");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 新增保存用户信息
|
|
|
- *
|
|
|
+ *
|
|
|
* @param user 用户信息
|
|
|
* @return 结果
|
|
|
*/
|
|
|
@Override
|
|
|
@Transactional
|
|
|
- public int insertUser(SysUser user)
|
|
|
- {
|
|
|
+ public int insertUser(SysUser user) {
|
|
|
// 新增用户信息
|
|
|
int rows = userMapper.insertUser(user);
|
|
|
// 新增用户岗位关联
|
|
@@ -230,14 +213,13 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
/**
|
|
|
* 修改保存用户信息
|
|
|
- *
|
|
|
+ *
|
|
|
* @param user 用户信息
|
|
|
* @return 结果
|
|
|
*/
|
|
|
@Override
|
|
|
@Transactional
|
|
|
- public int updateUser(SysUser user)
|
|
|
- {
|
|
|
+ public int updateUser(SysUser user) {
|
|
|
Long userId = user.getUserId();
|
|
|
// 删除用户与角色关联
|
|
|
userRoleMapper.deleteUserRoleByUserId(userId);
|
|
@@ -252,88 +234,79 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
/**
|
|
|
* 修改用户状态
|
|
|
- *
|
|
|
+ *
|
|
|
* @param user 用户信息
|
|
|
* @return 结果
|
|
|
*/
|
|
|
@Override
|
|
|
- public int updateUserStatus(SysUser user)
|
|
|
- {
|
|
|
+ public int updateUserStatus(SysUser user) {
|
|
|
return userMapper.updateUser(user);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 修改用户基本信息
|
|
|
- *
|
|
|
+ *
|
|
|
* @param user 用户信息
|
|
|
* @return 结果
|
|
|
*/
|
|
|
@Override
|
|
|
- public int updateUserProfile(SysUser user)
|
|
|
- {
|
|
|
+ public int updateUserProfile(SysUser user) {
|
|
|
return userMapper.updateUser(user);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 修改用户头像
|
|
|
- *
|
|
|
+ *
|
|
|
* @param userName 用户名
|
|
|
- * @param avatar 头像地址
|
|
|
+ * @param avatar 头像地址
|
|
|
* @return 结果
|
|
|
*/
|
|
|
@Override
|
|
|
- public boolean updateUserAvatar(String userName, String avatar)
|
|
|
- {
|
|
|
+ public boolean updateUserAvatar(String userName, String avatar) {
|
|
|
return userMapper.updateUserAvatar(userName, avatar) > 0;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 重置用户密码
|
|
|
- *
|
|
|
+ *
|
|
|
* @param user 用户信息
|
|
|
* @return 结果
|
|
|
*/
|
|
|
@Override
|
|
|
- public int resetPwd(SysUser user)
|
|
|
- {
|
|
|
+ public int resetPwd(SysUser user) {
|
|
|
return userMapper.updateUser(user);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 重置用户密码
|
|
|
- *
|
|
|
- * @param userName 用户名
|
|
|
- * @param password 密码
|
|
|
+ *
|
|
|
+ * @param userName 用户名
|
|
|
+ * @param password 密码
|
|
|
* @param clearTextPasswords 明文密码
|
|
|
* @return 结果
|
|
|
*/
|
|
|
@Override
|
|
|
- public int resetUserPwd(String userName, String password, String clearTextPasswords)
|
|
|
- {
|
|
|
+ public int resetUserPwd(String userName, String password, String clearTextPasswords) {
|
|
|
return userMapper.resetUserPwd(userName, password, clearTextPasswords);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 新增用户角色信息
|
|
|
- *
|
|
|
+ *
|
|
|
* @param user 用户对象
|
|
|
*/
|
|
|
- public void insertUserRole(SysUser user)
|
|
|
- {
|
|
|
+ public void insertUserRole(SysUser user) {
|
|
|
Long[] roles = user.getRoleIds();
|
|
|
- if (StringUtils.isNotNull(roles))
|
|
|
- {
|
|
|
+ if (StringUtils.isNotNull(roles)) {
|
|
|
// 新增用户与角色管理
|
|
|
List<SysUserRole> list = new ArrayList<SysUserRole>();
|
|
|
- for (Long roleId : roles)
|
|
|
- {
|
|
|
+ for (Long roleId : roles) {
|
|
|
SysUserRole ur = new SysUserRole();
|
|
|
ur.setUserId(user.getUserId());
|
|
|
ur.setRoleId(roleId);
|
|
|
list.add(ur);
|
|
|
}
|
|
|
- if (list.size() > 0)
|
|
|
- {
|
|
|
+ if (list.size() > 0) {
|
|
|
userRoleMapper.batchUserRole(list);
|
|
|
}
|
|
|
}
|
|
@@ -341,25 +314,21 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
/**
|
|
|
* 新增用户岗位信息
|
|
|
- *
|
|
|
+ *
|
|
|
* @param user 用户对象
|
|
|
*/
|
|
|
- public void insertUserPost(SysUser user)
|
|
|
- {
|
|
|
+ public void insertUserPost(SysUser user) {
|
|
|
Long[] posts = user.getPostIds();
|
|
|
- if (StringUtils.isNotNull(posts))
|
|
|
- {
|
|
|
+ if (StringUtils.isNotNull(posts)) {
|
|
|
// 新增用户与岗位管理
|
|
|
List<SysUserPost> list = new ArrayList<SysUserPost>();
|
|
|
- for (Long postId : posts)
|
|
|
- {
|
|
|
+ for (Long postId : posts) {
|
|
|
SysUserPost up = new SysUserPost();
|
|
|
up.setUserId(user.getUserId());
|
|
|
up.setPostId(postId);
|
|
|
list.add(up);
|
|
|
}
|
|
|
- if (list.size() > 0)
|
|
|
- {
|
|
|
+ if (list.size() > 0) {
|
|
|
userPostMapper.batchUserPost(list);
|
|
|
}
|
|
|
}
|
|
@@ -367,14 +336,13 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
/**
|
|
|
* 通过用户ID删除用户
|
|
|
- *
|
|
|
+ *
|
|
|
* @param userId 用户ID
|
|
|
* @return 结果
|
|
|
*/
|
|
|
@Override
|
|
|
@Transactional
|
|
|
- public int deleteUserById(Long userId)
|
|
|
- {
|
|
|
+ public int deleteUserById(Long userId) {
|
|
|
// 删除用户与角色关联
|
|
|
userRoleMapper.deleteUserRoleByUserId(userId);
|
|
|
// 删除用户与岗位表
|
|
@@ -384,16 +352,14 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
/**
|
|
|
* 批量删除用户信息
|
|
|
- *
|
|
|
+ *
|
|
|
* @param userIds 需要删除的用户ID
|
|
|
* @return 结果
|
|
|
*/
|
|
|
@Override
|
|
|
@Transactional
|
|
|
- public int deleteUserByIds(Long[] userIds)
|
|
|
- {
|
|
|
- for (Long userId : userIds)
|
|
|
- {
|
|
|
+ public int deleteUserByIds(Long[] userIds) {
|
|
|
+ for (Long userId : userIds) {
|
|
|
checkUserAllowed(new SysUser(userId));
|
|
|
}
|
|
|
// 删除用户与角色关联
|
|
@@ -405,17 +371,15 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
/**
|
|
|
* 导入用户数据
|
|
|
- *
|
|
|
- * @param userList 用户数据列表
|
|
|
+ *
|
|
|
+ * @param userList 用户数据列表
|
|
|
* @param isUpdateSupport 是否更新支持,如果已存在,则进行更新数据
|
|
|
- * @param operName 操作用户
|
|
|
+ * @param operName 操作用户
|
|
|
* @return 结果
|
|
|
*/
|
|
|
@Override
|
|
|
- public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName)
|
|
|
- {
|
|
|
- if (StringUtils.isNull(userList) || userList.size() == 0)
|
|
|
- {
|
|
|
+ public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
|
|
|
+ if (StringUtils.isNull(userList) || userList.size() == 0) {
|
|
|
throw new CustomException("导入用户数据不能为空!");
|
|
|
}
|
|
|
int successNum = 0;
|
|
@@ -423,48 +387,36 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
StringBuilder successMsg = new StringBuilder();
|
|
|
StringBuilder failureMsg = new StringBuilder();
|
|
|
String password = configService.selectConfigByKey("sys.user.initPassword");
|
|
|
- for (SysUser user : userList)
|
|
|
- {
|
|
|
- try
|
|
|
- {
|
|
|
+ for (SysUser user : userList) {
|
|
|
+ try {
|
|
|
// 验证是否存在这个用户
|
|
|
SysUser u = userMapper.selectUserByUserName(user.getUserName());
|
|
|
- if (StringUtils.isNull(u))
|
|
|
- {
|
|
|
+ if (StringUtils.isNull(u)) {
|
|
|
user.setPassword(SecurityUtils.encryptPassword(password));
|
|
|
user.setCreateBy(operName);
|
|
|
this.insertUser(user);
|
|
|
successNum++;
|
|
|
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
|
|
|
- }
|
|
|
- else if (isUpdateSupport)
|
|
|
- {
|
|
|
+ } else if (isUpdateSupport) {
|
|
|
user.setUpdateBy(operName);
|
|
|
this.updateUser(user);
|
|
|
successNum++;
|
|
|
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
+ } else {
|
|
|
failureNum++;
|
|
|
failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
|
|
|
}
|
|
|
- }
|
|
|
- catch (Exception e)
|
|
|
- {
|
|
|
+ } catch (Exception e) {
|
|
|
failureNum++;
|
|
|
String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败:";
|
|
|
failureMsg.append(msg + e.getMessage());
|
|
|
log.error(msg, e);
|
|
|
}
|
|
|
}
|
|
|
- if (failureNum > 0)
|
|
|
- {
|
|
|
+ if (failureNum > 0) {
|
|
|
failureMsg.insert(0, "很抱歉,导入失败!共 " + failureNum + " 条数据格式不正确,错误如下:");
|
|
|
throw new CustomException(failureMsg.toString());
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
+ } else {
|
|
|
successMsg.insert(0, "恭喜您,数据已全部导入成功!共 " + successNum + " 条,数据如下:");
|
|
|
}
|
|
|
return successMsg.toString();
|
|
@@ -472,39 +424,65 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
/**
|
|
|
* 给用户发短信
|
|
|
+ *
|
|
|
* @param map
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
|
- public AjaxResult sendSms(Map<String,Object> map) {
|
|
|
- StringBuilder nickNames = new StringBuilder("发送失败的人:");
|
|
|
- ArrayList<LinkedHashMap> userList = (ArrayList<LinkedHashMap>)map.get("userList");
|
|
|
+ public AjaxResult sendSms(Map<String, Object> map) {
|
|
|
+ StringBuilder nickNames = new StringBuilder("发送失败的人有:");
|
|
|
+ ArrayList<LinkedHashMap> userList = (ArrayList<LinkedHashMap>) map.get("userList");
|
|
|
String content = String.valueOf(map.get("content"));
|
|
|
- if (userList.size() > 0){
|
|
|
+ String accessKeyId = "LTAI5tNA2fcBJH6EWRH6Pxr6";
|
|
|
+ String accessKeySecret = "5WdaPEOvC3u9LC7pwy2DQ9pgmJvgUr";
|
|
|
+ String signName = "安徽博曼网络科技有限公司";
|
|
|
+ String templateCode = "SMS_219525380";
|
|
|
+ String message = null;
|
|
|
+ boolean flag = false;
|
|
|
+ Long textMessageId = Long.valueOf(String.valueOf(map.get("textMessageId")));
|
|
|
+ TextMessage textMessage = textMessageMapper.selectTextMessageById(textMessageId);
|
|
|
+ if (textMessage != null){
|
|
|
+ accessKeyId = textMessage.getAccessKeyId();
|
|
|
+ accessKeySecret = textMessage.getAccessKeySecret();
|
|
|
+ signName = textMessage.getSignName();
|
|
|
+ templateCode = textMessage.getTemplateCode();
|
|
|
+ }
|
|
|
+ if (userList.size() > 0) {
|
|
|
StringBuilder sb = new StringBuilder();
|
|
|
for (LinkedHashMap sysUser : userList) {
|
|
|
String phone = String.valueOf(sysUser.get("phonenumber"));
|
|
|
- if (StringUtils.isNotBlank(phone)){
|
|
|
+ if (StringUtils.isNotBlank(phone)) {
|
|
|
sb.append(phone).append(",");
|
|
|
- }else {
|
|
|
+ TextMessageLog textMessageLog = new TextMessageLog();
|
|
|
+ textMessageLog.setPhoneNum(phone);
|
|
|
+ textMessageLog.setNickName(sysUser.get("nickName").toString());
|
|
|
+ textMessageLog.setCreateTime(DateUtils.getNowDate());
|
|
|
+ textMessageLog.setContent(content);
|
|
|
+ textMessageLog.setCreateBy(SecurityUtils.getUsername());
|
|
|
+ textMessageLogMapper.insertTextMessageLog(textMessageLog);
|
|
|
+ } else {
|
|
|
String nikeName = sysUser.get("nickName").toString();
|
|
|
- if(!"null".equals(nikeName)){
|
|
|
+ if (!"null".equals(nikeName)) {
|
|
|
+ flag = true;
|
|
|
nickNames.append(sysUser.get("nickName")).append(",");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (StringUtils.isNotBlank(sb)){
|
|
|
+ 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);
|
|
|
+ try {
|
|
|
+ SendSmsResponse sendSmsResponse = SendSmsUtils.sendSms(sb.toString(), content, accessKeyId, accessKeySecret, signName, templateCode);
|
|
|
+ message = sendSmsResponse.getMessage();
|
|
|
} catch (ClientException e) {
|
|
|
e.printStackTrace();
|
|
|
- }*/
|
|
|
+ }
|
|
|
+ if (flag) {
|
|
|
+ nickNames.replace(nickNames.length() - 1, nickNames.length(), "");
|
|
|
+ return AjaxResult.success(nickNames);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
- return AjaxResult.success(nickNames);
|
|
|
+ return AjaxResult.success(message);
|
|
|
}
|
|
|
}
|