diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysUserService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysUserService.java index d7cd5ea..423c1df 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysUserService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysUserService.java @@ -1,9 +1,6 @@ package cn.estsh.i3plus.core.api.iservice.base; -import cn.estsh.i3plus.pojo.base.shirotoken.UserToken; -import cn.estsh.i3plus.pojo.model.flatform.UserModel; -import cn.estsh.i3plus.pojo.platform.bean.SessionUser; -import cn.estsh.i3plus.pojo.platform.bean.SysUser; +import cn.estsh.i3plus.pojo.platform.bean.*; import java.util.List; @@ -36,17 +33,40 @@ public interface ISysUserService { /** * 修改用户信息 - * @param model 封装的用户对象 - * @param user 当前会话用户 + * @param sysUser + */ + void updateSysUser(SysUser sysUser) throws Exception; + + /** + * 新增用户信息 + * @param sysUser 新增用户 + * @return + */ + SysUser insertSysUser(SysUser sysUser)throws Exception; + + /** + * 刷新 用户部门关系 + * @param sysUser + * @param departmentId + * @param user */ - SysUser updateSysUserModel(UserModel model, SessionUser user); + void refreshRefUserDepartment(SysUser sysUser, String departmentId , SessionUser user); /** - * 新建用户信息 - * @param model 用户封装对象 - * @param user 当前会话用户 + * 刷新用户角色关系 + * @param sysUser + * @param roleIds + * @param user + */ + void refreshRefUserRole(SysUser sysUser, String[] roleIds , SessionUser user); + + /** + * 刷新用户岗位信息 + * @param sysUser + * @param positionId + * @param user */ - SysUser insertSysUserModel(UserModel model,SessionUser user); + void refreshRefUserPosition(SysUser sysUser, String positionId , SessionUser user); /** * 根据Key 删除数据 @@ -59,7 +79,7 @@ public interface ISysUserService { * 查询所有数据 * @return */ - List findSysUserAll(); + List list(); /** * 根据id 数据 @@ -80,6 +100,6 @@ public interface ISysUserService { * @param user * @return */ - SysUser getSysUserInfo(SysUser user); + SysUser dealSysUserInfo(SysUser user); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeRecordingService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeRecordingService.java index 9f7a93e..2bf4c42 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeRecordingService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeRecordingService.java @@ -18,31 +18,31 @@ public interface ITaskTimeRecordingService { * 修改数据 * @param taskTimeRecording */ - void updateTaskTimedRecording(TaskTimeRecording taskTimeRecording); + void updateTaskTimeRecording(TaskTimeRecording taskTimeRecording); /** * 根据Key 删除数据 * @param id */ - void deleteTaskTimedRecordingById(String id); + void deleteTaskTimeRecordingById(String id); /** * 新增数据 * @param taskTimeRecording * @return */ - TaskTimeRecording insertTaskTimedRecording(TaskTimeRecording taskTimeRecording); + TaskTimeRecording insertTaskTimeRecording(TaskTimeRecording taskTimeRecording); /** * 查询所有数据 * @return */ - List findTaskTimedRecordingAll(); + List findTaskTimeRecordingAll(); /** * 根据id 数据 * @param id * @return */ - TaskTimeRecording getTaskTimedRecordingById(String id); + TaskTimeRecording getTaskTimeRecordingById(String id); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeService.java index e25cfd7..b1af89d 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeService.java @@ -18,7 +18,7 @@ public interface ITaskTimeService { * 修改数据 * @param taskTime */ - void updateTaskTimed(TaskTime taskTime); + void updateTaskTime(TaskTime taskTime); /** * 修改任务状态 @@ -26,31 +26,31 @@ public interface ITaskTimeService { * @param status 任务状态 * @param user 当前会话用户 */ - void updateTaskTimedStatus(String id, int status, SessionUser user); + void updateTaskTimeStatus(String id, int status, SessionUser user); /** * 根据Key 删除数据 * @param id */ - void deleteTaskTimedById(String id); + void deleteTaskTimeById(String id); /** * 新增数据 * @param taskTime * @return */ - TaskTime insertTaskTimed(TaskTime taskTime); + TaskTime insertTaskTime(TaskTime taskTime); /** * 查询所有数据 * @return */ - List findTaskTimedAll(); + List listTaskTime(); /** * 根据id 数据 * @param id * @return */ - TaskTime getTaskTimedById(String id); + TaskTime getTaskTimeById(String id); } 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 31c97ba..214c0bc 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 @@ -1,173 +1,166 @@ -//package cn.estsh.i3plus.core.apiservice.controller.busi; -// -//import cn.estsh.i3plus.core.api.iservice.base.ISysUserService; -//import cn.estsh.i3plus.platform.common.convert.ConvertBean; -//import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -//import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -//import cn.estsh.i3plus.pojo.model.flatform.UserModel; -//import cn.estsh.i3plus.pojo.platform.bean.SysUser; -//import cn.estsh.impp.framework.boot.auth.AuthUtil; -//import cn.estsh.impp.framework.boot.exception.ImppBusiException; -//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 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 : wei.peng -// * @Date : 2018-10-25 21:46 -// * @Modify : -// **/ -//@RestController -//@RequestMapping("/user") -//@Api(description = "系统用户服务") -//public class SysUserController { -// -// public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeController.class); -// -// @Autowired -// private ISysUserService sysUserService; -// -// -// @PostMapping(value = "/insert") -// @ApiOperation(value = "新增用户", notes = "新增系统用户") -// public ResultBean insertSysUser(SysUser user,String[] departmentIds,String[] positionIds ,String[] roleIds) { -// try { -// /** -// * 先插入 user -// * 插入用户部门关系数据 -// * 冗余部门名称信息 -// * 插入用户岗位关系数据 -// * 冗余岗位名称信息 -// * ... -// */ -// -//// // 用户基础信息校验 -//// ValidatorBean.beginValid(model); -//// -//// ValidatorBean.beginValid(model.getUser()) -//// .notNull("userLoginName",model.getUser().getUserLoginName()) -//// .notNull("userLoginPassword",model.getUser().getUserLoginPassword()) -//// .notNull("userEmpNo",model.getUser().getUserEmpNo()) -//// .notNull("userEmail",model.getUser().getUserEmail()); -//// -//// ValidatorBean.beginValid(model.getRole()) -//// .notNull("id",model.getRole().getId()); -//// -//// ValidatorBean.beginValid(model.getDepartment()) -//// .notNull("id",model.getDepartment().id); -//// -//// ValidatorBean.beginValid(model.getPosition()) -//// .notNull("id",model.getPosition().getId()); -//// -//// -//// model.getUser().setUserTypeId(CommonEnumUtil.USER_TYPE.USER.getValue()); -//// model.getUser().setDepartmentId(model.getDepartment().getId()); -//// model.getUser().setRoleId(model.getRole().getId()); -//// model.getUser().setPositionId(model.getPosition().getId()); -//// -//// ConvertBean.modelInitialize(model.getUser(), AuthUtil.getSessionUser()); -//// -//// SysUser user = sysUserService.insertSysUserModel(model, AuthUtil.getSessionUser()); -// -// return ResultBean.success("操作成功") -// .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) -// .setResultObject(user); -// } catch (ImppBusiException busExcep) { -// LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); -// return ResultBean.fail(busExcep.getErrorShow()); -// } catch (Exception e) { -// LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); -// return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); -// } -// } -// -// @PutMapping(value = "/update") -// @ApiOperation(value = "修改用户", notes = "修改用户信息") -// public ResultBean updateSysUser(UserModel model) { -// try { -// // 用户基础信息校验 -// ValidatorBean.beginValid(model); -// -// ValidatorBean.beginValid(model.getUser()) -// .notNull("id",model.getUser().getId()) -// .notNull("userLoginName",model.getUser().getUserLoginName()) -// .notNull("userLoginPassword",model.getUser().getUserLoginPassword()) -// .notNull("userEmpNo",model.getUser().getUserEmpNo()) -// .notNull("userEmail",model.getUser().getUserEmail()); -// -// ValidatorBean.beginValid(model.getRole()) -// .notNull("id",model.getRole().getId()); -// -// ValidatorBean.beginValid(model.getDepartment()) -// .notNull("id",model.getDepartment().id); -// -// ValidatorBean.beginValid(model.getPosition()) -// .notNull("id",model.getPosition().getId()); -// -// -// model.getUser().setUserTypeId(CommonEnumUtil.USER_TYPE.USER.getValue()); -// model.getUser().setDepartmentId(model.getDepartment().getId()); -// model.getUser().setRoleId(model.getRole().getId()); -// model.getUser().setPositionId(model.getPosition().getId()); -// -// ConvertBean.modelUpdate(model.getUser(), AuthUtil.getSessionUser()); -// -// sysUserService.updateSysUserModel(model, AuthUtil.getSessionUser()); -// -// return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// } catch (ImppBusiException busExcep) { -// LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); -// return ResultBean.fail(busExcep.getErrorShow()).build(); -// } catch (Exception e) { -// return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); -// } -// } -// -// @GetMapping(value = "/list") -// @ApiOperation(value = "查询所有用户", notes = "查询所有系统用户") -// public ResultBean findAll() { -// try { -// List list = sysUserService.findSysUserAll(); -// return ResultBean.success("操作成功") -// .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) -// .setResultList(list); -// } catch (ImppBusiException busExcep) { -// LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); -// return ResultBean.fail(busExcep.getErrorShow()); -// } catch (Exception e) { -// LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); -// return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); -// } -// } -// -// @DeleteMapping(value = "/delete") -// @ApiOperation(value = "删除定时任务", notes = "删除定时任务") -// public ResultBean delete(String id) { -// try { -// // 数据校验 -// ValidatorBean.checkNotNull(id, "用户id 不能为空"); -// -// sysUserService.deleteSysUserById(id); -// return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// } catch (ImppBusiException busExcep) { -// LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); -// return ResultBean.fail(busExcep.getErrorShow()); -// } catch (Exception e) { -// LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); -// return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); -// } -// } -// -// -// -//} +package cn.estsh.i3plus.core.apiservice.controller.busi; + +import cn.estsh.i3plus.core.api.iservice.base.ISysUserService; +import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; +import cn.estsh.impp.framework.boot.auth.AuthUtil; +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 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 : wei.peng + * @Date : 2018-10-25 21:46 + * @Modify : + **/ +@RestController +@RequestMapping("/user") +@Api(description = "系统用户服务") +public class SysUserController { + + public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeController.class); + + @Autowired + private ISysUserService sysUserService; + + + @PostMapping(value = "/insert") + @ApiOperation(value = "新增用户", notes = "新增系统用户") + public ResultBean insertSysUser(SysUser sysUser,String departmentId,String positionId ,String[] roleIds) { + try { + ValidatorBean.beginValid(sysUser) + .notNull("userLoginName",sysUser.getUserLoginName()) + .notNull("userLoginPassword",sysUser.getUserLoginPassword()) + .notNull("userEmpNo",sysUser.getUserEmpNo()) + .notNull("userEmail",sysUser.getUserEmpNo()); + + ValidatorBean.checkNotNull(departmentId,"部门 id 不能为空"); + ValidatorBean.checkNotNull(positionId,"岗位 id 不能为空"); + + if(roleIds == null || roleIds.length <= 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("角色信息不能为空") + .build(); + } + + //新增初始化 + ConvertBean.modelInitialize(sysUser, AuthUtil.getSessionUser()); + SysUser user = sysUserService.insertSysUser(sysUser); + + // 更新用户关系 + sysUserService.refreshRefUserDepartment(user,departmentId,AuthUtil.getSessionUser()); + sysUserService.refreshRefUserPosition(user,positionId,AuthUtil.getSessionUser()); + sysUserService.refreshRefUserRole(user,roleIds,AuthUtil.getSessionUser()); + + // 更新冗余信息 + sysUserService.updateSysUser(user); + + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultObject(user); + } catch (ImppBusiException busExcep) { + LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + } catch (Exception e) { + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + @PutMapping(value = "/update") + @ApiOperation(value = "修改用户", notes = "修改用户信息") + public ResultBean updateSysUser(SysUser sysUser,String departmentId,String positionId ,String[] roleIds) { + try { + ValidatorBean.beginValid(sysUser) + .notNull("id",sysUser.getId()) + .notNull("userLoginName",sysUser.getUserLoginName()) + .notNull("userLoginPassword",sysUser.getUserLoginPassword()) + .notNull("userEmpNo",sysUser.getUserEmpNo()) + .notNull("userEmail",sysUser.getUserEmpNo()); + + ValidatorBean.checkNotNull(departmentId,"部门 id 不能为空"); + ValidatorBean.checkNotNull(positionId,"岗位 id 不能为空"); + + if(roleIds == null || roleIds.length <= 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("角色信息不能为空") + .build(); + } + + ConvertBean.modelUpdate(sysUser, AuthUtil.getSessionUser()); + // 更新用户关系 + sysUserService.refreshRefUserDepartment(sysUser,departmentId,AuthUtil.getSessionUser()); + sysUserService.refreshRefUserPosition(sysUser,positionId,AuthUtil.getSessionUser()); + sysUserService.refreshRefUserRole(sysUser,roleIds,AuthUtil.getSessionUser()); + + // 更新冗余信息 + sysUserService.updateSysUser(sysUser); + + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultObject(sysUser); + } catch (ImppBusiException busExcep) { + LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + } catch (Exception e) { + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + @GetMapping(value = "/list") + @ApiOperation(value = "查询所有用户", notes = "查询所有系统用户") + public ResultBean findAll() { + try { + List list = sysUserService.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.getErrorShow()); + } catch (Exception e) { + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + @DeleteMapping(value = "/delete") + @ApiOperation(value = "删除定时任务", notes = "删除定时任务") + public ResultBean delete(String id) { + try { + // 数据校验 + ValidatorBean.checkNotNull(id, "用户id 不能为空"); + + sysUserService.deleteSysUserById(id); + return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + } catch (Exception e) { + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + + +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java index 7de0a3c..b0fcf86 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java @@ -34,14 +34,14 @@ public class TaskTimeController { public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeController.class); @Autowired - private ITaskTimeService taskTimedService; + private ITaskTimeService taskTimeService; @Autowired private ITaskTimeExpressionService taskTimeExpressionService; @PostMapping(value = "/insert") @ApiOperation(value = "新增定时任务", notes = "定时任务") - public ResultBean insertTaskTimed(TaskTime taskTime) { + public ResultBean insertTaskTime(TaskTime taskTime) { try { // 数据校验 ValidatorBean.beginValid(taskTime) @@ -57,7 +57,7 @@ public class TaskTimeController { ConvertBean.modelInitialize(taskTime, AuthUtil.getSessionUser()); - taskTime = taskTimedService.insertTaskTimed(taskTime); + taskTime = taskTimeService.insertTaskTime(taskTime); return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) @@ -73,7 +73,7 @@ public class TaskTimeController { @PutMapping(value = "/update") @ApiOperation(value = "修改定时任务", notes = "定时任务") - public ResultBean updateTaskTimed(TaskTime taskTime) { + public ResultBean updateTaskTime(TaskTime taskTime) { try { // 数据校验 ValidatorBean.beginValid(taskTime) @@ -93,7 +93,7 @@ public class TaskTimeController { ConvertBean.modelUpdate(taskTime, AuthUtil.getSessionUser()); - taskTimedService.updateTaskTimed(taskTime); + taskTimeService.updateTaskTime(taskTime); return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) @@ -109,12 +109,12 @@ public class TaskTimeController { @DeleteMapping(value = "/delete") @ApiOperation(value = "删除定时任务", notes = "删除定时任务") - public ResultBean deleteTaskTimed(String id) { + public ResultBean deleteTaskTime(String id) { try { // 数据校验 ValidatorBean.checkNotNull(id, "定时任务id 不能为空"); - taskTimedService.deleteTaskTimedById(id); + taskTimeService.deleteTaskTimeById(id); return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); @@ -126,10 +126,10 @@ public class TaskTimeController { } @GetMapping(value = "/list") - @ApiOperation(value = "查询TaskTimed", notes = "查询所有定时任务") - public ResultBean findTaskTimedAll() { + @ApiOperation(value = "查询TaskTime", notes = "查询所有定时任务") + public ResultBean findTaskTimeAll() { try { - List list = taskTimedService.findTaskTimedAll(); + List list = taskTimeService.listTaskTime(); return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultList(list); @@ -144,12 +144,12 @@ public class TaskTimeController { @GetMapping(value = "/get/{id}") @ApiOperation(value = "查询定时任务", notes = "查询根据ID查询定时任务") - public ResultBean getByTaskTimedId(@PathVariable("id") String id) { + public ResultBean getByTaskTimeId(@PathVariable("id") String id) { try { // 数据校验 ValidatorBean.checkNotNull(id, "定时任务id 不能为空"); - TaskTime taskTime = taskTimedService.getTaskTimedById(id); + TaskTime taskTime = taskTimeService.getTaskTimeById(id); return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) @@ -171,7 +171,7 @@ public class TaskTimeController { ValidatorBean.checkNotNull(id, "功能id 不能为空"); ValidatorBean.checkNotZero(status, "功能状态不能为空"); - taskTimedService.updateTaskTimedStatus(id,status,AuthUtil.getSessionUser()); + taskTimeService.updateTaskTimeStatus(id,status,AuthUtil.getSessionUser()); return new ResultBean(true); } catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java index 8f07cdf..3b1cbd6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserServiceImpl.java @@ -2,16 +2,19 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.base.ISysUserService; import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao; +import cn.estsh.i3plus.platform.common.tool.EncryptTool; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.shirotoken.AdminToken; import cn.estsh.i3plus.pojo.base.shirotoken.SaAdminToken; import cn.estsh.i3plus.pojo.base.shirotoken.UserToken; -import cn.estsh.i3plus.pojo.model.flatform.UserModel; +import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.platform.bean.*; import cn.estsh.i3plus.pojo.platform.repository.*; +import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import cn.estsh.impp.framework.boot.util.ValidatorBean; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authc.AuthenticationToken; import org.slf4j.Logger; @@ -101,7 +104,7 @@ public class SysUserServiceImpl implements ISysUserService { } SessionUser sessionUser = AuthUtil.login(token); - user = getSysUserInfo(user); //设置用户详细信息 + user = dealSysUserInfo(user); //设置用户详细信息 packSessionUser(sessionUser, user, user.getUserTypeId(), languageCode); AuthUtil.setSessionUser(sessionUser); return sessionUser; @@ -117,57 +120,106 @@ public class SysUserServiceImpl implements ISysUserService { sysUserRDao.update(sysUser); } - @Override - public SysUser updateSysUserModel(UserModel model, SessionUser user) { - LOGGER.info("平台用户 SYS_USER model:{}", model); - LOGGER.info("平台用户 SYS_USER user:{}", user); - - // 数据真实性校验 - SysRole sysRole = sysRoleRDao.getById(model.getRole().id); - checkSysRole(sysRole); - - Department dep = departmentRDao.getById(model.getDepartment().getId()); - checkDepartment(dep); +// @Override +// public SysUser updateSysUserModel(UserModel model, SessionUser user) { +// LOGGER.info("平台用户 SYS_USER model:{}", model); +// LOGGER.info("平台用户 SYS_USER user:{}", user); +// +// // 数据真实性校验 +// SysRole sysRole = sysRoleRDao.getById(model.getRole().id); +// checkSysRole(sysRole); +// +// Department dep = departmentRDao.getById(model.getDepartment().getId()); +// checkDepartment(dep); +// +// Position pos = positionRDao.getById(model.getPosition().getId()); +// checkPosition(pos); +// +// Organize organize = organizeRDao.getById(model.getDepartment().getOrganizeId()); +// checkOrganize(organize); +// +// SysUser sysUser = model.getUser(); +// +// //TODO UserLoginName Count +// SysUser loginUser = getSysUserByLoginName(sysUser.getUserLoginName()); +// // 判断是否修改登录名称 +// if (loginUser == null || loginUser.getId().equals(sysUser.getId())) { +// // 冗余部分信息 +// sysUser.setRedDepartmentName(dep.getDepartmentName()); +// sysUser.setRedRoleName(sysRole.getName()); +// sysUser.setRedPositionName(pos.getPositionName()); +// sysUser.setOrganizeId(organize.getId()); +// sysUser.setRedOrganizeName(organize.getRedParentName()); +// +// if (!sysUser.getUserLoginPassword().isEmpty()) { +// //TODO 密码加密 +// } +// +// // 刷新用户角色关系信息 +// refreshRefUserRole(model, sysUser); +// +// // 刷新用户部门关系信息 +// refreshRefUserDepartment(model, sysUser); +// +// // 刷新用户岗位关系信息 +// refreshRefUserPosition(model, sysUser); +// +// // 保存用户信息 +// sysUserInfoRDao.save(model.getUserInfo()); +// return sysUserRDao.save(sysUser); +// } else { +// throw ImppExceptionBuilder.newInstance() +// .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) +// .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) +// .setErrorDetail("用户名已存在") +// .setErrorSolution("请重新输入用户名") +// .build(); +// } +// } +// +// @Override +// public SysUser insertSysUserModel(UserModel model, SessionUser user) { +// LOGGER.info("平台用户 SYS_USER model:{}", model); +// LOGGER.info("平台用户 SYS_USER user:{}", user); +// +// SysUser sysUser = model.getUser(); +// SysUser loginUser = getSysUserByLoginName(sysUser.getUserLoginName()); +// if (null == loginUser) { +// sysUser = sysUserRDao.insert(sysUser); +// model.getUserInfo().setUserId(sysUser.getId()); +// model.setUser(sysUser); +// return updateSysUserModel(model, user); +// } else { +// throw ImppExceptionBuilder.newInstance() +// .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) +// .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) +// .setErrorDetail("用户名已存在") +// .setErrorSolution("请重新输入用户名") +// .build(); +// } +// } - Position pos = positionRDao.getById(model.getPosition().getId()); - checkPosition(pos); - Organize organize = organizeRDao.getById(model.getDepartment().getOrganizeId()); - checkOrganize(organize); - - SysUser sysUser = model.getUser(); + @Override + public void updateSysUser(SysUser sysUser) throws Exception{ + LOGGER.info("平台用户 SYS_USER SysUser :{}", sysUser); - //TODO UserLoginName Count SysUser loginUser = getSysUserByLoginName(sysUser.getUserLoginName()); // 判断是否修改登录名称 if (loginUser == null || loginUser.getId().equals(sysUser.getId())) { - // 冗余部分信息 - sysUser.setRedDepartmentName(dep.getDepartmentName()); - sysUser.setRedRoleName(sysRole.getName()); - sysUser.setRedPositionName(pos.getPositionName()); - sysUser.setOrganizeId(organize.getId()); - sysUser.setRedOrganizeName(organize.getRedParentName()); - - if (!sysUser.getUserLoginPassword().isEmpty()) { - //TODO 密码加密 + // 密码加密 输入的密码不等于密码一致时修改密码 + if(!sysUser.getUserLoginPassword().isEmpty()){ + if(sysUser.getUserLoginPassword().equals(loginUser.getUserLoginPassword())){ + String md5 = EncryptTool.hexMD5(sysUser.getUserLoginPassword()); + sysUser.setUserLoginPassword(md5); + } } - - // 刷新用户角色关系信息 - refreshRefUserRole(model, sysUser); - - // 刷新用户部门关系信息 - refreshRefUserDepartment(model, sysUser); - - // 刷新用户岗位关系信息 - refreshRefUserPosition(model, sysUser); - - // 保存用户信息 - sysUserInfoRDao.save(model.getUserInfo()); - return sysUserRDao.save(sysUser); - } else { + sysUserInfoRDao.update(sysUser.getUserInfo()); + sysUserRDao.save(sysUser); + }else { throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.USER_LOGIN_NAME_EXCEPTION.getCode()) .setErrorDetail("用户名已存在") .setErrorSolution("请重新输入用户名") .build(); @@ -175,17 +227,28 @@ public class SysUserServiceImpl implements ISysUserService { } @Override - public SysUser insertSysUserModel(UserModel model, SessionUser user) { - LOGGER.info("平台用户 SYS_USER model:{}", model); - LOGGER.info("平台用户 SYS_USER user:{}", user); + public SysUser insertSysUser(SysUser sysUser )throws Exception { + LOGGER.info("平台用户 SYS_USER SysUser:{}", sysUser); - SysUser sysUser = model.getUser(); SysUser loginUser = getSysUserByLoginName(sysUser.getUserLoginName()); if (null == loginUser) { - sysUser = sysUserRDao.insert(sysUser); - model.getUserInfo().setUserId(sysUser.getId()); - model.setUser(sysUser); - return updateSysUserModel(model, user); + // 密码加密 输入的密码不等于密码一致时修改密码 + if(!sysUser.getUserLoginPassword().isEmpty()){ + if(sysUser.getUserLoginPassword().equals(loginUser.getUserLoginPassword())){ + String md5 = EncryptTool.hexMD5(sysUser.getUserLoginPassword()); + sysUser.setUserLoginPassword(md5); + } + } + + SysUser user = sysUserRDao.insert(sysUser); + + // 保存用户详细信息 + SysUserInfo userInfo = new SysUserInfo(); + userInfo.setUserId(user.getId()); + SysUserInfo info = sysUserInfoRDao.insert(userInfo); + + user.setUserInfo(info); + return user; } else { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) @@ -197,6 +260,81 @@ public class SysUserServiceImpl implements ISysUserService { } @Override + public void refreshRefUserDepartment(SysUser sysUser, String departmentId, SessionUser user) { + LOGGER.info("平台用户 SYS_USER SysUser:{}", sysUser); + LOGGER.info("平台用户 SYS_USER departmentId:{}", departmentId); + LOGGER.info("平台用户 SYS_USER SessionUser:{}", user); + + refUserDepartmentRDao.deleteByProperties("userId", sysUser.getId()); //删除用户部门关系 + + Department dep = departmentRDao.getById(Long.parseLong(departmentId)); + if(dep != null ){ + ValidatorBean.checkNotNull(dep); + + // 用户部门关系保存 + RefUserDepartment refUserDepartment = new RefUserDepartment(sysUser.getId(), dep.getId(), dep.getDepartmentName()); + refUserDepartmentRDao.save(refUserDepartment); + + Organize organize = organizeRDao.getById(dep.getOrganizeId()); + if(organize != null){ + sysUser.setRedOrganizeName(organize.getName()); + } + + // 冗余 部门信息 + sysUser.setRedDepartmentName(dep.getDepartmentName()); + } + } + + @Override + public void refreshRefUserRole(SysUser sysUser, String[] roleIds, SessionUser user) { + LOGGER.info("平台用户 SYS_USER SysUser:{}", sysUser); + LOGGER.info("平台用户 SYS_USER String[] :{}", roleIds); + LOGGER.info("平台用户 SYS_USER SessionUser:{}", user); + + + // 根据IDS 查询所有的角色信息 + String where = CoreHqlPack.packHqlIds("id", roleIds); + List list = sysRoleRDao.findByHqlWhere(where); + + // 删除角色关系信息 + refUserRoleRDao.deleteByProperties("userId", sysUser.getId()); // 删除用户角色关系 + + // 新增用户角色关系 + if(null != list && list.size() > 0){ + List refUserRoles = new ArrayList<>(); + List roleNameList = new ArrayList<>(); + RefUserRole refUserRole = null; + for (SysRole role : list) { + roleNameList.add(role.getName()); + // 用户角色关系创建 + refUserRole = new RefUserRole(sysUser.getId(), role.getId(), role.getName()); + refUserRoles.add(refUserRole); + } + refUserRoleRDao.saveAll(refUserRoles); + // 角色名称冗余 + sysUser.getUserInfo().setRedRoleNames(String.join(",", roleNameList)); + } + } + + @Override + public void refreshRefUserPosition(SysUser sysUser, String positionId, SessionUser user) { + LOGGER.info("平台用户 SYS_USER SysUser:{}", sysUser); + LOGGER.info("平台用户 SYS_USER positionId :{}", positionId); + LOGGER.info("平台用户 SYS_USER SessionUser:{}", user); + + Position pos = positionRDao.getById(Long.parseLong(positionId)); + ValidatorBean.checkNotNull(pos); + + refUserPositionRDao.deleteByProperties("userId", sysUser.getId()); //删除用户部门关系 + + RefUserPosition refUserPosition = new RefUserPosition(sysUser.getId(), pos.getId(), pos.getPositionName());; + refUserPositionRDao.insert(refUserPosition); + + // 岗位名称冗余 + sysUser.getUserInfo().setRedPositionNames(pos.getPositionName()); + } + + @Override public void deleteSysUserById(String id) { LOGGER.info("平台用户 SYS_USER DELETE By id :{}", id); sysUserRDao.updateByProperties("id", id, "isValid", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); @@ -208,7 +346,7 @@ public class SysUserServiceImpl implements ISysUserService { } @Override - public List findSysUserAll() { + public List list() { LOGGER.info("平台用户 SYS_USER find All"); return sysUserRDao.findByProperty("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); } @@ -233,7 +371,7 @@ public class SysUserServiceImpl implements ISysUserService { * @return */ @Override - public SysUser getSysUserInfo(SysUser user) { + public SysUser dealSysUserInfo(SysUser user) { LOGGER.info("平台用户 SYS_USER user id :{}", user.getId()); SysUserInfo userInfo = sysUserInfoRDao.getByProperty("userId", user.getId()); Organize organize = organizeRDao.getById(user.getOrganizeId()); @@ -260,21 +398,6 @@ public class SysUserServiceImpl implements ISysUserService { return user; } - - - - - - - - - - - /**************************************** 公共方法封装 ****************************************/ - -// dealUserInfo() 用户信息封装 - - /** * 封装用户登陆信息 * @@ -296,146 +419,4 @@ public class SysUserServiceImpl implements ISysUserService { return sessionUser; } - /** - * 刷新用户 角色关系 - * @param model - * @param sysUser - */ - private void refreshRefUserRole( UserModel model, SysUser sysUser) { - // 用户角色操作 - refUserRoleRDao.deleteByProperties("userId", sysUser.getId()); // 删除用户角色关系 - if (null != model.getRoles() && model.getRoles().size() > 0) { //角色非空是操作 - List refUserRoles = new ArrayList<>(); - List roleNameList = new ArrayList<>(); - RefUserRole refUserRole = null; - - for (SysRole role : model.getRoles()) { - roleNameList.add(role.getName()); - // 用户角色关系创建 - refUserRole = new RefUserRole(sysUser.getId(), role.getId(), role.getName()); - refUserRoles.add(refUserRole); - } - - refUserRoleRDao.saveAll(refUserRoles); - // 角色名称冗余 - model.getUserInfo().setRedRoleNames(String.join(",",roleNameList)); - } - } - - /** - * 刷新用户部门关系 - * @param model - * @param sysUser - */ - private void refreshRefUserDepartment(UserModel model, SysUser sysUser) { - // 用户部门操作 - refUserDepartmentRDao.deleteByProperties("userId", sysUser.getId()); //删除用户部门关系 - /*if (null != model.getDepartments() && model.getDepartments().size() > 0) { - - List refUserDepartments = new ArrayList<>(); - StringBuffer departmentNames = new StringBuffer(); - RefUserDepartment refUserDepartment = null; - - for (Department department : model.getDepartments()) { - departmentNames.append("," + department.getDepartmentName()); - - // 用户部门关系创建 - refUserDepartment = new RefUserDepartment(sysUser.getId(), department.getId(), department.getDepartmentName()); - refUserDepartments.add(refUserDepartment); - } - - refUserDepartmentRDao.save(refUserDepartment); - // 部门名称冗余 - model.getUserInfo().setRedDepartmentNames(departmentNames.substring(1, departmentNames.length())); - }*/ - } - - - /** - * 刷新用户岗位关系 - * @param model - * @param sysUser - */ - private void refreshRefUserPosition(UserModel model, SysUser sysUser) { - /*refUserPositionRDao.deleteByProperties("userId", sysUser.getId()); //删除用户部门关系 - if (null != model.getPositions() && model.getPositions().size() > 0) { - - List refUserPositions = new ArrayList<>(); - StringBuffer positionNames = new StringBuffer(); - RefUserPosition refUserPosition = null; - for (Position position : model.getPositions()) { - positionNames.append("," + position.getPositionName()); - - // 用户岗位关系创建 - refUserPosition = new RefUserPosition(sysUser.getId(), position.getId(), position.getPositionName()); - refUserPositions.add(refUserPosition); - } - - refUserPositionRDao.saveAll(refUserPositions); - // 岗位名称冗余 - model.getUserInfo().setRedPositionNames(positionNames.substring(1, positionNames.length())); - }*/ - } - - - /** - * 部门真实性校验 - * @param department - */ - private void checkDepartment(Department department) { - if (null == department) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) - .setErrorDetail("部门不存在") - .setErrorSolution("请重新输入部门信息") - .build(); - } - } - - /** - * 岗位真实性 校验 - * @param position - */ - private void checkPosition(Position position) { - if (null == position) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) - .setErrorDetail("岗位不存在") - .setErrorSolution("请重新输入岗位信息") - .build(); - } - } - - /** - * 角色真实信息校验 - * @param sysRole - */ - private void checkSysRole(SysRole sysRole) { - if (null == sysRole) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) - .setErrorDetail("角色不存在") - .setErrorSolution("请重新输入角色信息") - .build(); - } - } - - /** - * 组织真实性校验 - * @param organize - */ - private void checkOrganize(Organize organize) { - if (null == organize) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) - .setErrorDetail("部门的组织不存在") - .setErrorSolution("请先完善组织信息") - .build(); - } - - } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeRecordingServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeRecordingServiceImpl.java index de60350..64a5284 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeRecordingServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeRecordingServiceImpl.java @@ -30,31 +30,31 @@ public class TaskTimeRecordingServiceImpl implements ITaskTimeRecordingService { private TaskTimeRecordingRepository taskTimeRecordingRDao; @Override - public void updateTaskTimedRecording(TaskTimeRecording taskTimeRecording) { + public void updateTaskTimeRecording(TaskTimeRecording taskTimeRecording) { LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING :{}", taskTimeRecording); taskTimeRecordingRDao.update(taskTimeRecording); } @Override - public void deleteTaskTimedRecordingById(String id) { + public void deleteTaskTimeRecordingById(String id) { LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING Key:{}", id); taskTimeRecordingRDao.deleteById(Long.parseLong(id)); } @Override - public TaskTimeRecording insertTaskTimedRecording(TaskTimeRecording taskTimeRecording) { + public TaskTimeRecording insertTaskTimeRecording(TaskTimeRecording taskTimeRecording) { LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING :{}", taskTimeRecording); return taskTimeRecordingRDao.insert(taskTimeRecording); } @Override - public List findTaskTimedRecordingAll() { + public List findTaskTimeRecordingAll() { LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING find All"); return taskTimeRecordingRDao.findAll(); } @Override - public TaskTimeRecording getTaskTimedRecordingById(String id) { + public TaskTimeRecording getTaskTimeRecordingById(String id) { LOGGER.info("定时任务执行记录 TASK_TIMED_RECORDING find id:{}", id); return taskTimeRecordingRDao.getOne(Long.parseLong(id)); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeServiceImpl.java index ac1df92..004298d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeServiceImpl.java @@ -31,13 +31,13 @@ public class TaskTimeServiceImpl implements ITaskTimeService { private TaskTimeRepository taskTimeRDao; @Override - public void updateTaskTimed(TaskTime taskTime) { + public void updateTaskTime(TaskTime taskTime) { LOGGER.info("定时任务 TASK_TIMED :{}", taskTime); taskTimeRDao.update(taskTime); } @Override - public void updateTaskTimedStatus(String id, int status, SessionUser user) { + public void updateTaskTimeStatus(String id, int status, SessionUser user) { LOGGER.info("定时任务 SYS_MENU id:{} status:{} user:{}", id,status,user); TaskTime taskTime = taskTimeRDao.getById(Long.parseLong(id)); taskTime.setTaskStatus(status); @@ -46,25 +46,25 @@ public class TaskTimeServiceImpl implements ITaskTimeService { } @Override - public void deleteTaskTimedById(String id) { + public void deleteTaskTimeById(String id) { LOGGER.info("定时任务 TASK_TIMED Key:{}", id); taskTimeRDao.deleteById(Long.parseLong(id)); } @Override - public TaskTime insertTaskTimed(TaskTime taskTime) { + public TaskTime insertTaskTime(TaskTime taskTime) { LOGGER.info("定时任务 TASK_TIMED :{}", taskTime); return taskTimeRDao.insert(taskTime); } @Override - public List findTaskTimedAll() { + public List listTaskTime() { LOGGER.info("定时任务 TASK_TIMED find All"); return taskTimeRDao.findAll(); } @Override - public TaskTime getTaskTimedById(String id) { + public TaskTime getTaskTimeById(String id) { LOGGER.info("定时任务 TASK_TIMED find id:{}", id); return taskTimeRDao.getOne(Long.parseLong(id)); }