I3_YF_SEAT
/
impp-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增根据职位名称查询人员的接口

Browse Source
yun-zuoyi
nies 4 years ago
parent d5189ee5b6
commit f45ff23249
8 changed files with 162 additions and 81 deletions
Show Stats Download Patch File Download Diff File

8
modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java
Unescape Escape View File

@ -111,4 +111,12 @@ public interface ISysPositionService extends ICrudService<SysPosition> {
*/ */
@ApiOperation(value = "查询符合条件的岗位信息", notes = "根据SysPosition查询所有符合条件的岗位") @ApiOperation(value = "查询符合条件的岗位信息", notes = "根据SysPosition查询所有符合条件的岗位")
List<SysPosition> findAllByBaseBean(SysPosition sysPosition); List<SysPosition> findAllByBaseBean(SysPosition sysPosition);
/**
* 根据岗位名称查询岗位信息
* @param positionName
* @return
*/
@ApiOperation(value = "根据岗位名称查询岗位信息", notes = "根据岗位名称查询岗位信息")
List<SysPosition> findAllByPositionName(String positionName);
} }

9
modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java
Unescape Escape View File

@ -142,6 +142,15 @@ public interface ISysUserInfoService {
@ApiOperation(value = "关系查询-用户岗位",notes = "查询用户岗位关系") @ApiOperation(value = "关系查询-用户岗位",notes = "查询用户岗位关系")
List<SysRefUserPosition> findSysRefUserPositionByUserId(Long userId); List<SysRefUserPosition> findSysRefUserPositionByUserId(Long userId);
/**
* 根据岗位名称查询用户信息
* @param positionName
* @return SysRefUserPosition
*/
@ApiOperation(value = "关系查询-用户岗位",notes = "查询用户岗位关系")
List<SysRefUserPosition> findSysRefUserPositionByPositionName(String positionName);
/** /**
* 根据(组织ID,部门ID,用户名称,用户工号) 查询用户信息 * 根据(组织ID,部门ID,用户名称,用户工号) 查询用户信息
* @param info * @param info

14
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java
Unescape Escape View File

@ -9,6 +9,7 @@ import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.platform.common.util.CommonConstWords;
import cn.estsh.i3plus.platform.common.util.FileContentTypeTool; import cn.estsh.i3plus.platform.common.util.FileContentTypeTool;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.Pager;
@ -598,6 +599,19 @@ public class SysUserInfoController extends CoreBaseController {
} }
} }
@GetMapping("/find-position-ref-user")
@ApiOperation(value = "根据职位名称查询用户信息", notes = "根据职位名称查询用户信息")
public BaseResultBean<SysRefUserPosition> findUserByPositionName(String positionName) {
try {
List<SysRefUserPosition> resultList = sysUserInfoService.findSysRefUserPositionByPositionName(positionName);
return new ResultBean().setSuccess(true).setResultList(resultList).build();
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
/** /**
* @param userInfoList 导入的全部数据 * @param userInfoList 导入的全部数据
* @param faildList 数据重复的 * @param faildList 数据重复的

16
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java
Unescape Escape View File

@ -14,14 +14,18 @@ import cn.estsh.i3plus.pojo.platform.repository.SysPositionRepository;
import cn.estsh.i3plus.pojo.platform.repository.SysUserInfoRepository; import cn.estsh.i3plus.pojo.platform.repository.SysUserInfoRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.base.service.CrudService; import cn.estsh.impp.framework.base.service.CrudService;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.util.ValidatorBean; import cn.estsh.impp.framework.boot.util.ValidatorBean;
import com.dingtalk.api.request.OapiAlitripBtripApprovalNewRequest;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Example; import org.springframework.data.domain.Example;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
@ -128,4 +132,16 @@ public class SysPositionService extends CrudService<SysPosition> implements ISys
return this.positionRDao.findAll(example); return this.positionRDao.findAll(example);
} }
@Override
public List<SysPosition> findAllByPositionName(String positionName) {
List<SysPosition> positionList = new ArrayList();
if (StringUtils.isEmpty(positionName)) {
return positionList;
}
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode());
DdlPreparedPack.getStringEqualPack(positionName, "name", ddlPackBean);
positionList = this.positionRDao.findByHqlWhere(ddlPackBean);
return positionList;
}
} }

168
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java
Unescape Escape View File

@ -8,11 +8,13 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.base.common.PagerHelper;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.model.platform.UserDetailModel; import cn.estsh.i3plus.pojo.model.platform.UserDetailModel;
import cn.estsh.i3plus.pojo.platform.bean.*; import cn.estsh.i3plus.pojo.platform.bean.*;
import cn.estsh.i3plus.pojo.platform.repository.*; import cn.estsh.i3plus.pojo.platform.repository.*;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -21,6 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -78,36 +81,36 @@ public class SysUserInfoService implements ISysUserInfoService {
* @return * @return
*/ */
@Override @Override
@ApiOperation(value = "新增用户",notes = "新增一个用户信息") @ApiOperation(value = "新增用户", notes = "新增一个用户信息")
public SysUserInfo insertSysUserInfo(SysUserInfo userInfo) { public SysUserInfo insertSysUserInfo(SysUserInfo userInfo) {
LOGGER.info("用户信息 SysUserInfo userInfo:{}",userInfo); LOGGER.info("用户信息 SysUserInfo userInfo:{}", userInfo);
return sysUserInfoRDao.insert(userInfo); return sysUserInfoRDao.insert(userInfo);
} }
@Override @Override
@ApiOperation(value = "修改用户",notes = "修改一个用户信息") @ApiOperation(value = "修改用户", notes = "修改一个用户信息")
public void updateSysUserInfo(SysUserInfo userInfo) { public void updateSysUserInfo(SysUserInfo userInfo) {
LOGGER.info("用户信息 SysUserInfo userInfo:{}",userInfo); LOGGER.info("用户信息 SysUserInfo userInfo:{}", userInfo);
sysUserInfoRDao.update(userInfo); sysUserInfoRDao.update(userInfo);
} }
@Override @Override
@ApiOperation(value = "刷新用户关系",notes = "刷新用户部门关系") @ApiOperation(value = "刷新用户关系", notes = "刷新用户部门关系")
public void refreshRefUserDepartment(Long userInfoId, Long[] departmentIds, String userName) { public void refreshRefUserDepartment(Long userInfoId, Long[] departmentIds, String userName) {
LOGGER.info("用户信息 SysUserInfo userInfoId:{} departmentIds:{} userName:{}",userInfoId,departmentIds,userName); LOGGER.info("用户信息 SysUserInfo userInfoId:{} departmentIds:{} userName:{}", userInfoId, departmentIds, userName);
SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId);
if(userInfo != null ){ if (userInfo != null) {
// 删除用户部门关系 // 删除用户部门关系
refUserDepartmentRDao.deleteByProperty("userId",userInfo.getId()); refUserDepartmentRDao.deleteByProperty("userId", userInfo.getId());
if(departmentIds.length > 0){ if (departmentIds.length > 0) {
// 查询部门信息 // 查询部门信息
List<SysDepartment> departmentList = departmentService.findByIdList(Arrays.asList(departmentIds)); List<SysDepartment> departmentList = departmentService.findByIdList(Arrays.asList(departmentIds));
if(departmentList != null && departmentList.size() >0){ if (departmentList != null && departmentList.size() > 0) {
List<SysRefUserDepartment> list = new ArrayList<>(); List<SysRefUserDepartment> list = new ArrayList<>();
SysRefUserDepartment ref = null; SysRefUserDepartment ref = null;
for (SysDepartment department : departmentList) { for (SysDepartment department : departmentList) {
@ -126,10 +129,10 @@ public class SysUserInfoService implements ISysUserInfoService {
refUserDepartmentRDao.saveAll(list); refUserDepartmentRDao.saveAll(list);
sysUserInfoRDao.save(userInfo); sysUserInfoRDao.save(userInfo);
LOGGER.info("用户信息 SysUserInfo RefUserDepartmentRDao Insert Size :{}",list.size()); LOGGER.info("用户信息 SysUserInfo RefUserDepartmentRDao Insert Size :{}", list.size());
} }
} }
}else { } else {
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
@ -140,19 +143,19 @@ public class SysUserInfoService implements ISysUserInfoService {
} }
@Override @Override
@ApiOperation(value = "刷新用户关系",notes = "刷新用户岗位关系") @ApiOperation(value = "刷新用户关系", notes = "刷新用户岗位关系")
public void refreshRefUserPosition(Long userInfoId, Long[] positionIds , String userName) { public void refreshRefUserPosition(Long userInfoId, Long[] positionIds, String userName) {
LOGGER.info("用户信息 SysUserInfo userInfoId:{} positionIds:{} userName:{}",userInfoId,positionIds,userName); LOGGER.info("用户信息 SysUserInfo userInfoId:{} positionIds:{} userName:{}", userInfoId, positionIds, userName);
SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId);
if(userInfo != null ){ if (userInfo != null) {
// 删除用户岗位关系 // 删除用户岗位关系
refUserPositionRDao.deleteByProperty("userId",userInfo.getId()); refUserPositionRDao.deleteByProperty("userId", userInfo.getId());
if(positionIds.length > 0){ if (positionIds.length > 0) {
List<SysPosition> positionList = positionService.findByIdList(Arrays.asList(positionIds)); List<SysPosition> positionList = positionService.findByIdList(Arrays.asList(positionIds));
if(positionList != null && positionList.size() >0){ if (positionList != null && positionList.size() > 0) {
List<SysRefUserPosition> list = new ArrayList<>(); List<SysRefUserPosition> list = new ArrayList<>();
SysRefUserPosition ref = null; SysRefUserPosition ref = null;
for (SysPosition position : positionList) { for (SysPosition position : positionList) {
@ -169,10 +172,10 @@ public class SysUserInfoService implements ISysUserInfoService {
refUserPositionRDao.saveAll(list); refUserPositionRDao.saveAll(list);
sysUserInfoRDao.save(userInfo); sysUserInfoRDao.save(userInfo);
LOGGER.info("用户信息 SysUserInfo RefUserPositionRDao Insert Size :{}",list.size()); LOGGER.info("用户信息 SysUserInfo RefUserPositionRDao Insert Size :{}", list.size());
} }
} }
}else { } else {
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
@ -183,13 +186,13 @@ public class SysUserInfoService implements ISysUserInfoService {
} }
@Override @Override
@ApiOperation(value = "刷新用户关系",notes = "刷新用户组织关系") @ApiOperation(value = "刷新用户关系", notes = "刷新用户组织关系")
public void refreshRefUserOrganize(Long userInfoId, Long organizeId, String userName) { public void refreshRefUserOrganize(Long userInfoId, Long organizeId, String userName) {
LOGGER.info("用户信息 SysUserInfo userInfoId:{} organizeId:{} userName:{}",userInfoId,organizeId,userName); LOGGER.info("用户信息 SysUserInfo userInfoId:{} organizeId:{} userName:{}", userInfoId, organizeId, userName);
SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId);
if(userInfo != null ){ if (userInfo != null) {
SysOrganize organize = organizeService.get(organizeId); SysOrganize organize = organizeService.get(organizeId);
if(organize != null ){ if (organize != null) {
userInfo.setOrganizeId(organize.getId()); userInfo.setOrganizeId(organize.getId());
userInfo.setOrganizeNameRdd(organize.getName()); userInfo.setOrganizeNameRdd(organize.getName());
@ -199,7 +202,7 @@ public class SysUserInfoService implements ISysUserInfoService {
sysUserInfoRDao.update(organize); sysUserInfoRDao.update(organize);
} }
}else { } else {
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
@ -210,14 +213,14 @@ public class SysUserInfoService implements ISysUserInfoService {
} }
@Override @Override
@ApiOperation(value = "刷新用户账号信息",notes = "根据UserInfoId 刷新用户账号信息") @ApiOperation(value = "刷新用户账号信息", notes = "根据UserInfoId 刷新用户账号信息")
public void refreshUserInfoUserNum(Long userInfoId) { public void refreshUserInfoUserNum(Long userInfoId) {
LOGGER.info("用户信息 SysUserInfo userInfoId:{}",userInfoId); LOGGER.info("用户信息 SysUserInfo userInfoId:{}", userInfoId);
SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId);
if(userInfo != null){ if (userInfo != null) {
sysUserRepository.findByPropertyCount( sysUserRepository.findByPropertyCount(
new String[]{"userInfoId","isValid"}, new String[]{"userInfoId", "isValid"},
new Object[]{userInfo.getId(),CommonEnumUtil.IS_VAILD.VAILD.getValue()}); new Object[]{userInfo.getId(), CommonEnumUtil.IS_VAILD.VAILD.getValue()});
// userInfo.setUserNum(count); // userInfo.setUserNum(count);
sysUserInfoRDao.save(userInfo); sysUserInfoRDao.save(userInfo);
@ -225,16 +228,16 @@ public class SysUserInfoService implements ISysUserInfoService {
} }
@Override @Override
@ApiOperation(value = "删除用户",notes = "根据UserInfoId 删除用户信息") @ApiOperation(value = "删除用户", notes = "根据UserInfoId 删除用户信息")
public void deleteSysUserInfoById(Long id) { public void deleteSysUserInfoById(Long id) {
LOGGER.info("用户信息 SysUserInfo id:{}",id); LOGGER.info("用户信息 SysUserInfo id:{}", id);
sysUserInfoRDao.deleteById(id); sysUserInfoRDao.deleteById(id);
} }
@Override @Override
@ApiOperation(value = "删除用户-批量",notes = "根据UserInfoId 批量删除用户信息") @ApiOperation(value = "删除用户-批量", notes = "根据UserInfoId 批量删除用户信息")
public void deleteSysUserInfoByIds(Long[] ids) { public void deleteSysUserInfoByIds(Long[] ids) {
LOGGER.info("用户信息 SysUserInfo ids:{}",ids); LOGGER.info("用户信息 SysUserInfo ids:{}", ids);
sysUserInfoRDao.deleteByIds(ids); sysUserInfoRDao.deleteByIds(ids);
} }
@ -243,39 +246,39 @@ public class SysUserInfoService implements ISysUserInfoService {
LOGGER.info("用户信息 SysUserInfo Count"); LOGGER.info("用户信息 SysUserInfo Count");
return sysUserInfoRDao.findByPropertyCount( return sysUserInfoRDao.findByPropertyCount(
new String[]{"isDeleted","isValid"}, new String[]{"isDeleted", "isValid"},
new Object[]{CommonEnumUtil.IS_DEAL.NO.getValue(),CommonEnumUtil.IS_VAILD.VAILD.getValue()}); new Object[]{CommonEnumUtil.IS_DEAL.NO.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue()});
} }
@Override @Override
@ApiOperation(value = "查询用户信息",notes = "根据 UserInfoId查询用户信息") @ApiOperation(value = "查询用户信息", notes = "根据 UserInfoId查询用户信息")
public SysUserInfo getSysUserInfoById(Long id) { public SysUserInfo getSysUserInfoById(Long id) {
return sysUserInfoRDao.getById(id); return sysUserInfoRDao.getById(id);
} }
@Override @Override
@ApiOperation(value = "查询用户信息",notes = "查询所有用户信息") @ApiOperation(value = "查询用户信息", notes = "查询所有用户信息")
public List listSysUserInfo() { public List listSysUserInfo() {
return sysUserInfoRDao.findAll(); return sysUserInfoRDao.findAll();
} }
@Override @Override
@ApiOperation(value = "查询用户信息",notes = "根据复杂查询条件查询用户信息(分页信息)") @ApiOperation(value = "查询用户信息", notes = "根据复杂查询条件查询用户信息(分页信息)")
public ListPager<SysUserInfo> querySysUserInfo(SysUserInfo userInfo, Pager pager) { public ListPager<SysUserInfo> querySysUserInfo(SysUserInfo userInfo, Pager pager) {
LOGGER.info("查询用户信息 TASK_TIME TaskTime:{}，Pager:{}",userInfo,pager); LOGGER.info("查询用户信息 TASK_TIME TaskTime:{}，Pager:{}", userInfo, pager);
if(userInfo == null) { if (userInfo == null) {
pager = PagerHelper.getPager(pager, sysUserInfoRDao.listCount()); pager = PagerHelper.getPager(pager, sysUserInfoRDao.listCount());
return new ListPager(sysUserInfoRDao.listPager(pager),pager); return new ListPager(sysUserInfoRDao.listPager(pager), pager);
}else { } else {
List<Long> departmentIdList = new ArrayList<>(); List<Long> departmentIdList = new ArrayList<>();
if(userInfo.getOrganizeId() != null){ if (userInfo.getOrganizeId() != null) {
// 查出所有组织 ID 集合 // 查出所有组织 ID 集合
SysOrganize parent = coreTreeService.getSysOrganizeTreeById(userInfo.getOrganizeId()); SysOrganize parent = coreTreeService.getSysOrganizeTreeById(userInfo.getOrganizeId());
List<Long> childIds = coreTreeService.findSysOrganizeChildIds(parent); List<Long> childIds = coreTreeService.findSysOrganizeChildIds(parent);
// 查询所有部门 ID 集合 // 查询所有部门 ID 集合
if(childIds != null && childIds.size() > 0){ if (childIds != null && childIds.size() > 0) {
for (Long organizeId : childIds) { for (Long organizeId : childIds) {
departmentIdList.addAll(coreTreeService.findSysDepartmentIdByOrganizeId(organizeId)); departmentIdList.addAll(coreTreeService.findSysDepartmentIdByOrganizeId(organizeId));
} }
@ -283,7 +286,7 @@ public class SysUserInfoService implements ISysUserInfoService {
} }
// 封装部门 ID 信息 // 封装部门 ID 信息
if(userInfo.getDepartmentId() != null){ if (userInfo.getDepartmentId() != null) {
SysDepartment department = departmentService.get(userInfo.getDepartmentId()); SysDepartment department = departmentService.get(userInfo.getDepartmentId());
departmentIdList.addAll(coreTreeService.findSysDepartmentChildIds(department)); departmentIdList.addAll(coreTreeService.findSysDepartmentChildIds(department));
} }
@ -292,7 +295,7 @@ public class SysUserInfoService implements ISysUserInfoService {
String hqlPack = CoreHqlPack.packHqlSysUserInfo(userInfo); String hqlPack = CoreHqlPack.packHqlSysUserInfo(userInfo);
pager = PagerHelper.getPager(pager, sysUserInfoRDao.findByHqlWhereCount(hqlPack)); pager = PagerHelper.getPager(pager, sysUserInfoRDao.findByHqlWhereCount(hqlPack));
return new ListPager(sysUserInfoRDao.findByHqlWherePage(hqlPack + userInfo.orderBy(),pager),pager); return new ListPager(sysUserInfoRDao.findByHqlWherePage(hqlPack + userInfo.orderBy(), pager), pager);
} }
} }
@ -304,42 +307,63 @@ public class SysUserInfoService implements ISysUserInfoService {
} }
@Override @Override
@ApiOperation(value = "关系查询-用户部门",notes = "查询用户部门关系") @ApiOperation(value = "关系查询-用户部门", notes = "查询用户部门关系")
public List<SysRefUserDepartment> findRefUserDepartmentByUserId(Long userId) { public List<SysRefUserDepartment> findRefUserDepartmentByUserId(Long userId) {
return refUserDepartmentRDao.findByProperty("userId",userId); return refUserDepartmentRDao.findByProperty("userId", userId);
} }
@Override @Override
@ApiOperation(value = "关系查询-用户部门",notes = "根据部门或者组织集合查询用户部门关系") @ApiOperation(value = "关系查询-用户部门", notes = "根据部门或者组织集合查询用户部门关系")
public List<SysRefUserDepartment> querySysRefUserDepartment(UserDetailModel model) { public List<SysRefUserDepartment> querySysRefUserDepartment(UserDetailModel model) {
if(model != null){ if (model != null) {
StringBuffer userIdWhere = new StringBuffer(); StringBuffer userIdWhere = new StringBuffer();
if(model.getUserDepartmentIdList() != null){ if (model.getUserDepartmentIdList() != null) {
HqlPack.getInPack(StringUtils.join(model.getInfoDepartmentIdList(),","),"departmentId", userIdWhere); HqlPack.getInPack(StringUtils.join(model.getInfoDepartmentIdList(), ","), "departmentId", userIdWhere);
} }
if(model.getUserOrganizeIdList() != null){ if (model.getUserOrganizeIdList() != null) {
HqlPack.getInPack( StringUtils.join(model.getUserOrganizeIdList(),","),"organizeId",userIdWhere); HqlPack.getInPack(StringUtils.join(model.getUserOrganizeIdList(), ","), "organizeId", userIdWhere);
} }
return refUserDepartmentRDao.findByHqlWhere(userIdWhere.toString()); return refUserDepartmentRDao.findByHqlWhere(userIdWhere.toString());
}else { } else {
return null; return null;
} }
} }
@Override @Override
@ApiOperation(value = "关系查询-用户岗位",notes = "查询用户岗位关系") @ApiOperation(value = "关系查询-用户岗位", notes = "查询用户岗位关系")
public List<SysRefUserPosition> findSysRefUserPositionByUserId(Long userId) { public List<SysRefUserPosition> findSysRefUserPositionByUserId(Long userId) {
return refUserPositionRDao.findByProperty("userId",userId); return refUserPositionRDao.findByProperty("userId", userId);
} }
@Override @Override
@ApiOperation(value = "用户唯一校验",notes = "校验用户信息唯一性") public List<SysRefUserPosition> findSysRefUserPositionByPositionName(String positionName) {
List<SysRefUserPosition> users = new ArrayList();
if (StringUtils.isEmpty(positionName)) {
return users;
}
List<SysPosition> positionList = positionService.findAllByPositionName(positionName);
if (ObjectUtils.isEmpty(positionList)) {
return users;
}
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode());
DdlPreparedPack.getInPackList(
positionList.stream().map(el -> el.getId()).collect(Collectors.toList()),
"positionId",
ddlPackBean
);
users = refUserPositionRDao.findByHqlWhere(ddlPackBean);
return users;
}
@Override
@ApiOperation(value = "用户唯一校验", notes = "校验用户信息唯一性")
public void checkSysUserInfoOnly(SysUserInfo userInfo) { public void checkSysUserInfoOnly(SysUserInfo userInfo) {
if(userInfo != null){ if (userInfo != null) {
// 登录名唯一教研 // 登录名唯一教研
if(!checkUserInfoByUserEmpNo(userInfo.getUserEmpNo(), userInfo.getId() == null ? 0 : userInfo.getId())){ if (!checkUserInfoByUserEmpNo(userInfo.getUserEmpNo(), userInfo.getId() == null ? 0 : userInfo.getId())) {
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
@ -351,11 +375,11 @@ public class SysUserInfoService implements ISysUserInfoService {
} }
@Override @Override
@ApiOperation(value = "查询用户信息-",notes = "根据组织、部门、名称+工号组合查询条件查询用户信息") @ApiOperation(value = "查询用户信息-", notes = "根据组织、部门、名称+工号组合查询条件查询用户信息")
public List<SysUserInfo> querySysUserInfoList(SysUserInfo info, List<Long> idList) { public List<SysUserInfo> querySysUserInfoList(SysUserInfo info, List<Long> idList) {
LOGGER.info("查询用户信息 TASK_TIME SysUserInfo:{}，List<Long> idList :{}",info,idList); LOGGER.info("查询用户信息 TASK_TIME SysUserInfo:{}，List<Long> idList :{}", info, idList);
String hqlPack = CoreHqlPack.packHqlSysUserInfo(info,idList); String hqlPack = CoreHqlPack.packHqlSysUserInfo(info, idList);
return sysUserInfoRDao.findByHqlWhere(hqlPack); return sysUserInfoRDao.findByHqlWhere(hqlPack);
} }
@ -376,17 +400,17 @@ public class SysUserInfoService implements ISysUserInfoService {
} }
@Override @Override
@ApiOperation(value = "用户唯一校验 用户工号",notes = "用户唯一校验 用户工号") @ApiOperation(value = "用户唯一校验 用户工号", notes = "用户唯一校验 用户工号")
public boolean checkUserInfoByUserEmpNo(String no, long id) { public boolean checkUserInfoByUserEmpNo(String no, long id) {
int count; int count;
if(id > 0){ if (id > 0) {
StringBuffer sw = new StringBuffer(); StringBuffer sw = new StringBuffer();
HqlPack.getStringEqualPack(no,"userEmpNo",sw); HqlPack.getStringEqualPack(no, "userEmpNo", sw);
HqlPack.getNumNOEqualPack(id,"id",sw); HqlPack.getNumNOEqualPack(id, "id", sw);
count = sysUserInfoRDao.findByHqlWhereCount(sw.toString()); count = sysUserInfoRDao.findByHqlWhereCount(sw.toString());
}else{ } else {
count = sysUserInfoRDao.findByPropertyCount("userEmpNo",no); count = sysUserInfoRDao.findByPropertyCount("userEmpNo", no);
} }
return count <= 0 ; return count <= 0;
} }
} }

15
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java
Unescape Escape View File

@ -55,6 +55,10 @@ public class MailUtil {
private boolean isAuthenticationSMTP = false; private boolean isAuthenticationSMTP = false;
private final List<BodyPart> attachmentList = new ArrayList<>(); private final List<BodyPart> attachmentList = new ArrayList<>();
private static final int MAIL_SMTP_TIMEOUT =10000;
private static final int MAIL_SMTP_CONNECTIONTIMEOUT =10000;
private static final int MAIL_SMTP_WRITETIMEOUT =10000;
/** /**
* 初始化服务器邮箱参数 * 初始化服务器邮箱参数
* *
@ -255,6 +259,11 @@ public class MailUtil {
Properties server = new Properties(); Properties server = new Properties();
server.put("mail.smtp.port", String.valueOf(this.smtpPort)); server.put("mail.smtp.port", String.valueOf(this.smtpPort));
server.put("mail.smtp.host", this.smtpHost); server.put("mail.smtp.host", this.smtpHost);
//设置邮件的默认的超时时间
server.put("mail.smtp.timeout", MAIL_SMTP_TIMEOUT);
server.put("mail.smtp.connectiontimeout", MAIL_SMTP_CONNECTIONTIMEOUT);
server.put("mail.smtp.writetimeout", MAIL_SMTP_WRITETIMEOUT);
if (this.isAuthenticationSMTP) { if (this.isAuthenticationSMTP) {
server.put("mail.smtp.auth", "true"); server.put("mail.smtp.auth", "true");
} }
@ -366,12 +375,12 @@ public class MailUtil {
mailConfig.setMailPassword("Aa135790"); mailConfig.setMailPassword("Aa135790");
MailUtil mailUtil = new MailUtil(); MailUtil mailUtil = new MailUtil();
mailUtil.init(mailConfig); mailUtil.init(mailConfig);
mailUtil.setNick("yunhao"); mailUtil.setNick("ns");
mailUtil.setTo("yunhaok@163.com"); mailUtil.setTo("13298408382@163.com");
mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.TEXT.getDescription()); mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.TEXT.getDescription());
mailUtil.setSubject("test"); mailUtil.setSubject("test");
mailUtil.setBody("666"); mailUtil.setBody("666");
File file = new File("C:\\Users\\yunha\\Desktop\\miss_file (2).txt"); File file = new File("C:\\Users\\ns\\Desktop\\test.txt");
mailUtil.addAttachment(file); mailUtil.addAttachment(file);
mailUtil.send(); mailUtil.send();

3
modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java
Unescape Escape View File

@ -1,5 +1,6 @@
package test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi; package test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.apiservice.auth.realm.UserAuthRealm;
import cn.estsh.i3plus.pojo.base.shirotoken.UserToken; import cn.estsh.i3plus.pojo.base.shirotoken.UserToken;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.impp.framework.boot.util.SpringContextsUtil; import cn.estsh.impp.framework.boot.util.SpringContextsUtil;
@ -45,7 +46,7 @@ public class TestBase {
SessionContext sessionContext = new DefaultSessionContext(); SessionContext sessionContext = new DefaultSessionContext();
sessionContext.setHost("localhost"); sessionContext.setHost("localhost");
ImppUserAuthRealm userAuthRealm = (ImppUserAuthRealm) SpringContextsUtil.getBean(ImppUserAuthRealm.class); UserAuthRealm userAuthRealm = (UserAuthRealm) SpringContextsUtil.getBean(UserAuthRealm.class);
org.apache.shiro.mgt.SecurityManager securityManager = new DefaultSecurityManager(userAuthRealm); org.apache.shiro.mgt.SecurityManager securityManager = new DefaultSecurityManager(userAuthRealm);
SecurityUtils.setSecurityManager(securityManager); SecurityUtils.setSecurityManager(securityManager);
securityManager.start(sessionContext); securityManager.start(sessionContext);

10
modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/TestMailUtil.java
Unescape Escape View File

@ -31,14 +31,14 @@ public class TestMailUtil extends TestBase {
mailConfig.setMailHost("smtphm.qiye.163.com"); mailConfig.setMailHost("smtphm.qiye.163.com");
mailConfig.setMailPort(25); mailConfig.setMailPort(25);
mailConfig.setMailNick(""); mailConfig.setMailNick("");
mailConfig.setMailUser("impp.dev@sss.com"); mailConfig.setMailUser("impp-test@estsh.com");
mailConfig.setMailPassword("Aa135790s"); mailConfig.setMailPassword("Aa135790");
MailUtil mailUtil = new MailUtil(); MailUtil mailUtil = new MailUtil();
try { try {
mailUtil.setTo("yunhao.wang@estsh.com"); mailUtil.setTo("13298408382@163.com");
mailUtil.setBody("zhenw"); mailUtil.setBody("测试");
mailUtil.setSubject("title"); mailUtil.setSubject("发送邮件测试");
mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getDescription()); mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getDescription());
mailUtil.init(mailConfig).send(); mailUtil.init(mailConfig).send();
} catch (Exception e){ } catch (Exception e){

Write Preview
Loading…
Cancel
Save