From 10d50ad43dab5cb1677ebf3649d1303131425f55 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Sat, 8 May 2021 18:05:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?UAT=20Sweb=E5=88=9B=E5=BB=BA=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E4=BC=98=E5=8C=96=20#15180?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/iservice/busi/ISysDepartmentService.java | 10 ++++++ .../api/iservice/busi/ISysPositionService.java | 8 +++++ .../controller/busi/SysDepartmentController.java | 36 ++++++++++++++++++---- .../controller/busi/SysPositionController.java | 26 ++++++++++++++-- .../serviceimpl/busi/SysDepartmentService.java | 7 +++++ .../serviceimpl/busi/SysPositionService.java | 7 +++++ 6 files changed, 85 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java index 8d0e375..f7598b5 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java @@ -100,4 +100,14 @@ public interface ISysDepartmentService extends ICrudService { @ApiOperation(value = "检查工厂是否存在") boolean checkSysDepartmentOnly(SysDepartment sysDepartment); + /** + * 根据部门代码和组织代码获取部门信息 + * @param departmentCode + * @param organizeId + * @return + */ + @ApiOperation(value = "根据部门代码和组织代码获取部门信息") + SysDepartment findSysDepartmentByDepartCodeAndOrganizedId(String departmentCode,Long organizeId); + + } 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 8d27260..6e50249 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 @@ -95,5 +95,13 @@ public interface ISysPositionService extends ICrudService { // @ApiOperation(value = "查询岗位信息",notes = "查询岗位信息 (分页，组合)") // ListPager findSysPositionByPager(SysPosition position, Pager pager); + /** + * 根据组织代码和岗位代码获取岗位信息 + * @param positionCode + * @param organizeCode + * @return + */ + @ApiOperation(value = "查询岗位信息", notes = "根据组织代码和岗位代码获取岗位信息") + SysPosition findPositionByPositionCodeAndOrganizeId(String positionCode,String organizeCode); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java index 0640ddd..4c25e01 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java @@ -9,9 +9,7 @@ import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; -import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; -import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment; +import cn.estsh.i3plus.pojo.platform.bean.*; import cn.estsh.impp.framework.base.controller.CrudBaseController; import cn.estsh.impp.framework.base.service.ICrudService; import cn.estsh.impp.framework.boot.auth.AuthUtil; @@ -24,9 +22,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; @@ -334,4 +330,32 @@ public class SysDepartmentController extends CrudBaseController { // } // } + @GetMapping(value = "/cloud-query-department/{departmentCode}") + @ApiOperation(value = "微服务查询部门", notes = "等值查询部门code") + public ResultBean queryPagerByCloud(@PathVariable String departmentCode) { + SessionUser sessionUser = getSessionUser(); + SysUser sysUser = personnelService.getSysUserById(sessionUser.getUserId()); + Long organizeId = sysUser.getOrganizeId(); + try { + //根据用户组织id 和 部门代码 查询部门 + SysDepartment sysDepartment = departmentService.findSysDepartmentByDepartCodeAndOrganizedId(departmentCode, organizeId); + return ResultBean.success("操作成功").setResultObject(sysDepartment).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + + } + + @PostMapping(value = "/cloud-insert") + @ApiOperation(value = "微服务添加部门", notes = "添加部门") + @Override + public ResultBean insertByCloud(@RequestBody SysDepartment bean) { + SessionUser sessionUser = getSessionUser(); + SysUser sysUser = personnelService.getSysUserById(sessionUser.getUserId()); + Long organizeId = sysUser.getOrganizeId(); + bean.setOrganizeId(organizeId); + return this.insert(bean); + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java index c836d65..f60209c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java @@ -20,9 +20,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; @@ -123,4 +121,26 @@ public class SysPositionController extends CrudBaseController { return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } } + + + @ApiOperation(value = "微服务查询岗位", notes = "微服务根据岗位代码等值查询岗位") + @GetMapping("/cloud-query/{positionCode}") + public ResultBean findPositionByCode(@PathVariable String positionCode) { + String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); + try { + SysPosition sysPosition = positionService.findPositionByPositionCodeAndOrganizeId(positionCode, organizeCode); + return ResultBean.success("操作成功").setResultObject(sysPosition).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + @Override + @ApiOperation(value = "微服务添加新的职位", notes = "微服务添加新职位") + @PostMapping("/cloud-insert") + public ResultBean insertByCloud(@RequestBody SysPosition bean) { + return this.insert(bean); + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java index 1767c94..55c96d3 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java @@ -319,5 +319,12 @@ public class SysDepartmentService extends CrudService implements return !departmentRDao.isExitByHql(CoreHqlPack.packHqlCheckSysDepartmentOnly(sysDepartment)); } + @Override + public SysDepartment findSysDepartmentByDepartCodeAndOrganizedId(String departmentCode,Long organizeId) { + String[] columns = {"departmentCode","organizeId"}; + Object[] values ={departmentCode,organizeId}; + return departmentRDao.getByProperty(columns,values); + } + } 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 6f00ca3..a44e11f 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 @@ -114,4 +114,11 @@ public class SysPositionService extends CrudService implements ISys return new ListPager(positionRDao.findByHqlWherePage(ddlPackBean, pager), pager); } + @Override + public SysPosition findPositionByPositionCodeAndOrganizeId(String positionCode, String organizeCode) { + String[] columns = {"positionCode","organizeCode"}; + Object[] values = {positionCode,organizeCode}; + return positionRDao.getByProperty(columns,values); + } + } From 909de971e11f0bd0e571be69daead7491184f0a9 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Mon, 10 May 2021 11:08:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=20UAT-=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9=2015179?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/controller/busi/PersonnelController.java | 5 +++-- .../serviceimpl/busi/PersonnelServiceService.java | 17 +++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index 9a2fbbb..b94ba19 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java @@ -689,10 +689,11 @@ public class PersonnelController extends CoreBaseController { .notNull("infoPositionId", model.getInfoPositionId()) .notNull("infoDepartmentId", model.getInfoDepartmentId()) .notNull("userDepartmentId", model.getUserDepartmentId()) - .notNull("userLoginName", model.getUserLoginName()) + .notNull("userLoginName", model.getUserLoginName()); // FIXME 松下移除邮箱校验 // .notNull("userEmail", model.getUserEmail()) - .notNull("userPhone", model.getUserPhone()); + // FIXME 松下移除手机号校验 +// .notNull("userPhone", model.getUserPhone()); } /** diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java index 07e7978..4c9749e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java @@ -650,14 +650,15 @@ public class PersonnelServiceService implements IPersonnelService { // } // 手机号唯一教研 - if(!checkSysUserPhone(user.getUserPhone(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){ - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) - .setErrorDetail("手机号已存在") - .setErrorSolution("请重新输入手机号") - .build(); - } + //FIXME 松下移除唯一校验 +// if(!checkSysUserPhone(user.getUserPhone(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){ +// throw ImppExceptionBuilder.newInstance() +// .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) +// .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) +// .setErrorDetail("手机号已存在") +// .setErrorSolution("请重新输入手机号") +// .build(); +// } // 工号唯一教研 if(!checkSysUserEmpNo(user.getUserEmpNo(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){ From d4f3e8b324c3ba0e84a1a193688ac14910a80211 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Tue, 11 May 2021 13:53:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?WIP:UAT-=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9=2015179?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/controller/busi/PersonnelController.java | 5 +++-- .../serviceimpl/busi/PersonnelServiceService.java | 17 +++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index 9a2fbbb..b94ba19 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java @@ -689,10 +689,11 @@ public class PersonnelController extends CoreBaseController { .notNull("infoPositionId", model.getInfoPositionId()) .notNull("infoDepartmentId", model.getInfoDepartmentId()) .notNull("userDepartmentId", model.getUserDepartmentId()) - .notNull("userLoginName", model.getUserLoginName()) + .notNull("userLoginName", model.getUserLoginName()); // FIXME 松下移除邮箱校验 // .notNull("userEmail", model.getUserEmail()) - .notNull("userPhone", model.getUserPhone()); + // FIXME 松下移除手机号校验 +// .notNull("userPhone", model.getUserPhone()); } /** diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java index 07e7978..4c9749e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java @@ -650,14 +650,15 @@ public class PersonnelServiceService implements IPersonnelService { // } // 手机号唯一教研 - if(!checkSysUserPhone(user.getUserPhone(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){ - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) - .setErrorDetail("手机号已存在") - .setErrorSolution("请重新输入手机号") - .build(); - } + //FIXME 松下移除唯一校验 +// if(!checkSysUserPhone(user.getUserPhone(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){ +// throw ImppExceptionBuilder.newInstance() +// .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) +// .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) +// .setErrorDetail("手机号已存在") +// .setErrorSolution("请重新输入手机号") +// .build(); +// } // 工号唯一教研 if(!checkSysUserEmpNo(user.getUserEmpNo(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){