|
|
|
|
@ -1,5 +1,6 @@
|
|
|
|
|
package cn.estsh.i3plus.core.apiservice.controller.busi;
|
|
|
|
|
|
|
|
|
|
import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
|
|
|
|
|
import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService;
|
|
|
|
|
import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
|
|
|
|
|
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
|
|
|
|
|
@ -8,11 +9,9 @@ import cn.estsh.i3plus.platform.common.tool.StringTool;
|
|
|
|
|
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
|
|
|
|
import cn.estsh.i3plus.pojo.base.common.Pager;
|
|
|
|
|
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
|
|
|
|
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
|
|
|
|
|
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
|
|
|
|
|
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
|
|
|
|
|
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole;
|
|
|
|
|
import cn.estsh.i3plus.pojo.platform.bean.SysUser;
|
|
|
|
|
import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
|
|
|
|
|
import cn.estsh.i3plus.pojo.platform.bean.*;
|
|
|
|
|
import cn.estsh.impp.framework.base.controller.CoreBaseController;
|
|
|
|
|
import cn.estsh.impp.framework.boot.auth.AuthUtil;
|
|
|
|
|
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
|
|
|
|
|
@ -22,6 +21,7 @@ import cn.estsh.impp.framework.boot.util.ResultBean;
|
|
|
|
|
import cn.estsh.impp.framework.boot.util.ValidatorBean;
|
|
|
|
|
import io.swagger.annotations.Api;
|
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
|
import org.apache.commons.lang3.RandomStringUtils;
|
|
|
|
|
import org.slf4j.Logger;
|
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
@ -49,6 +49,9 @@ public class SysUserController extends CoreBaseController{
|
|
|
|
|
@Autowired
|
|
|
|
|
private ISysUserInfoService sysUserInfoService;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private ISysMessageService sysMessageService;
|
|
|
|
|
|
|
|
|
|
@PostMapping(value = "/insert")
|
|
|
|
|
@ApiOperation(value = "新增用户", notes = "新增系统用户")
|
|
|
|
|
public ResultBean insertSysUser(SysUser sysUser,String[] roleIds) {
|
|
|
|
|
@ -83,6 +86,8 @@ public class SysUserController extends CoreBaseController{
|
|
|
|
|
sysUser.setUserStatus(CommonEnumUtil.USER_STATUS.NORMAL.getValue());
|
|
|
|
|
sysUser.setDepartmentId(userInfo.getDepartmentId());
|
|
|
|
|
sysUser.setDepartmentNameRdd(userInfo.getDepartmentNameRdd());
|
|
|
|
|
sysUser.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
|
|
|
|
|
sysUser.setUserLoginNum(0);
|
|
|
|
|
ConvertBean.modelInitialize(sysUser,AuthUtil.getSessionUser());
|
|
|
|
|
|
|
|
|
|
SysUser user = sysUserService.insertSysUser(sysUser);
|
|
|
|
|
@ -146,6 +151,7 @@ public class SysUserController extends CoreBaseController{
|
|
|
|
|
user.setUserLoginPassword(md5);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
user.setUserInfoId(userInfo.getId());
|
|
|
|
|
user.setUserName(userInfo.getName());
|
|
|
|
|
user.setDepartmentId(userInfo.getDepartmentId());
|
|
|
|
|
user.setDepartmentNameRdd(userInfo.getDepartmentNameRdd());
|
|
|
|
|
@ -272,9 +278,9 @@ public class SysUserController extends CoreBaseController{
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@DeleteMapping(value = "/delete")
|
|
|
|
|
@ApiOperation(value = "删除定时任务", notes = "删除定时任务")
|
|
|
|
|
public ResultBean delete(String id) {
|
|
|
|
|
@DeleteMapping(value = "/delete/{id}")
|
|
|
|
|
@ApiOperation(value = "删除账号", notes = "删除制定账号信息")
|
|
|
|
|
public ResultBean delete(@PathVariable("id") String id) {
|
|
|
|
|
try {
|
|
|
|
|
// 数据校验
|
|
|
|
|
ValidatorBean.checkNotNull(id, "用户id 不能为空");
|
|
|
|
|
@ -333,4 +339,47 @@ public class SysUserController extends CoreBaseController{
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@DeleteMapping("/reset-pwd/{id}")
|
|
|
|
|
@ApiOperation(value = "密码重置",notes = "根据id重置用户密码")
|
|
|
|
|
public ResultBean updateResetPassword(@PathVariable String id){
|
|
|
|
|
try {
|
|
|
|
|
SysUser user = sysUserService.getSysUserById(Long.parseLong(id));
|
|
|
|
|
if(user != null){
|
|
|
|
|
String password = RandomStringUtils.random(6, true, false);
|
|
|
|
|
user.setUserLoginPassword(EncryptTool.hexMD5(password));
|
|
|
|
|
sysUserService.updateSysUser(user);
|
|
|
|
|
|
|
|
|
|
String content = "系统提示：\n" +
|
|
|
|
|
"\t"+getSessionUser().getUserName()+"使用密码重置功能帮您重置了【"+user.getUserLoginName()+"】账号的密码，" +
|
|
|
|
|
"新密码是："+password+"";
|
|
|
|
|
|
|
|
|
|
SysMessage message = new SysMessage();
|
|
|
|
|
message.setMessageTitle("重置密码");
|
|
|
|
|
message.setMessageContent(content);
|
|
|
|
|
message.setMessageType(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue());
|
|
|
|
|
message.setMessageContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.TEXT.getValue());
|
|
|
|
|
message.setMessageSenderId(getSessionUser().getUser().getId());
|
|
|
|
|
message.setMessageSenderNameRdd(getSessionUser().getUserName());
|
|
|
|
|
message.setMessageReceiversId(user.getId().toString());
|
|
|
|
|
message.setMessageReceiversNameRdd(user.getUserName());
|
|
|
|
|
|
|
|
|
|
sysMessageService.doSendSysMessage(message);
|
|
|
|
|
|
|
|
|
|
LOGGER.info("系统提示：{} 使用密码重置功能帮{}重置了{}账号的密码，新密码是：{}",
|
|
|
|
|
getSessionUser().getUserName(),user.getUserName(),user.getUserLoginName(),password);
|
|
|
|
|
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
|
|
|
|
}else{
|
|
|
|
|
return ResultBean.success("操作失败")
|
|
|
|
|
.setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode())
|
|
|
|
|
.setErrorMsg("用户不存在");
|
|
|
|
|
}
|
|
|
|
|
} catch (ImppBusiException busExcep) {
|
|
|
|
|
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
|
|
|
|
|
return ResultBean.fail(busExcep);
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
|
|
|
|
|
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
wei.peng
7 years ago