From 98f4a662cbd44211edda12dbcbb3752a8df3f2c7 Mon Sep 17 00:00:00 2001 From: fangcheng Date: Tue, 7 Mar 2017 17:13:00 +0800 Subject: [PATCH] role init voer --- .../lyms/cm/controller/sys/SysRolesController.java | 74 ++++++++++++-- .../lyms/cm/controller/sys/SysUsersController.java | 13 ++- .../java/com/lyms/cm/dao/sys/SysRolesMapper.java | 11 ++- .../java/com/lyms/cm/dao/sys/SysRolesMapper.xml | 18 ++++ .../com/lyms/cm/dao/sys/SysUserRoleMapsMapper.java | 20 ++++ .../com/lyms/cm/dao/sys/SysUserRoleMapsMapper.xml | 17 ++++ .../java/com/lyms/cm/dao/sys/SysUsersMapper.java | 13 +-- .../java/com/lyms/cm/dao/sys/SysUsersMapper.xml | 30 ++++++ .../main/java/com/lyms/cm/entity/sys/SysRoles.java | 50 +++++----- .../com/lyms/cm/entity/sys/SysUserRoleMaps.java | 75 ++++++++++++++ .../main/java/com/lyms/cm/entity/sys/SysUsers.java | 87 +++++++--------- .../com/lyms/cm/service/sys/SysRolesService.java | 67 ++----------- .../cm/service/sys/SysUserRoleMapsService.java | 24 +++++ .../com/lyms/cm/service/sys/SysUsersService.java | 95 ++++++++++-------- .../cm/service/sys/impl/SysRolesServiceImpl.java | 110 ++------------------- .../sys/impl/SysUserRoleMapsServiceImpl.java | 24 +++++ .../cm/service/sys/impl/SysUsersServiceImpl.java | 20 ++-- .../src/main/resources/xml/app-datasource.xml | 10 +- .../src/main/webapp/WEB-INF/views/common/base.html | 5 + .../webapp/WEB-INF/views/common/base_list.html | 5 + .../main/webapp/WEB-INF/views/role/role_edit.html | 68 +++++++++++++ .../main/webapp/WEB-INF/views/role/role_list.html | 41 ++++++-- .../main/webapp/WEB-INF/views/user/user_edit.html | 2 +- .../main/webapp/WEB-INF/views/user/user_list.html | 14 +-- .../lyms/mybatis/DeleteLogicByIdSqlInjector.java | 41 ++++++++ .../src/main/resources/template/entity.java.vm | 2 - .../src/main/resources/template/mapper.java.vm | 3 + .../src/main/resources/template/service.java.vm | 8 ++ .../main/resources/template/serviceImpl.java.vm | 4 + .../mybatisplus/test/generator/MysqlGenerator.java | 11 ++- 30 files changed, 628 insertions(+), 334 deletions(-) create mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysUserRoleMapsMapper.java create mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysUserRoleMapsMapper.xml create mode 100644 center.manager/src/main/java/com/lyms/cm/entity/sys/SysUserRoleMaps.java create mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/SysUserRoleMapsService.java create mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUserRoleMapsServiceImpl.java create mode 100644 center.manager/src/main/webapp/WEB-INF/views/role/role_edit.html create mode 100644 core.sdk/src/main/java/com/lyms/mybatis/DeleteLogicByIdSqlInjector.java diff --git a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java index 053872d..1109cf4 100644 --- a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java +++ b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java @@ -1,15 +1,21 @@ package com.lyms.cm.controller.sys; - +import org.apache.commons.lang3.StringUtils; 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.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.lyms.cm.entity.sys.SysRoles; import com.lyms.cm.service.sys.SysRolesService; +import com.lyms.constants.OperationName; +import com.lyms.util.StrUtils; +import com.lyms.web.bean.AjaxResult; import com.lyms.web.controller.BaseController; /** @@ -23,11 +29,10 @@ import com.lyms.web.controller.BaseController; @Controller @RequestMapping("/sysRoles") public class SysRolesController extends BaseController { - + @Autowired private SysRolesService sysRolesService; - - + @RequestMapping("/toList") public String list() { return "/role/role_list"; @@ -35,9 +40,64 @@ public class SysRolesController extends BaseController { @RequestMapping(value = "/getRoleList", method = { RequestMethod.POST }) @ResponseBody - public java.util.Map getRoleList(){ + public java.util.Map getRoleList() { Page page = getPage(); - return toGridData(sysRolesService.selectPage(page)); + EntityWrapper ew = new EntityWrapper(); + ew.where("ifDel=0"); + return toGridData(sysRolesService.selectPage(page,ew)); + } + + /** + * 跳转到编辑页面 + * + * @return + */ + @RequestMapping(value = { "/{id}/toEdit" }, method = RequestMethod.GET) + public String toEdit(@PathVariable String id, Model model) { + if (!StringUtils.isBlank(id) && !"0".equals(id)) { + SysRoles role = sysRolesService.selectById(id); + model.addAttribute("role", role); + } + return "/role/role_edit"; + } + + /** + * 创建用户 + *

+ * TODO + * + * @param user + * @return + */ + @RequestMapping(value = "/create", method = RequestMethod.POST) + @ResponseBody + public AjaxResult create(SysRoles role, AjaxResult ajaxResult) { + role.setId(StrUtils.uuid()); + role.setIfdel(0); + boolean tag = sysRolesService.insert(role); + return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); + } + + /** + * 修改信息 + */ + @RequestMapping(value = "/update", method = { RequestMethod.POST }) + @ResponseBody + public AjaxResult update(SysRoles role, AjaxResult ajaxResult) { + boolean tag = sysRolesService.updateById(role); + return handleAjaxResult(ajaxResult, tag, OperationName.UPDATE); } - + + /** + * 删除用户 + * + * @return + */ + @RequestMapping(value = "/{id}/delete", method = { RequestMethod.GET, RequestMethod.POST }) + @ResponseBody + public AjaxResult delete(@PathVariable String id, AjaxResult ajaxResult) { + int tag = sysRolesService.deleteLogicById(id); + return handleAjaxResult(ajaxResult, tag, OperationName.DELETE); + } + } 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 1e6e30c..eda1dcd 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 @@ -11,6 +11,7 @@ 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.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.lyms.cm.entity.sys.SysUsers; import com.lyms.cm.service.sys.SysUsersService; @@ -44,7 +45,7 @@ public class SysUsersController extends BaseController { @RequestMapping(value = "/create", method = RequestMethod.POST) @ResponseBody public AjaxResult create(SysUsers user, AjaxResult ajaxResult) { - boolean tag = userService.updateUser(user); + boolean tag = userService.addUser(user); return handleAjaxResult(ajaxResult, tag, OperationName.UPDATE); } @@ -69,7 +70,9 @@ public class SysUsersController extends BaseController { @ResponseBody public Map list(Model model) { Page page = getPage(); - page = userService.selectPage(page); + EntityWrapper ew = new EntityWrapper(); + ew.where("ifDel=0"); + page = userService.selectPage(page,ew); return toGridData(page); } @@ -90,7 +93,7 @@ public class SysUsersController extends BaseController { /** * 修改信息 */ - @RequestMapping(value = "/edit", method = { RequestMethod.POST }) + @RequestMapping(value = "/update", method = { RequestMethod.POST }) @ResponseBody public AjaxResult update(SysUsers user, AjaxResult ajaxResult) { boolean tag = userService.updateUser(user); @@ -105,8 +108,8 @@ public class SysUsersController extends BaseController { */ @RequestMapping(value = "/{id}/delete", method = { RequestMethod.GET, RequestMethod.POST }) @ResponseBody - public AjaxResult del(@PathVariable String id, AjaxResult ajaxResult) { - boolean tag = userService.delete(id); + public AjaxResult delete(@PathVariable String id, AjaxResult ajaxResult) { + int tag = userService.deleteLogicById(id); return handleAjaxResult(ajaxResult, tag, OperationName.DELETE); } diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.java b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.java index b11cf8c..072656f 100644 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.java +++ b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.java @@ -1,19 +1,20 @@ package com.lyms.cm.dao.sys; - -import com.baomidou.mybatisplus.mapper.BaseMapper; import com.lyms.cm.entity.sys.SysRoles; - +import com.baomidou.mybatisplus.mapper.BaseMapper; import org.springframework.stereotype.Repository; +import java.io.Serializable; /** *

* Mapper接口 *

* - * @author maliang - * @since 2017-03-02 + * @author fangcheng + * @since 2017-03-07 */ @Repository public interface SysRolesMapper extends BaseMapper { + public Integer deleteLogicById(Serializable id); + } \ No newline at end of file diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.xml b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.xml index 779cd69..9916a26 100644 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.xml +++ b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.xml @@ -2,5 +2,23 @@ + + + + + + + + + + + + + + + + + ID AS id, TYPE AS type, NAME AS name, PUBLISH_ID AS publishId, ENABLE AS enable, IFDEL AS ifdel, REMARKS AS remarks, SHORT_CODE AS shortCode, ORG_ID AS orgId, CREATED AS created, MODIFIED AS modified + diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUserRoleMapsMapper.java b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUserRoleMapsMapper.java new file mode 100644 index 0000000..80a9be5 --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUserRoleMapsMapper.java @@ -0,0 +1,20 @@ +package com.lyms.cm.dao.sys; + +import com.lyms.cm.entity.sys.SysUserRoleMaps; +import com.baomidou.mybatisplus.mapper.BaseMapper; +import org.springframework.stereotype.Repository; +import java.io.Serializable; +/** + *

+ * Mapper接口 + *

+ * + * @author fangcheng + * @since 2017-03-07 + */ +@Repository +public interface SysUserRoleMapsMapper extends BaseMapper { + + public Integer deleteLogicById(Serializable id); + +} \ No newline at end of file diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUserRoleMapsMapper.xml b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUserRoleMapsMapper.xml new file mode 100644 index 0000000..82c0510 --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUserRoleMapsMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + ID AS id, USER_ID AS userId, ROLE_ID AS roleId, IFDEL AS ifdel + + diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.java b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.java index 1cef2aa..3c74f04 100644 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.java +++ b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.java @@ -1,19 +1,20 @@ package com.lyms.cm.dao.sys; -import org.springframework.stereotype.Repository; - -import com.baomidou.mybatisplus.mapper.BaseMapper; import com.lyms.cm.entity.sys.SysUsers; - +import com.baomidou.mybatisplus.mapper.BaseMapper; +import org.springframework.stereotype.Repository; +import java.io.Serializable; /** *

* Mapper接口 *

* - * @author maliang - * @since 2017-03-02 + * @author fangcheng + * @since 2017-03-07 */ @Repository public interface SysUsersMapper extends BaseMapper { + public Integer deleteLogicById(Serializable id); + } \ No newline at end of file diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.xml b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.xml index 91455c7..bd8b75c 100644 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.xml +++ b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.xml @@ -2,5 +2,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, TYPE AS type, ORG_ID AS orgId, DEPT_ID AS deptId, NAME AS name, ACCOUNT AS account, PWD AS pwd, PHONE AS phone, PUBLISH_ID AS publishId, IFDEL AS ifdel, ENABLE AS enable, MODIFIED AS modified, CREATED AS created, REMARKS AS remarks, LAST_LOGIN_TIME AS lastLoginTime, FOREIGN_ID AS foreignId, OTHER_ACCOUNT AS otherAccount, EMPLOYEE_ID AS employeeId, EXPIR_TIME AS expirTime, LEVEL AS level, AVATAR AS avatar, WORK_TIME AS workTime, GOOD_AT AS goodAt + diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRoles.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRoles.java index d950cd2..99a1134 100644 --- a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRoles.java +++ b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRoles.java @@ -1,81 +1,81 @@ package com.lyms.cm.entity.sys; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.annotations.TableField; import java.io.Serializable; import java.util.Date; -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableName; -import com.lyms.cm.enums.StatusEnum; - /** *

* 角色表 *

* - * @author maliang - * @since 2017-03-02 + * @author fangcheng + * @since 2017-03-07 */ @TableName("SYS_ROLES") public class SysRoles implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** * */ - @TableField(value = "ID") + @TableId(value="ID") private String id; /** * 0:管理员角色,1:用户角色 */ - @TableField(value = "TYPE") + @TableField(value="TYPE") private Integer type; /** * 角色名称 */ - @TableField(value = "NAME") + @TableField(value="NAME") private String name; /** * */ - @TableField(value = "PUBLISH_ID") + @TableField(value="PUBLISH_ID") private String publishId; /** * 1：启用，2：停用 */ - @TableField(value = "ENABLE") + @TableField(value="ENABLE") private Integer enable; /** * 1：有效，2：无效 */ - @TableField(value = "YN") - private Integer yn; + @TableField(value="IFDEL") + private Integer ifdel; /** * 备注 */ - @TableField(value = "REMARKS") + @TableField(value="REMARKS") private String remarks; /** * 简码 */ - @TableField(value = "SHORT_CODE") + @TableField(value="SHORT_CODE") private String shortCode; /** * 机构id */ - @TableField(value = "ORG_ID") + @TableField(value="ORG_ID") private String orgId; /** * */ - @TableField(value = "CREATED") + @TableField(value="CREATED") private Date created; /** * */ - @TableField(value = "MODIFIED") + @TableField(value="MODIFIED") private Date modified; + public String getId() { return id; } @@ -116,12 +116,12 @@ public class SysRoles implements Serializable { this.enable = enable; } - public Integer getYn() { - return yn; + public Integer getIfdel() { + return ifdel; } - public void setYn(Integer yn) { - this.yn = yn; + public void setIfdel(Integer ifdel) { + this.ifdel = ifdel; } public String getRemarks() { @@ -164,8 +164,4 @@ public class SysRoles implements Serializable { this.modified = modified; } - public boolean isEnabled() { - return StatusEnum.isEnabled(this.getEnable()); - } - } diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUserRoleMaps.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUserRoleMaps.java new file mode 100644 index 0000000..2a64661 --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUserRoleMaps.java @@ -0,0 +1,75 @@ +package com.lyms.cm.entity.sys; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; + +/** + *

+ * 用户角色关系表 + *

+ * + * @author fangcheng + * @since 2017-03-07 + */ +@TableName("SYS_USER_ROLE_MAPS") +public class SysUserRoleMaps implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableField(value="ID") + private String id; + /** + * + */ + @TableField(value="USER_ID") + private String userId; + /** + * + */ + @TableField(value="ROLE_ID") + private String roleId; + /** + * + */ + @TableField(value="IFDEL") + private Integer ifdel; + + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getRoleId() { + return roleId; + } + + public void setRoleId(String roleId) { + this.roleId = roleId; + } + + public Integer getIfdel() { + return ifdel; + } + + public void setIfdel(Integer ifdel) { + this.ifdel = ifdel; + } + +} diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUsers.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUsers.java index 855aab9..1e3ddb9 100644 --- a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUsers.java +++ b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUsers.java @@ -5,152 +5,137 @@ import java.util.Date; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; -import com.lyms.cm.enums.StatusEnum; -import com.lyms.cm.enums.TypeEnum; -import com.lyms.cm.enums.ValidityEnum; /** *

* 用户表 *

* - * @author maliang - * @since 2017-03-02 + * @author fangcheng + * @since 2017-03-07 */ @TableName("SYS_USERS") public class SysUsers implements Serializable { - private static final long serialVersionUID = 1L; - - // 初始默认值 - public SysUsers() { - // this.setType(UserTypeEnum.USER.getType()); - // this.setEnable(UserStatusEnum.ENABLED.getStatus()); - // this.setCreated(new Date()); - } + private static final long serialVersionUID = 1L; /** * */ - @TableField(value = "ID") + @TableField(value="ID") private String id; /** * 0:管理员,1:用户 - *

- * {@link TypeEnum#MANAGER} OR {@link TypeEnum#USER} */ - @TableField(value = "TYPE") - private Integer type = TypeEnum.USER.getType(); + @TableField(value="TYPE") + private Integer type; /** * 机构id */ - @TableField(value = "ORG_ID") + @TableField(value="ORG_ID") private String orgId; /** * 部门id */ - @TableField(value = "DEPT_ID") + @TableField(value="DEPT_ID") private String deptId; /** * 名称 */ - @TableField(value = "NAME") + @TableField(value="NAME") private String name; /** * 帐号 */ - @TableField(value = "ACCOUNT") + @TableField(value="ACCOUNT") private String account; /** * 名字 */ - @TableField(value = "PWD") + @TableField(value="PWD") private String pwd; /** * 手机号 */ - @TableField(value = "PHONE") + @TableField(value="PHONE") private String phone; /** * 发布者id */ - @TableField(value = "PUBLISH_ID") + @TableField(value="PUBLISH_ID") private Integer publishId; /** * 1：有效，2：无效 - *

- * {@link ValidityEnum#VALIDITY} OR {@link ValidityEnum#UNVALIDITY} */ - @TableField(value = "YN") - private Integer yn = ValidityEnum.VALIDITY.getValidity(); + @TableField(value="IFDEL") + private Integer ifdel; /** * 1：启用，2：停用 - *

- * {@link StatusEnum#ENABLED} OR {@link StatusEnum#DISENABLED} */ - @TableField(value = "ENABLE") - private Integer enable = StatusEnum.ENABLED.getStatus(); + @TableField(value="ENABLE") + private Integer enable; /** * 最后修改时间 */ - @TableField(value = "MODIFIED") + @TableField(value="MODIFIED") private Date modified; /** * 创建时间 */ - @TableField(value = "CREATED") + @TableField(value="CREATED") private Date created; /** * 备注 */ - @TableField(value = "REMARKS") + @TableField(value="REMARKS") private String remarks; /** * 最后登录时间 */ - @TableField(value = "LAST_LOGIN_TIME") + @TableField(value="LAST_LOGIN_TIME") private Date lastLoginTime; /** * 导入数据的源id */ - @TableField(value = "FOREIGN_ID") + @TableField(value="FOREIGN_ID") private String foreignId; /** * 医院的帐号 */ - @TableField(value = "OTHER_ACCOUNT") + @TableField(value="OTHER_ACCOUNT") private String otherAccount; /** * */ - @TableField(value = "EMPLOYEE_ID") + @TableField(value="EMPLOYEE_ID") private String employeeId; /** * */ - @TableField(value = "EXPIR_TIME") + @TableField(value="EXPIR_TIME") private Date expirTime; /** * */ - @TableField(value = "LEVEL") + @TableField(value="LEVEL") private Integer level; /** * */ - @TableField(value = "AVATAR") + @TableField(value="AVATAR") private String avatar; /** * */ - @TableField(value = "WORK_TIME") + @TableField(value="WORK_TIME") private String workTime; /** * */ - @TableField(value = "GOOD_AT") + @TableField(value="GOOD_AT") private String goodAt; + public String getId() { return id; } @@ -223,12 +208,12 @@ public class SysUsers implements Serializable { this.publishId = publishId; } - public Integer getYn() { - return yn; + public Integer getIfdel() { + return ifdel; } - public void setYn(Integer yn) { - this.yn = yn; + public void setIfdel(Integer ifdel) { + this.ifdel = ifdel; } public Integer getEnable() { @@ -335,8 +320,4 @@ public class SysUsers implements Serializable { this.goodAt = goodAt; } - public boolean isEnabled() { - return StatusEnum.isEnabled(this.getEnable()); - } - } 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 ea1845b..a9b83a6 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,73 +1,24 @@ package com.lyms.cm.service.sys; import com.lyms.cm.entity.sys.SysRoles; -import com.lyms.exception.SystemException; import com.lyms.web.service.BaseService; +import java.io.Serializable; /** *

- * 角色服务类 + * 服务类 *

* * @author maliang - * @since 2017-03-02 + * @since 2017-03-07 */ 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; - - /** - * 删除角色信息 - * - * @param roleId - * @return - * @throws SystemException - */ - public boolean deleteRole(String roleId) throws SystemException; - - /** - * 分页获取角色信息 - *

- * 目前没有参数设置，过滤 - * - * @param page - * @return - */ - // public Page getRolesByPage(Page page) throws - // SystemException; - - /** - * 根据roleId 获取角色信息 - * - * @param roleId - * @return - * @throws SystemException - */ - // public SysRoles getRoleById(String roleId) throws SystemException; - - /** - * 禁/启用角色 - * - * @param roleId - * @return - * @throws SystemException - */ - public boolean enable(String roleId) throws SystemException; + /** + *

  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 + *
  • @param id 删除主键id + *
  • @return 大于0修改成功，否则为失败 + */ + public Integer deleteLogicById(Serializable id); } diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/SysUserRoleMapsService.java b/center.manager/src/main/java/com/lyms/cm/service/sys/SysUserRoleMapsService.java new file mode 100644 index 0000000..9b72c21 --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/service/sys/SysUserRoleMapsService.java @@ -0,0 +1,24 @@ +package com.lyms.cm.service.sys; + +import com.lyms.cm.entity.sys.SysUserRoleMaps; +import com.lyms.web.service.BaseService; +import java.io.Serializable; + +/** + *

    + * 服务类 + *

    + * + * @author fangcheng + * @since 2017-03-07 + */ +public interface SysUserRoleMapsService extends BaseService { + + /** + *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 + *
  • @param id 删除主键id + *
  • @return 大于0修改成功，否则为失败 + */ + public Integer deleteLogicById(Serializable id); + +} 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 ab5b9ea..98feba9 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,5 +1,7 @@ package com.lyms.cm.service.sys; +import java.io.Serializable; + import com.lyms.cm.entity.sys.SysUsers; import com.lyms.exception.SystemException; import com.lyms.web.service.BaseService; @@ -14,52 +16,59 @@ import com.lyms.web.service.BaseService; */ public interface SysUsersService extends BaseService { - /** - * 添加用户 - * - * @param user - * @return - * @author maliang - */ - public boolean addUser(SysUsers user) throws SystemException; + /** + * 添加用户 + * + * @param user + * @return + * @author maliang + */ + public boolean addUser(SysUsers user) throws SystemException; + + /** + * 修改用户信息 + * + * @param user + * @return + * @author maliang + */ + public boolean updateUser(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 SysUsers getUserById(String userId) throws SystemException; + /** + * 启用/停用 + *

    + * 根据用户ID操作 + *

    + * + * @param userId + * @return + * @author maliang + */ + public boolean enabled(String userId) throws SystemException; - /** - * 启用/停用 - *

    - * 根据用户ID操作 - *

    - * - * @param userId - * @return - * @author maliang - */ - public boolean enabled(String userId) throws SystemException; + /** + * 删除用户信息 + * + * @param userId + * @return + * @throws SystemException + */ + public boolean delete(String userId) throws SystemException; - /** - * 删除用户信息 - * - * @param userId - * @return - * @throws SystemException - */ - public boolean delete(String userId) throws SystemException; + /** + *

  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 + *
  • @param id 删除主键id + *
  • @return 大于0修改成功，否则为失败 + */ + public Integer deleteLogicById(Serializable id); } 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 0005058..0b13685 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,116 +1,24 @@ package com.lyms.cm.service.sys.impl; -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.service.impl.ServiceImpl; -import com.lyms.cm.dao.sys.SysRolesMapper; import com.lyms.cm.entity.sys.SysRoles; -import com.lyms.cm.enums.StatusEnum; -import com.lyms.cm.enums.ValidityEnum; +import com.lyms.cm.dao.sys.SysRolesMapper; import com.lyms.cm.service.sys.SysRolesService; -import com.lyms.exception.SystemException; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import java.io.Serializable; /** *

    - * 角色表 服务实现类 + * 角色表 服务实现类 *

    * * @author maliang - * @since 2017-03-02 + * @since 2017-03-07 */ @Service public class SysRolesServiceImpl extends ServiceImpl implements SysRolesService { - - @Autowired - private SysRolesMapper roleMapper; - - /** - * 实体空判断 - * - * @param role - * @return - */ - private boolean empty(SysRoles role) { - return role == null; + + public Integer deleteLogicById(Serializable id){ + return baseMapper.deleteLogicById(id); } - - @Transactional - @Override - public boolean addRole(SysRoles role) throws SystemException { - if (empty(role)) - return false; - Integer tag = roleMapper.insert(role); - return tag != null && tag >= 1; - } - - @Override - @Transactional - public boolean updateRole(SysRoles role) throws SystemException { - if (empty(role)) - return false; - Integer tag = roleMapper.updateById(role); - return tag != null && tag >= 1; - } - - @Override - @Transactional - public boolean deleteRole(String roleId) throws SystemException { - if (StringUtils.isBlank(roleId)) - return false; - // 并非真实删除，通过字段属性控制 - // TODO 通过sql 修改 - SysRoles role = roleMapper.selectById(roleId); - if (role != null) { - Integer yn = role.getYn(); - if (yn == null || yn == ValidityEnum.VALIDITY.getValidity()) { - yn = ValidityEnum.UNVALIDITY.getValidity(); - } else { - yn = ValidityEnum.VALIDITY.getValidity(); - } - role.setYn(yn); - Integer tag = roleMapper.updateById(role); - return tag != null && tag >= 1; - } - 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); } - */ - - @Transactional - @Override - public boolean enable(String roleId) throws SystemException { - - SysRoles role = this.selectById(roleId); - - if (empty(role)) - return false; - - // 判断当前用户的启用，禁用情况 - // TODO 拆分成SQL执行，两种操作 - if (role.isEnabled()) { - role.setEnable(StatusEnum.DISENABLED.getStatus()); - } else { - role.setEnable(StatusEnum.ENABLED.getStatus()); - } - - return false; - } - } diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUserRoleMapsServiceImpl.java b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUserRoleMapsServiceImpl.java new file mode 100644 index 0000000..4315dd6 --- /dev/null +++ b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUserRoleMapsServiceImpl.java @@ -0,0 +1,24 @@ +package com.lyms.cm.service.sys.impl; + +import com.lyms.cm.entity.sys.SysUserRoleMaps; +import com.lyms.cm.dao.sys.SysUserRoleMapsMapper; +import com.lyms.cm.service.sys.SysUserRoleMapsService; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import java.io.Serializable; + +/** + *

    + * 用户角色关系表 服务实现类 + *

    + * + * @author fangcheng + * @since 2017-03-07 + */ +@Service +public class SysUserRoleMapsServiceImpl extends ServiceImpl implements SysUserRoleMapsService { + + public Integer deleteLogicById(Serializable id){ + return baseMapper.deleteLogicById(id); + } +} 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 a4b369b..ea700ab 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,5 +1,7 @@ package com.lyms.cm.service.sys.impl; +import java.io.Serializable; + import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -60,6 +62,7 @@ public class SysUsersServiceImpl extends ServiceImpl i return false; // 设置user ID user.setId(StrUtils.uuid()); + user.setIfdel(0); // 设置用户密码 this.initPwd(user); @@ -95,7 +98,7 @@ public class SysUsersServiceImpl extends ServiceImpl i return false; // 判断当前用户的启用，禁用情况 - if (user.isEnabled()) { + if (StatusEnum.isEnabled(user.getEnable())) { user.setEnable(StatusEnum.DISENABLED.getStatus()); } else { user.setEnable(StatusEnum.ENABLED.getStatus()); @@ -112,17 +115,22 @@ public class SysUsersServiceImpl extends ServiceImpl i // TODO 通过sql 修改 SysUsers user = userMapper.selectById(userId); if (user != null) { - Integer yn = user.getYn(); - if (yn == null || yn == ValidityEnum.VALIDITY.getValidity()) { - yn = ValidityEnum.UNVALIDITY.getValidity(); + Integer ifDel = user.getIfdel() ; + if (ifDel == null || ifDel == ValidityEnum.VALIDITY.getValidity()) { + ifDel = ValidityEnum.UNVALIDITY.getValidity(); } else { - yn = ValidityEnum.VALIDITY.getValidity(); + ifDel = ValidityEnum.VALIDITY.getValidity(); } - user.setYn(yn); + user.setIfdel(ifDel); Integer tag = userMapper.updateById(user); return tag != null && tag >= 1; } return false; } + @Override + public Integer deleteLogicById(Serializable id) { + return baseMapper.deleteLogicById(id); + } + } diff --git a/center.manager/src/main/resources/xml/app-datasource.xml b/center.manager/src/main/resources/xml/app-datasource.xml index 995701e..dabfe8c 100644 --- a/center.manager/src/main/resources/xml/app-datasource.xml +++ b/center.manager/src/main/resources/xml/app-datasource.xml @@ -62,8 +62,16 @@ + + + + + + + + @@ -82,7 +90,7 @@ - + diff --git a/center.manager/src/main/webapp/WEB-INF/views/common/base.html b/center.manager/src/main/webapp/WEB-INF/views/common/base.html index b5507ba..f27974e 100644 --- a/center.manager/src/main/webapp/WEB-INF/views/common/base.html +++ b/center.manager/src/main/webapp/WEB-INF/views/common/base.html @@ -12,6 +12,7 @@ + #block("css")#end @@ -22,6 +23,10 @@ #block("body")#end + + #block("js")#end diff --git a/center.manager/src/main/webapp/WEB-INF/views/common/base_list.html b/center.manager/src/main/webapp/WEB-INF/views/common/base_list.html index 6688321..ebb1471 100644 --- a/center.manager/src/main/webapp/WEB-INF/views/common/base_list.html +++ b/center.manager/src/main/webapp/WEB-INF/views/common/base_list.html @@ -10,6 +10,7 @@ + #block("css")#end @@ -29,8 +30,12 @@ + #block("js")#end + diff --git a/center.manager/src/main/webapp/WEB-INF/views/role/role_edit.html b/center.manager/src/main/webapp/WEB-INF/views/role/role_edit.html new file mode 100644 index 0000000..8e3cb0d --- /dev/null +++ b/center.manager/src/main/webapp/WEB-INF/views/role/role_edit.html @@ -0,0 +1,68 @@ +#override("body") +
    +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + +#end +#extends("/common/base_list.html") \ No newline at end of file diff --git a/center.manager/src/main/webapp/WEB-INF/views/role/role_list.html b/center.manager/src/main/webapp/WEB-INF/views/role/role_list.html index 4ea78ff..d135290 100644 --- a/center.manager/src/main/webapp/WEB-INF/views/role/role_list.html +++ b/center.manager/src/main/webapp/WEB-INF/views/role/role_list.html @@ -22,9 +22,9 @@
    - - - + + +
    @@ -33,9 +33,25 @@ #end #override("js") #end 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 6d2b202..9b5757a 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 @@ -35,7 +35,7 @@ }else{ ajaxPost(APP.PATH + "/sysUsers/update",data); } - parent.reloadGrid('datagrid'); + parent.reloadGrid('dataTable'); } } 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 68a116b..e8db785 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 @@ -33,23 +33,25 @@ #end #override("js")