diff --git a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java index d4ada64..1e6e30c 100644 --- a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java +++ b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java @@ -2,6 +2,7 @@ package com.lyms.cm.controller.sys; import java.util.Map; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -68,7 +69,7 @@ public class SysUsersController extends BaseController { @ResponseBody public Map list(Model model) { Page page = getPage(); - page = userService.getUserByPage(page); + page = userService.selectPage(page); return toGridData(page); } @@ -79,8 +80,10 @@ public class SysUsersController extends BaseController { */ @RequestMapping(value = { "/{id}/toEdit" }, method = RequestMethod.GET) public String toEdit(@PathVariable String id, Model model) { - SysUsers user = userService.getUserById(id); - model.addAttribute("user", user); + if (!StringUtils.isBlank(id)) { + SysUsers user = userService.selectById(id); + model.addAttribute("user", user); + } return "/user/user_edit"; } diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/SysRolesService.java b/center.manager/src/main/java/com/lyms/cm/service/sys/SysRolesService.java index 86d4a49..ea1845b 100644 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/SysRolesService.java +++ b/center.manager/src/main/java/com/lyms/cm/service/sys/SysRolesService.java @@ -1,6 +1,5 @@ package com.lyms.cm.service.sys; -import com.baomidou.mybatisplus.plugins.Page; import com.lyms.cm.entity.sys.SysRoles; import com.lyms.exception.SystemException; import com.lyms.web.service.BaseService; @@ -50,7 +49,8 @@ public interface SysRolesService extends BaseService { * @param page * @return */ - public Page getRolesByPage(Page page) throws SystemException; + // public Page getRolesByPage(Page page) throws + // SystemException; /** * 根据roleId 获取角色信息 @@ -59,7 +59,7 @@ public interface SysRolesService extends BaseService { * @return * @throws SystemException */ - public SysRoles getRoleById(String roleId) throws SystemException; + // public SysRoles getRoleById(String roleId) throws SystemException; /** * 禁/启用角色 diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/SysUsersService.java b/center.manager/src/main/java/com/lyms/cm/service/sys/SysUsersService.java index e3a94eb..ab5b9ea 100644 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/SysUsersService.java +++ b/center.manager/src/main/java/com/lyms/cm/service/sys/SysUsersService.java @@ -1,6 +1,5 @@ package com.lyms.cm.service.sys; -import com.baomidou.mybatisplus.plugins.Page; import com.lyms.cm.entity.sys.SysUsers; import com.lyms.exception.SystemException; import com.lyms.web.service.BaseService; @@ -40,19 +39,7 @@ public interface SysUsersService extends BaseService { * @return * @author maliang */ - public SysUsers getUserById(String userId) throws SystemException; - - /** - * 分页获取用户数据信息 - *

- * 该方法不携带任何过滤信息 - * - * @param page - * 分页对象 - * @return - * @throws SystemException - */ - public Page getUserByPage(Page page) throws SystemException; + // public SysUsers getUserById(String userId) throws SystemException; /** * 启用/停用 diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRolesServiceImpl.java b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRolesServiceImpl.java index f4f2ddb..8885694 100644 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRolesServiceImpl.java +++ b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRolesServiceImpl.java @@ -1,13 +1,10 @@ package com.lyms.cm.service.sys.impl; -import java.util.List; - import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.lyms.cm.dao.sys.SysRolesMapper; import com.lyms.cm.entity.sys.SysRoles; @@ -80,30 +77,27 @@ public class SysRolesServiceImpl extends ServiceImpl i return false; } - @Override - public Page getRolesByPage(Page page) throws SystemException { - - if (page == null) - return null; - - // TODO 添加参数过滤 - List roles = roleMapper.selectPage(page, null); - page.setRecords(roles); - - return page; - } - - @Override - public SysRoles getRoleById(String roleId) throws SystemException { - if (StringUtils.isBlank(roleId)) - return null; - return roleMapper.selectById(roleId); - } + /* + * @Override public Page getRolesByPage(Page page) + * throws SystemException { + * + * if (page == null) return null; + * + * // TODO 添加参数过滤 List roles = roleMapper.selectPage(page, null); + * page.setRecords(roles); + * + * return page; } + * + * @Override public SysRoles getRoleById(String roleId) throws + * SystemException { if (StringUtils.isBlank(roleId)) return null; return + * roleMapper.selectById(roleId); } + */ + @Transactional @Override public boolean enable(String roleId) throws SystemException { - SysRoles role = this.getRoleById(roleId); + SysRoles role = this.selectById(roleId); if (empty(role)) return false; diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUsersServiceImpl.java b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUsersServiceImpl.java index 15259d4..a4b369b 100644 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUsersServiceImpl.java +++ b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUsersServiceImpl.java @@ -1,13 +1,10 @@ package com.lyms.cm.service.sys.impl; -import java.util.List; - import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.lyms.cm.dao.sys.SysUsersMapper; import com.lyms.cm.entity.sys.SysUsers; @@ -83,18 +80,17 @@ public class SysUsersServiceImpl extends ServiceImpl i return tag != null && tag >= 1; } - @Override - public SysUsers getUserById(String userId) throws SystemException { - if (StringUtils.isBlank(userId)) - return null; - return userMapper.selectById(userId); - } + /* + * @Override public SysUsers getUserById(String userId) throws + * SystemException { if (StringUtils.isBlank(userId)) return null; return + * userMapper.selectById(userId); } + */ @Override @Transactional public boolean enabled(String userId) throws SystemException { // TODO 编写SQL 修改 - SysUsers user = this.getUserById(userId); + SysUsers user = this.selectById(userId); if (empty(user)) return false; @@ -108,17 +104,6 @@ public class SysUsersServiceImpl extends ServiceImpl i } @Override - public Page getUserByPage(Page page) throws SystemException { - - if (page == null) - return null; - // TODO 添加过过滤条件 - List users = userMapper.selectPage(page, null); - page.setRecords(users); - return page; - } - - @Override @Transactional public boolean delete(String userId) throws SystemException { diff --git a/center.manager/src/test/java/center/manager/test/user/UserTest.java b/center.manager/src/test/java/center/manager/test/user/UserTest.java index 7d5eaa3..3d7f44d 100644 --- a/center.manager/src/test/java/center/manager/test/user/UserTest.java +++ b/center.manager/src/test/java/center/manager/test/user/UserTest.java @@ -38,7 +38,7 @@ public class UserTest extends BaseTest { @Test public void updateUserTest() { - SysUsers user = userService.getUserById("6204903E7E1741688350349EF920ED88"); + SysUsers user = userService.selectById("6204903E7E1741688350349EF920ED88"); user.setName("hellow"); boolean tag = userService.updateUser(user); System.out.println(tag); @@ -53,7 +53,7 @@ public class UserTest extends BaseTest { @Test public void selectUserByPage() { Page page = new Page<>(1, 1); - Page result = userService.getUserByPage(page); + Page result = userService.selectPage(page); System.out.println(result.getRecords().size()); System.out.println(ToStringBuilder.reflectionToString(result)); }