From 68a3aac25a4b6547668d759e72659877cdf4f42f Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 29 Oct 2018 17:46:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=AE=9E=E4=BD=93=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/controller/busi/DepartmentController.java | 4 ++-- .../core/apiservice/controller/busi/SysMessageController.java | 6 +++--- .../core/apiservice/controller/busi/SysUserController.java | 2 +- .../i3plus/core/apiservice/controller/busi/ToolController.java | 10 +++++----- .../core/apiservice/serviceimpl/base/SystemLoginService.java | 2 +- .../core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java | 2 +- .../apiservice/serviceimpl/busi/DepartmentServiceImpl.java | 4 ++-- .../core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java | 2 +- .../core/apiservice/serviceimpl/busi/SysUserServiceImpl.java | 8 ++++---- 9 files changed, 20 insertions(+), 20 deletions(-) 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 8e35f27..f93a4a8 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 @@ -48,7 +48,7 @@ public class DepartmentController { //条件验证 ValidatorBean.beginValid(department) - .notNull("departmentName", department.getDepartmentName()) + .notNull("departmentName", department.getName()) .notNull("departmentCode", department.getDepartmentCode()) .checkNotZero("organizeId",department.getOrganizeId()); @@ -76,7 +76,7 @@ public class DepartmentController { //条件验证 ValidatorBean.beginValid(department) .checkNotZero("id", department.getId()) - .notNull("departmentName", department.getDepartmentName()) + .notNull("departmentName", department.getName()) .notNull("departmentCode", department.getDepartmentCode()) .checkNotZero("organizeId",department.getOrganizeId()); 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 685c0fe..00a027e 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 @@ -47,14 +47,14 @@ public class SysMessageController { ValidatorBean.beginValid(sysMessage) .notNull("messageTitle",sysMessage.getMessageTitle()) .notNull("messageContent",sysMessage.getMessageContent()) - .checkNotZero("messageType",sysMessage.getMessageType()) + .checkNotZero("messageType",sysMessage.getMessageTypeId()) .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()); + sysMessage.setMessageStatusId(ImppEnumUtil.USER_MESSAGE_STATUS.UNREAD.getValue()); // TODO 状态 status sysMessageService.insertSysMessage(sysMessage); @@ -97,7 +97,7 @@ public class SysMessageController { ValidatorBean.beginValid(sysMessage) .notNull("messageTitle",sysMessage.getMessageTitle()) .notNull("messageContent",sysMessage.getMessageContent()) - .checkNotZero("messageType",sysMessage.getMessageType()) + .checkNotZero("messageType",sysMessage.getMessageTypeId()) .notNull("messageRecipientId",sysMessage.getMessageRecipientId()); // 添加初始化 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 a113226..1ebd659 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 @@ -62,7 +62,7 @@ public class SysUserController { //新增初始化 ConvertBean.modelInitialize(sysUser, AuthUtil.getSessionUser()); - sysUser.setUserStatus(CommonEnumUtil.USER_STATUS.NORMAL.getValue()); + sysUser.setUserStatusId(CommonEnumUtil.USER_STATUS.NORMAL.getValue()); sysUser.setUserTypeId(CommonEnumUtil.USER_TYPE.USER.getValue()); SysUser user = sysUserService.insertSysUser(sysUser); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java index 533a8c3..c3d7bb3 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java @@ -49,14 +49,14 @@ public class ToolController { ValidatorBean.beginValid(tool) .notNull("name",tool.getName()) .notNull("toolTypeId",tool.getToolTypeId()) - .notNull("toolConnType",tool.getToolConnType()) - .notNull("toolDataType",tool.getToolDataType()) + .notNull("toolConnType",tool.getToolConnTypeId()) + .notNull("toolDataType",tool.getToolDataTypeId()) .notNull("toolIp",tool.getToolIp()) .notNull("toolPort",tool.getToolPort()); // 添加初始化 ConvertBean.modelInitialize(tool,user); - tool.setToolStatus(ImppEnumUtil.COMM_STATUS.ENABLE.getValue()); + tool.setToolStatusId(ImppEnumUtil.COMM_STATUS.ENABLE.getValue()); toolService.insertTool(tool); return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); @@ -82,8 +82,8 @@ public class ToolController { ValidatorBean.beginValid(tool) .notNull("name",tool.getName()) .notNull("toolTypeId",tool.getToolTypeId()) - .notNull("toolConnType",tool.getToolConnType()) - .notNull("toolDataType",tool.getToolDataType()) + .notNull("toolConnType",tool.getToolConnTypeId()) + .notNull("toolDataType",tool.getToolDataTypeId()) .notNull("toolIp",tool.getToolIp()) .notNull("toolPort",tool.getToolPort()); 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 00e4f8a..94fa4a1 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 @@ -125,7 +125,7 @@ public class SystemLoginService implements ISystemLoginService { sessionUser.setLanguageCode(languageCode); // sessionUser.setSiteCode(user.getFactoryCode()); // sessionUser.setUserName(user.getName()); - sessionUser.setUserType(userType); + sessionUser.setUserTypeId(Integer.parseInt(userType)); // sessionUser.setUserCode(user.getUserInfo().getLanguageCode()); return sessionUser; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java index b8e4fa1..bb3b4fd 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeServiceImpl.java @@ -49,7 +49,7 @@ public class CoreTreeServiceImpl implements ICoreTreeService { } } - LOGGER.info("【{}】包含子集：{},步长：{}",parent.getDepartmentName(),childDepList.size(),step); + LOGGER.info("【{}】包含子集：{},步长：{}",parent.getName(),childDepList.size(),step); parent.setChildList(childDepList); } } 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 5246b0b..7424690 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 @@ -46,7 +46,7 @@ public class DepartmentServiceImpl implements IDepartmentService { Department parentPosition = departmentRDao.getById(department.getParentId()); ValidatorBean.checkNotNull(parentPosition); - department.setRedParentName(parentPosition.getDepartmentName()); + department.setRedParentName(parentPosition.getName()); } // 查询所属组织名称 @@ -87,7 +87,7 @@ public class DepartmentServiceImpl implements IDepartmentService { Department parentPosition = departmentRDao.getById(department.getParentId()); ValidatorBean.checkNotNull(parentPosition); - department.setRedParentName(parentPosition.getDepartmentName()); + department.setRedParentName(parentPosition.getName()); } // 查询所属组织名称 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java index 9885db9..d003b03 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleServiceImpl.java @@ -39,7 +39,7 @@ public class SysRoleServiceImpl implements ISysRoleService { public void updateSysRoleStatus(String id, int status, SessionUser user) { LOGGER.info("系统角色 SYS_MENU id:{} status:{} user:{}", id,status,user); SysRole role = sysRoleRDao.getById(Long.parseLong(id)); - role.setRoleStatus(status); + role.setRoleStatusId(status); role.setModifyUser(user.getUserName()); sysRoleRDao.update(role); 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 152bbcc..e163594 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 @@ -98,7 +98,7 @@ public class SysUserServiceImpl implements ISysUserService { public void updateSysUserStatus(String id, int status, SessionUser user) { LOGGER.info("平台用户 SYS_USER id:{} status:{} modifyUser:{}", id, status, user.getUserName()); SysUser sysUser = sysUserRDao.getById(Long.parseLong(id)); - sysUser.setUserStatus(status); + sysUser.setUserStatusId(status); sysUser.setModifyUser(user.getUserName()); sysUserRDao.update(sysUser); } @@ -171,7 +171,7 @@ public class SysUserServiceImpl implements ISysUserService { ValidatorBean.checkNotNull(dep); // 用户部门关系保存 - RefUserDepartment refUserDepartment = new RefUserDepartment(sysUser.getId(), dep.getId(), dep.getDepartmentName()); + RefUserDepartment refUserDepartment = new RefUserDepartment(sysUser.getId(), dep.getId(), dep.getName()); refUserDepartmentRDao.save(refUserDepartment); // 组织信息冗余 @@ -182,7 +182,7 @@ public class SysUserServiceImpl implements ISysUserService { } // 冗余 部门信息 - sysUser.setRedDepartmentName(dep.getDepartmentName()); + sysUser.setRedDepartmentName(dep.getName()); } } @@ -322,7 +322,7 @@ public class SysUserServiceImpl implements ISysUserService { public static SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType, String languageCode) { sessionUser.setLanguageCode(languageCode); sessionUser.setUserName(user.getName()); - sessionUser.setUserType(CommonEnumUtil.USER_TYPE.valueOf(userType)); + sessionUser.setUserTypeId(Integer.parseInt(CommonEnumUtil.USER_TYPE.valueOf(userType))); sessionUser.setUserCode(user.getUserInfo().getLanguageCode()); sessionUser.setRoleList(user.getRoleList()); sessionUser.setDepartmentList(user.getDepartmentList());