From e42084ab38061068cbbe45b08285fc6689844953 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 4 Jan 2019 19:29:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=AE=8C=E6=88=90=20=E8=A7=A3=E5=86=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/iservice/busi/ISysLogTaskTimeService.java | 47 +++++++++ .../controller/busi/SysLogSystemController.java | 81 ++++++++++++++++ .../controller/busi/SysLogTaskTimeController.java | 105 +++++++++++++++++++++ .../controller/busi/SysUserController.java | 2 + .../serviceimpl/busi/SysLogTaskTimeService.java | 63 +++++++++++++ .../src/main/resources/init/sys-config.xlsx | Bin 33692 -> 33811 bytes 6 files changed, 298 insertions(+) create mode 100644 modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogTaskTimeService.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogTaskTimeService.java diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogTaskTimeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogTaskTimeService.java new file mode 100644 index 0000000..ae9e32d --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogTaskTimeService.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.core.api.iservice.busi; + +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; +import io.swagger.annotations.ApiOperation; + +/** + * @Description : 定时任务日志服务接口 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-01-04 15:06 + * @Modify: + **/ +public interface ISysLogTaskTimeService { + + /** + * 添加定时任务日志 + * @param sysLogTaskTime + */ + @ApiOperation(value = "添加定时任务日志",notes = "添加定时任务日志") + void insertSysLogTaskTime(SysLogTaskTime sysLogTaskTime); + + /** + * 根据id删除定时任务日志 + * @param id + */ + @ApiOperation(value = "删除定时任务日志",notes = "删除定时任务日志") + void deleteSysLogTaskTimeById(Long id); + + /** + * 根据id查询定时任务日志 + * @param id + * @return + */ + @ApiOperation(value = "根据id查询定时任务日志",notes = "根据id查询定时任务日志") + SysLogTaskTime getSysLogTaskTimeById(Long id); + + /** + * 定时任务日志复杂查询 + * @param sysLogTaskTime + * @param pager + * @return + */ + @ApiOperation(value = "定时任务日志分页复杂查询",notes = "定时任务日志分页复杂查询") + ListPager querySysLogTaskTimeByPager(SysLogTaskTime sysLogTaskTime, Pager pager); +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java index 1ec9af3..e2d1303 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java @@ -1,14 +1,24 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; +import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService; import cn.estsh.i3plus.core.api.iservice.busi.ISysLogSystemService; +import cn.estsh.i3plus.core.apiservice.util.ExcelUtil; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; 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.bean.SysDictionary; +import cn.estsh.i3plus.pojo.platform.bean.SysFile; +import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; 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.fastdfs.FastDFSClient; +import cn.estsh.impp.framework.boot.fastdfs.FastDFSFile; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; @@ -18,6 +28,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; /** @@ -36,6 +47,18 @@ public class SysLogSystemController extends CoreBaseController{ @Autowired private ISysLogSystemService logSystemService; + @Autowired + private ISysDictionaryService sysDictionaryService; + + @Autowired + private ISysConfigService sysConfigService; + + @Autowired + private ISysFileService sysFileService; + + @Autowired + private FastDFSClient dfsClient; + @PostMapping(value = "/insert") @ApiOperation(value="新增系统日志",notes = "新增系统日志") public ResultBean insertSysLogSystem(SysLogSystem logSystem) { @@ -109,4 +132,62 @@ public class SysLogSystemController extends CoreBaseController{ return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } + + @GetMapping("/get-col") + @ApiOperation(value = "获取系统日志字段") + public ResultBean getSysLogSystem(){ + try { + return ResultBean.success("导出成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(ExcelUtil.getColName(SysLogSystem.class)); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/export") + @ApiOperation(value = "导出系统日志") + public ResultBean exportSysLogSystem(SysLogSystem sysLogSystem, String[] colName){ + try { + Pager pager = new Pager(); + pager.setCurrentPage(1); + pager.setPageSize(Integer.parseInt(sysConfigService.getSysConfigByCode(PlatformConstWords.EXCEL_EXPORT_MAX_ROW).getConfigValue())); + ListPager listPager; + String[] fileAbsolutePath; + List result = new ArrayList(); + do { + listPager = logSystemService.querySysLogSystemByPager(sysLogSystem, pager); + pager = listPager.getObjectPager(); + + // 上传至文件服务器 + FastDFSFile fastDFSFile = new FastDFSFile(SysOrderNoRule.class.getSimpleName() + pager.getCurrentPage() + ".xls", + ExcelUtil.exportData(listPager.getObjectList(),SysOrderNoRule.class,colName),"xls"); + + fileAbsolutePath = dfsClient.upload(fastDFSFile); + + // 保证系统文件表中 + String filePath = dfsClient.getHostUi() + "/" + fileAbsolutePath[0] + "/" + fileAbsolutePath[1]; + SysDictionary dictionary = sysDictionaryService.getSysDictionaryByParentCodeAndCode( + CommonConstWords.DICTIONARY_FILE_TYPE,fastDFSFile.getExt()); + + SysFile sysFile = new SysFile(); + sysFile.setDfsGroupName(fileAbsolutePath[0]); + sysFile.setDfsFileName(fileAbsolutePath[1]); + sysFile.setFileSize(fastDFSFile.getContent().length); + sysFile.setFilePath(filePath); + sysFile.setFileOriginalName(fastDFSFile.getName()); + sysFile.setFileTypeId(dictionary.getId()); + sysFile.setFileTypeName(dictionary.getName()); + sysFile.setDownloadNum(0); + result.add(sysFileService.insertSysFile(sysFile)); + + pager.setCurrentPage(pager.getCurrentPage() + 1); + } while (pager.getCurrentPage() <= pager.getTotalPages()); + return ResultBean.success("导出成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(result); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java new file mode 100644 index 0000000..21381d2 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java @@ -0,0 +1,105 @@ +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; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ResultBean; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Description : 定时任务日志服务 + * @Reference : + * @Author : yunhao + * @Date : 2019-01-04 + * @Modify : + **/ +@RestController +@Api(description = "定时任务日志服务") +@RequestMapping(PlatformConstWords.BASE_URL +"/sys-log-task-time") +public class SysLogTaskTimeController extends CoreBaseController{ + public static final Logger LOGGER = LoggerFactory.getLogger(SysLogTaskTimeController.class); + + @Autowired + private ISysLogTaskTimeService logTaskTimeService; + + @PostMapping(value = "/insert") + @ApiOperation(value="新增定时任务日志",notes = "新增定时任务日志") + public ResultBean insertSyslogTaskTime(SysLogTaskTime sysLogTaskTime) { + try { + logTaskTimeService.insertSysLogTaskTime(sysLogTaskTime); + return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @DeleteMapping(value = "/delete") + @ApiOperation(value = "删除定时任务日志",notes = "删除定时任务日志") + public ResultBean deleteSysLogTaskTimeById(String id) { + try { + // 条件校验 + ValidatorBean.checkNotNull(id,"id不能为空"); + + logTaskTimeService.deleteSysLogTaskTimeById(Long.parseLong(id)); + return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/get") + @ApiOperation(value = "根据id查询定时任务日志",notes = "根据id查询定时任务日志") + public ResultBean getSysLogTaskTimeById(String id){ + try { + SysLogTaskTime logTaskTime = logTaskTimeService.getSysLogTaskTimeById(Long.parseLong(id)); + if (logTaskTime != null) { + return ResultBean.success("查询成功").setResultObject(logTaskTime).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }else { + return ResultBean.fail("日志不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); + } + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + /** + * 定时任务日志分页复杂查询 + * @param sysLogTaskTime + * @param pager + * @return + */ + @GetMapping("/query") + @ApiOperation(value = "定时任务日志分页复杂查询",notes = "定时任务日志分页复杂查询") + public ResultBean querySysLogSystemByPager(SysLogTaskTime sysLogTaskTime, Pager pager){ + try { + ListPager logSystemList = logTaskTimeService.querySysLogTaskTimeByPager(sysLogTaskTime, pager); + return ResultBean.success("查询成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index cb91230..50dfc36 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; 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.platform.common.util.CommonConstWords; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; @@ -421,6 +422,7 @@ public class SysUserController extends CoreBaseController{ message.setMessageSenderNameRdd(getSessionUser().getUserName()); message.setMessageReceiversId(user.getId().toString()); message.setMessageReceiversNameRdd(user.getUserName()); + message.setMessageSendTime(TimeTool.getNowTime(true)); sysMessageService.doSendSysMessage(message); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogTaskTimeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogTaskTimeService.java new file mode 100644 index 0000000..696dab6 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogTaskTimeService.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysLogTaskTimeService; +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.platform.platbean.SysLogSystem; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; +import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogTaskTimeRepository; +import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack; +import io.swagger.annotations.ApiOperation; +import org.bson.conversions.Bson; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Description : 定时任务服务接口实现 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-01-04 15:10 + * @Modify: + **/ +@Service +public class SysLogTaskTimeService implements ISysLogTaskTimeService { + public static final Logger LOGGER = LoggerFactory.getLogger(SysLogTaskTimeService.class); + + @Autowired + private SysLogTaskTimeRepository sysLogTaskTimeRDao; + + @Override + @ApiOperation(value = "添加定时任务日志",notes = "添加定时任务日志") + public void insertSysLogTaskTime(SysLogTaskTime sysLogTaskTime) { + sysLogTaskTimeRDao.insert(sysLogTaskTime); + } + + @Override + @ApiOperation(value = "删除定时任务日志",notes = "删除定时任务日志") + public void deleteSysLogTaskTimeById(Long id) { + sysLogTaskTimeRDao.deleteById(id); + } + + @Override + @ApiOperation(value = "根据id查询定时任务日志",notes = "根据id查询定时任务日志") + public SysLogTaskTime getSysLogTaskTimeById(Long id) { + return sysLogTaskTimeRDao.getById(id); + } + + @Override + @ApiOperation(value = "定时任务日志分页复杂查询",notes = "定时任务日志分页复杂查询") + public ListPager querySysLogTaskTimeByPager(SysLogTaskTime sysLogTaskTime, Pager pager) { + if (sysLogTaskTime == null) { + pager = PagerHelper.getPager(pager,sysLogTaskTimeRDao.listCount()); + return new ListPager(sysLogTaskTimeRDao.listPager(pager),pager); + } else { + Bson bson = CoreBsonPack.packBsonByLogTaskTime(sysLogTaskTime); + pager = PagerHelper.getPager(pager,sysLogTaskTimeRDao.findByBsonCount(bson)); + return new ListPager(sysLogTaskTimeRDao.findByBsonPager(bson,pager,sysLogTaskTime.getOrderByParam() + ,sysLogTaskTime.getAscOrDesc()),pager); + } + } +} diff --git a/modules/i3plus-core-apiservice/src/main/resources/init/sys-config.xlsx b/modules/i3plus-core-apiservice/src/main/resources/init/sys-config.xlsx index 4b31a2304b56449f52661a133e7b4074bca5fd15..94b84796ae6eccc0eb3eba9c8b65507f95a71bcc 100644 GIT binary patch delta 9723 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 PP=t37+o?-%yzhSiG2}rW delta 9636 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 bL_}x) Date: Mon, 7 Jan 2019 15:52:24 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=86=97=E4=BD=99=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/busi/IPersonnelService.java | 29 +- .../controller/busi/PersonnelController.java | 3 +- .../controller/busi/SysMenuController.java | 8 +- .../serviceimpl/base/SystemLoginService.java | 5 +- .../serviceimpl/busi/CoreTreeService.java | 4 +- .../serviceimpl/busi/PersonnelServiceService.java | 317 +++++++++++++++++---- .../serviceimpl/busi/SysDepartmentService.java | 11 +- .../serviceimpl/busi/SysMenuService.java | 51 ++-- .../serviceimpl/busi/SysOrganizeService.java | 8 +- .../serviceimpl/busi/SysPositionService.java | 8 +- .../serviceimpl/busi/SysRoleService.java | 12 +- .../serviceimpl/busi/SysUserService.java | 53 +++- 12 files changed, 406 insertions(+), 103 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java index e2b8a15..41ce6cc 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java @@ -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); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index ca5f2cd..b014475 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java @@ -415,7 +415,6 @@ public class PersonnelController extends CoreBaseController { } List 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); @@ -531,7 +530,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())); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java index e2534b4..3788cee 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java @@ -99,6 +99,7 @@ public class SysMenuController extends CoreBaseController { LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); return ResultBean.fail(busExcep).build(); } catch (Exception e) { + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } } @@ -126,9 +127,7 @@ public class SysMenuController extends CoreBaseController { public ResultBean findAll() { try { List 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); @@ -144,8 +143,7 @@ public class SysMenuController extends CoreBaseController { try{ ListPager 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); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java index b661388..ab4e0a0 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java @@ -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 { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java index 4b56eea..b93ad5c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java @@ -294,7 +294,9 @@ public class CoreTreeService implements ICoreTreeService { @ApiOperation(value = "封装菜单树",notes = "封装当前菜单树") public void findSysMenuChildrenTreePack(SysMenu parent, int step) { ++step; - List childList = menuRDao.findByProperty("parentId", parent.getId()); + List childList = menuRDao.findByProperty( + new String[]{"parentId","menuStatus"}, + new Object[]{parent.getId(),CommonEnumUtil.DATA_STATUS.ENABLE.getValue()}); if (childList.size() > 0) { //说明有子集 for (SysMenu child : childList) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java index 21a4f45..96df3fb 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java @@ -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 refs = refRoleMenuRDao.findByProperty("menuId", menu.getId()); + if(refs != null && refs.size() >0){ + Long[] idArray = null; + for (SysRefRoleMenu ref : refs) { + List 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 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 refs = refUserRoleRDao.findByProperty("roleId", role.getId()); + if(refs != null && refs.size() >0){ + Long[] idArray = null; + for (SysRefUserRole ref : refs) { + List 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 refs = refUserDepartmentRDao.findByProperty("departmentId", department.getId()); + if(refs != null && refs.size() >0){ + Long[] idArray = null; + for (SysRefUserDepartment ref : refs) { + List 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 refs = refUserInfoDepartmentRDao.findByProperty("departmentId", department.getId()); + if(refs != null && refs.size() >0){ + Long[] idArray = null; + for (SysRefUserInfoDepartment ref : refs) { + List 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 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 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 nameList = null; - HqlPack.getInPack(StringUtils.join(result, ","), "userId", strWhere); - List infoList = userInfoRDao.findByHqlWhere(strWhere.toString()); - - // 更新用户的冗余信息 - if(infoList != null && infoList.size() > 0){ - for (SysUserInfo info : infoList) { - List 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 refs = refUserPositionRDao.findByProperty("positionId", position.getId()); + if(refs != null && refs.size() >0){ + Long[] positionIdArray = null; + for (SysRefUserPosition ref : refs) { + List 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); } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java index cd51851..5a86ac2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java @@ -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 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java index be34b81..58d6a84 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java @@ -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 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 findSysMenuAll() { LOGGER.info("系统功能 SYS_MENU find All"); - return sysMenuRDao.findAll(); + return sysMenuRDao.findByProperty(new String[]{"menuStatus"},new Object[]{CommonEnumUtil.DATA_STATUS.ENABLE.getValue()}); } @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrganizeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrganizeService.java index cf490e1..13e9628 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrganizeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrganizeService.java @@ -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 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java index 410a985..915f8f0 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java @@ -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); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java index 387744d..1473a86 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java @@ -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 @@ -157,7 +163,7 @@ public class SysRoleService implements ISysRoleService { ref.setMenuId(menu.getId()); ref.setMenuTypeRdd(menu.getMenuType()); - ConvertBean.serviceModelInitialize(ref,userName); +// ConvertBean.serviceModelInitialize(ref,userName); refs.add(ref); } @@ -181,7 +187,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 +216,7 @@ public class SysRoleService implements ISysRoleService { @ApiOperation(value = "查信角色信息",notes = "查询所有角色信息") public List findSysRoleAll() { LOGGER.info("系统角色 SYS_ROLE find All"); - return sysRoleRDao.findAll(); + return sysRoleRDao.findByProperty(new String[]{"roleStatus"},new Object[]{CommonEnumUtil.DATA_STATUS.ENABLE.getValue()}); } @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index fe3046e..3a3dcc2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -500,8 +500,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 +571,6 @@ public class SysUserService implements ISysUserService { /** * 封装用户 菜单信息 - * @param sessionUser * @param user * @return */ From 2e7059fada587108da6df05198b460cea699cde9 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 7 Jan 2019 17:41:59 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DemoResourceController.java | 48 ++++------------ .../controller/DemoTreeAndExceptionController.java | 4 +- .../controller/DemoUploadController.java | 5 +- .../controller/busi/PersonnelController.java | 40 ++++--------- .../controller/busi/SysDashboardController.java | 17 +++--- .../controller/busi/SysDepartmentController.java | 34 +++-------- .../controller/busi/SysDictionaryController.java | 52 ++++------------- .../controller/busi/SysFileController.java | 35 +++--------- .../controller/busi/SysLogTaskTimeController.java | 4 -- .../controller/busi/SysMenuController.java | 35 +++--------- .../controller/busi/SysOrganizeController.java | 38 ++++--------- .../controller/busi/SysPositionController.java | 32 +++-------- .../controller/busi/SysRoleController.java | 52 +++++------------ .../controller/busi/SysTaskCycleController.java | 3 +- .../controller/busi/SysToolController.java | 28 ++++------ .../controller/busi/SysToolTypeController.java | 45 ++++----------- .../controller/busi/SysTreeController.java | 65 ++++++---------------- .../controller/busi/SysUserController.java | 54 +++++------------- .../controller/busi/SysUserInfoController.java | 56 ++++--------------- 19 files changed, 168 insertions(+), 479 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java index db7542c..7322623 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java @@ -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); } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java index b4328fa..1b8d6e8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java @@ -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); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java index 2152b77..2f01aff 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java @@ -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); } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index b014475..c1e0497 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java @@ -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,11 +374,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); } } @@ -417,11 +399,9 @@ public class PersonnelController extends CoreBaseController { List 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); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java index 7246954..fe3c5a8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java @@ -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); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java index 07f9c8b..6941388 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java @@ -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 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); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java index bdaa8cd..ccd2042 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java @@ -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 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 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); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java index 7dfa895..bcaa485 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java @@ -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); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java index 21381d2..db37eda 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java @@ -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 : diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java index 3788cee..05e9325 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java @@ -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,11 +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) { - LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); - return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -114,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); } } @@ -129,11 +124,9 @@ public class SysMenuController extends CoreBaseController { List list = sysMenuService.findSysMenuAll(); 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); } } @@ -145,11 +138,9 @@ public class SysMenuController 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); } } @@ -168,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); } } @@ -188,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); } } @@ -209,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); } } @@ -233,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); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java index 804c892..fff26a4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java @@ -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); } } @@ -123,11 +119,9 @@ public class SysOrganizeController 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); } } @@ -140,11 +134,9 @@ public class SysOrganizeController extends CoreBaseController{ .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 +149,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 +168,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 +188,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); } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java index 5c4ebd5..dc0ec77 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java @@ -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()); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java index 947668c..78283f4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java @@ -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 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); } } @@ -193,11 +179,9 @@ public class SysRoleController extends CoreBaseController{ sysRoleService.updateSysRoleStatus(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); } } @@ -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); } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java index b29702d..c28f74e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java @@ -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()); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java index ff28147..fe1eb2f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java @@ -123,15 +123,14 @@ public class SysToolController extends CoreBaseController{ @GetMapping(value = "/list") @ApiOperation(value = "查询全部",notes = "查询全部") public ResultBean findSysToolAll(){ - try{ - List 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 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){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java index bd2ac32..12489de 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java @@ -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 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); } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java index 0345188..0c85d54 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java @@ -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 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 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 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 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); } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index 50dfc36..ff76e3d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -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); } } @@ -281,11 +267,9 @@ public class SysUserController 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); } } @@ -299,11 +283,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 +306,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 +322,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 +369,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 +410,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 +449,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); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java index 2a5a0b9..53a3766 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java @@ -70,23 +70,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); } } @@ -105,23 +95,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); } } @@ -135,11 +115,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); } } @@ -151,11 +129,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); } } @@ -167,11 +143,9 @@ public class SysUserInfoController 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); } } @@ -191,11 +165,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); } } @@ -215,11 +187,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); } } @@ -233,11 +203,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); } } @@ -258,11 +226,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); } } @@ -276,11 +242,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); } } From 29f82caef78c47cb681933690f453d427a2e7b65 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 7 Jan 2019 18:59:47 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/controller/busi/SysEnumController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java index adafc4f..02845e8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java @@ -155,10 +155,10 @@ public class SysEnumController extends CoreBaseController{ Arrays.asList(CommonEnumUtil.USER_INFO_STATUS.values())); } - @GetMapping("/sys-config-value-type") + @GetMapping("/sys-value-type") @ApiOperation(value = "系统参数值类型", notes = "用户状态") public ResultBean getSysConfigValueType(){ return new ResultBean(true, "操作成功", - Arrays.asList(ImppEnumUtil.SYS_CONFIG_VALUE_TYPE.values())); + Arrays.asList(ImppEnumUtil.SYS_VALUE_TYPE.values())); } } From c43c06251949e1e852d4cd3962a68f95677758cf Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 7 Jan 2019 20:20:08 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/controller/DemoMongoController.java | 24 ++++++++-------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java index ed2231b..a658af9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java @@ -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); } } }