|
|
|
|
@ -61,6 +61,7 @@ public class SysUserInfoService implements ISysUserInfoService {
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@ApiOperation(value = "新增用户",notes = "新增一个用户信息")
|
|
|
|
|
public SysUserInfo insertSysUserInfo(SysUserInfo userInfo) {
|
|
|
|
|
LOGGER.info("用户信息 SysUserInfo userInfo:{}",userInfo);
|
|
|
|
|
|
|
|
|
|
@ -68,48 +69,53 @@ public class SysUserInfoService implements ISysUserInfoService {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@ApiOperation(value = "修改用户",notes = "修改一个用户信息")
|
|
|
|
|
public void updateSysUserInfo(SysUserInfo userInfo) {
|
|
|
|
|
LOGGER.info("用户信息 SysUserInfo userInfo:{}",userInfo);
|
|
|
|
|
sysUserInfoRDao.update(userInfo);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@ApiOperation(value = "刷新用户关系",notes = "刷新用户部门关系")
|
|
|
|
|
public void refreshRefUserDepartment(Long userInfoId, Long[] departmentIds, String userName) {
|
|
|
|
|
LOGGER.info("用户信息 SysUserInfo userInfoId:{} departmentIds:{} userName:{}",userInfoId,departmentIds,userName);
|
|
|
|
|
|
|
|
|
|
SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId);
|
|
|
|
|
if(userInfo != null ){
|
|
|
|
|
// 查询部门信息
|
|
|
|
|
StringBuffer where = new StringBuffer();
|
|
|
|
|
HqlPack.getInPack(StringUtils.join(departmentIds,","),"id",where);
|
|
|
|
|
List<SysDepartment> departmentList = departmentRDao.findByHqlWhere(where.toString());
|
|
|
|
|
|
|
|
|
|
// 删除用户部门关系
|
|
|
|
|
refUserDepartmentRDao.deleteByProperty("userId",userInfo.getId());
|
|
|
|
|
|
|
|
|
|
if(departmentList != null && departmentList.size() >0){
|
|
|
|
|
List<SysRefUserDepartment> list = new ArrayList<>();
|
|
|
|
|
List<String> nameList = new ArrayList<>();
|
|
|
|
|
SysRefUserDepartment ref = null;
|
|
|
|
|
for (SysDepartment department : departmentList) {
|
|
|
|
|
ref = new SysRefUserDepartment();
|
|
|
|
|
ref.setDepartmentId(department.getId());
|
|
|
|
|
ref.setDepartmentNameRdd(department.getName());
|
|
|
|
|
ref.setUserId(userInfo.getId());
|
|
|
|
|
ref.setUserNameRdd(userInfo.getName());
|
|
|
|
|
ref.setCreateUser(userName);
|
|
|
|
|
ref.setCreateDatetime(TimeTool.getNowTime(true));
|
|
|
|
|
list.add(ref);
|
|
|
|
|
|
|
|
|
|
nameList.add(department.getName());
|
|
|
|
|
if(departmentIds.length > 0){
|
|
|
|
|
// 查询部门信息
|
|
|
|
|
StringBuffer where = new StringBuffer();
|
|
|
|
|
HqlPack.getInPack(StringUtils.join(departmentIds,","),"id",where);
|
|
|
|
|
List<SysDepartment> departmentList = departmentRDao.findByHqlWhere(where.toString());
|
|
|
|
|
|
|
|
|
|
if(departmentList != null && departmentList.size() >0){
|
|
|
|
|
List<SysRefUserDepartment> list = new ArrayList<>();
|
|
|
|
|
List<String> nameList = new ArrayList<>();
|
|
|
|
|
SysRefUserDepartment ref = null;
|
|
|
|
|
for (SysDepartment department : departmentList) {
|
|
|
|
|
ref = new SysRefUserDepartment();
|
|
|
|
|
ref.setDepartmentId(department.getId());
|
|
|
|
|
ref.setDepartmentNameRdd(department.getName());
|
|
|
|
|
ref.setUserId(userInfo.getId());
|
|
|
|
|
ref.setUserNameRdd(userInfo.getName());
|
|
|
|
|
ref.setCreateUser(userName);
|
|
|
|
|
ref.setCreateDatetime(TimeTool.getNowTime(true));
|
|
|
|
|
list.add(ref);
|
|
|
|
|
|
|
|
|
|
nameList.add(department.getName());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
userInfo.setDepartmentNamesRdd(String.join(",",nameList));
|
|
|
|
|
|
|
|
|
|
refUserDepartmentRDao.saveAll(list);
|
|
|
|
|
sysUserInfoRDao.save(userInfo);
|
|
|
|
|
|
|
|
|
|
LOGGER.info("用户信息 SysUserInfo RefUserDepartmentRDao Insert Size :{}",list.size());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
userInfo.setDepartmentNamesRdd(String.join(",",nameList));
|
|
|
|
|
|
|
|
|
|
refUserDepartmentRDao.saveAll(list);
|
|
|
|
|
sysUserInfoRDao.save(userInfo);
|
|
|
|
|
|
|
|
|
|
LOGGER.info("用户信息 SysUserInfo RefUserDepartmentRDao Insert Size :{}",list.size());
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
throw ImppExceptionBuilder.newInstance()
|
|
|
|
|
@ -122,42 +128,44 @@ public class SysUserInfoService implements ISysUserInfoService {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@ApiOperation(value = "刷新用户关系",notes = "刷新用户岗位关系")
|
|
|
|
|
public void refreshRefUserPosition(Long userInfoId, Long[] positionIds , String userName) {
|
|
|
|
|
LOGGER.info("用户信息 SysUserInfo userInfoId:{} positionIds:{} userName:{}",userInfoId,positionIds,userName);
|
|
|
|
|
|
|
|
|
|
SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId);
|
|
|
|
|
if(userInfo != null ){
|
|
|
|
|
// 查询部门信息
|
|
|
|
|
StringBuffer where = new StringBuffer();
|
|
|
|
|
HqlPack.getInPack(StringUtils.join(positionIds,","),"id",where);
|
|
|
|
|
List<SysPosition> positionList = positionRDao.findByHqlWhere(where.toString());
|
|
|
|
|
|
|
|
|
|
// 删除用户岗位关系
|
|
|
|
|
refUserPositionRDao.deleteByProperty("userId",userInfo.getId());
|
|
|
|
|
|
|
|
|
|
if(positionList != null && positionList.size() >0){
|
|
|
|
|
List<SysRefUserPosition> list = new ArrayList<>();
|
|
|
|
|
List<String> nameList = new ArrayList<>();
|
|
|
|
|
SysRefUserPosition ref = null;
|
|
|
|
|
for (SysPosition position : positionList) {
|
|
|
|
|
ref = new SysRefUserPosition();
|
|
|
|
|
ref.setUserId(userInfo.getId());
|
|
|
|
|
ref.setUserNameRdd(userInfo.getName());
|
|
|
|
|
ref.setPositionId(position.getId());
|
|
|
|
|
ref.setPositionNameRdd(position.getName());
|
|
|
|
|
ref.setCreateUser(userName);
|
|
|
|
|
ref.setCreateDatetime(TimeTool.getNowTime(true));
|
|
|
|
|
list.add(ref);
|
|
|
|
|
|
|
|
|
|
nameList.add(position.getName());
|
|
|
|
|
if(positionIds.length > 0){
|
|
|
|
|
StringBuffer where = new StringBuffer();
|
|
|
|
|
HqlPack.getInPack(StringUtils.join(positionIds,","),"id",where); // 查询部门信息
|
|
|
|
|
List<SysPosition> positionList = positionRDao.findByHqlWhere(where.toString());
|
|
|
|
|
|
|
|
|
|
if(positionList != null && positionList.size() >0){
|
|
|
|
|
List<SysRefUserPosition> list = new ArrayList<>();
|
|
|
|
|
List<String> nameList = new ArrayList<>();
|
|
|
|
|
SysRefUserPosition ref = null;
|
|
|
|
|
for (SysPosition position : positionList) {
|
|
|
|
|
ref = new SysRefUserPosition();
|
|
|
|
|
ref.setUserId(userInfo.getId());
|
|
|
|
|
ref.setUserNameRdd(userInfo.getName());
|
|
|
|
|
ref.setPositionId(position.getId());
|
|
|
|
|
ref.setPositionNameRdd(position.getName());
|
|
|
|
|
ref.setCreateUser(userName);
|
|
|
|
|
ref.setCreateDatetime(TimeTool.getNowTime(true));
|
|
|
|
|
list.add(ref);
|
|
|
|
|
|
|
|
|
|
nameList.add(position.getName());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
userInfo.setPositionNamesRdd(String.join(",",nameList));
|
|
|
|
|
|
|
|
|
|
refUserPositionRDao.saveAll(list);
|
|
|
|
|
sysUserInfoRDao.save(userInfo);
|
|
|
|
|
|
|
|
|
|
LOGGER.info("用户信息 SysUserInfo RefUserPositionRDao Insert Size :{}",list.size());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
userInfo.setPositionNamesRdd(String.join(",",nameList));
|
|
|
|
|
|
|
|
|
|
refUserPositionRDao.saveAll(list);
|
|
|
|
|
sysUserInfoRDao.save(userInfo);
|
|
|
|
|
|
|
|
|
|
LOGGER.info("用户信息 SysUserInfo RefUserPositionRDao Insert Size :{}",list.size());
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
throw ImppExceptionBuilder.newInstance()
|
|
|
|
|
@ -170,6 +178,7 @@ public class SysUserInfoService implements ISysUserInfoService {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@ApiOperation(value = "刷新用户关系",notes = "刷新用户组织关系")
|
|
|
|
|
public void refreshRefUserOrganize(Long userInfoId, Long organizeId, String userName) {
|
|
|
|
|
LOGGER.info("用户信息 SysUserInfo userInfoId:{} organizeId:{} userName:{}",userInfoId,organizeId,userName);
|
|
|
|
|
SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId);
|
|
|
|
|
@ -208,28 +217,33 @@ public class SysUserInfoService implements ISysUserInfoService {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@ApiOperation(value = "删除用户",notes = "根据UserInfoId 删除用户信息")
|
|
|
|
|
public void deleteSysUserInfoById(Long id) {
|
|
|
|
|
LOGGER.info("用户信息 SysUserInfo id:{}",id);
|
|
|
|
|
sysUserInfoRDao.deleteById(id);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@ApiOperation(value = "删除用户-批量",notes = "根据UserInfoId 批量删除用户信息")
|
|
|
|
|
public void deleteSysUserInfoByIds(Long[] ids) {
|
|
|
|
|
LOGGER.info("用户信息 SysUserInfo ids:{}",ids);
|
|
|
|
|
sysUserInfoRDao.deleteByIds(ids);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@ApiOperation(value = "查询用户信息",notes = "根据 UserInfoId查询用户信息")
|
|
|
|
|
public SysUserInfo getSysUserInfoById(Long id) {
|
|
|
|
|
return sysUserInfoRDao.getById(id);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@ApiOperation(value = "查询用户信息",notes = "查询所有用户信息")
|
|
|
|
|
public List listSysUserInfo() {
|
|
|
|
|
return sysUserInfoRDao.findAll();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@ApiOperation(value = "查询用户信息",notes = "根据复杂查询条件查询用户信息(分页信息)")
|
|
|
|
|
public ListPager<SysUserInfo> querySysUserInfo(SysUserInfo userInfo, Pager pager) {
|
|
|
|
|
LOGGER.info("定时任务 TASK_TIME TaskTime:{}，Pager:{}",userInfo,pager);
|
|
|
|
|
if(userInfo == null) {
|
|
|
|
|
|
wei.peng
6 years ago