From d0655776c6f6d5076a195d0f3d3dd348f42b2b81 Mon Sep 17 00:00:00 2001 From: maliang Date: Mon, 6 Mar 2017 11:33:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A7=92=E8=89=B2=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/cm/controller/sys/SysUsersController.java | 60 ++++++++++++++++++- .../src/main/java/com/lyms/cm/enums/RoleType.java | 22 +++++++ .../com/lyms/cm/service/sys/ISysRolesService.java | 16 ----- .../com/lyms/cm/service/sys/ISysUsersService.java | 56 ------------------ .../com/lyms/cm/service/sys/SysRolesService.java | 38 ++++++++++++ .../com/lyms/cm/service/sys/SysUsersService.java | 69 ++++++++++++++++++++++ .../cm/service/sys/impl/SysRolesServiceImpl.java | 15 ++++- .../cm/service/sys/impl/SysUsersServiceImpl.java | 25 +++++++- .../src/main/resources/xml/app-shiro.xml | 7 ++- .../main/webapp/WEB-INF/views/user/user_edit.html | 8 +-- .../main/webapp/WEB-INF/views/user/user_list.html | 38 ++++++++---- .../java/center/manager/test/user/UserTest.java | 14 ++++- 12 files changed, 270 insertions(+), 98 deletions(-) create mode 100644 center.manager/src/main/java/com/lyms/cm/enums/RoleType.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/ISysRolesService.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/ISysUsersService.java create mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/SysRolesService.java create mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/SysUsersService.java 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 0a109c8..fd00fd3 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 @@ -1,12 +1,20 @@ package com.lyms.cm.controller.sys; +import java.util.Map; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import com.baomidou.mybatisplus.plugins.Page; import com.lyms.cm.entity.sys.SysUsers; -import com.lyms.cm.service.sys.ISysUsersService; +import com.lyms.cm.service.sys.SysUsersService; +import com.lyms.constants.OperationName; +import com.lyms.web.bean.AjaxResult; import com.lyms.web.controller.BaseController; /** @@ -22,7 +30,7 @@ import com.lyms.web.controller.BaseController; public class SysUsersController extends BaseController { @Autowired - private ISysUsersService userService; + private SysUsersService userService; /** * 创建用户 @@ -38,4 +46,52 @@ public class SysUsersController extends BaseController { return null; } + /** + * 跳转到用户列表页面 + * + * @return + */ + @RequestMapping(value = "/toList", method = { RequestMethod.GET }) + public String toList() { + return "/user/user_list"; + } + + /** + * 用户列表 + * + * @param page + * @param model + * @return + */ + @RequestMapping(value = "/list", method = { RequestMethod.POST, RequestMethod.GET }) + @ResponseBody + public Map list(Model model) { + Page page = getPage(); + page = userService.getUserByPage(page); + return toGridData(page); + } + + /** + * 跳转到编辑页面 + * + * @return + */ + @RequestMapping(value = { "/{id}/toEdit" }, method = RequestMethod.GET) + public String toEdit(@PathVariable String id, Model model) { + SysUsers user = userService.getUserById(id); + model.addAttribute("user", user); + return "/user/user_edit"; + } + + /** + * 修改信息 + */ + @RequestMapping(value = "/edit", method = { RequestMethod.POST }) + @ResponseBody + public AjaxResult update(SysUsers user, AjaxResult ajaxResult) { + boolean tag = userService.updateUser(user); + return handleAjaxResult(ajaxResult, tag, OperationName.UPDATE); + + } + } diff --git a/center.manager/src/main/java/com/lyms/cm/enums/RoleType.java b/center.manager/src/main/java/com/lyms/cm/enums/RoleType.java new file mode 100644 index 0000000..36594df --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/enums/RoleType.java @@ -0,0 +1,22 @@ +package com.lyms.cm.enums; + +/** + * 角色类型 + * + * @author maliang + * + */ +public enum RoleType { + + SYSTEM(0), USER(1); + + private int code; + + private RoleType(int code) { + this.code = code; + } + + public int getCode() { + return code; + } +} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/ISysRolesService.java b/center.manager/src/main/java/com/lyms/cm/service/sys/ISysRolesService.java deleted file mode 100644 index 0295a85..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/ISysRolesService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.lyms.cm.service.sys; - -import com.lyms.cm.entity.sys.SysRoles; -import com.lyms.web.service.BaseService; - -/** - *

- * 服务类 - *

- * - * @author maliang - * @since 2017-03-02 - */ -public interface ISysRolesService extends BaseService { - -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/ISysUsersService.java b/center.manager/src/main/java/com/lyms/cm/service/sys/ISysUsersService.java deleted file mode 100644 index c60ee76..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/ISysUsersService.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.lyms.cm.service.sys; - -import com.lyms.cm.entity.sys.SysUsers; -import com.lyms.exception.SystemException; -import com.lyms.web.service.BaseService; - -/** - *

- * 用户服务类 - *

- * - * @author maliang - * @since 2017-03-02 - */ -public interface ISysUsersService extends BaseService { - - /** - * 添加用户 - * - * @param user - * @return - * @author maliang - */ - public boolean addUser(SysUsers user) throws SystemException; - - /** - * 修改用户信息 - * - * @param user - * @return - * @author maliang - */ - public boolean updateUser(SysUsers user) throws SystemException; - - /** - * 根据ID获取用户信息 - * - * @param userId - * @return - * @author maliang - */ - public SysUsers getUserById(String userId) throws SystemException; - - /** - * 启用/停用 - *

- * 根据用户ID操作 - *

- * - * @param userId - * @return - * @author maliang - */ - public boolean enabled(String userId) throws SystemException; - -} 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 new file mode 100644 index 0000000..ea37b47 --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/service/sys/SysRolesService.java @@ -0,0 +1,38 @@ +package com.lyms.cm.service.sys; + +import com.lyms.cm.entity.sys.SysRoles; +import com.lyms.exception.SystemException; +import com.lyms.web.service.BaseService; + +/** + *

+ * 角色服务类 + *

+ * + * @author maliang + * @since 2017-03-02 + */ +public interface SysRolesService extends BaseService { + + /** + * 添加角色信息 + * + * @param role + * @return + * @throws SystemException + */ + public boolean addRole(SysRoles role) throws SystemException; + + /** + * 修改角色信息 + * + * @param role + * @return + * @throws SystemException + */ + public boolean updateRole(SysRoles role) 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 new file mode 100644 index 0000000..715550f --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/service/sys/SysUsersService.java @@ -0,0 +1,69 @@ +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; + +/** + *

+ * 用户服务类 + *

+ * + * @author maliang + * @since 2017-03-02 + */ +public interface SysUsersService extends BaseService { + + /** + * 添加用户 + * + * @param user + * @return + * @author maliang + */ + public boolean addUser(SysUsers user) throws SystemException; + + /** + * 修改用户信息 + * + * @param user + * @return + * @author maliang + */ + public boolean updateUser(SysUsers user) throws SystemException; + + /** + * 根据ID获取用户信息 + * + * @param userId + * @return + * @author maliang + */ + public SysUsers getUserById(String userId) throws SystemException; + + /** + * 分页获取用户数据信息 + *

+ * 该方法不携带任何过滤信息 + * + * @param page + * 分页对象 + * @return + * @throws SystemException + */ + public Page getUserByPage(Page page) throws SystemException; + + /** + * 启用/停用 + *

+ * 根据用户ID操作 + *

+ * + * @param userId + * @return + * @author maliang + */ + public boolean enabled(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 3742c9e..763baf4 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 @@ -5,7 +5,8 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.lyms.cm.dao.sys.SysRolesMapper; import com.lyms.cm.entity.sys.SysRoles; -import com.lyms.cm.service.sys.ISysRolesService; +import com.lyms.cm.service.sys.SysRolesService; +import com.lyms.exception.SystemException; /** *

@@ -16,6 +17,16 @@ import com.lyms.cm.service.sys.ISysRolesService; * @since 2017-03-02 */ @Service -public class SysRolesServiceImpl extends ServiceImpl implements ISysRolesService { +public class SysRolesServiceImpl extends ServiceImpl implements SysRolesService { + + @Override + public boolean addRole(SysRoles role) throws SystemException { + return false; + } + + @Override + public boolean updateRole(SysRoles role) throws SystemException { + 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 0af26ce..19002e4 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,15 +1,18 @@ 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; import com.lyms.cm.enums.UserStatusEnum; -import com.lyms.cm.service.sys.ISysUsersService; +import com.lyms.cm.service.sys.SysUsersService; import com.lyms.exception.SystemException; import com.lyms.util.MD5Utils; import com.lyms.util.StrUtils; @@ -23,7 +26,7 @@ import com.lyms.util.StrUtils; * @since 2017-03-02 */ @Service -public class SysUsersServiceImpl extends ServiceImpl implements ISysUsersService { +public class SysUsersServiceImpl extends ServiceImpl implements SysUsersService { @Autowired private SysUsersMapper userMapper; @@ -45,7 +48,9 @@ public class SysUsersServiceImpl extends ServiceImpl i if (empty(user)) return; String pwd = user.getPwd(); - pwd = DEFAULT_PWD; + if (StringUtils.isBlank(pwd)) { + pwd = DEFAULT_PWD; + } String encode = MD5Utils.md5(pwd); user.setPwd(encode); } @@ -69,6 +74,10 @@ public class SysUsersServiceImpl extends ServiceImpl i public boolean updateUser(SysUsers user) throws SystemException { if (empty(user)) return false; + + // 初始密码 + this.initPwd(user); + Integer tag = userMapper.updateById(user); return tag != null && tag >= 1; } @@ -97,4 +106,14 @@ public class SysUsersServiceImpl extends ServiceImpl i return this.updateUser(user); } + @Override + public Page getUserByPage(Page page) throws SystemException { + + if (page == null) + return null; + List users = userMapper.selectPage(page, null); + page.setRecords(users); + return page; + } + } diff --git a/center.manager/src/main/resources/xml/app-shiro.xml b/center.manager/src/main/resources/xml/app-shiro.xml index 00a540c..32d4b75 100644 --- a/center.manager/src/main/resources/xml/app-shiro.xml +++ b/center.manager/src/main/resources/xml/app-shiro.xml @@ -31,7 +31,7 @@ - + @@ -45,11 +45,12 @@ - /login = anon + /login = anon + /sysUsers/** =anon /logout = logout /static/** = anon /authenticated = authc - /** = user,forceLogout + /** = user,forceLogout diff --git a/center.manager/src/main/webapp/WEB-INF/views/user/user_edit.html b/center.manager/src/main/webapp/WEB-INF/views/user/user_edit.html index 5c7e957..6d2b202 100644 --- a/center.manager/src/main/webapp/WEB-INF/views/user/user_edit.html +++ b/center.manager/src/main/webapp/WEB-INF/views/user/user_edit.html @@ -6,13 +6,13 @@

- +
- +
@@ -31,9 +31,9 @@ var data = $('#validForm').serialize(); data = data + "&" + $('#roleForm').serialize(); if("$!user.id" == ""){ - ajaxPost(APP.PATH + "/user/create",data); + ajaxPost(APP.PATH + "/sysUsers/create",data); }else{ - ajaxPost(APP.PATH + "/user/update",data); + ajaxPost(APP.PATH + "/sysUsers/update",data); } parent.reloadGrid('datagrid'); } diff --git a/center.manager/src/main/webapp/WEB-INF/views/user/user_list.html b/center.manager/src/main/webapp/WEB-INF/views/user/user_list.html index 150e96e..46bdcea 100644 --- a/center.manager/src/main/webapp/WEB-INF/views/user/user_list.html +++ b/center.manager/src/main/webapp/WEB-INF/views/user/user_list.html @@ -40,7 +40,7 @@ function add() { function edit(){ var id = getSingleSelectedValue("dataTable","id"); if(id){ - popWindow("修改用户", APP.PATH+"/user/" + id + "/toEdit",700,400); + popWindow("修改用户", APP.PATH+"/sysUsers/" + id + "/toEdit",700,400); } } @@ -49,23 +49,41 @@ function del(){ } ## 参考 base_table_init.js 或者根据empty_bootstrap_table_init.js 来自己创建特殊的table ## 注意:自己创建的特殊的table不能extends base_list.html -var default_dataUrl = APP.PATH + "/user/getUserList"; +var default_dataUrl = APP.PATH + "/sysUsers/list"; var default_dataColumns = [{ field: 'check_state', title: '', checkbox: true },{ field: 'id', - title: '序号' - }, { - field: 'username', - title: '登录名' + title: '编号' + },{ + field: 'type', + title: '类型' }, { - field: 'password', - title: '密码' + field: 'account', + title: '帐号' + },{ + field: 'orgId', + title: '机构' + },{ + field: 'deptId', + title: '部门' + },{ + field: 'name', + title: '名称' + },{ + field: 'phone', + title: '手机号' + },{ + field: 'publishId', + title: '发布者' + },{ + field: 'yn', + title: '状态' },{ - field: 'roles', - title: '角色' + field: 'enable', + title: '启/停用' }]; #end 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 647cdff..7d5eaa3 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 @@ -2,18 +2,20 @@ package center.manager.test.user; import java.util.Date; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; +import com.baomidou.mybatisplus.plugins.Page; import com.lyms.cm.entity.sys.SysUsers; -import com.lyms.cm.service.sys.ISysUsersService; +import com.lyms.cm.service.sys.SysUsersService; public class UserTest extends BaseTest { @Autowired - private ISysUsersService userService; + private SysUsersService userService; SysUsers user = null; @@ -48,4 +50,12 @@ public class UserTest extends BaseTest { System.out.println(tag); } + @Test + public void selectUserByPage() { + Page page = new Page<>(1, 1); + Page result = userService.getUserByPage(page); + System.out.println(result.getRecords().size()); + System.out.println(ToStringBuilder.reflectionToString(result)); + } + } -- 1.8.3.1