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

规范实体字段

Browse Source
yun-zuoyi
yunhao.wang 7 years ago
parent 99ff3d783b
commit 68a3aac25a
9 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File

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

@ -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());

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

@ -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());
// 添加初始化

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

@ -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);

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

@ -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());

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

@ -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;

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

@ -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);
}
}

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

@ -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());
}
// 查询所属组织名称

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

@ -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);

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

@ -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());

Write Preview
Loading…
Cancel
Save