package org.jeecg.modules.system.controller;
|
|
|
import cn.hutool.core.util.RandomUtil;
|
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSONArray;
|
import com.alibaba.fastjson.JSONObject;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import lombok.extern.slf4j.Slf4j;
|
import org.apache.commons.lang.StringUtils;
|
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
import org.apache.shiro.authz.annotation.RequiresRoles;
|
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.aspect.annotation.PermissionData;
|
import org.jeecg.common.constant.CommonConstant;
|
import org.jeecg.common.constant.SymbolConstant;
|
import org.jeecg.common.system.api.ISysBaseAPI;
|
import org.jeecg.modules.base.service.BaseCommonService;
|
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.util.JwtUtil;
|
import org.jeecg.common.system.vo.LoginUser;
|
import org.jeecg.common.util.*;
|
import org.jeecg.modules.system.entity.*;
|
import org.jeecg.modules.system.model.DepartIdModel;
|
import org.jeecg.modules.system.model.SysUserSysDepartModel;
|
import org.jeecg.modules.system.service.*;
|
import org.jeecg.modules.system.vo.SysDepartUsersVO;
|
import org.jeecg.modules.system.vo.SysUserRoleVO;
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
import org.jeecgframework.poi.excel.entity.ImportParams;
|
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
|
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
import org.springframework.web.servlet.ModelAndView;
|
|
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletResponse;
|
import java.io.IOException;
|
import java.util.*;
|
import java.util.stream.Collectors;
|
|
/**
|
* <p>
|
* 用户表 前端控制器
|
* </p>
|
*
|
* @Author scott
|
* @since 2018-12-20
|
*/
|
@Slf4j
|
@RestController
|
@RequestMapping("/sys/user")
|
public class SysUserController {
|
|
@Autowired
|
private ISysUserService sysUserService;
|
|
@Autowired
|
private ISysDepartService sysDepartService;
|
|
@Autowired
|
private ISysUserRoleService sysUserRoleService;
|
|
@Autowired
|
private ISysUserDepartService sysUserDepartService;
|
|
@Autowired
|
private ISysUserRoleService userRoleService;
|
|
@Autowired
|
private ISysDepartRoleUserService departRoleUserService;
|
|
@Autowired
|
private ISysDepartRoleService departRoleService;
|
|
@Autowired
|
private RedisUtil redisUtil;
|
|
@Value("${jeecg.path.upload}")
|
private String upLoadPath;
|
|
@Autowired
|
private BaseCommonService baseCommonService;
|
|
/**
|
* 获取用户列表数据
|
* @param user
|
* @param pageNo
|
* @param pageSize
|
* @param req
|
* @return
|
*/
|
@PermissionData(pageComponent = "system/UserList")
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
public Result<IPage<SysUser>> queryPageList(SysUser user,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
|
Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
|
QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
|
|
//update-begin-Author:wangshuai--Date:20211119--for:【vue3】通过部门id查询用户，通过code查询id
|
//部门ID
|
String departId = req.getParameter("departId");
|
if(oConvertUtils.isNotEmpty(departId)){
|
LambdaQueryWrapper<SysUserDepart> query = new LambdaQueryWrapper<>();
|
query.eq(SysUserDepart::getDepId,departId);
|
List<SysUserDepart> list = sysUserDepartService.list(query);
|
List<String> userIds = list.stream().map(SysUserDepart::getUserId).collect(Collectors.toList());
|
//update-begin---author:wangshuai ---date:20220322 for：[issues/I4XTYB]查询用户时，当部门id 下没有分配用户时接口报错------------
|
if(oConvertUtils.listIsNotEmpty(userIds)){
|
queryWrapper.in("id",userIds);
|
}else{
|
return Result.OK();
|
}
|
//update-end---author:wangshuai ---date:20220322 for：[issues/I4XTYB]查询用户时，当部门id 下没有分配用户时接口报错------------
|
}
|
//用户ID
|
String code = req.getParameter("code");
|
if(oConvertUtils.isNotEmpty(code)){
|
queryWrapper.in("id",Arrays.asList(code.split(",")));
|
pageSize = code.split(",").length;
|
}
|
//update-end-Author:wangshuai--Date:20211119--for:【vue3】通过部门id查询用户，通过code查询id
|
|
//update-begin-author:taoyan--date:20220104--for: JTC-372 【用户冻结问题】 online授权、用户组件，选择用户都能看到被冻结的用户
|
String status = req.getParameter("status");
|
if(oConvertUtils.isNotEmpty(status)){
|
queryWrapper.eq("status", Integer.parseInt(status));
|
}
|
//update-end-author:taoyan--date:20220104--for: JTC-372 【用户冻结问题】 online授权、用户组件，选择用户都能看到被冻结的用户
|
|
//TODO 外部模拟登陆临时账号，列表不显示
|
queryWrapper.ne("username","_reserve_user_external");
|
Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
|
IPage<SysUser> pageList = sysUserService.page(page, queryWrapper);
|
|
//批量查询用户的所属部门
|
//step.1 先拿到全部的 useids
|
//step.2 通过 useids，一次性查询用户的所属部门名字
|
List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
|
if(userIds!=null && userIds.size()>0){
|
Map<String,String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
|
pageList.getRecords().forEach(item->{
|
item.setOrgCodeTxt(useDepNames.get(item.getId()));
|
});
|
}
|
result.setSuccess(true);
|
result.setResult(pageList);
|
log.info(pageList.toString());
|
return result;
|
}
|
|
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:user:add")
|
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
public Result<SysUser> add(@RequestBody JSONObject jsonObject) {
|
Result<SysUser> result = new Result<SysUser>();
|
String selectedRoles = jsonObject.getString("selectedroles");
|
String selectedDeparts = jsonObject.getString("selecteddeparts");
|
try {
|
SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
|
user.setCreateTime(new Date());//设置创建时间
|
String salt = oConvertUtils.randomGen(8);
|
user.setSalt(salt);
|
String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), salt);
|
user.setPassword(passwordEncode);
|
user.setStatus(1);
|
user.setDelFlag(CommonConstant.DEL_FLAG_0);
|
//用户表字段org_code不能在这里设置他的值
|
user.setOrgCode(null);
|
// 保存用户走一个service 保证事务
|
sysUserService.saveUser(user, selectedRoles, selectedDeparts);
|
baseCommonService.addLog("添加用户，username： " +user.getUsername() ,CommonConstant.LOG_TYPE_2, 2);
|
result.success("添加成功！");
|
} catch (Exception e) {
|
log.error(e.getMessage(), e);
|
result.error500("操作失败");
|
}
|
return result;
|
}
|
|
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:user:edit")
|
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
|
Result<SysUser> result = new Result<SysUser>();
|
try {
|
SysUser sysUser = sysUserService.getById(jsonObject.getString("id"));
|
baseCommonService.addLog("编辑用户，username： " +sysUser.getUsername() ,CommonConstant.LOG_TYPE_2, 2);
|
if(sysUser==null) {
|
result.error500("未找到对应实体");
|
}else {
|
SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
|
user.setUpdateTime(new Date());
|
//String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), sysUser.getSalt());
|
user.setPassword(sysUser.getPassword());
|
String roles = jsonObject.getString("selectedroles");
|
String departs = jsonObject.getString("selecteddeparts");
|
if(oConvertUtils.isEmpty(departs)){
|
//vue3.0前端只传递了departIds
|
departs=user.getDepartIds();
|
}
|
//用户表字段org_code不能在这里设置他的值
|
user.setOrgCode(null);
|
// 修改用户走一个service 保证事务
|
sysUserService.editUser(user, roles, departs);
|
result.success("修改成功!");
|
}
|
} catch (Exception e) {
|
log.error(e.getMessage(), e);
|
result.error500("操作失败");
|
}
|
return result;
|
}
|
|
/**
|
* 删除用户
|
*/
|
//@RequiresRoles({"admin"})
|
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
|
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 3);
|
this.sysUserService.deleteUser(id);
|
return Result.ok("删除用户成功");
|
}
|
|
/**
|
* 批量删除用户
|
*/
|
//@RequiresRoles({"admin"})
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
baseCommonService.addLog("批量删除用户， ids： " +ids ,CommonConstant.LOG_TYPE_2, 3);
|
this.sysUserService.deleteBatchUsers(ids);
|
return Result.ok("批量删除用户成功");
|
}
|
|
/**
|
* 冻结&解冻用户
|
* @param jsonObject
|
* @return
|
*/
|
//@RequiresRoles({"admin"})
|
@RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT)
|
public Result<SysUser> frozenBatch(@RequestBody JSONObject jsonObject) {
|
Result<SysUser> result = new Result<SysUser>();
|
try {
|
String ids = jsonObject.getString("ids");
|
String status = jsonObject.getString("status");
|
String[] arr = ids.split(",");
|
for (String id : arr) {
|
if(oConvertUtils.isNotEmpty(id)) {
|
this.sysUserService.update(new SysUser().setStatus(Integer.parseInt(status)),
|
new UpdateWrapper<SysUser>().lambda().eq(SysUser::getId,id));
|
}
|
}
|
} catch (Exception e) {
|
log.error(e.getMessage(), e);
|
result.error500("操作失败"+e.getMessage());
|
}
|
result.success("操作成功!");
|
return result;
|
|
}
|
|
@RequestMapping(value = "/queryById", method = RequestMethod.GET)
|
public Result<SysUser> queryById(@RequestParam(name = "id", required = true) String id) {
|
Result<SysUser> result = new Result<SysUser>();
|
SysUser sysUser = sysUserService.getById(id);
|
if (sysUser == null) {
|
result.error500("未找到对应实体");
|
} else {
|
result.setResult(sysUser);
|
result.setSuccess(true);
|
}
|
return result;
|
}
|
|
@RequestMapping(value = "/queryUserRole", method = RequestMethod.GET)
|
public Result<List<String>> queryUserRole(@RequestParam(name = "userid", required = true) String userid) {
|
Result<List<String>> result = new Result<>();
|
List<String> list = new ArrayList<String>();
|
List<SysUserRole> userRole = sysUserRoleService.list(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, userid));
|
if (userRole == null || userRole.size() <= 0) {
|
result.error500("未找到用户相关角色信息");
|
} else {
|
for (SysUserRole sysUserRole : userRole) {
|
list.add(sysUserRole.getRoleId());
|
}
|
result.setSuccess(true);
|
result.setResult(list);
|
}
|
return result;
|
}
|
|
|
/**
|
* 校验用户账号是否唯一<br>
|
* 可以校验其他 需要检验什么就传什么。。。
|
*
|
* @param sysUser
|
* @return
|
*/
|
@RequestMapping(value = "/checkOnlyUser", method = RequestMethod.GET)
|
public Result<Boolean> checkOnlyUser(SysUser sysUser) {
|
Result<Boolean> result = new Result<>();
|
//如果此参数为false则程序发生异常
|
result.setResult(true);
|
try {
|
//通过传入信息查询新的用户信息
|
sysUser.setPassword(null);
|
SysUser user = sysUserService.getOne(new QueryWrapper<SysUser>(sysUser));
|
if (user != null) {
|
result.setSuccess(false);
|
result.setMessage("用户账号已存在");
|
return result;
|
}
|
|
} catch (Exception e) {
|
result.setSuccess(false);
|
result.setMessage(e.getMessage());
|
return result;
|
}
|
result.setSuccess(true);
|
return result;
|
}
|
|
/**
|
* 修改密码
|
*/
|
//@RequiresRoles({"admin"})
|
@RequestMapping(value = "/changePassword", method = RequestMethod.PUT)
|
public Result<?> changePassword(@RequestBody SysUser sysUser) {
|
SysUser u = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, sysUser.getUsername()));
|
if (u == null) {
|
return Result.error("用户不存在！");
|
}
|
sysUser.setId(u.getId());
|
//update-begin---author:wangshuai ---date:20220316 for：[VUEN-234]修改密码添加敏感日志------------
|
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
baseCommonService.addLog("修改用户 "+sysUser.getUsername()+" 的密码，操作人： " +loginUser.getUsername() ,CommonConstant.LOG_TYPE_2, 2);
|
//update-end---author:wangshuai ---date:20220316 for：[VUEN-234]修改密码添加敏感日志------------
|
return sysUserService.changePassword(sysUser);
|
}
|
|
/**
|
* 查询指定用户和部门关联的数据
|
*
|
* @param userId
|
* @return
|
*/
|
@RequestMapping(value = "/userDepartList", method = RequestMethod.GET)
|
public Result<List<DepartIdModel>> getUserDepartsList(@RequestParam(name = "userId", required = true) String userId) {
|
Result<List<DepartIdModel>> result = new Result<>();
|
try {
|
List<DepartIdModel> depIdModelList = this.sysUserDepartService.queryDepartIdsOfUser(userId);
|
if (depIdModelList != null && depIdModelList.size() > 0) {
|
result.setSuccess(true);
|
result.setMessage("查找成功");
|
result.setResult(depIdModelList);
|
} else {
|
result.setSuccess(false);
|
result.setMessage("查找失败");
|
}
|
return result;
|
} catch (Exception e) {
|
log.error(e.getMessage(), e);
|
result.setSuccess(false);
|
result.setMessage("查找过程中出现了异常: " + e.getMessage());
|
return result;
|
}
|
|
}
|
|
/**
|
* 生成在添加用户情况下没有主键的问题,返回给前端,根据该id绑定部门数据
|
*
|
* @return
|
*/
|
@RequestMapping(value = "/generateUserId", method = RequestMethod.GET)
|
public Result<String> generateUserId() {
|
Result<String> result = new Result<>();
|
System.out.println("我执行了,生成用户ID==============================");
|
String userId = UUID.randomUUID().toString().replace("-", "");
|
result.setSuccess(true);
|
result.setResult(userId);
|
return result;
|
}
|
|
/**
|
* 根据部门id查询用户信息
|
*
|
* @param id
|
* @return
|
*/
|
@RequestMapping(value = "/queryUserByDepId", method = RequestMethod.GET)
|
public Result<List<SysUser>> queryUserByDepId(@RequestParam(name = "id", required = true) String id,@RequestParam(name="realname",required=false) String realname) {
|
Result<List<SysUser>> result = new Result<>();
|
//List<SysUser> userList = sysUserDepartService.queryUserByDepId(id);
|
SysDepart sysDepart = sysDepartService.getById(id);
|
List<SysUser> userList = sysUserDepartService.queryUserByDepCode(sysDepart.getOrgCode(),realname);
|
|
//批量查询用户的所属部门
|
//step.1 先拿到全部的 useids
|
//step.2 通过 useids，一次性查询用户的所属部门名字
|
List<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList());
|
if(userIds!=null && userIds.size()>0){
|
Map<String,String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
|
userList.forEach(item->{
|
//TODO 临时借用这个字段用于页面展示
|
item.setOrgCodeTxt(useDepNames.get(item.getId()));
|
});
|
}
|
|
try {
|
result.setSuccess(true);
|
result.setResult(userList);
|
return result;
|
} catch (Exception e) {
|
log.error(e.getMessage(), e);
|
result.setSuccess(false);
|
return result;
|
}
|
}
|
|
/**
|
* 用户选择组件 专用 根据用户账号或部门分页查询
|
* @param departId
|
* @param username
|
* @return
|
*/
|
@RequestMapping(value = "/queryUserComponentData", method = RequestMethod.GET)
|
public Result<IPage<SysUser>> queryUserComponentData(
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
@RequestParam(name = "departId", required = false) String departId,
|
@RequestParam(name="realname",required=false) String realname,
|
@RequestParam(name="username",required=false) String username,
|
@RequestParam(name="id",required = false) String id) {
|
//update-begin-author:taoyan date:2022-7-14 for: VUEN-1702【禁止问题】sql注入漏洞
|
String[] arr = new String[]{departId, realname, username, id};
|
SqlInjectionUtil.filterContent(arr, SymbolConstant.SINGLE_QUOTATION_MARK);
|
//update-end-author:taoyan date:2022-7-14 for: VUEN-1702【禁止问题】sql注入漏洞
|
IPage<SysUser> pageList = sysUserDepartService.queryDepartUserPageList(departId, username, realname, pageSize, pageNo,id);
|
return Result.OK(pageList);
|
}
|
|
/**
|
* 导出excel
|
*
|
* @param request
|
* @param sysUser
|
*/
|
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:user:export")
|
@RequestMapping(value = "/exportXls")
|
public ModelAndView exportXls(SysUser sysUser,HttpServletRequest request) {
|
// Step.1 组装查询条件
|
QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(sysUser, request.getParameterMap());
|
//Step.2 AutoPoi 导出Excel
|
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
|
//update-begin--Author:kangxiaolin Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据--------------------
|
String selections = request.getParameter("selections");
|
if(!oConvertUtils.isEmpty(selections)){
|
queryWrapper.in("id",selections.split(","));
|
}
|
//update-end--Author:kangxiaolin Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据----------------------
|
List<SysUser> pageList = sysUserService.list(queryWrapper);
|
|
//导出文件名称
|
mv.addObject(NormalExcelConstants.FILE_NAME, "用户列表");
|
mv.addObject(NormalExcelConstants.CLASS, SysUser.class);
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
ExportParams exportParams = new ExportParams("用户列表数据", "导出人:"+user.getRealname(), "导出信息");
|
exportParams.setImageBasePath(upLoadPath);
|
mv.addObject(NormalExcelConstants.PARAMS, exportParams);
|
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
|
return mv;
|
}
|
|
/**
|
* 通过excel导入数据
|
*
|
* @param request
|
* @param response
|
* @return
|
*/
|
//@RequiresRoles({"admin"})
|
//@RequiresPermissions("system:user:import")
|
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response)throws IOException {
|
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
|
// 错误信息
|
List<String> errorMessage = new ArrayList<>();
|
int successLines = 0, errorLines = 0;
|
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
|
MultipartFile file = entity.getValue();// 获取上传文件对象
|
ImportParams params = new ImportParams();
|
params.setTitleRows(2);
|
params.setHeadRows(1);
|
params.setNeedSave(true);
|
try {
|
List<SysUser> listSysUsers = ExcelImportUtil.importExcel(file.getInputStream(), SysUser.class, params);
|
for (int i = 0; i < listSysUsers.size(); i++) {
|
SysUser sysUserExcel = listSysUsers.get(i);
|
if (StringUtils.isBlank(sysUserExcel.getPassword())) {
|
// 密码默认为 “123456”
|
sysUserExcel.setPassword("123456");
|
}
|
// 密码加密加盐
|
String salt = oConvertUtils.randomGen(8);
|
sysUserExcel.setSalt(salt);
|
String passwordEncode = PasswordUtil.encrypt(sysUserExcel.getUsername(), sysUserExcel.getPassword(), salt);
|
sysUserExcel.setPassword(passwordEncode);
|
try {
|
sysUserService.save(sysUserExcel);
|
successLines++;
|
} catch (Exception e) {
|
errorLines++;
|
String message = e.getMessage().toLowerCase();
|
int lineNumber = i + 1;
|
// 通过索引名判断出错信息
|
if (message.contains(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_USERNAME)) {
|
errorMessage.add("第 " + lineNumber + " 行：用户名已经存在，忽略导入。");
|
} else if (message.contains(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_WORK_NO)) {
|
errorMessage.add("第 " + lineNumber + " 行：工号已经存在，忽略导入。");
|
} else if (message.contains(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_PHONE)) {
|
errorMessage.add("第 " + lineNumber + " 行：手机号已经存在，忽略导入。");
|
} else if (message.contains(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_EMAIL)) {
|
errorMessage.add("第 " + lineNumber + " 行：电子邮件已经存在，忽略导入。");
|
} else if (message.contains(CommonConstant.SQL_INDEX_UNIQ_SYS_USER)) {
|
errorMessage.add("第 " + lineNumber + " 行：违反表唯一性约束。");
|
} else {
|
errorMessage.add("第 " + lineNumber + " 行：未知错误，忽略导入");
|
log.error(e.getMessage(), e);
|
}
|
}
|
// 批量将部门和用户信息建立关联关系
|
String departIds = sysUserExcel.getDepartIds();
|
if (StringUtils.isNotBlank(departIds)) {
|
String userId = sysUserExcel.getId();
|
String[] departIdArray = departIds.split(",");
|
List<SysUserDepart> userDepartList = new ArrayList<>(departIdArray.length);
|
for (String departId : departIdArray) {
|
userDepartList.add(new SysUserDepart(userId, departId));
|
}
|
sysUserDepartService.saveBatch(userDepartList);
|
}
|
|
}
|
} catch (Exception e) {
|
errorMessage.add("发生异常：" + e.getMessage());
|
log.error(e.getMessage(), e);
|
} finally {
|
try {
|
file.getInputStream().close();
|
} catch (IOException e) {
|
log.error(e.getMessage(), e);
|
}
|
}
|
}
|
return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage);
|
}
|
|
/**
|
* @功能：根据id 批量查询
|
* @param userIds
|
* @return
|
*/
|
@RequestMapping(value = "/queryByIds", method = RequestMethod.GET)
|
public Result<Collection<SysUser>> queryByIds(@RequestParam String userIds) {
|
Result<Collection<SysUser>> result = new Result<>();
|
String[] userId = userIds.split(",");
|
Collection<String> idList = Arrays.asList(userId);
|
Collection<SysUser> userRole = sysUserService.listByIds(idList);
|
result.setSuccess(true);
|
result.setResult(userRole);
|
return result;
|
}
|
|
/**
|
* 首页用户重置密码
|
*/
|
//@RequiresRoles({"admin"})
|
@RequestMapping(value = "/updatePassword", method = RequestMethod.PUT)
|
public Result<?> updatePassword(@RequestBody JSONObject json) {
|
String username = json.getString("username");
|
String oldpassword = json.getString("oldpassword");
|
String password = json.getString("password");
|
String confirmpassword = json.getString("confirmpassword");
|
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
|
if(!sysUser.getUsername().equals(username)){
|
return Result.error("只允许修改自己的密码！");
|
}
|
SysUser user = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, username));
|
if(user==null) {
|
return Result.error("用户不存在！");
|
}
|
//update-begin---author:wangshuai ---date:20220316 for：[VUEN-234]修改密码添加敏感日志------------
|
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
baseCommonService.addLog("修改密码，username： " +loginUser.getUsername() ,CommonConstant.LOG_TYPE_2, 2);
|
//update-end---author:wangshuai ---date:20220316 for：[VUEN-234]修改密码添加敏感日志------------
|
return sysUserService.resetPassword(username,oldpassword,password,confirmpassword);
|
}
|
|
@RequestMapping(value = "/userRoleList", method = RequestMethod.GET)
|
public Result<IPage<SysUser>> userRoleList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
|
Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
|
Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
|
String roleId = req.getParameter("roleId");
|
String username = req.getParameter("username");
|
IPage<SysUser> pageList = sysUserService.getUserByRoleId(page,roleId,username);
|
result.setSuccess(true);
|
result.setResult(pageList);
|
return result;
|
}
|
|
/**
|
* 给指定角色添加用户
|
*
|
* @param
|
* @return
|
*/
|
//@RequiresRoles({"admin"})
|
@RequestMapping(value = "/addSysUserRole", method = RequestMethod.POST)
|
public Result<String> addSysUserRole(@RequestBody SysUserRoleVO sysUserRoleVO) {
|
Result<String> result = new Result<String>();
|
try {
|
String sysRoleId = sysUserRoleVO.getRoleId();
|
for(String sysUserId:sysUserRoleVO.getUserIdList()) {
|
SysUserRole sysUserRole = new SysUserRole(sysUserId,sysRoleId);
|
QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<SysUserRole>();
|
queryWrapper.eq("role_id", sysRoleId).eq("user_id",sysUserId);
|
SysUserRole one = sysUserRoleService.getOne(queryWrapper);
|
if(one==null){
|
sysUserRoleService.save(sysUserRole);
|
}
|
|
}
|
result.setMessage("添加成功!");
|
result.setSuccess(true);
|
return result;
|
}catch(Exception e) {
|
log.error(e.getMessage(), e);
|
result.setSuccess(false);
|
result.setMessage("出错了: " + e.getMessage());
|
return result;
|
}
|
}
|
/**
|
* 删除指定角色的用户关系
|
* @param
|
* @return
|
*/
|
//@RequiresRoles({"admin"})
|
@RequestMapping(value = "/deleteUserRole", method = RequestMethod.DELETE)
|
public Result<SysUserRole> deleteUserRole(@RequestParam(name="roleId") String roleId,
|
@RequestParam(name="userId",required=true) String userId
|
) {
|
Result<SysUserRole> result = new Result<SysUserRole>();
|
try {
|
QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<SysUserRole>();
|
queryWrapper.eq("role_id", roleId).eq("user_id",userId);
|
sysUserRoleService.remove(queryWrapper);
|
result.success("删除成功!");
|
}catch(Exception e) {
|
log.error(e.getMessage(), e);
|
result.error500("删除失败！");
|
}
|
return result;
|
}
|
|
/**
|
* 批量删除指定角色的用户关系
|
*
|
* @param
|
* @return
|
*/
|
//@RequiresRoles({"admin"})
|
@RequestMapping(value = "/deleteUserRoleBatch", method = RequestMethod.DELETE)
|
public Result<SysUserRole> deleteUserRoleBatch(
|
@RequestParam(name="roleId") String roleId,
|
@RequestParam(name="userIds",required=true) String userIds) {
|
Result<SysUserRole> result = new Result<SysUserRole>();
|
try {
|
QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<SysUserRole>();
|
queryWrapper.eq("role_id", roleId).in("user_id",Arrays.asList(userIds.split(",")));
|
sysUserRoleService.remove(queryWrapper);
|
result.success("删除成功!");
|
}catch(Exception e) {
|
log.error(e.getMessage(), e);
|
result.error500("删除失败！");
|
}
|
return result;
|
}
|
|
/**
|
* 部门用户列表
|
*/
|
@RequestMapping(value = "/departUserList", method = RequestMethod.GET)
|
public Result<IPage<SysUser>> departUserList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) {
|
Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
|
Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
|
String depId = req.getParameter("depId");
|
String username = req.getParameter("username");
|
//根据部门ID查询,当前和下级所有的部门IDS
|
List<String> subDepids = new ArrayList<>();
|
//部门id为空时，查询我的部门下所有用户
|
if(oConvertUtils.isEmpty(depId)){
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
int userIdentity = user.getUserIdentity() != null?user.getUserIdentity():CommonConstant.USER_IDENTITY_1;
|
if(oConvertUtils.isNotEmpty(userIdentity) && userIdentity == CommonConstant.USER_IDENTITY_2 ){
|
subDepids = sysDepartService.getMySubDepIdsByDepId(user.getDepartIds());
|
}
|
}else{
|
subDepids = sysDepartService.getSubDepIdsByDepId(depId);
|
}
|
if(subDepids != null && subDepids.size()>0){
|
IPage<SysUser> pageList = sysUserService.getUserByDepIds(page,subDepids,username);
|
//批量查询用户的所属部门
|
//step.1 先拿到全部的 useids
|
//step.2 通过 useids，一次性查询用户的所属部门名字
|
List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
|
if(userIds!=null && userIds.size()>0){
|
Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
|
pageList.getRecords().forEach(item -> {
|
//批量查询用户的所属部门
|
item.setOrgCode(useDepNames.get(item.getId()));
|
});
|
}
|
result.setSuccess(true);
|
result.setResult(pageList);
|
}else{
|
result.setSuccess(true);
|
result.setResult(null);
|
}
|
return result;
|
}
|
|
|
/**
|
* 根据 orgCode 查询用户，包括子部门下的用户
|
* 若某个用户包含多个部门，则会显示多条记录，可自行处理成单条记录
|
*/
|
@GetMapping("/queryByOrgCode")
|
public Result<?> queryByDepartId(
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
@RequestParam(name = "orgCode") String orgCode,
|
SysUser userParams
|
) {
|
IPage<SysUserSysDepartModel> pageList = sysUserService.queryUserByOrgCode(orgCode, userParams, new Page(pageNo, pageSize));
|
return Result.ok(pageList);
|
}
|
|
/**
|
* 根据 orgCode 查询用户，包括子部门下的用户
|
* 针对通讯录模块做的接口，将多个部门的用户合并成一条记录，并转成对前端友好的格式
|
*/
|
@GetMapping("/queryByOrgCodeForAddressList")
|
public Result<?> queryByOrgCodeForAddressList(
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
@RequestParam(name = "orgCode",required = false) String orgCode,
|
SysUser userParams
|
) {
|
IPage page = new Page(pageNo, pageSize);
|
IPage<SysUserSysDepartModel> pageList = sysUserService.queryUserByOrgCode(orgCode, userParams, page);
|
List<SysUserSysDepartModel> list = pageList.getRecords();
|
|
// 记录所有出现过的 user, key = userId
|
Map<String, JSONObject> hasUser = new HashMap<>(list.size());
|
|
JSONArray resultJson = new JSONArray(list.size());
|
|
for (SysUserSysDepartModel item : list) {
|
String userId = item.getId();
|
// userId
|
JSONObject getModel = hasUser.get(userId);
|
// 之前已存在过该用户，直接合并数据
|
if (getModel != null) {
|
String departName = getModel.get("departName").toString();
|
getModel.put("departName", (departName + " | " + item.getDepartName()));
|
} else {
|
// 将用户对象转换为json格式，并将部门信息合并到 json 中
|
JSONObject json = JSON.parseObject(JSON.toJSONString(item));
|
json.remove("id");
|
json.put("userId", userId);
|
json.put("departId", item.getDepartId());
|
json.put("departName", item.getDepartName());
|
// json.put("avatar", item.getSysUser().getAvatar());
|
resultJson.add(json);
|
hasUser.put(userId, json);
|
}
|
}
|
|
IPage<JSONObject> result = new Page<>(pageNo, pageSize, pageList.getTotal());
|
result.setRecords(resultJson.toJavaList(JSONObject.class));
|
return Result.ok(result);
|
}
|
|
/**
|
* 给指定部门添加对应的用户
|
*/
|
//@RequiresRoles({"admin"})
|
@RequestMapping(value = "/editSysDepartWithUser", method = RequestMethod.POST)
|
public Result<String> editSysDepartWithUser(@RequestBody SysDepartUsersVO sysDepartUsersVO) {
|
Result<String> result = new Result<String>();
|
try {
|
String sysDepId = sysDepartUsersVO.getDepId();
|
for(String sysUserId:sysDepartUsersVO.getUserIdList()) {
|
SysUserDepart sysUserDepart = new SysUserDepart(null,sysUserId,sysDepId);
|
QueryWrapper<SysUserDepart> queryWrapper = new QueryWrapper<SysUserDepart>();
|
queryWrapper.eq("dep_id", sysDepId).eq("user_id",sysUserId);
|
SysUserDepart one = sysUserDepartService.getOne(queryWrapper);
|
if(one==null){
|
sysUserDepartService.save(sysUserDepart);
|
}
|
}
|
result.setMessage("添加成功!");
|
result.setSuccess(true);
|
return result;
|
}catch(Exception e) {
|
log.error(e.getMessage(), e);
|
result.setSuccess(false);
|
result.setMessage("出错了: " + e.getMessage());
|
return result;
|
}
|
}
|
|
/**
|
* 删除指定机构的用户关系
|
*/
|
//@RequiresRoles({"admin"})
|
@RequestMapping(value = "/deleteUserInDepart", method = RequestMethod.DELETE)
|
public Result<SysUserDepart> deleteUserInDepart(@RequestParam(name="depId") String depId,
|
@RequestParam(name="userId",required=true) String userId
|
) {
|
Result<SysUserDepart> result = new Result<SysUserDepart>();
|
try {
|
QueryWrapper<SysUserDepart> queryWrapper = new QueryWrapper<SysUserDepart>();
|
queryWrapper.eq("dep_id", depId).eq("user_id",userId);
|
boolean b = sysUserDepartService.remove(queryWrapper);
|
if(b){
|
List<SysDepartRole> sysDepartRoleList = departRoleService.list(new QueryWrapper<SysDepartRole>().eq("depart_id",depId));
|
List<String> roleIds = sysDepartRoleList.stream().map(SysDepartRole::getId).collect(Collectors.toList());
|
if(roleIds != null && roleIds.size()>0){
|
QueryWrapper<SysDepartRoleUser> query = new QueryWrapper<>();
|
query.eq("user_id",userId).in("drole_id",roleIds);
|
departRoleUserService.remove(query);
|
}
|
result.success("删除成功!");
|
}else{
|
result.error500("当前选中部门与用户无关联关系!");
|
}
|
}catch(Exception e) {
|
log.error(e.getMessage(), e);
|
result.error500("删除失败！");
|
}
|
return result;
|
}
|
|
/**
|
* 批量删除指定机构的用户关系
|
*/
|
//@RequiresRoles({"admin"})
|
@RequestMapping(value = "/deleteUserInDepartBatch", method = RequestMethod.DELETE)
|
public Result<SysUserDepart> deleteUserInDepartBatch(
|
@RequestParam(name="depId") String depId,
|
@RequestParam(name="userIds",required=true) String userIds) {
|
Result<SysUserDepart> result = new Result<SysUserDepart>();
|
try {
|
QueryWrapper<SysUserDepart> queryWrapper = new QueryWrapper<SysUserDepart>();
|
queryWrapper.eq("dep_id", depId).in("user_id",Arrays.asList(userIds.split(",")));
|
boolean b = sysUserDepartService.remove(queryWrapper);
|
if(b){
|
departRoleUserService.removeDeptRoleUser(Arrays.asList(userIds.split(",")),depId);
|
}
|
result.success("删除成功!");
|
}catch(Exception e) {
|
log.error(e.getMessage(), e);
|
result.error500("删除失败！");
|
}
|
return result;
|
}
|
|
/**
|
* 查询当前用户的所有部门/当前部门编码
|
* @return
|
*/
|
@RequestMapping(value = "/getCurrentUserDeparts", method = RequestMethod.GET)
|
public Result<Map<String,Object>> getCurrentUserDeparts() {
|
Result<Map<String,Object>> result = new Result<Map<String,Object>>();
|
try {
|
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
|
List<SysDepart> list = this.sysDepartService.queryUserDeparts(sysUser.getId());
|
Map<String,Object> map = new HashMap(5);
|
map.put("list", list);
|
map.put("orgCode", sysUser.getOrgCode());
|
result.setSuccess(true);
|
result.setResult(map);
|
}catch(Exception e) {
|
log.error(e.getMessage(), e);
|
result.error500("查询失败！");
|
}
|
return result;
|
}
|
|
|
|
|
/**
|
* 用户注册接口
|
*
|
* @param jsonObject
|
* @param user
|
* @return
|
*/
|
@PostMapping("/register")
|
public Result<JSONObject> userRegister(@RequestBody JSONObject jsonObject, SysUser user) {
|
Result<JSONObject> result = new Result<JSONObject>();
|
String phone = jsonObject.getString("phone");
|
String smscode = jsonObject.getString("smscode");
|
|
//update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
|
String redisKey = CommonConstant.PHONE_REDIS_KEY_PRE+phone;
|
Object code = redisUtil.get(redisKey);
|
//update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
|
|
String username = jsonObject.getString("username");
|
//未设置用户名，则用手机号作为用户名
|
if(oConvertUtils.isEmpty(username)){
|
username = phone;
|
}
|
//未设置密码，则随机生成一个密码
|
String password = jsonObject.getString("password");
|
if(oConvertUtils.isEmpty(password)){
|
password = RandomUtil.randomString(8);
|
}
|
String email = jsonObject.getString("email");
|
SysUser sysUser1 = sysUserService.getUserByName(username);
|
if (sysUser1 != null) {
|
result.setMessage("用户名已注册");
|
result.setSuccess(false);
|
return result;
|
}
|
SysUser sysUser2 = sysUserService.getUserByPhone(phone);
|
if (sysUser2 != null) {
|
result.setMessage("该手机号已注册");
|
result.setSuccess(false);
|
return result;
|
}
|
|
if(oConvertUtils.isNotEmpty(email)){
|
SysUser sysUser3 = sysUserService.getUserByEmail(email);
|
if (sysUser3 != null) {
|
result.setMessage("邮箱已被注册");
|
result.setSuccess(false);
|
return result;
|
}
|
}
|
if(null == code){
|
result.setMessage("手机验证码失效，请重新获取");
|
result.setSuccess(false);
|
return result;
|
}
|
if (!smscode.equals(code.toString())) {
|
result.setMessage("手机验证码错误");
|
result.setSuccess(false);
|
return result;
|
}
|
|
try {
|
user.setCreateTime(new Date());// 设置创建时间
|
String salt = oConvertUtils.randomGen(8);
|
String passwordEncode = PasswordUtil.encrypt(username, password, salt);
|
user.setSalt(salt);
|
user.setUsername(username);
|
user.setRealname(username);
|
user.setPassword(passwordEncode);
|
user.setEmail(email);
|
user.setPhone(phone);
|
user.setStatus(CommonConstant.USER_UNFREEZE);
|
user.setDelFlag(CommonConstant.DEL_FLAG_0);
|
user.setActivitiSync(CommonConstant.ACT_SYNC_0);
|
sysUserService.addUserWithRole(user,"ee8626f80f7c2619917b6236f3a7f02b");//默认临时角色 test
|
result.success("注册成功");
|
} catch (Exception e) {
|
result.error500("注册失败");
|
}
|
return result;
|
}
|
|
// /**
|
// * 根据用户名或手机号查询用户信息
|
// * @param
|
// * @return
|
// */
|
// @GetMapping("/querySysUser")
|
// public Result<Map<String, Object>> querySysUser(SysUser sysUser) {
|
// String phone = sysUser.getPhone();
|
// String username = sysUser.getUsername();
|
// Result<Map<String, Object>> result = new Result<Map<String, Object>>();
|
// Map<String, Object> map = new HashMap<String, Object>();
|
// if (oConvertUtils.isNotEmpty(phone)) {
|
// SysUser user = sysUserService.getUserByPhone(phone);
|
// if(user!=null) {
|
// map.put("username",user.getUsername());
|
// map.put("phone",user.getPhone());
|
// result.setSuccess(true);
|
// result.setResult(map);
|
// return result;
|
// }
|
// }
|
// if (oConvertUtils.isNotEmpty(username)) {
|
// SysUser user = sysUserService.getUserByName(username);
|
// if(user!=null) {
|
// map.put("username",user.getUsername());
|
// map.put("phone",user.getPhone());
|
// result.setSuccess(true);
|
// result.setResult(map);
|
// return result;
|
// }
|
// }
|
// result.setSuccess(false);
|
// result.setMessage("验证失败");
|
// return result;
|
// }
|
|
/**
|
* 用户手机号验证
|
*/
|
@PostMapping("/phoneVerification")
|
public Result<Map<String,String>> phoneVerification(@RequestBody JSONObject jsonObject) {
|
Result<Map<String,String>> result = new Result<Map<String,String>>();
|
String phone = jsonObject.getString("phone");
|
String smscode = jsonObject.getString("smscode");
|
//update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
|
String redisKey = CommonConstant.PHONE_REDIS_KEY_PRE+phone;
|
Object code = redisUtil.get(redisKey);
|
if (!smscode.equals(code)) {
|
result.setMessage("手机验证码错误");
|
result.setSuccess(false);
|
return result;
|
}
|
//设置有效时间
|
redisUtil.set(redisKey, smscode,600);
|
//update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
|
|
//新增查询用户名
|
LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<>();
|
query.eq(SysUser::getPhone,phone);
|
SysUser user = sysUserService.getOne(query);
|
Map<String,String> map = new HashMap(5);
|
map.put("smscode",smscode);
|
map.put("username",user.getUsername());
|
result.setResult(map);
|
result.setSuccess(true);
|
return result;
|
}
|
|
/**
|
* 用户更改密码
|
*/
|
@GetMapping("/passwordChange")
|
public Result<SysUser> passwordChange(@RequestParam(name="username")String username,
|
@RequestParam(name="password")String password,
|
@RequestParam(name="smscode")String smscode,
|
@RequestParam(name="phone") String phone) {
|
Result<SysUser> result = new Result<SysUser>();
|
if(oConvertUtils.isEmpty(username) || oConvertUtils.isEmpty(password) || oConvertUtils.isEmpty(smscode) || oConvertUtils.isEmpty(phone) ) {
|
result.setMessage("重置密码失败！");
|
result.setSuccess(false);
|
return result;
|
}
|
|
SysUser sysUser=new SysUser();
|
//update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
|
String redisKey = CommonConstant.PHONE_REDIS_KEY_PRE+phone;
|
Object object= redisUtil.get(redisKey);
|
//update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
|
if(null==object) {
|
result.setMessage("短信验证码失效！");
|
result.setSuccess(false);
|
return result;
|
}
|
if(!smscode.equals(object.toString())) {
|
result.setMessage("短信验证码不匹配！");
|
result.setSuccess(false);
|
return result;
|
}
|
sysUser = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername,username).eq(SysUser::getPhone,phone));
|
if (sysUser == null) {
|
result.setMessage("未找到用户！");
|
result.setSuccess(false);
|
return result;
|
} else {
|
String salt = oConvertUtils.randomGen(8);
|
sysUser.setSalt(salt);
|
String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), password, salt);
|
sysUser.setPassword(passwordEncode);
|
this.sysUserService.updateById(sysUser);
|
//update-begin---author:wangshuai ---date:20220316 for：[VUEN-234]密码重置添加敏感日志------------
|
baseCommonService.addLog("重置 "+username+" 的密码，操作人： " +sysUser.getUsername() ,CommonConstant.LOG_TYPE_2, 2);
|
//update-end---author:wangshuai ---date:20220316 for：[VUEN-234]密码重置添加敏感日志------------
|
result.setSuccess(true);
|
result.setMessage("密码重置完成！");
|
return result;
|
}
|
}
|
|
|
/**
|
* 根据TOKEN获取用户的部分信息（返回的数据是可供表单设计器使用的数据）
|
*
|
* @return
|
*/
|
@GetMapping("/getUserSectionInfoByToken")
|
public Result<?> getUserSectionInfoByToken(HttpServletRequest request, @RequestParam(name = "token", required = false) String token) {
|
try {
|
String username = null;
|
// 如果没有传递token，就从header中获取token并获取用户信息
|
if (oConvertUtils.isEmpty(token)) {
|
username = JwtUtil.getUserNameByToken(request);
|
} else {
|
username = JwtUtil.getUsername(token);
|
}
|
|
log.debug(" ------ 通过令牌获取部分用户信息，当前用户： " + username);
|
|
// 根据用户名查询用户信息
|
SysUser sysUser = sysUserService.getUserByName(username);
|
Map<String, Object> map = new HashMap<String, Object>();
|
map.put("sysUserId", sysUser.getId());
|
map.put("sysUserCode", sysUser.getUsername()); // 当前登录用户登录账号
|
map.put("sysUserName", sysUser.getRealname()); // 当前登录用户真实名称
|
map.put("sysOrgCode", sysUser.getOrgCode()); // 当前登录用户部门编号
|
|
log.debug(" ------ 通过令牌获取部分用户信息，已获取的用户信息： " + map);
|
|
return Result.ok(map);
|
} catch (Exception e) {
|
log.error(e.getMessage(), e);
|
return Result.error(500, "查询失败:" + e.getMessage());
|
}
|
}
|
|
/**
|
* 【APP端接口】获取用户列表 根据用户名和真实名 模糊匹配
|
* @param keyword
|
* @param pageNo
|
* @param pageSize
|
* @return
|
*/
|
@GetMapping("/appUserList")
|
public Result<?> appUserList(@RequestParam(name = "keyword", required = false) String keyword,
|
@RequestParam(name = "username", required = false) String username,
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
@RequestParam(name = "syncFlow", required = false) String syncFlow) {
|
try {
|
//TODO 从查询效率上将不要用mp的封装的page分页查询 建议自己写分页语句
|
LambdaQueryWrapper<SysUser> query = new LambdaQueryWrapper<SysUser>();
|
if(oConvertUtils.isNotEmpty(syncFlow)){
|
query.eq(SysUser::getActivitiSync, CommonConstant.ACT_SYNC_1);
|
}
|
query.eq(SysUser::getDelFlag,CommonConstant.DEL_FLAG_0);
|
if(oConvertUtils.isNotEmpty(username)){
|
if(username.contains(",")){
|
query.in(SysUser::getUsername,username.split(","));
|
}else{
|
query.eq(SysUser::getUsername,username);
|
}
|
}else{
|
query.and(i -> i.like(SysUser::getUsername, keyword).or().like(SysUser::getRealname, keyword));
|
}
|
Page<SysUser> page = new Page<>(pageNo, pageSize);
|
IPage<SysUser> res = this.sysUserService.page(page, query);
|
return Result.ok(res);
|
} catch (Exception e) {
|
log.error(e.getMessage(), e);
|
return Result.error(500, "查询失败:" + e.getMessage());
|
}
|
|
}
|
|
/**
|
* 获取被逻辑删除的用户列表，无分页
|
*
|
* @return logicDeletedUserList
|
*/
|
@GetMapping("/recycleBin")
|
public Result getRecycleBin() {
|
List<SysUser> logicDeletedUserList = sysUserService.queryLogicDeleted();
|
if (logicDeletedUserList.size() > 0) {
|
// 批量查询用户的所属部门
|
// step.1 先拿到全部的 userIds
|
List<String> userIds = logicDeletedUserList.stream().map(SysUser::getId).collect(Collectors.toList());
|
// step.2 通过 userIds，一次性查询用户的所属部门名字
|
Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
|
logicDeletedUserList.forEach(item -> item.setOrgCode(useDepNames.get(item.getId())));
|
}
|
return Result.ok(logicDeletedUserList);
|
}
|
|
/**
|
* 还原被逻辑删除的用户
|
*
|
* @param jsonObject
|
* @return
|
*/
|
@RequestMapping(value = "/putRecycleBin", method = RequestMethod.PUT)
|
public Result putRecycleBin(@RequestBody JSONObject jsonObject, HttpServletRequest request) {
|
String userIds = jsonObject.getString("userIds");
|
if (StringUtils.isNotBlank(userIds)) {
|
SysUser updateUser = new SysUser();
|
updateUser.setUpdateBy(JwtUtil.getUserNameByToken(request));
|
updateUser.setUpdateTime(new Date());
|
sysUserService.revertLogicDeleted(Arrays.asList(userIds.split(",")), updateUser);
|
}
|
return Result.ok("还原成功");
|
}
|
|
/**
|
* 彻底删除用户
|
*
|
* @param userIds 被删除的用户ID，多个id用半角逗号分割
|
* @return
|
*/
|
//@RequiresRoles({"admin"})
|
@RequestMapping(value = "/deleteRecycleBin", method = RequestMethod.DELETE)
|
public Result deleteRecycleBin(@RequestParam("userIds") String userIds) {
|
if (StringUtils.isNotBlank(userIds)) {
|
sysUserService.removeLogicDeleted(Arrays.asList(userIds.split(",")));
|
}
|
return Result.ok("删除成功");
|
}
|
|
|
/**
|
* 移动端修改用户信息
|
* @param jsonObject
|
* @return
|
*/
|
@RequestMapping(value = "/appEdit", method = {RequestMethod.PUT,RequestMethod.POST})
|
public Result<SysUser> appEdit(HttpServletRequest request,@RequestBody JSONObject jsonObject) {
|
Result<SysUser> result = new Result<SysUser>();
|
try {
|
String username = JwtUtil.getUserNameByToken(request);
|
SysUser sysUser = sysUserService.getUserByName(username);
|
baseCommonService.addLog("移动端编辑用户，id： " +jsonObject.getString("id") ,CommonConstant.LOG_TYPE_2, 2);
|
String realname=jsonObject.getString("realname");
|
String avatar=jsonObject.getString("avatar");
|
String sex=jsonObject.getString("sex");
|
String phone=jsonObject.getString("phone");
|
String email=jsonObject.getString("email");
|
Date birthday=jsonObject.getDate("birthday");
|
SysUser userPhone = sysUserService.getUserByPhone(phone);
|
if(sysUser==null) {
|
result.error500("未找到对应用户!");
|
}else {
|
if(userPhone!=null){
|
String userPhonename = userPhone.getUsername();
|
if(!userPhonename.equals(username)){
|
result.error500("手机号已存在!");
|
return result;
|
}
|
}
|
if(StringUtils.isNotBlank(realname)){
|
sysUser.setRealname(realname);
|
}
|
if(StringUtils.isNotBlank(avatar)){
|
sysUser.setAvatar(avatar);
|
}
|
if(StringUtils.isNotBlank(sex)){
|
sysUser.setSex(Integer.parseInt(sex));
|
}
|
if(StringUtils.isNotBlank(phone)){
|
sysUser.setPhone(phone);
|
}
|
if(StringUtils.isNotBlank(email)){
|
//update-begin---author:wangshuai ---date:20220708 for：[VUEN-1528]积木官网邮箱重复，应该提示准确------------
|
LambdaQueryWrapper<SysUser> emailQuery = new LambdaQueryWrapper<>();
|
emailQuery.eq(SysUser::getEmail,email);
|
long count = sysUserService.count(emailQuery);
|
if (!email.equals(sysUser.getEmail()) && count!=0) {
|
result.error500("保存失败，邮箱已存在!");
|
return result;
|
}
|
//update-end---author:wangshuai ---date:20220708 for：[VUEN-1528]积木官网邮箱重复，应该提示准确--------------
|
sysUser.setEmail(email);
|
}
|
if(null != birthday){
|
sysUser.setBirthday(birthday);
|
}
|
sysUser.setUpdateTime(new Date());
|
sysUserService.updateById(sysUser);
|
}
|
} catch (Exception e) {
|
log.error(e.getMessage(), e);
|
result.error500("保存失败!");
|
}
|
return result;
|
}
|
/**
|
* 移动端保存设备信息
|
* @param clientId
|
* @return
|
*/
|
@RequestMapping(value = "/saveClientId", method = RequestMethod.GET)
|
public Result<SysUser> saveClientId(HttpServletRequest request,@RequestParam("clientId")String clientId) {
|
Result<SysUser> result = new Result<SysUser>();
|
try {
|
String username = JwtUtil.getUserNameByToken(request);
|
SysUser sysUser = sysUserService.getUserByName(username);
|
if(sysUser==null) {
|
result.error500("未找到对应用户!");
|
}else {
|
sysUser.setClientId(clientId);
|
sysUserService.updateById(sysUser);
|
}
|
} catch (Exception e) {
|
log.error(e.getMessage(), e);
|
result.error500("操作失败!");
|
}
|
return result;
|
}
|
/**
|
* 根据userid获取用户信息和部门员工信息
|
*
|
* @return Result
|
*/
|
@GetMapping("/queryChildrenByUsername")
|
public Result queryChildrenByUsername(@RequestParam("userId") String userId) {
|
//获取用户信息
|
Map<String,Object> map=new HashMap(5);
|
SysUser sysUser = sysUserService.getById(userId);
|
String username = sysUser.getUsername();
|
Integer identity = sysUser.getUserIdentity();
|
map.put("sysUser",sysUser);
|
if(identity!=null && identity==2){
|
//获取部门用户信息
|
String departIds = sysUser.getDepartIds();
|
if(StringUtils.isNotBlank(departIds)){
|
List<String> departIdList = Arrays.asList(departIds.split(","));
|
List<SysUser> childrenUser = sysUserService.queryByDepIds(departIdList,username);
|
map.put("children",childrenUser);
|
}
|
}
|
return Result.ok(map);
|
}
|
/**
|
* 移动端查询部门用户信息
|
* @param departId
|
* @return
|
*/
|
@GetMapping("/appQueryByDepartId")
|
public Result<List<SysUser>> appQueryByDepartId(@RequestParam(name="departId", required = false) String departId) {
|
Result<List<SysUser>> result = new Result<List<SysUser>>();
|
List<String> list=new ArrayList<String> ();
|
list.add(departId);
|
List<SysUser> childrenUser = sysUserService.queryByDepIds(list,null);
|
result.setResult(childrenUser);
|
return result;
|
}
|
/**
|
* 移动端查询用户信息(通过用户名模糊查询)
|
* @param keyword
|
* @return
|
*/
|
@GetMapping("/appQueryUser")
|
public Result<List<SysUser>> appQueryUser(@RequestParam(name = "keyword", required = false) String keyword,
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
|
Result<List<SysUser>> result = new Result<List<SysUser>>();
|
LambdaQueryWrapper<SysUser> queryWrapper =new LambdaQueryWrapper<SysUser>();
|
//TODO 外部模拟登陆临时账号，列表不显示
|
queryWrapper.ne(SysUser::getUsername,"_reserve_user_external");
|
if(StringUtils.isNotBlank(keyword)){
|
queryWrapper.and(i -> i.like(SysUser::getUsername, keyword).or().like(SysUser::getRealname, keyword));
|
}
|
Page<SysUser> page = new Page<>(pageNo, pageSize);
|
IPage<SysUser> pageList = this.sysUserService.page(page, queryWrapper);
|
//批量查询用户的所属部门
|
//step.1 先拿到全部的 useids
|
//step.2 通过 useids，一次性查询用户的所属部门名字
|
List<String> userIds = pageList.getRecords().stream().map(SysUser::getId).collect(Collectors.toList());
|
if(userIds!=null && userIds.size()>0){
|
Map<String,String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
|
pageList.getRecords().forEach(item->{
|
item.setOrgCodeTxt(useDepNames.get(item.getId()));
|
});
|
}
|
result.setResult(pageList.getRecords());
|
return result;
|
}
|
|
/**
|
* 根据用户名修改手机号[该方法未使用]
|
* @param json
|
* @return
|
*/
|
@RequestMapping(value = "/updateMobile", method = RequestMethod.PUT)
|
public Result<?> changMobile(@RequestBody JSONObject json,HttpServletRequest request) {
|
String smscode = json.getString("smscode");
|
String phone = json.getString("phone");
|
Result<SysUser> result = new Result<SysUser>();
|
//获取登录用户名
|
String username = JwtUtil.getUserNameByToken(request);
|
if(oConvertUtils.isEmpty(username) || oConvertUtils.isEmpty(smscode) || oConvertUtils.isEmpty(phone)) {
|
result.setMessage("修改手机号失败！");
|
result.setSuccess(false);
|
return result;
|
}
|
//update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
|
String redisKey = CommonConstant.PHONE_REDIS_KEY_PRE+phone;
|
Object object= redisUtil.get(redisKey);
|
//update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
|
if(null==object) {
|
result.setMessage("短信验证码失效！");
|
result.setSuccess(false);
|
return result;
|
}
|
if(!smscode.equals(object.toString())) {
|
result.setMessage("短信验证码不匹配！");
|
result.setSuccess(false);
|
return result;
|
}
|
SysUser user = sysUserService.getUserByName(username);
|
if(user==null) {
|
return Result.error("用户不存在！");
|
}
|
user.setPhone(phone);
|
sysUserService.updateById(user);
|
return Result.ok("手机号设置成功!");
|
}
|
|
|
/**
|
* 根据对象里面的属性值作in查询 属性可能会变 用户组件用到
|
* @param sysUser
|
* @return
|
*/
|
@GetMapping("/getMultiUser")
|
public List<SysUser> getMultiUser(SysUser sysUser){
|
QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(sysUser, null);
|
//update-begin---author:wangshuai ---date:20220104 for：[JTC-297]已冻结用户仍可设置为代理人------------
|
queryWrapper.eq("status",Integer.parseInt(CommonConstant.STATUS_1));
|
//update-end---author:wangshuai ---date:20220104 for：[JTC-297]已冻结用户仍可设置为代理人------------
|
List<SysUser> ls = this.sysUserService.list(queryWrapper);
|
for(SysUser user: ls){
|
user.setPassword(null);
|
user.setSalt(null);
|
}
|
return ls;
|
}
|
|
}
|
