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/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/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java new file mode 100644 index 0000000..058a0c5 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + + +import cn.estsh.i3plus.core.api.iservice.busi.IPositionService; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.web.WebAppConfiguration; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-29 19:12 + * @Modify : + **/ +@SpringBootTest +@WebAppConfiguration +@RunWith(SpringRunner.class) +public class TestBase { + + @Before + public void init() { + System.out.println("开始测试-----------------"); + } + + @After + public void after() { + System.out.println("测试结束-----------------"); + } + + @Autowired + private IPositionService positionService; + + + @Test + public void test1(){ + System.out.println(positionService); + } +} diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionServiceImpl.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionServiceImpl.java new file mode 100644 index 0000000..969ea29 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionServiceImpl.java @@ -0,0 +1,27 @@ +//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; +// +//import cn.estsh.i3plus.core.api.iservice.busi.IPositionService; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.test.context.SpringBootTest; +//import org.springframework.test.context.junit4.SpringRunner; +// +///** +// * @Description : +// * @Reference : +// * @Author : wei.peng +// * @Date : 2018-10-29 19:02 +// * @Modify : +// **/ +//@RunWith(SpringRunner.class) +//@SpringBootTest(classes = {cn.estsh.ImppGo.class}) +//public class TestPositionServiceImpl { +// +// @Autowired +// private IPositionService positionService; +// +// @Test +// public void test1(){ +// System.out.println(positionService); +// } +// +//}