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

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev

Browse Source
yun-zuoyi
yunhao.wang 6 years ago
parent e83f3d9bd7 28745097e8
commit 8d3f36c6eb
33 changed files with 716 additions and 626 deletions
Show Stats Download Patch File Download Diff File

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

@ -67,6 +67,12 @@ public interface ICoreTreeService {
@ApiOperation(value = "获取部门树",notes = "根据父节点获取部门树")
SysDepartment getSysDepartmentTreeById(long id);
@ApiOperation(value = "获取部门ID集合",notes = "根据组织ID获取部门子集ID集合")
List<Long> findSysDepartmentIdByOrganizeId(long id);
@ApiOperation(value = "获取部门ID集合",notes = "获取部门子集ID集合")
List<Long> findSysDepartmentChildIds(SysDepartment department);
/**
* 生成子集树递归方法
* @param parent 父类对象

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

@ -101,8 +101,17 @@ public interface IPersonnelService {
@ApiOperation(value = "岗位关系检查")
void checkSysPositionRef(Long positionId);
@ApiOperation(value = "岗位关系检查")
void refreshMenuRdd(Long menuId);
@ApiOperation(value = "岗位关系检查")
void refreshUpdateMenuRdd(Long menuId);
@ApiOperation(value = "刷新组织冗余")
void refreshOrganizeRdd(Long organizeId);
@ApiOperation(value = "刷新组织冗余")
void refreshRefSysUserOrganizeRdd(Long organizeIds);
void refreshUpdateOrganizeRdd(Long organizeId);
@ApiOperation(value = "刷新账号部门")
void refreshRefSysUserDepartment(Long userId, Long[] departmentIds);
@ -110,18 +119,28 @@ public interface IPersonnelService {
@ApiOperation(value = "刷新账号角色")
void refreshRefSysUserRole(Long userId, Long[] roleIds);
@ApiOperation(value = "刷新角色冗余")
void refreshUpdateSysRoleRdd(Long roleId);
@ApiOperation(value = "刷新组织冗余")
void refreshDepartmentRdd(Long departmentId);
@ApiOperation(value = "刷新账号部门")
void refreshRefSysUserDepartmentRdd(Long departmentId);
void refreshUpdateRefSysUserDepartmentRdd(Long departmentId);
@ApiOperation(value = "刷新用户部门")
void refreshRefSysUserInfoDepartment(Long userInfoId, Long[] departmentIds);
void refreshUpdateRefSysUserInfoDepartment(Long userInfoId, Long[] departmentIds);
@ApiOperation(value = "刷新用户部门")
void refreshRefSysUserInfoDepartmentRdd(Long departmentId);
void refreshUpdateRefSysUserInfoDepartmentRdd(Long departmentId);
@ApiOperation(value = "刷新岗位冗余")
void refreshPositionRdd(Long positionId);
@ApiOperation(value = "刷新用户岗位")
void refreshRefSysUserInfoPosition(Long userInfoId, Long[] positionIds);
@ApiOperation(value = "刷新用户岗位")
void refreshRefSysUserInfoPositionRdd(Long positionId);
void refreshUpdateRefSysUserInfoPositionRdd(Long positionId);
}

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

@ -120,6 +120,9 @@ public interface ISysUserService {
@ApiOperation(value = "查询用户ID 集合",notes = "根据角色Id 查询用户ID集合")
List<Long> findSysUserIdListByRoleId(Long roleId);
@ApiOperation(value = "查询用户ID 集合",notes = "根据部门Id 查询用户ID集合")
List<Long> findSysUserIdListByDepartmentId(List<Long> idList);
/**
* 复杂查询
* @param user

24
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java
Unescape Escape View File

@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ResultBean;
import io.swagger.annotations.Api;
@ -41,11 +42,9 @@ public class DemoMongoController extends CoreBaseController{
logOperateService.insertSysLogOperate(logOperate);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep).build();
}catch(Exception e){
LOGGER.error(e.getMessage(),e);
return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -60,7 +59,6 @@ public class DemoMongoController extends CoreBaseController{
logOperateService.deleteSysLogOperateById(Long.parseLong(id));
return ResultBean.success("删除日志成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep).build();
}catch(Exception e){
return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
@ -74,11 +72,9 @@ public class DemoMongoController extends CoreBaseController{
List logList = logOperateService.listSysLogOperate();
return ResultBean.success("操作成功").setResultList(logList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
return ResultBean.fail(busExcep).build();
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -93,11 +89,9 @@ public class DemoMongoController extends CoreBaseController{
return ResultBean.success("操作成功").setResultList(logList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
return ResultBean.fail(busExcep).build();
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -108,11 +102,9 @@ public class DemoMongoController extends CoreBaseController{
logOperateService.getSysLogOperateById(Long.parseLong(id));
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
return ResultBean.fail(busExcep).build();
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
}

48
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java
Unescape Escape View File

@ -77,11 +77,9 @@ public class DemoResourceController extends CoreBaseController {
systemResourceService.insertSysLocaleLanguage(lang);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep).build();
}catch(Exception e){
LOGGER.error(e.getMessage(),e);
return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -107,10 +105,9 @@ public class DemoResourceController extends CoreBaseController {
systemResourceService.updateSysLocaleLanguage(lang);
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep).build();
}catch(Exception e){
return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -121,11 +118,9 @@ public class DemoResourceController extends CoreBaseController {
ListPager listPager = systemResourceService.listSysLocaleLanguageByPager(lang,pager);
return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -144,15 +139,11 @@ public class DemoResourceController extends CoreBaseController {
//新增初始化
ConvertBean.modelInitialize(res,user);
systemResourceService.insertSysLocaleResource(res);
return ResultBean.success("操作成功")
.setResultObject(res)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("操作成功").setResultObject(res).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -161,15 +152,11 @@ public class DemoResourceController extends CoreBaseController {
public ResultBean queryResource(SysLocaleResource res,Pager pager) {
try{
ListPager listPager = systemResourceService.listSysLocaleResourceByPager(res,pager);
return ResultBean.success("操作成功")
.setListPager(listPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -190,11 +177,9 @@ public class DemoResourceController extends CoreBaseController {
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(res);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -213,11 +198,9 @@ public class DemoResourceController extends CoreBaseController {
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -240,11 +223,9 @@ public class DemoResourceController extends CoreBaseController {
return ResultBean.success("保存成功");
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -261,11 +242,9 @@ public class DemoResourceController extends CoreBaseController {
return ResultBean.success("保存成功");
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -289,12 +268,9 @@ public class DemoResourceController extends CoreBaseController {
return ResultBean.success("保存成功");
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
e.printStackTrace();
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
}

4
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java
Unescape Escape View File

@ -50,11 +50,9 @@ public class DemoTreeAndExceptionController extends CoreBaseController{
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(department);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}

5
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient;
import cn.estsh.impp.framework.boot.fastdfs.FastDFSFile;
@ -62,11 +63,9 @@ public class DemoUploadController extends CoreBaseController{
FastDFSFile dfsFile = dfsClient.saveFile(file);
return ResultBean.success("上传成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(dfsFile);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
}

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

@ -103,11 +103,9 @@ public class PersonnelController extends CoreBaseController {
return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -162,11 +160,9 @@ public class PersonnelController extends CoreBaseController {
return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -196,11 +192,9 @@ public class PersonnelController extends CoreBaseController {
personnelService.saveSysUser(user);
return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -233,11 +227,9 @@ public class PersonnelController extends CoreBaseController {
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(resultMap);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -260,11 +252,9 @@ public class PersonnelController extends CoreBaseController {
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(resultMap);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@ -285,11 +275,9 @@ public class PersonnelController extends CoreBaseController {
return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
}
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -325,11 +313,9 @@ public class PersonnelController extends CoreBaseController {
return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
}
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -350,11 +336,9 @@ public class PersonnelController extends CoreBaseController {
return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
}
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ResultBean.fail(e).setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
}
}
@ -390,16 +374,14 @@ public class PersonnelController extends CoreBaseController {
return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
}
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@GetMapping(value = "/query-ref-department")
@PostMapping(value = "/query-ref-department")
@ApiOperation(value = "查询角色的所有角色权限关系", notes = "查询角色的所有角色权限关系")
public ResultBean queryRefDepartment(UserDetailModel model) {
try {
@ -415,14 +397,11 @@ public class PersonnelController extends CoreBaseController {
}
List<SysUser> result = personnelService.querySysUserByUserDetailModelOrIds(model, idList);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(result);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -531,7 +510,7 @@ public class PersonnelController extends CoreBaseController {
if(info != null){
// 刷新用户 部门关系
personnelService.refreshRefSysUserInfoDepartment(info.getId(),StringTool.getArrayLong(model.getInfoDepartmentIdList()));
personnelService.refreshUpdateRefSysUserInfoDepartment(info.getId(),StringTool.getArrayLong(model.getInfoDepartmentIdList()));
// 刷新用户 岗位关系
personnelService.refreshRefSysUserInfoPosition(info.getId(),StringTool.getArrayLong(model.getInfoPositionIdList()));
}

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

@ -9,6 +9,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import cn.estsh.impp.framework.boot.util.ResultBean;
import io.swagger.annotations.Api;
@ -70,10 +71,9 @@ public class SysDashboardController extends CoreBaseController {
redisCore.putHashMap(redisKey, dashboardData, 500);
}
return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(dashboardData);
} catch (
ImppBusiException busExcep) {
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {
}catch(Exception e){
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -98,10 +98,9 @@ public class SysDashboardController extends CoreBaseController {
return ResultBean.success("查询成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultMap(dashboardData);
} catch (
ImppBusiException busExcep) {
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {
}catch(Exception e){
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -130,6 +129,8 @@ public class SysDashboardController extends CoreBaseController {
.setResultMap(dashboardData);
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
}catch(Exception e){
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -157,7 +158,7 @@ public class SysDashboardController extends CoreBaseController {
.setResultMap(dashboardData);
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {
}catch(Exception e){
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -205,7 +206,7 @@ public class SysDashboardController extends CoreBaseController {
.setResultMap(dashboardData);
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {
}catch(Exception e){
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}

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

@ -74,11 +74,9 @@ public class SysDepartmentController extends CoreBaseController {
departmentService.insertSysDepartment(department);
return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ResultBean.fail(e).setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
}
}
@ -105,11 +103,9 @@ public class SysDepartmentController extends CoreBaseController {
departmentService.updateSysDepartment(department);
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -123,11 +119,9 @@ public class SysDepartmentController extends CoreBaseController {
departmentService.deleteSysDepartmentById(Long.parseLong(id));
return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -136,14 +130,11 @@ public class SysDepartmentController extends CoreBaseController {
public ResultBean findSysDepartmentAll() {
try {
List<SysDepartment> departmentList = departmentService.listSysDepartment();
return ResultBean.success("操作成功").setResultList(departmentList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("操作成功").setResultList(departmentList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -161,11 +152,9 @@ public class SysDepartmentController extends CoreBaseController {
return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
}
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -188,11 +177,9 @@ public class SysDepartmentController extends CoreBaseController {
}
return ResultBean.success("查询成功").setListPager(list).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -209,14 +196,11 @@ public class SysDepartmentController extends CoreBaseController {
.build();
}
departmentService.deleteSysDepartmentByIds(StringTool.getArrayLong(ids));
return ResultBean.success("删除成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}

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

@ -49,9 +49,6 @@ public class SysDictionaryController extends CoreBaseController{
@ApiOperation(value = "添加字典",notes = "添加字典")
public ResultBean insertSysDictionary(SysDictionary sysDictionary) {
try {
// 登录用户
SessionUser user = AuthUtil.getSessionUser();
// 条件验证
ValidatorBean.beginValid(sysDictionary)
.notNull("name",sysDictionary.getName())
@ -64,11 +61,9 @@ public class SysDictionaryController extends CoreBaseController{
sysDictionaryService.insertSysDictionary(sysDictionary);
return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -91,11 +86,9 @@ public class SysDictionaryController extends CoreBaseController{
sysDictionaryService.updateSysDictionary(sysDictionary);
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -117,11 +110,9 @@ public class SysDictionaryController extends CoreBaseController{
sysDictionaryService.deleteSysDictionaryById(Long.parseLong(idStr));
return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -133,11 +124,9 @@ public class SysDictionaryController extends CoreBaseController{
return ResultBean.success("查询成功").setResultList(sysDictionaryList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -155,13 +144,9 @@ public class SysDictionaryController extends CoreBaseController{
return ResultBean.fail("字典不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
}
} catch (ImppBusiException busExcep) {
busExcep.printStackTrace();
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
e.printStackTrace();
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -170,14 +155,11 @@ public class SysDictionaryController extends CoreBaseController{
public ResultBean findSysDictionaryByParentCode(@PathVariable("code") String code) {
try {
List<SysDictionary> sysDictionaryList = sysDictionaryService.findSysDictionaryByParentCode(code);
return ResultBean.success("查询成功").setResultList(sysDictionaryList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("查询成功").setResultList(sysDictionaryList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -198,11 +180,9 @@ public class SysDictionaryController extends CoreBaseController{
return ResultBean.success("查询成功").setResultMap(resultMap).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -213,11 +193,9 @@ public class SysDictionaryController extends CoreBaseController{
ListPager sysDictionaryListPager = sysDictionaryService.querySysDictionaryByPager(sysDictionary,pager);
return ResultBean.success("查询成功").setListPager(sysDictionaryListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@ -226,15 +204,11 @@ public class SysDictionaryController extends CoreBaseController{
public ResultBean findSysDictionaryByTop() {
try {
List<SysDictionary> sysDictionaryList = sysDictionaryService.findSysDictionaryByTop();
return ResultBean.success("查询成功")
.setResultList(sysDictionaryList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("查询成功").setResultList(sysDictionaryList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -252,11 +226,9 @@ public class SysDictionaryController extends CoreBaseController{
sysDictionaryService.deleteSysDictionaryByIds(StringTool.getArrayLong(ids));
return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}

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

@ -68,20 +68,15 @@ public class SysFileController extends CoreBaseController{
@ApiOperation(value = "修改文件资源",notes = "修改文件资源")
public ResultBean updateSysFile(SysFile sysFile){
try {
// 登录用户
SessionUser user = AuthUtil.getSessionUser();
// 条件验证
ValidatorBean.beginValid(sysFile).notNull("name",sysFile.getName());
sysFileService.updateSysFile(sysFile);
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -92,11 +87,9 @@ public class SysFileController extends CoreBaseController{
sysFileService.deleteSysFileById(Long.parseLong(id));
return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -109,11 +102,9 @@ public class SysFileController extends CoreBaseController{
.setResultList(sysFileList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -128,11 +119,9 @@ public class SysFileController extends CoreBaseController{
.setResultObject(sysFile)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -143,11 +132,9 @@ public class SysFileController extends CoreBaseController{
ListPager sysFileListPager = sysFileService.querySysFileByPager(sysFile,pager);
return ResultBean.success("查询成功").setListPager(sysFileListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -166,11 +153,9 @@ public class SysFileController extends CoreBaseController{
sysFileService.deleteSysFileByIds(StringTool.getArrayLong(ids));
return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -218,11 +203,9 @@ public class SysFileController extends CoreBaseController{
return ResultBean.success("上传成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(fileDb);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -282,11 +265,9 @@ public class SysFileController extends CoreBaseController{
sysFileService.updateSysFile(sysFile);
return ResultBean.success("下载").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}

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

@ -1,12 +1,10 @@
package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogSystemService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogTaskTimeService;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
@ -20,8 +18,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @Description : 定时任务日志服务
* @Reference :

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

@ -66,10 +66,9 @@ public class SysMenuController extends CoreBaseController {
menu = sysMenuService.insertSysMenu(menu);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(menu);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep).build();
} catch (Exception e) {
return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -96,10 +95,9 @@ public class SysMenuController extends CoreBaseController {
sysMenuService.updateSysMenu(menu);
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep).build();
} catch (Exception e) {
return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -113,11 +111,9 @@ public class SysMenuController extends CoreBaseController {
sysMenuService.deleteSysMenuById(Long.parseLong(id));
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -126,15 +122,11 @@ public class SysMenuController extends CoreBaseController {
public ResultBean findAll() {
try {
List<SysMenu> list = sysMenuService.findSysMenuAll();
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(list);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -144,14 +136,11 @@ public class SysMenuController extends CoreBaseController {
try{
ListPager<SysMenu> listPager = sysMenuService.querySysMenu(menu, pager);
return ResultBean.success("操作成功").setListPager(listPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -170,11 +159,9 @@ public class SysMenuController extends CoreBaseController {
return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
}
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -190,11 +177,9 @@ public class SysMenuController extends CoreBaseController {
sysMenuService.updateSysMenuStatus(Long.parseLong(id),status,getSessionUser());
return new ResultBean(true);
} catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -211,11 +196,9 @@ public class SysMenuController extends CoreBaseController {
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -235,11 +218,9 @@ public class SysMenuController extends CoreBaseController {
return ResultBean.success("删除成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}

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

@ -62,10 +62,9 @@ public class SysOrganizeController extends CoreBaseController{
organize = organizeService.insertSysOrganize(organize);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(organize);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -89,10 +88,9 @@ public class SysOrganizeController extends CoreBaseController{
organizeService.updateSysOrganize(organize);
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -106,11 +104,9 @@ public class SysOrganizeController extends CoreBaseController{
organizeService.deleteSysOrganizeById(Long.parseLong(idStr));
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -119,15 +115,11 @@ public class SysOrganizeController extends CoreBaseController{
public ResultBean findSysOrganizeAll() {
try {
List<SysOrganize> list = organizeService.listSysOrganize();
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(list);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -136,15 +128,11 @@ public class SysOrganizeController extends CoreBaseController{
public ResultBean queryPosition(SysOrganize organize, Pager pager){
try{
ListPager<SysOrganize> listPager = organizeService.querySysOrganize(organize, pager);
return ResultBean.success("操作成功")
.setListPager(listPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -157,16 +145,11 @@ public class SysOrganizeController extends CoreBaseController{
SysOrganize organize = organizeService.getSysOrganizeById(Long.parseLong(id));
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(organize);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(organize);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
e.printStackTrace();
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -181,11 +164,9 @@ public class SysOrganizeController extends CoreBaseController{
organizeService.updateSysOrganizeStatus(Long.parseLong(id), status, AuthUtil.getSessionUser());
return new ResultBean(true);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -203,14 +184,11 @@ public class SysOrganizeController extends CoreBaseController{
}
organizeService.deleteSysOrganizeByIds(StringTool.getArrayLong(ids));
return ResultBean.success("删除成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
}

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

@ -64,11 +64,9 @@ public class SysPositionController extends CoreBaseController {
return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(pos);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ResultBean.fail(e).setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
}
}
@ -95,11 +93,9 @@ public class SysPositionController extends CoreBaseController {
positionService.updateSysPosition(position);
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ResultBean.fail(e).setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
}
}
@ -113,11 +109,9 @@ public class SysPositionController extends CoreBaseController {
positionService.deleteSysPositionById(Long.parseLong(id));
return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ResultBean.fail(e).setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
}
}
@ -129,11 +123,9 @@ public class SysPositionController extends CoreBaseController {
return ResultBean.success("操作成功").setResultList(positionList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@ -145,11 +137,9 @@ public class SysPositionController extends CoreBaseController {
return ResultBean.success("操作成功").setListPager(listPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@ -163,15 +153,11 @@ public class SysPositionController extends CoreBaseController {
ValidatorBean.beginValid(position)
.notNull("id",position.getId());
return ResultBean.success("查询成功")
.setResultObject(position)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("查询成功").setResultObject(position).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@ -191,11 +177,9 @@ public class SysPositionController extends CoreBaseController {
return ResultBean.success("删除成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}

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

@ -60,10 +60,9 @@ public class SysRoleController extends CoreBaseController{
role = sysRoleService.insertSysRole(role);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(role);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep).build();
} catch (Exception e) {
return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -81,10 +80,9 @@ public class SysRoleController extends CoreBaseController{
sysRoleService.updateSysRole(role);
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep).build();
return ResultBean.fail(busExcep);
} catch (Exception e) {
return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -98,11 +96,9 @@ public class SysRoleController extends CoreBaseController{
sysRoleService.deleteSysRoleById(Long.parseLong(id));
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -111,15 +107,11 @@ public class SysRoleController extends CoreBaseController{
public ResultBean findAll() {
try {
List<SysRole> list = sysRoleService.findSysRoleAll();
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(list);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -134,11 +126,9 @@ public class SysRoleController extends CoreBaseController{
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(list);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -151,11 +141,9 @@ public class SysRoleController extends CoreBaseController{
return ResultBean.success("操作成功").setListPager(listPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -174,11 +162,9 @@ public class SysRoleController extends CoreBaseController{
return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
}
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -191,13 +177,11 @@ public class SysRoleController extends CoreBaseController{
ValidatorBean.checkNotZero(status, "角色状态不能为空");
sysRoleService.updateSysRoleStatus(Long.parseLong(id), status, AuthUtil.getSessionUser());
return new ResultBean(true);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -215,11 +199,9 @@ public class SysRoleController extends CoreBaseController{
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -236,11 +218,9 @@ public class SysRoleController extends CoreBaseController{
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -267,11 +247,9 @@ public class SysRoleController extends CoreBaseController{
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -291,11 +269,9 @@ public class SysRoleController extends CoreBaseController{
return ResultBean.success("删除成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
}

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

@ -144,8 +144,7 @@ public class SysTaskCycleController extends CoreBaseController{
SysTaskCycle sysTaskCycle = sysTaskCycleService.getSysTaskCycleById(Long.parseLong(id));
if (sysTaskCycle != null) {
return ResultBean.success("查询成功")
.setResultObject(sysTaskCycle).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("查询成功").setResultObject(sysTaskCycle).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}else {
return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
}

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

@ -123,15 +123,14 @@ public class SysToolController extends CoreBaseController{
@GetMapping(value = "/list")
@ApiOperation(value = "查询全部",notes = "查询全部")
public ResultBean findSysToolAll(){
try{
List<SysTool> toolList = toolService.listSysTool();
return ResultBean.success("操作成功").setResultList(toolList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
}catch(Exception e){
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
try{
List<SysTool> toolList = toolService.listSysTool();
return ResultBean.success("操作成功").setResultList(toolList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
}catch(Exception e){
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@GetMapping(value = "/get/{id}")
@ -143,12 +142,9 @@ public class SysToolController extends CoreBaseController{
SysTool tool = toolService.getSysToolById(Long.parseLong(id));
if (tool != null) {
return ResultBean.success("查询成功")
.setResultObject(tool)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("查询成功").setResultObject(tool).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}else {
return ResultBean.fail("硬件不存在")
.setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
return ResultBean.fail("硬件不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
}
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
@ -162,9 +158,7 @@ public class SysToolController extends CoreBaseController{
public ResultBean querySysToolByPager(SysTool tool, Pager pager){
try {
ListPager sysSysToolListPager = toolService.querySysToolByPager(tool,pager);
return ResultBean.success("查询成功")
.setListPager(sysSysToolListPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("查询成功").setListPager(sysSysToolListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
}catch(Exception e){

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

@ -46,23 +46,18 @@ public class SysToolTypeController extends CoreBaseController{
@ApiOperation(value = "添加硬件类型",notes = "添加硬件类型")
public ResultBean insertSysToolType(SysToolType toolType){
try {
// 登录用户
SessionUser user = AuthUtil.getSessionUser();
// 条件校验
ValidatorBean.beginValid(toolType).notNull("name",toolType.getName());
// 添加初始化
ConvertBean.modelInitialize(toolType,user);
ConvertBean.modelInitialize(toolType, AuthUtil.getSessionUser());
toolTypeService.insertSysToolType(toolType);
return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -82,11 +77,9 @@ public class SysToolTypeController extends CoreBaseController{
toolTypeService.updateSysToolType(toolType);
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -110,8 +103,7 @@ public class SysToolTypeController extends CoreBaseController{
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -120,14 +112,11 @@ public class SysToolTypeController extends CoreBaseController{
public ResultBean findSysToolTypeAll(){
try{
List<SysToolType> toolTypeList = toolTypeService.listSysToolType();
return ResultBean.success("操作成功").setResultList(toolTypeList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("操作成功").setResultList(toolTypeList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -140,19 +129,14 @@ public class SysToolTypeController extends CoreBaseController{
SysToolType toolType = toolTypeService.getSysToolTypeById(Long.parseLong(id));
if (toolType != null) {
return ResultBean.success("查询成功")
.setResultObject(toolType)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("查询成功").setResultObject(toolType).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}else {
return ResultBean.fail("硬件不存在")
.setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
return ResultBean.fail("硬件不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
}
}catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -161,15 +145,12 @@ public class SysToolTypeController extends CoreBaseController{
public ResultBean querySysToolTypeByPager(SysToolType toolType, Pager pager){
try {
ListPager sysDictionaryListPager = toolTypeService.querySysToolTypeByPager(toolType,pager);
return ResultBean.success("查询成功")
.setListPager(sysDictionaryListPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("查询成功").setListPager(sysDictionaryListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -187,11 +168,9 @@ public class SysToolTypeController extends CoreBaseController{
toolTypeService.deleteSysToolTypeByIds(StringTool.getArrayLong(ids));
return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
}

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

@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
import cn.estsh.i3plus.pojo.platform.bean.SysPosition;
import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ResultBean;
import io.swagger.annotations.Api;
@ -55,11 +56,9 @@ public class SysTreeController extends CoreBaseController {
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(position);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -73,11 +72,9 @@ public class SysTreeController extends CoreBaseController {
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(positionList);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -87,15 +84,11 @@ public class SysTreeController extends CoreBaseController {
try {
SysOrganize obj = coreTreeService.getSysOrganizeTreeById(id);
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(obj);
return ResultBean.success("查询部门树成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(obj);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -105,15 +98,11 @@ public class SysTreeController extends CoreBaseController {
try {
List<SysOrganize> resultList = coreTreeService.findSysOrganizeTreeByParentId(parentId);
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(resultList);
return ResultBean.success("查询部门树成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(resultList);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -123,15 +112,11 @@ public class SysTreeController extends CoreBaseController {
try {
SysDepartment obj = coreTreeService.getSysDepartmentTreeById(id);
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(obj);
return ResultBean.success("查询部门树成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(obj);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -141,15 +126,11 @@ public class SysTreeController extends CoreBaseController {
try {
List<SysDepartment> resultList = coreTreeService.findSysDepartmentTreeByParentId(parentId);
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(resultList);
return ResultBean.success("查询部门树成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(resultList);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -159,15 +140,11 @@ public class SysTreeController extends CoreBaseController {
try {
SysMenu obj = coreTreeService.getSysMenuTreeById(id);
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(obj);
return ResultBean.success("查询部门树成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(obj);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -177,15 +154,11 @@ public class SysTreeController extends CoreBaseController {
try {
List<SysMenu> resultList = coreTreeService.findSysMenuTreeByParentId(parentId);
return ResultBean.success("查询部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(resultList);
return ResultBean.success("查询部门树成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(resultList);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -195,15 +168,11 @@ public class SysTreeController extends CoreBaseController {
try {
List<CommonTreeModel> resultList = coreTreeService.findOrganizeDepartment(parentId);
return ResultBean.success("查询组织-部门树成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(resultList);
return ResultBean.success("查询组织-部门树成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(resultList);
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
}

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

@ -97,8 +97,6 @@ public class SysUserController extends CoreBaseController{
//新增初始化
sysUser.setUserName(userInfo.getName());
sysUser.setUserStatus(CommonEnumUtil.USER_STATUS.ENABLE.getValue());
// sysUser.setDepartmentId(userInfo.getDepartmentId());
// sysUser.setDepartmentNameRdd(userInfo.getDepartmentNameRdd());
sysUser.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
sysUser.setUserType(CommonEnumUtil.USER_TYPE.USER.getValue());
sysUser.setUserLoginNum(0);
@ -113,11 +111,9 @@ public class SysUserController extends CoreBaseController{
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(user);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -175,11 +171,9 @@ public class SysUserController extends CoreBaseController{
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(user);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -194,11 +188,9 @@ public class SysUserController extends CoreBaseController{
sysUserService.updateSysUserStatus(Long.parseLong(id), status, AuthUtil.getSessionUser());
return new ResultBean(true);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -216,11 +208,9 @@ public class SysUserController extends CoreBaseController{
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -237,11 +227,9 @@ public class SysUserController extends CoreBaseController{
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -254,11 +242,9 @@ public class SysUserController extends CoreBaseController{
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(list);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -266,26 +252,12 @@ public class SysUserController extends CoreBaseController{
@ApiOperation(value="查询系统用户",notes="组合查询用户，外带分页查询(isValid = 1)")
public ResultBean querySysUserByPager(SysUser user, Pager pager){
try{
// 初始化用户查询讯息
if(null == user) {
user = new SysUser();
}
if(user.getRoleId() != null){
List<Long> ids = sysUserService.findSysUserIdListByRoleId(Long.parseLong(user.getRoleId()));
user.setRoleIdList(ids);
}
ListPager<SysUser> listPager = sysUserService.querySysUserByPager(user, pager);
return ResultBean.success("操作成功").setListPager(listPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -299,11 +271,9 @@ public class SysUserController extends CoreBaseController{
sysUserService.deleteSysUserById(Long.parseLong(id));
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -324,11 +294,9 @@ public class SysUserController extends CoreBaseController{
return ResultBean.success("删除成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -342,11 +310,9 @@ public class SysUserController extends CoreBaseController{
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(list);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -391,11 +357,9 @@ public class SysUserController extends CoreBaseController{
.setErrorMsg("用户不存在");
}
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -434,11 +398,9 @@ public class SysUserController extends CoreBaseController{
.setErrorMsg("用户不存在");
}
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -475,11 +437,9 @@ public class SysUserController extends CoreBaseController{
.setErrorMsg("验证码已过期");
}
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}

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

@ -84,23 +84,13 @@ public class SysUserInfoController extends CoreBaseController{
SysUserInfo info = sysUserInfoService.insertSysUserInfo(userInfo);
// sysUserInfoService.refreshRefUserDepartment(info.getId(),
// StringTool.getArrayLong(userInfo.getDepartmentIdList()),
// user.getUserName());
//
// sysUserInfoService.refreshRefUserPosition(info.getId(),
// StringTool.getArrayLong(userInfo.getPositionIdList()),
// user.getUserName());
sysUserInfoService.refreshRefUserOrganize(info.getId(), userInfo.getDepartment().getOrganizeId(),user.getUserName());
return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(info);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -119,23 +109,13 @@ public class SysUserInfoController extends CoreBaseController{
sysUserInfoService.updateSysUserInfo(userInfo);
// sysUserInfoService.refreshRefUserDepartment(userInfo.getId(),
// StringTool.getArrayLong(userInfo.getDepartmentIdList()),
// user.getUserName());
//
// sysUserInfoService.refreshRefUserPosition(userInfo.getId(),
// StringTool.getArrayLong(userInfo.getPositionIdList()),
// user.getUserName());
sysUserInfoService.refreshRefUserOrganize(userInfo.getId(), userInfo.getDepartment().getOrganizeId(),user.getUserName());
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -149,11 +129,9 @@ public class SysUserInfoController extends CoreBaseController{
sysUserInfoService.deleteSysUserInfoById(Long.parseLong(id));
return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -165,11 +143,9 @@ public class SysUserInfoController extends CoreBaseController{
return ResultBean.success("操作成功").setResultList(SysUserInfoList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -178,14 +154,11 @@ public class SysUserInfoController extends CoreBaseController{
public ResultBean querySysUserInfo(SysUserInfo SysUserInfo, Pager pager){
try{
ListPager<SysUserInfo> listPager = sysUserInfoService.querySysUserInfo(SysUserInfo, pager);
return ResultBean.success("操作成功").setListPager(listPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -205,11 +178,9 @@ public class SysUserInfoController extends CoreBaseController{
return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
}
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -229,11 +200,9 @@ public class SysUserInfoController extends CoreBaseController{
return ResultBean.success("删除成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -247,15 +216,13 @@ public class SysUserInfoController extends CoreBaseController{
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(list);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@GetMapping(value = "/query-ref-department")
@PostMapping(value = "/query-ref-department")
@ApiOperation(value = "查询角色的所有角色权限关系", notes = "查询角色的所有角色权限关系")
public ResultBean queryRefDepartment(UserDetailModel model) {
try {
@ -272,11 +239,9 @@ public class SysUserInfoController extends CoreBaseController{
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(result);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -290,11 +255,9 @@ public class SysUserInfoController extends CoreBaseController{
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(list);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}

5
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java
Unescape Escape View File

@ -123,7 +123,10 @@ public class SystemLoginService implements ISystemLoginService {
* @return
*/
public SysUser getUserLoginInfo(String loginName,String pwd) {
SysUser user = sysUserRDao.getByProperty("userLoginName",loginName);
SysUser user = sysUserRDao.getByProperty(
new String[]{"userLoginName","isValid"},
new Object[]{loginName,CommonEnumUtil.IS_VAILD.VAILD.getValue()}
);
if(user == null){ //用户不存在
throw new CredentialsException("用户不存在");
}else {

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

@ -146,6 +146,37 @@ public class CoreTreeService implements ICoreTreeService {
}
@Override
@ApiOperation(value = "获取部门ID集合",notes = "根据组织ID获取部门子集ID集合")
public List<Long> findSysDepartmentIdByOrganizeId(long id) {
List<Long> result = new ArrayList<>();
if(id > 0){
List<SysDepartment> list = departmentRDao.findByProperty("organizeId", id);
if(list != null && list.size()> 0){
for (SysDepartment department : list) {
findSysDepartmentChildrenTreePack(department,0);
result.addAll(findSysDepartmentChildIds(department));
}
}
}
return result;
}
@Override
@ApiOperation(value = "获取部门ID集合",notes = "获取部门子集ID集合")
public List<Long> findSysDepartmentChildIds(SysDepartment department) {
List<Long> result = new ArrayList<>();
if(null != department){
if(department.getChildList() != null && department.getChildList().size() > 0){
for (SysDepartment dep : department.getChildList()) {
result.addAll(findSysDepartmentChildIds(dep));
}
}
result.add(department.getId());
}
return result;
}
@Override
@ApiOperation(value = "封装部门树",notes = "封装当前部门树")
public void findSysDepartmentChildrenTreePack(SysDepartment parent, int step) {
++step;
@ -294,7 +325,9 @@ public class CoreTreeService implements ICoreTreeService {
@ApiOperation(value = "封装菜单树",notes = "封装当前菜单树")
public void findSysMenuChildrenTreePack(SysMenu parent, int step) {
++step;
List<SysMenu> childList = menuRDao.findByProperty("parentId", parent.getId());
List<SysMenu> childList = menuRDao.findByProperty(
new String[]{"parentId","menuStatus"},
new Object[]{parent.getId(),CommonEnumUtil.DATA_STATUS.ENABLE.getValue()});
if (childList.size() > 0) { //说明有子集
for (SysMenu child : childList) {

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService;
import cn.estsh.i3plus.core.apiservice.util.HqlModelPack;
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
@ -71,6 +72,15 @@ public class PersonnelServiceService implements IPersonnelService {
@Autowired
private SysPositionRepository positionRDao;
@Autowired
private SysMenuRepository menuRDao;
@Autowired
private SysRefRoleMenuRepository refRoleMenuRDao;
@Autowired
private ISysRoleService roleService;
@Resource(name="redisCore")
protected ImppRedis redisCore;
@ -496,8 +506,89 @@ public class PersonnelServiceService implements IPersonnelService {
}
@Override
public void refreshRefSysUserOrganizeRdd(Long organizeIds) {
public void refreshMenuRdd(Long menuId) {
LOGGER.info("系统功能 SysMenu menuId:{} ",menuId);
if(menuId != null){
SysMenu menu = menuRDao.getById(menuId);
if(menu != null){
menuRDao.updateByProperties(
new String[]{"parentId"},
new Object[]{menu.getId()},
new String[]{"parentNameRdd"},
new Object[]{menu.getName()});
}
}
}
@Override
public void refreshUpdateMenuRdd(Long menuId) {
LOGGER.info("系统功能 SysMenu menuId:{} ",menuId);
if(menuId != null){
SysMenu menu = menuRDao.getById(menuId);
if(menu != null){
refRoleMenuRDao.updateByProperties(
new String[]{"menuId"},
new Object[]{menu.getId()},
new String[]{"menuNameRdd"},
new Object[]{menu.getName()});
// 更新角色权限关系
List<SysRefRoleMenu> refs = refRoleMenuRDao.findByProperty("menuId", menu.getId());
if(refs != null && refs.size() >0){
Long[] idArray = null;
for (SysRefRoleMenu ref : refs) {
List<SysRefRoleMenu> userRefList = refRoleMenuRDao.findByProperty("roleId", ref.getRoleId());
if(userRefList != null && userRefList.size() > 0){
idArray = new Long[userRefList.size()];
for (int i = 0; i < userRefList.size(); i++) {
idArray[i] = userRefList.get(i).getMenuId();
}
}
roleService.refreshSysRoleRef(ref.getRoleId(),idArray,null);
idArray = null;
}
}
}
}
}
@Override
public void refreshOrganizeRdd(Long organizeId) {
LOGGER.info("组织信息 SysOrganize organizeId:{} ",organizeId);
if(organizeId != null){
SysOrganize organize = organizeRDao.getById(organizeId);
if(organize != null){
organizeRDao.updateByProperties(
new String[]{"parentId"},
new Object[]{organize.getId()},
new String[]{"parentNameRdd"},
new Object[]{organize.getName()});
}
}
}
@Override
public void refreshUpdateOrganizeRdd(Long organizeId) {
LOGGER.info("组织信息 SysOrganize organizeId:{} ",organizeId);
if(organizeId != null){
SysOrganize organize = organizeRDao.getById(organizeId);
if(organize != null){
departmentRDao.updateByProperties(
new String[]{"organizeId"},
new Object[]{organize.getId()},
new String[]{"organizeNameRdd"},
new Object[]{organize.getName()});
// 更新用户、账号 组织冗余信息
List<SysDepartment> departmentList = departmentRDao.findByProperty("organizeId", organize.getId());
if(departmentList != null && departmentList.size() >0 ){
for (SysDepartment department : departmentList) {
refreshUpdateRefSysUserDepartmentRdd(department.getId());
refreshUpdateRefSysUserInfoDepartmentRdd(department.getId());
}
}
}
}
}
@Override
@ -540,13 +631,21 @@ public class PersonnelServiceService implements IPersonnelService {
LOGGER.info("账号部门信息 SysUserInfo RefUserDepartmentRDao Insert Size :{}",list.size());
}
}
}else {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
.setErrorDetail("用户信息不存在")
.setErrorSolution("请重新操作")
.build();
}
}
@Override
public void refreshDepartmentRdd(Long departmentId) {
LOGGER.info("部门信息 SysDepartment departmentId:{} ",departmentId);
if(departmentId != null){
SysDepartment department = departmentRDao.getById(departmentId);
if(department != null){
departmentRDao.updateByProperties(
new String[]{"parentId"},
new Object[]{department.getId()},
new String[]{"parentNameRdd"},
new Object[]{department.getName()});
}
}
}
@ -589,12 +688,83 @@ public class PersonnelServiceService implements IPersonnelService {
}
@Override
public void refreshRefSysUserDepartmentRdd(Long departmentId) {
public void refreshUpdateSysRoleRdd(Long roleId) {
LOGGER.debug("角色信息 RefSysUserRole roleId:{}", roleId);
if(roleId != null){
SysRole role = roleRDao.getById(roleId);
if(role != null){
// 更新账号角色关系冗余信息
refUserRoleRDao.updateByProperties(
new String[]{"roleId"},
new Object[]{role.getId()},
new String[]{"roleNameRdd"},
new Object[]{role.getName()}
);
// 账号组织关系集合
List<SysRefUserRole> refs = refUserRoleRDao.findByProperty("roleId", role.getId());
if(refs != null && refs.size() >0){
Long[] idArray = null;
for (SysRefUserRole ref : refs) {
List<SysRefUserRole> userRefList = refUserRoleRDao.findByProperty("userId", ref.getUserId());
if(userRefList != null && userRefList.size() > 0){
idArray = new Long[userRefList.size()];
for (int i = 0; i < userRefList.size(); i++) {
idArray[i] = userRefList.get(i).getRoleId();
}
}
refreshRefSysUserRole(ref.getUserId(),idArray);
idArray = null;
}
}
}
}
}
@Override
public void refreshUpdateRefSysUserDepartmentRdd(Long departmentId) {
LOGGER.info("部门信息 SysDepartment departmentId:{} ",departmentId);
if(departmentId != null){
SysDepartment department = departmentRDao.getById(departmentId);
if(department != null){
// 更新账号组织关系冗余信息
refUserDepartmentRDao.updateByProperties(
new String[]{"departmentId"},
new Object[]{department.getId()},
new String[]{"departmentNameRdd","organizeId","organizeNameRdd"},
new Object[]{department.getName(),department.getOrganizeId(),department.getOrganizeNameRdd()}
);
// 更新账号组织冗余信息
userRDao.updateByProperties(
new String[]{"departmentId"},
new Object[]{department.getId()},
new String[]{"departmentNameRdd","organizeId","organizeNameRdd"},
new Object[]{department.getName(),department.getOrganizeId(),department.getOrganizeNameRdd()}
);
// 账号组织关系集合
List<SysRefUserDepartment> refs = refUserDepartmentRDao.findByProperty("departmentId", department.getId());
if(refs != null && refs.size() >0){
Long[] idArray = null;
for (SysRefUserDepartment ref : refs) {
List<SysRefUserDepartment> userRefList = refUserDepartmentRDao.findByProperty("userId", ref.getUserId());
if(userRefList != null && userRefList.size() > 0){
idArray = new Long[userRefList.size()];
for (int i = 0; i < userRefList.size(); i++) {
idArray[i] = userRefList.get(i).getDepartmentId();
}
}
refreshRefSysUserDepartment(ref.getUserId(),idArray);
idArray = null;
}
}
}
}
}
@Override
public void refreshRefSysUserInfoDepartment(Long userInfoId, Long[] departmentIds) {
public void refreshUpdateRefSysUserInfoDepartment(Long userInfoId, Long[] departmentIds) {
LOGGER.info("用户部门关系信息 SysUser userInfoId:{} departmentIds:{}",userInfoId,departmentIds);
SysUserInfo info = userInfoRDao.getById(userInfoId);
@ -644,8 +814,60 @@ public class PersonnelServiceService implements IPersonnelService {
}
@Override
public void refreshRefSysUserInfoDepartmentRdd(Long departmentId) {
public void refreshUpdateRefSysUserInfoDepartmentRdd(Long departmentId) {
LOGGER.info("部门信息 SysInfoDepartment departmentId:{} ",departmentId);
if(departmentId != null){
SysDepartment department = departmentRDao.getById(departmentId);
if(department != null){
// 更新账号组织关系冗余信息
refUserInfoDepartmentRDao.updateByProperties(
new String[]{"departmentId"},
new Object[]{department.getId()},
new String[]{"departmentNameRdd","organizeId","organizeNameRdd"},
new Object[]{department.getName(),department.getOrganizeId(),department.getOrganizeNameRdd()}
);
// 更新账号组织冗余信息
userInfoRDao.updateByProperties(
new String[]{"departmentId"},
new Object[]{department.getId()},
new String[]{"departmentNameRdd","organizeId","organizeNameRdd"},
new Object[]{department.getName(),department.getOrganizeId(),department.getOrganizeNameRdd()}
);
// 账号组织关系集合
List<SysRefUserInfoDepartment> refs = refUserInfoDepartmentRDao.findByProperty("departmentId", department.getId());
if(refs != null && refs.size() >0){
Long[] idArray = null;
for (SysRefUserInfoDepartment ref : refs) {
List<SysRefUserInfoDepartment> userRefList = refUserInfoDepartmentRDao.findByProperty("userId", ref.getUserId());
if(userRefList != null && userRefList.size() > 0){
idArray = new Long[userRefList.size()];
for (int i = 0; i < userRefList.size(); i++) {
idArray[i] = userRefList.get(i).getDepartmentId();
}
}
refreshRefSysUserDepartment(ref.getUserId(),idArray);
idArray = null;
}
}
}
}
}
@Override
public void refreshPositionRdd(Long positionId) {
LOGGER.info("岗位信息 SysPosition positionId:{} ",positionId);
if(positionId != null){
SysPosition position = positionRDao.getById(positionId);
if(position != null){
positionRDao.updateByProperties(
new String[]{"parentId"},
new Object[]{position.getId()},
new String[]{"parentNameRdd"},
new Object[]{position.getName()});
}
}
}
@Override
@ -696,52 +918,43 @@ public class PersonnelServiceService implements IPersonnelService {
}
@Override
public void refreshRefSysUserInfoPositionRdd(Long positionId) {
List<Long> result = new ArrayList<>(); // 需要更新的用户ID 集合
// 更新关系表中数据
public void refreshUpdateRefSysUserInfoPositionRdd(Long positionId) {
LOGGER.info("岗位信息 SysPosition positionId:{} ",positionId);
if(positionId != null){
SysPosition position = positionRDao.getById(positionId);
if(position != null){
List<SysRefUserPosition> list = refUserPositionRDao.findByProperty("positionId", position.getId());
if(list != null && list.size() > 0){
// 更新关系表中的冗余信息
refUserPositionRDao.updateByProperties(
"positionId",position.getId(),
"positionNameRdd", position.getName());
// 更新父节点冗余信息
positionRDao.updateByProperties("parentId",position.getId(),
"parentNameRdd",position.getName());
for (SysRefUserPosition ref : list) {
result.add(ref.getUserId());
}
}
}
}
// 删除关系表中数据
refUserPositionRDao.deleteByProperty("positionId", positionId);
// 获取需要更新的用户
StringBuffer strWhere = new StringBuffer();
List<String> nameList = null;
HqlPack.getInPack(StringUtils.join(result, ","), "userId", strWhere);
List<SysUserInfo> infoList = userInfoRDao.findByHqlWhere(strWhere.toString());
// 更新用户的冗余信息
if(infoList != null && infoList.size() > 0){
for (SysUserInfo info : infoList) {
List<SysRefUserPosition> list = refUserPositionRDao.findByProperty("userId", info.getId());
if (list != null) {
for (SysRefUserPosition ref : list) {
nameList.add(ref.getPositionNameRdd());
// 更新用户岗位关系冗余信息
refUserPositionRDao.updateByProperties(
new String[]{"positionId"},
new Object[]{position.getId()},
new String[]{"positionNameRdd"},
new Object[]{position.getName()}
);
// 更新用户主岗位冗余信息
userInfoRDao.updateByProperties(
new String[]{"positionId"},
new Object[]{position.getId()},
new String[]{"positionNameRdd"},
new Object[]{position.getName()}
);
// 用户用户岗位关系集合
List<SysRefUserPosition> refs = refUserPositionRDao.findByProperty("positionId", position.getId());
if(refs != null && refs.size() >0){
Long[] positionIdArray = null;
for (SysRefUserPosition ref : refs) {
List<SysRefUserPosition> userRefList = refUserPositionRDao.findByProperty("userId", ref.getUserId());
if(userRefList != null && userRefList.size() > 0){
positionIdArray = new Long[userRefList.size()];
for (int i = 0; i < userRefList.size(); i++) {
positionIdArray[i] = userRefList.get(i).getPositionId();
}
}
refreshRefSysUserInfoPosition(ref.getUserId(),positionIdArray);
positionIdArray = null;
}
}
info.setPositionNamesRdd(StringUtils.join(nameList, ","));
userInfoRDao.save(info);
}
}
}

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

@ -1,5 +1,6 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysDepartmentService;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
@ -42,6 +43,9 @@ public class SysDepartmentService implements ISysDepartmentService {
@Autowired
private CoreTreeService coreTreeService;
@Autowired
private IPersonnelService personnelService;
@Override
@ApiOperation(value = "新增部门信息")
public SysDepartment insertSysDepartment(SysDepartment department) {
@ -156,10 +160,9 @@ public class SysDepartmentService implements ISysDepartmentService {
LOGGER.info("部门信息 DEPARTMENT department:{}",department);
departmentRDao.update(department);
// 修改冗余信息
departmentRDao.updateByProperties("parentId",department.getId(),
new String[]{"parentNameRdd", "organizeId", "organizeNameRdd"},
new Object[]{department.getName(), department.getOrganizeId(), department.getOrganizeNameRdd()});
personnelService.refreshDepartmentRdd(department.getId());
personnelService.refreshUpdateRefSysUserDepartmentRdd(department.getId());
personnelService.refreshUpdateRefSysUserInfoDepartmentRdd(department.getId());
}
@Override

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

@ -1,5 +1,6 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
@ -44,38 +45,44 @@ public class SysMenuService implements ISysMenuService {
@Autowired
private SysRefRoleMenuRepository refRoleMenuRDao;
@Autowired
private IPersonnelService personnelService;
@Override
@ApiOperation(value = "更新菜单信息")
public void updateSysMenu(SysMenu sysMenu) {
LOGGER.info("系统功能 SYS_MENU :{}", sysMenu);
public void updateSysMenu(SysMenu menu) {
LOGGER.info("系统功能 SYS_MENU :{}", menu);
// 唯一校验 CODE 相同 ID 不同 则视为相同
List<SysMenu> list = sysMenuRDao.findByProperty("menuCode", sysMenu.getMenuCode());
if(null != list && list.size() > 0){
for (SysMenu menu : list) {
if(!menu.getId().equals(sysMenu.getId())){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode())
.setErrorDetail("权限代码已存在")
.setErrorSolution("请重新输入权限代码")
.build();
}
}
StringBuffer countWhere = new StringBuffer();
HqlPack.getStringEqualPack( menu.getMenuCode(),"menuCode",countWhere);
HqlPack.getNumNOEqualPack(menu.getId().toString(),"id",countWhere);
int count = sysMenuRDao.findByHqlWhereCount(countWhere.toString());
if(count > 0){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode())
.setErrorDetail("权限代码已存在")
.setErrorSolution("请重新输入权限代码")
.build();
}
// 父节点检查
coreTreeService.doValidatorSysMenuParentId(sysMenu);
coreTreeService.doValidatorSysMenuParentId(menu);
if (sysMenu.getParentId() != null && sysMenu.getParentId() > 0) {
SysMenu parent = sysMenuRDao.getById(sysMenu.getParentId());
if (menu.getParentId() != null && menu.getParentId() > 0) {
SysMenu parent = sysMenuRDao.getById(menu.getParentId());
ValidatorBean.checkNotNull(parent,"上级权限信息不存在");
sysMenu.setParentNameRdd(parent.getName());
menu.setParentNameRdd(parent.getName());
}
sysMenuRDao.update(sysMenu);
sysMenuRDao.updateByProperties("parentId",sysMenu.getId(),
"parentNameRdd",sysMenu.getName());
sysMenuRDao.update(menu);
// 更新冗余信息
personnelService.refreshMenuRdd(menu.getId());
personnelService.refreshUpdateMenuRdd(menu.getId());
}
@Override
@ -172,7 +179,7 @@ public class SysMenuService implements ISysMenuService {
@ApiOperation(value = "查询菜单信息",notes = "查询所有菜单信息")
public List<SysMenu> findSysMenuAll() {
LOGGER.info("系统功能 SYS_MENU find All");
return sysMenuRDao.findAll();
return sysMenuRDao.findByProperty(new String[]{"menuStatus"},new Object[]{CommonEnumUtil.DATA_STATUS.ENABLE.getValue()});
}
@Override

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

@ -1,5 +1,6 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysOrganizeService;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
@ -38,6 +39,9 @@ public class SysOrganizeService implements ISysOrganizeService {
@Autowired
private CoreTreeService coreTreeService;
@Autowired
private IPersonnelService personnelService;
@Override
@ApiOperation(value = "更新组织",notes = "传入持久化组织对象，进行更新")
public void updateSysOrganize(SysOrganize organize) {
@ -71,8 +75,8 @@ public class SysOrganizeService implements ISysOrganizeService {
// 更新数据
organizeRDao.update(organize);
// 修改冗余信息
organizeRDao.updateByProperties("parentId",organize.getId(),
"parentNameRdd",organize.getName());
personnelService.refreshOrganizeRdd(organize.getId());
personnelService.refreshUpdateOrganizeRdd(organize.getId());
}
@Override
@ -163,6 +167,12 @@ public class SysOrganizeService implements ISysOrganizeService {
pager = PagerHelper.getPager(pager,count);
return new ListPager(organizeRDao.listPager(pager),pager);
}else {
if(organize.getParentId() != null){
SysOrganize parent = coreTreeService.getSysOrganizeTreeById(organize.getParentId());
List<Long> childIds = coreTreeService.findSysOrganizeChildIds(parent);
organize.setChildIdList(childIds);
}
//生成hql查询语句
String hqlPack = CoreHqlPack.packHqlSysOrganize(organize);
pager = PagerHelper.getPager(pager,organizeRDao.findByHqlWhereCount(hqlPack));

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

@ -108,8 +108,9 @@ public class SysPositionService implements ISysPositionService {
// 修改岗位信息
LOGGER.info("岗位信息 POSITION position:{}", position);
positionRDao.update(position);
// 修改冗余信息
// personnelService.refreshRefSysUserInfoPositionRdd(position.getId());
// 更新冗余信息
personnelService.refreshPositionRdd(position.getId());
personnelService.refreshUpdateRefSysUserInfoPositionRdd(position.getId());
}
@Override
@ -119,7 +120,6 @@ public class SysPositionService implements ISysPositionService {
personnelService.checkSysPositionRef(id);
positionRDao.deleteById(id);
personnelService.refreshRefSysUserInfoPositionRdd(id);
}
@Override
@ -133,7 +133,7 @@ public class SysPositionService implements ISysPositionService {
positionRDao.deleteByIds(ids);
for (Long id : ids) {
personnelService.refreshRefSysUserInfoPositionRdd(id);
personnelService.refreshUpdateRefSysUserInfoPositionRdd(id);
}
}

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

@ -1,5 +1,6 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
@ -48,11 +49,16 @@ public class SysRoleService implements ISysRoleService {
@Autowired
private SysRefRoleMenuRepository refRoleMenuRDao;
@Autowired
private IPersonnelService personnelService;
@Override
@ApiOperation(value = "更新角色信息",notes = "更新角色信息")
public void updateSysRole(SysRole sysRole) {
LOGGER.info("系统角色 SYS_ROLE :{}", sysRole);
sysRoleRDao.update(sysRole);
// 更新冗余信息
personnelService.refreshUpdateSysRoleRdd(sysRole.getId());
}
@Override
@ -155,10 +161,9 @@ public class SysRoleService implements ISysRoleService {
ref.setRoleNameRdd(role.getName());
ref.setMenuNameRdd(menu.getName());
ref.setMenuId(menu.getId());
ref.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue());
ref.setMenuTypeRdd(menu.getMenuType());
ConvertBean.serviceModelInitialize(ref,userName);
refs.add(ref);
}
@ -181,7 +186,7 @@ public class SysRoleService implements ISysRoleService {
role.setMenuNumber(featuresListRdd.size());
role.setMenuNamesRdd(String.join(",",featuresListRdd));
ConvertBean.serviceModelUpdate(role,userName);
// ConvertBean.serviceModelUpdate(role,userName);
}
refRoleMenuRDao.saveAll(refs);
@ -210,7 +215,7 @@ public class SysRoleService implements ISysRoleService {
@ApiOperation(value = "查信角色信息",notes = "查询所有角色信息")
public List<SysRole> findSysRoleAll() {
LOGGER.info("系统角色 SYS_ROLE find All");
return sysRoleRDao.findAll();
return sysRoleRDao.findByProperty(new String[]{"roleStatus"},new Object[]{CommonEnumUtil.DATA_STATUS.ENABLE.getValue()});
}
@Override

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

@ -1,5 +1,6 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService;
import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.platform.common.tool.TimeTool;
@ -58,6 +59,9 @@ public class SysUserInfoService implements ISysUserInfoService {
@Autowired
private SysOrganizeRepository organizeRDao;
@Autowired
private ICoreTreeService coreTreeService;
/***
* @param userInfo
* @return
@ -257,6 +261,29 @@ public class SysUserInfoService implements ISysUserInfoService {
pager = PagerHelper.getPager(pager, sysUserInfoRDao.listCount());
return new ListPager(sysUserInfoRDao.listPager(pager),pager);
}else {
List<Long> departmentIdList = new ArrayList<>();
if(userInfo.getOrganizeId() != null){
// 查出所有组织 ID 集合
SysOrganize parent = coreTreeService.getSysOrganizeTreeById(userInfo.getOrganizeId());
List<Long> childIds = coreTreeService.findSysOrganizeChildIds(parent);
// 查询所有部门 ID 集合
if(childIds != null && childIds.size() > 0){
for (Long organizeId : childIds) {
departmentIdList.addAll(coreTreeService.findSysDepartmentIdByOrganizeId(organizeId));
}
}
}
// 封装部门 ID 信息
if(userInfo.getDepartmentId() != null){
SysDepartment department = departmentRDao.getById(userInfo.getDepartmentId());
departmentIdList.addAll(coreTreeService.findSysDepartmentChildIds(department));
}
userInfo.setDepartmentIdList(StringTool.getListString(departmentIdList));
String hqlPack = CoreHqlPack.packHqlSysUserInfo(userInfo);
pager = PagerHelper.getPager(pager, sysUserInfoRDao.findByHqlWhereCount(hqlPack));
return new ListPager(sysUserInfoRDao.findByHqlWherePage(hqlPack + userInfo.orderBy(),pager),pager);

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

@ -7,12 +7,12 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.platform.common.tool.EncryptTool;
import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.platform.common.tool.TimeTool;
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.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.base.shirotoken.UserToken;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.platform.bean.*;
@ -22,6 +22,9 @@ import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections.ListUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.CredentialsException;
import org.apache.shiro.authc.UnknownAccountException;
@ -72,7 +75,7 @@ public class SysUserService implements ISysUserService {
private SysFileRepository sysFileRDao;
@Autowired
private SysDepartmentRepository sysDepartmentRDao;
private SysDepartmentRepository departmentRDao;
@Autowired
private SysPositionRepository sysPositionRDao;
@ -315,10 +318,58 @@ public class SysUserService implements ISysUserService {
}
@Override
@ApiOperation(value = "查询用户ID 集合",notes = "根据部门Id 查询用户ID集合")
public List<Long> findSysUserIdListByDepartmentId(List<Long> idList) {
List<Long> result = new ArrayList<>();
if(idList != null){
StringBuffer hqlWhere = new StringBuffer();
HqlPack.getInPack(StringUtils.join(idList, ","), "departmentId", hqlWhere);
List<SysRefUserDepartment> list = refUserDepartmentRDao.findByHqlWhere(hqlWhere.toString());
if(list != null && list.size() > 0){
for (SysRefUserDepartment ref : list) {
result.add(ref.getUserId());
}
}
}
return result;
}
@Override
@ApiOperation(value = "账号分页查询", notes = "组合查询")
public ListPager<SysUser> querySysUserByPager(SysUser user, Pager pager) {
LOGGER.debug("系统用户 SysUser find user :{} page :{}", user, pager);
// 角色查询
if(user.getRoleId() != null){
List<Long> ids = findSysUserIdListByRoleId(Long.parseLong(user.getRoleId()));
user.setRoleIdList(StringTool.getListString(ids));
}
List<Long> departmentIdList = new ArrayList<>();
if(user.getOrganizeId() != null){
// 查出所有组织 ID 集合
SysOrganize parent = coreTreeService.getSysOrganizeTreeById(user.getOrganizeId());
List<Long> childIds = coreTreeService.findSysOrganizeChildIds(parent);
// 查询所有部门 ID 集合
if(childIds != null && childIds.size() > 0){
for (Long organizeId : childIds) {
List<Long> ids = coreTreeService.findSysDepartmentIdByOrganizeId(organizeId);
departmentIdList.addAll(ids);
}
}
}
// 封装部门 ID 信息
if(user.getDepartmentId() != null){
SysDepartment department = departmentRDao.getById(user.getDepartmentId());
departmentIdList.addAll(coreTreeService.findSysDepartmentChildIds(department));
}
List<Long> idList = findSysUserIdListByDepartmentId(departmentIdList);
user.setDepartmentIdList(StringTool.getListString(idList));
//生成hql查询语句
String hqlPack = CoreHqlPack.packHqlSysUser(user);
pager = PagerHelper.getPager(pager, sysUserRDao.findByHqlWhereCount(hqlPack));
@ -500,8 +551,58 @@ public class SysUserService implements ISysUserService {
}
/**
* 账号数据排序
* 创建时间 角色升序
* 序号倒叙 + 编号升序 菜单
* 创建时间 组织升序
* 创建时间 部门升序
* @param user
*/
public void packSysUserSort(SysUser user){
if(user != null){
// 创建时间升序
if(user.getRoleList() != null){
user.getRoleList().sort(Comparator.comparing(SysRole::getCreateDatetime));
}
if(user.getMenuList() != null){
user.getMenuList().sort(Comparator.comparing(SysMenu::getMenuSort).reversed() // 倒序
.thenComparing(SysMenu::getMenuCode)); //升序
}
if(user.getOrganizeList() != null){
user.getOrganizeList().sort(Comparator.comparing(SysOrganize::getCreateDatetime));
}
if(user.getDepartmentList() != null){
user.getDepartmentList().sort(Comparator.comparing(SysDepartment::getCreateDatetime));
}
}
}
/**
* 用户数据排序
* 岗位创建时间 升序
* 部门创建时间 升序
* 组织创建时间 升序
* @param info
*/
public void packSysUserInfoSort(SysUserInfo info){
if(info != null){
if(info.getPositionList() != null){
info.getPositionList().sort(Comparator.comparing(SysPosition::getCreateDatetime));
}
if(info.getDepartmentList() != null){
info.getDepartmentList().sort(Comparator.comparing(SysDepartment::getCreateDatetime));
}
if(info.getOrganizeList() != null){
info.getOrganizeList().sort(Comparator.comparing(SysOrganize::getCreateDatetime));
}
}
}
/**
* 封装用户角色信息
* @param sessionUser
* @param user
* @return
*/
@ -521,7 +622,6 @@ public class SysUserService implements ISysUserService {
/**
* 封装用户 菜单信息
* @param sessionUser
* @param user
* @return
*/
@ -577,7 +677,7 @@ public class SysUserService implements ISysUserService {
personnelService.findSysRefUserInfoDepartmentById(userInfo.id);
userInfo.setDepartment(sysDepartmentRDao.getById(userInfo.getDepartmentId()));
userInfo.setDepartment(departmentRDao.getById(userInfo.getDepartmentId()));
userInfo.setDepartmentList(personnelService.findSysUserInfoDepartmentByInfoId(userInfo.getId()));
}catch (Exception e){
LOGGER.error(" SysUser Peck Department information Error userId : {} Exception Message : {} " ,userInfo.getId(),e.getMessage());
@ -594,7 +694,7 @@ public class SysUserService implements ISysUserService {
try {
LOGGER.debug("平台用户 SYS_USER user id :{}", user.getId());
user.setDepartment(sysDepartmentRDao.getById(user.getDepartmentId()));
user.setDepartment(departmentRDao.getById(user.getDepartmentId()));
user.setDepartmentList(personnelService.findSysUserDepartmentByInfoId(user.id));
}catch (Exception e){
LOGGER.error(" SysUser Peck Department information Error userId : {} Exception Message : {} " ,user.getId(),e.getMessage());

Write Preview
Loading…
Cancel
Save