From f45ff23249101285f7e4f47199bd55695c5717a0 Mon Sep 17 00:00:00 2001 From: nies Date: Mon, 16 Aug 2021 15:29:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E8=81=8C?= =?UTF-8?q?=E4=BD=8D=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/iservice/busi/ISysPositionService.java | 8 + .../api/iservice/busi/ISysUserInfoService.java | 9 ++ .../controller/busi/SysUserInfoController.java | 14 ++ .../serviceimpl/busi/SysPositionService.java | 16 ++ .../serviceimpl/busi/SysUserInfoService.java | 168 ++++++++++++--------- .../i3plus/core/apiservice/util/MailUtil.java | 15 +- .../core/apiservice/serviceimpl/busi/TestBase.java | 3 +- .../i3plus/core/apiservice/util/TestMailUtil.java | 10 +- 8 files changed, 162 insertions(+), 81 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java index a8c1204..32d5f82 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java @@ -111,4 +111,12 @@ public interface ISysPositionService extends ICrudService { */ @ApiOperation(value = "查询符合条件的岗位信息", notes = "根据SysPosition查询所有符合条件的岗位") List findAllByBaseBean(SysPosition sysPosition); + + /** + * 根据岗位名称查询岗位信息 + * @param positionName + * @return + */ + @ApiOperation(value = "根据岗位名称查询岗位信息", notes = "根据岗位名称查询岗位信息") + List findAllByPositionName(String positionName); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java index 2ab2e4a..a308345 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java @@ -142,6 +142,15 @@ public interface ISysUserInfoService { @ApiOperation(value = "关系查询-用户岗位",notes = "查询用户岗位关系") List findSysRefUserPositionByUserId(Long userId); + + /** + * 根据岗位名称查询用户信息 + * @param positionName + * @return SysRefUserPosition + */ + @ApiOperation(value = "关系查询-用户岗位",notes = "查询用户岗位关系") + List findSysRefUserPositionByPositionName(String positionName); + /** * 根据(组织ID,部门ID,用户名称,用户工号) 查询用户信息 * @param info diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java index bf2f137..e4dc6cf 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java @@ -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.FileContentTypeTool; 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.ListPager; 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 findUserByPositionName(String positionName) { + try { + List 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 faildList 数据重复的 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java index e0615d0..473d462 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java @@ -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.sqlpack.CoreHqlPack; 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.util.ValidatorBean; +import com.dingtalk.api.request.OapiAlitripBtripApprovalNewRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Example; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; +import java.util.ArrayList; import java.util.List; /** @@ -128,4 +132,16 @@ public class SysPositionService extends CrudService implements ISys return this.positionRDao.findAll(example); } + @Override + public List findAllByPositionName(String positionName) { + List 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; + } + } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java index b3f8f01..d547771 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java @@ -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.PagerHelper; 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.model.platform.UserDetailModel; import cn.estsh.i3plus.pojo.platform.bean.*; import cn.estsh.i3plus.pojo.platform.repository.*; 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.i3plus.platform.common.exception.ImppExceptionEnum; import io.swagger.annotations.ApiOperation; @@ -21,6 +23,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; import java.util.ArrayList; import java.util.Arrays; @@ -78,36 +81,36 @@ public class SysUserInfoService implements ISysUserInfoService { * @return */ @Override - @ApiOperation(value = "新增用户",notes = "新增一个用户信息") + @ApiOperation(value = "新增用户", notes = "新增一个用户信息") public SysUserInfo insertSysUserInfo(SysUserInfo userInfo) { - LOGGER.info("用户信息 SysUserInfo userInfo:{}",userInfo); + LOGGER.info("用户信息 SysUserInfo userInfo:{}", userInfo); return sysUserInfoRDao.insert(userInfo); } @Override - @ApiOperation(value = "修改用户",notes = "修改一个用户信息") + @ApiOperation(value = "修改用户", notes = "修改一个用户信息") public void updateSysUserInfo(SysUserInfo userInfo) { - LOGGER.info("用户信息 SysUserInfo userInfo:{}",userInfo); + LOGGER.info("用户信息 SysUserInfo userInfo:{}", userInfo); sysUserInfoRDao.update(userInfo); } @Override - @ApiOperation(value = "刷新用户关系",notes = "刷新用户部门关系") + @ApiOperation(value = "刷新用户关系", notes = "刷新用户部门关系") 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); - 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 departmentList = departmentService.findByIdList(Arrays.asList(departmentIds)); - if(departmentList != null && departmentList.size() >0){ + if (departmentList != null && departmentList.size() > 0) { List list = new ArrayList<>(); SysRefUserDepartment ref = null; for (SysDepartment department : departmentList) { @@ -126,10 +129,10 @@ public class SysUserInfoService implements ISysUserInfoService { refUserDepartmentRDao.saveAll(list); sysUserInfoRDao.save(userInfo); - LOGGER.info("用户信息 SysUserInfo RefUserDepartmentRDao Insert Size :{}",list.size()); + LOGGER.info("用户信息 SysUserInfo RefUserDepartmentRDao Insert Size :{}", list.size()); } } - }else { + } else { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) @@ -140,19 +143,19 @@ 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); + @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 ){ + if (userInfo != null) { // 删除用户岗位关系 - refUserPositionRDao.deleteByProperty("userId",userInfo.getId()); + refUserPositionRDao.deleteByProperty("userId", userInfo.getId()); - if(positionIds.length > 0){ + if (positionIds.length > 0) { List positionList = positionService.findByIdList(Arrays.asList(positionIds)); - if(positionList != null && positionList.size() >0){ + if (positionList != null && positionList.size() > 0) { List list = new ArrayList<>(); SysRefUserPosition ref = null; for (SysPosition position : positionList) { @@ -169,10 +172,10 @@ public class SysUserInfoService implements ISysUserInfoService { refUserPositionRDao.saveAll(list); sysUserInfoRDao.save(userInfo); - LOGGER.info("用户信息 SysUserInfo RefUserPositionRDao Insert Size :{}",list.size()); + LOGGER.info("用户信息 SysUserInfo RefUserPositionRDao Insert Size :{}", list.size()); } } - }else { + } else { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) @@ -183,13 +186,13 @@ public class SysUserInfoService implements ISysUserInfoService { } @Override - @ApiOperation(value = "刷新用户关系",notes = "刷新用户组织关系") + @ApiOperation(value = "刷新用户关系", notes = "刷新用户组织关系") 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); - if(userInfo != null ){ + if (userInfo != null) { SysOrganize organize = organizeService.get(organizeId); - if(organize != null ){ + if (organize != null) { userInfo.setOrganizeId(organize.getId()); userInfo.setOrganizeNameRdd(organize.getName()); @@ -199,7 +202,7 @@ public class SysUserInfoService implements ISysUserInfoService { sysUserInfoRDao.update(organize); } - }else { + } else { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) @@ -210,14 +213,14 @@ public class SysUserInfoService implements ISysUserInfoService { } @Override - @ApiOperation(value = "刷新用户账号信息",notes = "根据UserInfoId 刷新用户账号信息") + @ApiOperation(value = "刷新用户账号信息", notes = "根据UserInfoId 刷新用户账号信息") public void refreshUserInfoUserNum(Long userInfoId) { - LOGGER.info("用户信息 SysUserInfo userInfoId:{}",userInfoId); + LOGGER.info("用户信息 SysUserInfo userInfoId:{}", userInfoId); SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); - if(userInfo != null){ + if (userInfo != null) { sysUserRepository.findByPropertyCount( - new String[]{"userInfoId","isValid"}, - new Object[]{userInfo.getId(),CommonEnumUtil.IS_VAILD.VAILD.getValue()}); + new String[]{"userInfoId", "isValid"}, + new Object[]{userInfo.getId(), CommonEnumUtil.IS_VAILD.VAILD.getValue()}); // userInfo.setUserNum(count); sysUserInfoRDao.save(userInfo); @@ -225,16 +228,16 @@ public class SysUserInfoService implements ISysUserInfoService { } @Override - @ApiOperation(value = "删除用户",notes = "根据UserInfoId 删除用户信息") + @ApiOperation(value = "删除用户", notes = "根据UserInfoId 删除用户信息") public void deleteSysUserInfoById(Long id) { - LOGGER.info("用户信息 SysUserInfo id:{}",id); + LOGGER.info("用户信息 SysUserInfo id:{}", id); sysUserInfoRDao.deleteById(id); } @Override - @ApiOperation(value = "删除用户-批量",notes = "根据UserInfoId 批量删除用户信息") + @ApiOperation(value = "删除用户-批量", notes = "根据UserInfoId 批量删除用户信息") public void deleteSysUserInfoByIds(Long[] ids) { - LOGGER.info("用户信息 SysUserInfo ids:{}",ids); + LOGGER.info("用户信息 SysUserInfo ids:{}", ids); sysUserInfoRDao.deleteByIds(ids); } @@ -243,39 +246,39 @@ public class SysUserInfoService implements ISysUserInfoService { LOGGER.info("用户信息 SysUserInfo Count"); return sysUserInfoRDao.findByPropertyCount( - new String[]{"isDeleted","isValid"}, - new Object[]{CommonEnumUtil.IS_DEAL.NO.getValue(),CommonEnumUtil.IS_VAILD.VAILD.getValue()}); + new String[]{"isDeleted", "isValid"}, + new Object[]{CommonEnumUtil.IS_DEAL.NO.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue()}); } @Override - @ApiOperation(value = "查询用户信息",notes = "根据 UserInfoId查询用户信息") + @ApiOperation(value = "查询用户信息", notes = "根据 UserInfoId查询用户信息") public SysUserInfo getSysUserInfoById(Long id) { return sysUserInfoRDao.getById(id); } @Override - @ApiOperation(value = "查询用户信息",notes = "查询所有用户信息") + @ApiOperation(value = "查询用户信息", notes = "查询所有用户信息") public List listSysUserInfo() { return sysUserInfoRDao.findAll(); } @Override - @ApiOperation(value = "查询用户信息",notes = "根据复杂查询条件查询用户信息(分页信息)") + @ApiOperation(value = "查询用户信息", notes = "根据复杂查询条件查询用户信息(分页信息)") public ListPager querySysUserInfo(SysUserInfo userInfo, Pager pager) { - LOGGER.info("查询用户信息 TASK_TIME TaskTime:{}，Pager:{}",userInfo,pager); - if(userInfo == null) { + LOGGER.info("查询用户信息 TASK_TIME TaskTime:{}，Pager:{}", userInfo, pager); + if (userInfo == null) { pager = PagerHelper.getPager(pager, sysUserInfoRDao.listCount()); - return new ListPager(sysUserInfoRDao.listPager(pager),pager); - }else { + return new ListPager(sysUserInfoRDao.listPager(pager), pager); + } else { List departmentIdList = new ArrayList<>(); - if(userInfo.getOrganizeId() != null){ + if (userInfo.getOrganizeId() != null) { // 查出所有组织 ID 集合 SysOrganize parent = coreTreeService.getSysOrganizeTreeById(userInfo.getOrganizeId()); List childIds = coreTreeService.findSysOrganizeChildIds(parent); // 查询所有部门 ID 集合 - if(childIds != null && childIds.size() > 0){ + if (childIds != null && childIds.size() > 0) { for (Long organizeId : childIds) { departmentIdList.addAll(coreTreeService.findSysDepartmentIdByOrganizeId(organizeId)); } @@ -283,7 +286,7 @@ public class SysUserInfoService implements ISysUserInfoService { } // 封装部门 ID 信息 - if(userInfo.getDepartmentId() != null){ + if (userInfo.getDepartmentId() != null) { SysDepartment department = departmentService.get(userInfo.getDepartmentId()); departmentIdList.addAll(coreTreeService.findSysDepartmentChildIds(department)); } @@ -292,7 +295,7 @@ public class SysUserInfoService implements ISysUserInfoService { String hqlPack = CoreHqlPack.packHqlSysUserInfo(userInfo); 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 - @ApiOperation(value = "关系查询-用户部门",notes = "查询用户部门关系") + @ApiOperation(value = "关系查询-用户部门", notes = "查询用户部门关系") public List findRefUserDepartmentByUserId(Long userId) { - return refUserDepartmentRDao.findByProperty("userId",userId); + return refUserDepartmentRDao.findByProperty("userId", userId); } @Override - @ApiOperation(value = "关系查询-用户部门",notes = "根据部门或者组织集合查询用户部门关系") + @ApiOperation(value = "关系查询-用户部门", notes = "根据部门或者组织集合查询用户部门关系") public List querySysRefUserDepartment(UserDetailModel model) { - if(model != null){ + if (model != null) { StringBuffer userIdWhere = new StringBuffer(); - if(model.getUserDepartmentIdList() != null){ - HqlPack.getInPack(StringUtils.join(model.getInfoDepartmentIdList(),","),"departmentId", userIdWhere); + if (model.getUserDepartmentIdList() != null) { + HqlPack.getInPack(StringUtils.join(model.getInfoDepartmentIdList(), ","), "departmentId", userIdWhere); } - if(model.getUserOrganizeIdList() != null){ - HqlPack.getInPack( StringUtils.join(model.getUserOrganizeIdList(),","),"organizeId",userIdWhere); + if (model.getUserOrganizeIdList() != null) { + HqlPack.getInPack(StringUtils.join(model.getUserOrganizeIdList(), ","), "organizeId", userIdWhere); } return refUserDepartmentRDao.findByHqlWhere(userIdWhere.toString()); - }else { + } else { return null; } } @Override - @ApiOperation(value = "关系查询-用户岗位",notes = "查询用户岗位关系") + @ApiOperation(value = "关系查询-用户岗位", notes = "查询用户岗位关系") public List findSysRefUserPositionByUserId(Long userId) { - return refUserPositionRDao.findByProperty("userId",userId); + return refUserPositionRDao.findByProperty("userId", userId); } @Override - @ApiOperation(value = "用户唯一校验",notes = "校验用户信息唯一性") + public List findSysRefUserPositionByPositionName(String positionName) { + List users = new ArrayList(); + if (StringUtils.isEmpty(positionName)) { + return users; + } + List 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) { - 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() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) @@ -351,11 +375,11 @@ public class SysUserInfoService implements ISysUserInfoService { } @Override - @ApiOperation(value = "查询用户信息-",notes = "根据组织、部门、名称+工号组合查询条件查询用户信息") + @ApiOperation(value = "查询用户信息-", notes = "根据组织、部门、名称+工号组合查询条件查询用户信息") public List querySysUserInfoList(SysUserInfo info, List idList) { - LOGGER.info("查询用户信息 TASK_TIME SysUserInfo:{}，List idList :{}",info,idList); + LOGGER.info("查询用户信息 TASK_TIME SysUserInfo:{}，List idList :{}", info, idList); - String hqlPack = CoreHqlPack.packHqlSysUserInfo(info,idList); + String hqlPack = CoreHqlPack.packHqlSysUserInfo(info, idList); return sysUserInfoRDao.findByHqlWhere(hqlPack); } @@ -376,17 +400,17 @@ public class SysUserInfoService implements ISysUserInfoService { } @Override - @ApiOperation(value = "用户唯一校验 用户工号",notes = "用户唯一校验 用户工号") + @ApiOperation(value = "用户唯一校验 用户工号", notes = "用户唯一校验 用户工号") public boolean checkUserInfoByUserEmpNo(String no, long id) { int count; - if(id > 0){ + if (id > 0) { StringBuffer sw = new StringBuffer(); - HqlPack.getStringEqualPack(no,"userEmpNo",sw); - HqlPack.getNumNOEqualPack(id,"id",sw); + HqlPack.getStringEqualPack(no, "userEmpNo", sw); + HqlPack.getNumNOEqualPack(id, "id", sw); count = sysUserInfoRDao.findByHqlWhereCount(sw.toString()); - }else{ - count = sysUserInfoRDao.findByPropertyCount("userEmpNo",no); + } else { + count = sysUserInfoRDao.findByPropertyCount("userEmpNo", no); } - return count <= 0 ; + return count <= 0; } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java index 2a1e5ec..2f4cdcc 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java @@ -55,6 +55,10 @@ public class MailUtil { private boolean isAuthenticationSMTP = false; private final List 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(); server.put("mail.smtp.port", String.valueOf(this.smtpPort)); 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) { server.put("mail.smtp.auth", "true"); } @@ -366,12 +375,12 @@ public class MailUtil { mailConfig.setMailPassword("Aa135790"); MailUtil mailUtil = new MailUtil(); mailUtil.init(mailConfig); - mailUtil.setNick("yunhao"); - mailUtil.setTo("yunhaok@163.com"); + mailUtil.setNick("ns"); + mailUtil.setTo("13298408382@163.com"); mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.TEXT.getDescription()); mailUtil.setSubject("test"); 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.send(); diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java index 53f266a..5b22792 100644 --- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java @@ -1,5 +1,6 @@ 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.platform.bean.SessionUser; import cn.estsh.impp.framework.boot.util.SpringContextsUtil; @@ -45,7 +46,7 @@ public class TestBase { SessionContext sessionContext = new DefaultSessionContext(); 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); SecurityUtils.setSecurityManager(securityManager); securityManager.start(sessionContext); diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/TestMailUtil.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/TestMailUtil.java index 72af6ce..bb42a91 100644 --- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/TestMailUtil.java +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/TestMailUtil.java @@ -31,14 +31,14 @@ public class TestMailUtil extends TestBase { mailConfig.setMailHost("smtphm.qiye.163.com"); mailConfig.setMailPort(25); mailConfig.setMailNick(""); - mailConfig.setMailUser("impp.dev@sss.com"); - mailConfig.setMailPassword("Aa135790s"); + mailConfig.setMailUser("impp-test@estsh.com"); + mailConfig.setMailPassword("Aa135790"); MailUtil mailUtil = new MailUtil(); try { - mailUtil.setTo("yunhao.wang@estsh.com"); - mailUtil.setBody("zhenw"); - mailUtil.setSubject("title"); + mailUtil.setTo("13298408382@163.com"); + mailUtil.setBody("测试"); + mailUtil.setSubject("发送邮件测试"); mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getDescription()); mailUtil.init(mailConfig).send(); } catch (Exception e){