From 8cfa440e92bc41ef37a61ea9ac0f408d6207fec5 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Sat, 27 Oct 2018 20:26:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=20?= =?UTF-8?q?=E5=AE=8C=E6=88=90=20=E7=B3=BB=E7=BB=9F=E6=97=A5=E5=BF=97=20?= =?UTF-8?q?=E5=AE=8C=E6=88=90=20=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF=20?= =?UTF-8?q?=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/ILogOperateService.java | 2 +- .../core/api/iservice/busi/ILogSystemService.java | 2 +- .../core/api/iservice/busi/ISysFileService.java | 2 +- .../core/api/iservice/busi/ISysMessageService.java | 2 +- .../controller/busi/DepartmentController.java | 10 ++-- .../apiservice/controller/busi/EnumController.java | 56 ++++++++++++++++++++++ .../controller/busi/LogOperateController.java | 4 +- .../controller/busi/LogSystemController.java | 6 +-- .../controller/busi/PositionController.java | 2 +- .../controller/busi/SysFileController.java | 11 ++--- .../controller/busi/SysMessageController.java | 24 ++++++---- .../serviceimpl/busi/DepartmentServiceImpl.java | 20 ++++---- .../serviceimpl/busi/LogOperateServiceImpl.java | 6 +-- .../serviceimpl/busi/LogSystemServiceImpl.java | 6 +-- .../serviceimpl/busi/PositionServiceImpl.java | 13 +++-- .../serviceimpl/busi/SysFileServiceImpl.java | 6 +-- .../serviceimpl/busi/SysMessageServiceImpl.java | 31 ++++++++++-- 17 files changed, 148 insertions(+), 55 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java index e9dc72e..452e650 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogOperateService.java @@ -36,7 +36,7 @@ public interface ILogOperateService { * 查找所有操作日志 * @return */ - List findLogOperateAll(); + List listLogOperate(); /** * 根据id查找操作日志 diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogSystemService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogSystemService.java index 578549c..b9c0910 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogSystemService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogSystemService.java @@ -35,7 +35,7 @@ public interface ILogSystemService { * 查询全部日志 * @return */ - List findLogSystemAll(); + List listLogSystem(); /** * 根据id查询系统日志 diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java index 08ef826..bce8695 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java @@ -35,7 +35,7 @@ public interface ISysFileService { * 查询全部文件资源信息 * @return */ - List findSysFileAll(); + List listSysFile(); /** * 根据id查询文件资源信息 diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java index 680c5ed..b2cc056 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java @@ -35,7 +35,7 @@ public interface ISysMessageService { * 查询全部信息 * @return */ - List findSysMessageAll(); + List listSysMessage(); /** * 根据id查询消息 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java index f9cb48e..4dd2f37 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java @@ -39,7 +39,7 @@ public class DepartmentController { public IDepartmentService departmentService; - @PutMapping(value = "/insert") + @PostMapping(value = "/insert") @ApiOperation(value = "添加部门", notes = "返回内容添加部门") public ResultBean insertDepartment(Department department) { try { @@ -70,7 +70,6 @@ public class DepartmentController { @ApiOperation(value = "修改部门", notes = "根据部门id修改信息") public ResultBean updateDepartmentById(Department department) { try { - //登陆用户 SessionUser user = AuthUtil.getSessionUser(); @@ -78,7 +77,8 @@ public class DepartmentController { ValidatorBean.beginValid(department) .checkNotZero("id", department.getId()) .notNull("departmentName", department.getDepartmentName()) - .notNull("departmentCode", department.getDepartmentCode()); + .notNull("departmentCode", department.getDepartmentCode()) + .checkNotZero("organizeId",department.getOrganizeId()); //修改初始化 ConvertBean.modelUpdate(department, user); @@ -96,7 +96,7 @@ public class DepartmentController { @DeleteMapping(value = "/delete/{id}") @ApiOperation(value = "删除部门", notes = "根据部门id删除信息") - public ResultBean deleteDepartment(String id) { + public ResultBean deleteDepartment(@PathVariable("id") String id) { try { //条件验证 ValidatorBean.checkNotNull(id, "id为空。"); @@ -168,7 +168,7 @@ public class DepartmentController { } } - @DeleteMapping(value = "/delete") + @DeleteMapping(value = "/batch-delete") @ApiOperation(value = "根据id批量删除", notes = "根据id批量删除") public ResultBean deleteDepartmentByIds(@RequestBody String[] ids) { try { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java index 6fc772e..9cd9826 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java @@ -65,4 +65,60 @@ public class EnumController { Arrays.asList(CommonEnumUtil.USER_STATUS.values())); } + @GetMapping("/log-level") + @ApiOperation(value = "日志等级", notes = "日志等级") + public ResultBean getLogLevel(){ + return new ResultBean(true, "操作成功", + Arrays.asList(ImppEnumUtil.LOG_LEVEL.values())); + } + + @GetMapping("/soft-type") + @ApiOperation(value = "软件类型", notes = "软件类型") + public ResultBean getSoftType(){ + return new ResultBean(true, "操作成功", + Arrays.asList(CommonEnumUtil.SOFT_TYPE.values())); + } + + @GetMapping("/log-type") + @ApiOperation(value = "操作日志类型", notes = "操作日志类型") + public ResultBean getLogType(){ + return new ResultBean(true, "操作成功", + Arrays.asList(ImppEnumUtil.LOG_TYPE.values())); + } + + @GetMapping("/user-message-status") + @ApiOperation(value = "用户消息状态", notes = "用户消息状态") + public ResultBean getUserMessageStatus(){ + return new ResultBean(true, "操作成功", + Arrays.asList(ImppEnumUtil.USER_MESSAGE_STATUS.values())); + } + + @GetMapping("/user-message-type") + @ApiOperation(value = "用户消息类型", notes = "用户消息类型") + public ResultBean getUserMessageType(){ + return new ResultBean(true, "操作成功", + Arrays.asList(ImppEnumUtil.USER_MESSAGE_TYPE.values())); + } + + + @GetMapping("/tool-conn-type") + @ApiOperation(value = "硬件连接类型", notes = "硬件连接类型") + public ResultBean getToolConnType(){ + return new ResultBean(true, "操作成功", + Arrays.asList(ImppEnumUtil.TOOL_CONN_TYPE.values())); + } + + @GetMapping("/tool-data-type") + @ApiOperation(value = "硬件数据类型", notes = "硬件数据类型") + public ResultBean getToolDataType(){ + return new ResultBean(true, "操作成功", + Arrays.asList(ImppEnumUtil.TOOL_DATA_TYPE.values())); + } + + @GetMapping("/sys-param-type") + @ApiOperation(value = "系统参数类型", notes = "系统参数类型") + public ResultBean getSysParamType(){ + return new ResultBean(true, "操作成功", + Arrays.asList(ImppEnumUtil.SYS_PARAM_TYPE.values())); + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogOperateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogOperateController.java index 68047ce..76cb6a1 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogOperateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogOperateController.java @@ -36,7 +36,7 @@ public class LogOperateController { @Autowired private ILogOperateService logOperateService; - @PutMapping(value = "/insert") + @PostMapping(value = "/insert") @ApiOperation(value = "添加操作日志",notes = "添加操作日志") public ResultBean insertLogOperateController(LogOperate logOperate){ try { @@ -99,7 +99,7 @@ public class LogOperateController { @ApiOperation(value = "查询全部操作日志",notes = "查询全部操作日志") public ResultBean findLogOperateAll(){ try { - List logOperateList = logOperateService.findLogOperateAll(); + List logOperateList = logOperateService.listLogOperate(); return ResultBean.success("查询成功") .setResultList(logOperateList) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogSystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogSystemController.java index a215834..c558c00 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogSystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogSystemController.java @@ -36,7 +36,7 @@ public class LogSystemController { private ILogSystemService logSystemService; - @PutMapping(value = "/insert") + @PostMapping(value = "/insert") @ApiOperation(value="新增系统日志",notes = "新增系统日志") public ResultBean insertLogSystem(LogSystem logSystem) { try { @@ -96,11 +96,11 @@ public class LogSystemController { } } - @GetMapping(value = "/find-all") + @GetMapping(value = "/list") @ApiOperation(value = "查询全部系统日志",notes = "查询全部系统日志") public ResultBean findLogSystemAll(){ try { - List logSystemList = logSystemService.findLogSystemAll(); + List logSystemList = logSystemService.listLogSystem(); return ResultBean.success("查询成功") .setResultList(logSystemList) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PositionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PositionController.java index da933d3..0af0e05 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PositionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PositionController.java @@ -49,7 +49,7 @@ public class PositionController { //条件验证 ValidatorBean.beginValid(position) - .notNull("positionName",position.getName()) + .notNull("name",position.getName()) .notNull("positionCode",position.getPositionCode()); //新增初始化 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 d22f318..cb81865 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 @@ -15,10 +15,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -39,7 +36,7 @@ public class SysFileController { private ISysFileService sysFileService; - @PutMapping(value = "/insert") + @PostMapping(value = "/insert") @ApiOperation(value = "添加文件资源",notes = "添加文件资源") public ResultBean insertSysFile(SysFile sysFile){ try { @@ -84,11 +81,11 @@ public class SysFileController { } } - @GetMapping(value = "/find-all") + @GetMapping(value = "/list") @ApiOperation(value = "查询全部文件资源",notes = "查询全部文件资源") public ResultBean findSysFileAll(SysFile sysFile){ try { - List sysFileList = sysFileService.findSysFileAll(); + List sysFileList = sysFileService.listSysFile(); return ResultBean.success("查询成功") .setResultList(sysFileList) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java index 0df4840..685c0fe 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; @@ -35,7 +36,7 @@ public class SysMessageController { @Autowired private ISysMessageService sysMessageService; - @PutMapping(value = "/insert") + @PostMapping(value = "/insert") @ApiOperation(value = "新增消息",notes = "新增消息") public ResultBean insertSysMessage(SysMessage sysMessage){ try { @@ -46,11 +47,14 @@ public class SysMessageController { ValidatorBean.beginValid(sysMessage) .notNull("messageTitle",sysMessage.getMessageTitle()) .notNull("messageContent",sysMessage.getMessageContent()) - .notNull("messageSendId",sysMessage.getMessageSendId()) - .notNull("messageAcceptId",sysMessage.getMessageAcceptId()); + .checkNotZero("messageType",sysMessage.getMessageType()) + .notNull("messageRecipientId",sysMessage.getMessageRecipientId()); // 添加初始化 ConvertBean.modelInitialize(sysMessage,user); + // sysMessage.setMessageSendId(user.getUser().getId()); + // sysMessage.setRedSendName(user.getUser().getName()); + sysMessage.setMessageStatus(ImppEnumUtil.USER_MESSAGE_STATUS.UNREAD.getValue()); // TODO 状态 status sysMessageService.insertSysMessage(sysMessage); @@ -64,9 +68,9 @@ public class SysMessageController { } } - @DeleteMapping("/delete") + @DeleteMapping("/delete/{id}") @ApiOperation(value = "根据id删除消息",notes = "根据id删除消息") - public ResultBean deleteSysMessageById(String id){ + public ResultBean deleteSysMessageById(@PathVariable("id") String id){ try { // 条件校验 ValidatorBean.checkNotNull(id,"id不能为空"); @@ -93,11 +97,13 @@ public class SysMessageController { ValidatorBean.beginValid(sysMessage) .notNull("messageTitle",sysMessage.getMessageTitle()) .notNull("messageContent",sysMessage.getMessageContent()) - .notNull("messageSendId",sysMessage.getMessageSendId()) - .notNull("messageAcceptId",sysMessage.getMessageAcceptId()); + .checkNotZero("messageType",sysMessage.getMessageType()) + .notNull("messageRecipientId",sysMessage.getMessageRecipientId()); // 添加初始化 ConvertBean.modelUpdate(sysMessage,user); + // sysMessage.setMessageSendId(user.getUser().getId()); + // sysMessage.setRedSendName(user.getUser().getName()); // TODO 状态 status sysMessageService.updateSysMessage(sysMessage); @@ -111,11 +117,11 @@ public class SysMessageController { } } - @GetMapping(value = "/find-all") + @GetMapping(value = "/list") @ApiOperation(value = "查询全部消息",notes = "查询全部消息") public ResultBean findSysConfigAll(){ try { - List sysMessageList = sysMessageService.findSysMessageAll(); + List sysMessageList = sysMessageService.listSysMessage(); return ResultBean.success("查询成功") .setResultList(sysMessageList) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentServiceImpl.java index e4a7d66..da8fb07 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/DepartmentServiceImpl.java @@ -18,6 +18,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; import java.util.List; /** @@ -40,7 +41,7 @@ public class DepartmentServiceImpl implements IDepartmentService { @Override public void insertDepartment(Department department) { // 查询父级部门名称 - if (department.getParentId() != null && department.getParentId() > 0) { + if (department.getParentId() != null && department.getParentId() > 0) { LOGGER.info("部门信息 DEPARTMENT :{}", department.getParentId()); Department parentPosition = departmentRDao.getById(department.getParentId()); ValidatorBean.checkNotNull(parentPosition); @@ -49,11 +50,11 @@ public class DepartmentServiceImpl implements IDepartmentService { } // 查询所属组织名称 - LOGGER.info("组织信息 ORGANIZE :{}", department.getOrganizeId()); - Organize organize = organizeRDao.getById(department.getOrganizeId()); - ValidatorBean.checkNotNull(organize); + LOGGER.info("组织信息 ORGANIZE :{}", department.getOrganizeId()); + Organize organize = organizeRDao.getById(department.getOrganizeId()); + ValidatorBean.checkNotNull(organize); - department.setRedOrganizeName(organize.getName()); + department.setRedOrganizeName(organize.getName()); // 新增部门 LOGGER.info("部门信息 DEPARTMENT {}",department); @@ -64,7 +65,7 @@ public class DepartmentServiceImpl implements IDepartmentService { public void deleteDepartmentById(String id) { // 查询是否存在子级 LOGGER.info("部门信息 DEPARTMENT :{}", id); - if (departmentRDao.findByPropertyCount("parentId",id) > 0) { + if (departmentRDao.findByPropertyCount("parentId",Long.parseLong(id)) > 0) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) @@ -81,7 +82,7 @@ public class DepartmentServiceImpl implements IDepartmentService { @Override public void updateDepartment(Department department) { // 查询父级部门名称 - if (department.getParentId() != null && department.getParentId() > 0) { + if (department.getParentId() != null && department.getParentId() > 0) { LOGGER.info("部门信息 DEPARTMENT :{}", department.getParentId()); Department parentPosition = departmentRDao.getById(department.getParentId()); ValidatorBean.checkNotNull(parentPosition); @@ -90,14 +91,14 @@ public class DepartmentServiceImpl implements IDepartmentService { } // 查询所属组织名称 - LOGGER.info("组织信息 ORGANIZE :{}", department.getOrganizeId()); + LOGGER.info("组织信息 ORGANIZE organizeId:{}", department.getOrganizeId()); Organize organize = organizeRDao.getById(department.getOrganizeId()); ValidatorBean.checkNotNull(organize); department.setRedOrganizeName(organize.getName()); // 新增部门 - LOGGER.info("部门信息 DEPARTMENT :{}",department); + LOGGER.info("部门信息 DEPARTMENT department:{}",department); departmentRDao.update(department); } @@ -126,4 +127,5 @@ public class DepartmentServiceImpl implements IDepartmentService { return new ListPager(departmentRDao.findByHqlWherePage(hqlPack + department.getOrderByParam(),pager),pager); } } + } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateServiceImpl.java index 927f859..735cac4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateServiceImpl.java @@ -43,9 +43,9 @@ public class LogOperateServiceImpl implements ILogOperateService { } @Override - public List findLogOperateAll() { - LOGGER.info("操作日志 LOG_ACTION find-all"); - return logOperateRDao.findAll(); + public List listLogOperate() { + LOGGER.info("操作日志 LOG_ACTION list"); + return logOperateRDao.list(); } @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogSystemServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogSystemServiceImpl.java index 57fe4d6..a1f0bf8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogSystemServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogSystemServiceImpl.java @@ -43,9 +43,9 @@ public class LogSystemServiceImpl implements ILogSystemService { } @Override - public List findLogSystemAll() { - LOGGER.info("系统日志 LOG_SYSTEM find-all"); - return logSystemRDao.findAll(); + public List listLogSystem() { + LOGGER.info("系统日志 LOG_SYSTEM list"); + return logSystemRDao.list(); } @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PositionServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PositionServiceImpl.java index 0522a88..3c5f9b0 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PositionServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PositionServiceImpl.java @@ -12,10 +12,13 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; 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 cn.estsh.impp.framework.boot.util.ValidatorBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import java.lang.reflect.Array; import java.util.Arrays; @@ -38,9 +41,11 @@ public class PositionServiceImpl implements IPositionService { @Override public Position insertPosition(Position position) { // 查询父级岗位名称 - if (position.getParentId() != null) { + if (position.getParentId() != null && position.getParentId() > 0) { LOGGER.info("岗位信息 POSITION parentId:{}", position.getParentId()); Position parentPosition = positionRDao.getById(position.getParentId()); + ValidatorBean.checkNotNull(parentPosition); + position.setRedParentName(parentPosition.getName()); } @@ -52,9 +57,11 @@ public class PositionServiceImpl implements IPositionService { @Override public void updatePosition(Position position) { // 查询父级岗位名称 - if (position.getParentId() != null) { + if (position.getParentId() != null && position.getParentId() > 0) { LOGGER.info("岗位信息 POSITION parentId:{}", position.getParentId()); Position parentPosition = positionRDao.getById(position.getParentId()); + ValidatorBean.checkNotNull(parentPosition); + position.setRedParentName(parentPosition.getName()); } @@ -67,7 +74,7 @@ public class PositionServiceImpl implements IPositionService { public void deletePositionById(String id) { // 查询是否存在子级 LOGGER.info("岗位信息 POSITION id:{}", id); - long positionCount = positionRDao.findByPropertyCount("parentId",id); + long positionCount = positionRDao.findByPropertyCount("parentId",Long.parseLong(id)); if (positionCount >= 1) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java index b76f38e..8193977 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java @@ -43,9 +43,9 @@ public class SysFileServiceImpl implements ISysFileService { } @Override - public List findSysFileAll() { - LOGGER.info("文件资源 SYS_FILE find-aLl"); - return sysFileRDao.findAll(); + public List listSysFile() { + LOGGER.info("文件资源 SYS_FILE list"); + return sysFileRDao.list(); } @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageServiceImpl.java index baa78cb..4ac17db 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageServiceImpl.java @@ -1,8 +1,12 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; +import cn.estsh.i3plus.pojo.platform.bean.Department; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; import cn.estsh.i3plus.pojo.platform.repository.SysMessageRepository; +import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository; +import cn.estsh.impp.framework.boot.util.ValidatorBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -24,8 +28,20 @@ public class SysMessageServiceImpl implements ISysMessageService { @Autowired public SysMessageRepository sysMessageRDao; + @Autowired + public SysUserRepository sysUserRDao; + @Override public void insertSysMessage(SysMessage sysMessage) { + // 查询接收人名称 + if (sysMessage.getMessageRecipientId() != null && sysMessage.getMessageRecipientId() > 0) { + LOGGER.info("用户信息 SYSUSER id:{}", sysMessage.getMessageRecipientId()); + SysUser acceptUser = sysUserRDao.getById(sysMessage.getMessageRecipientId()); + ValidatorBean.checkNotNull(acceptUser); + + sysMessage.setRedMessageRecipientName(acceptUser.getName()); + } + LOGGER.info("系统信息 SYS_MESSAGE :{}",sysMessage); sysMessageRDao.insert(sysMessage); } @@ -39,14 +55,23 @@ public class SysMessageServiceImpl implements ISysMessageService { @Override public void updateSysMessage(SysMessage sysMessage) { + // 查询接收人名称 + if (sysMessage.getMessageRecipientId() != null && sysMessage.getMessageRecipientId() > 0) { + LOGGER.info("用户信息 SYSUSER id:{}", sysMessage.getMessageRecipientId()); + SysUser acceptUser = sysUserRDao.getById(sysMessage.getMessageRecipientId()); + ValidatorBean.checkNotNull(acceptUser); + + sysMessage.setRedMessageRecipientName(acceptUser.getName()); + } + LOGGER.info("系统信息 SYS_MESSAGE :{}",sysMessage); sysMessageRDao.update(sysMessage); } @Override - public List findSysMessageAll() { - LOGGER.info("系统信息 SYS_MESSAGE find-all"); - return sysMessageRDao.findAll(); + public List listSysMessage() { + LOGGER.info("系统信息 SYS_MESSAGE list"); + return sysMessageRDao.list(); } @Override