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 eda1dcd..617b3d0 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 @@ -45,8 +45,13 @@ public class SysUsersController extends BaseController { @RequestMapping(value = "/create", method = RequestMethod.POST) @ResponseBody public AjaxResult create(SysUsers user, AjaxResult ajaxResult) { + if(userService.isExistAccount(user.getAccount())){ + ajaxResult.setSuccess(true); + ajaxResult.setMessage("新增失败！" + user.getAccount() + " 已经存在，请修改登录账号！"); + return ajaxResult; + } boolean tag = userService.addUser(user); - return handleAjaxResult(ajaxResult, tag, OperationName.UPDATE); + return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); } /** @@ -96,6 +101,11 @@ public class SysUsersController extends BaseController { @RequestMapping(value = "/update", method = { RequestMethod.POST }) @ResponseBody public AjaxResult update(SysUsers user, AjaxResult ajaxResult) { + if(userService.isExistAccount(user.getAccount())){ + ajaxResult.setSuccess(true); + ajaxResult.setMessage("修改失败！ " + user.getAccount()+" 已经存在，请修改登录账号！"); + return ajaxResult; + } boolean tag = userService.updateUser(user); return handleAjaxResult(ajaxResult, tag, OperationName.UPDATE); 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 1e3ddb9..f5f7967 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 @@ -1,10 +1,10 @@ package com.lyms.cm.entity.sys; -import java.io.Serializable; -import java.util.Date; - +import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; +import java.util.Date; /** *

@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.annotations.TableName; *

* * @author fangcheng - * @since 2017-03-07 + * @since 2017-03-08 */ @TableName("SYS_USERS") public class SysUsers implements Serializable { @@ -22,7 +22,7 @@ public class SysUsers implements Serializable { /** * */ - @TableField(value="ID") + @TableId(value="ID") private String id; /** * 0:管理员,1:用户 @@ -30,16 +30,6 @@ public class SysUsers implements Serializable { @TableField(value="TYPE") private Integer type; /** - * 机构id - */ - @TableField(value="ORG_ID") - private String orgId; - /** - * 部门id - */ - @TableField(value="DEPT_ID") - private String deptId; - /** * 名称 */ @TableField(value="NAME") @@ -50,6 +40,16 @@ public class SysUsers implements Serializable { @TableField(value="ACCOUNT") private String account; /** + * 机构id + */ + @TableField(value="ORG_ID") + private String orgId; + /** + * 部门id + */ + @TableField(value="DEPT_ID") + private String deptId; + /** * 名字 */ @TableField(value="PWD") @@ -60,31 +60,6 @@ public class SysUsers implements Serializable { @TableField(value="PHONE") private String phone; /** - * 发布者id - */ - @TableField(value="PUBLISH_ID") - private Integer publishId; - /** - * 1：有效，2：无效 - */ - @TableField(value="IFDEL") - private Integer ifdel; - /** - * 1：启用，2：停用 - */ - @TableField(value="ENABLE") - private Integer enable; - /** - * 最后修改时间 - */ - @TableField(value="MODIFIED") - private Date modified; - /** - * 创建时间 - */ - @TableField(value="CREATED") - private Date created; - /** * 备注 */ @TableField(value="REMARKS") @@ -134,6 +109,36 @@ public class SysUsers implements Serializable { */ @TableField(value="GOOD_AT") private String goodAt; + /** + * + */ + @TableField(value="CREATE_ID") + private String createId; + /** + * + */ + @TableField(value="CREATE_TIME") + private Date createTime; + /** + * + */ + @TableField(value="MODIFY_ID") + private String modifyId; + /** + * + */ + @TableField(value="MODIFY_TIME") + private Date modifyTime; + /** + * + */ + @TableField(value="IFDEL") + private Integer ifdel; + /** + * + */ + @TableField(value="ENABLE") + private Integer enable; public String getId() { @@ -152,22 +157,6 @@ public class SysUsers implements Serializable { this.type = type; } - public String getOrgId() { - return orgId; - } - - public void setOrgId(String orgId) { - this.orgId = orgId; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - public String getName() { return name; } @@ -184,60 +173,36 @@ public class SysUsers implements Serializable { this.account = account; } - public String getPwd() { - return pwd; - } - - public void setPwd(String pwd) { - this.pwd = pwd; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public Integer getPublishId() { - return publishId; - } - - public void setPublishId(Integer publishId) { - this.publishId = publishId; - } - - public Integer getIfdel() { - return ifdel; + public String getOrgId() { + return orgId; } - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; + public void setOrgId(String orgId) { + this.orgId = orgId; } - public Integer getEnable() { - return enable; + public String getDeptId() { + return deptId; } - public void setEnable(Integer enable) { - this.enable = enable; + public void setDeptId(String deptId) { + this.deptId = deptId; } - public Date getModified() { - return modified; + public String getPwd() { + return pwd; } - public void setModified(Date modified) { - this.modified = modified; + public void setPwd(String pwd) { + this.pwd = pwd; } - public Date getCreated() { - return created; + public String getPhone() { + return phone; } - public void setCreated(Date created) { - this.created = created; + public void setPhone(String phone) { + this.phone = phone; } public String getRemarks() { @@ -320,4 +285,52 @@ public class SysUsers implements Serializable { this.goodAt = goodAt; } + public String getCreateId() { + return createId; + } + + public void setCreateId(String createId) { + this.createId = createId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getModifyId() { + return modifyId; + } + + public void setModifyId(String modifyId) { + this.modifyId = modifyId; + } + + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + public Integer getIfdel() { + return ifdel; + } + + public void setIfdel(Integer ifdel) { + this.ifdel = ifdel; + } + + public Integer getEnable() { + return enable; + } + + public void setEnable(Integer enable) { + this.enable = enable; + } + } 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 98feba9..1fdb74d 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 @@ -70,5 +70,17 @@ public interface SysUsersService extends BaseService { *
  • @return 大于0修改成功，否则为失败 */ public Integer deleteLogicById(Serializable id); + + + /** + *
  • @Description:是否存在登录号 + *
  • @param username + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年3月8日 + *
  • 修改人： + *
  • 修改时间： + */ + public boolean isExistAccount(String username); } 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 ea700ab..0826e25 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 @@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.lyms.cm.dao.sys.SysUsersMapper; import com.lyms.cm.entity.sys.SysUsers; @@ -28,109 +29,131 @@ import com.lyms.util.StrUtils; @Service public class SysUsersServiceImpl extends ServiceImpl implements SysUsersService { - @Autowired - private SysUsersMapper userMapper; - - /** - * 系统默认密码 - */ - private static final String DEFAULT_PWD = "123456"; - - // 模块基础操作信息 - private boolean empty(SysUsers user) { - return user == null; - } - - /** - * 初始密码设置 - */ - private void initPwd(SysUsers user) { - if (empty(user)) - return; - String pwd = user.getPwd(); - if (StringUtils.isBlank(pwd)) { - pwd = DEFAULT_PWD; - } - String encode = MD5Utils.md5(pwd); - user.setPwd(encode); - } - - @Override - @Transactional - public boolean addUser(SysUsers user) throws SystemException { - if (empty(user)) - return false; - // 设置user ID - user.setId(StrUtils.uuid()); - user.setIfdel(0); - // 设置用户密码 - this.initPwd(user); - - Integer tag = userMapper.insert(user); - return tag != null && tag >= 1; - } - - @Override - @Transactional - 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; - } - - /* - * @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.selectById(userId); - if (empty(user)) - return false; - - // 判断当前用户的启用，禁用情况 - if (StatusEnum.isEnabled(user.getEnable())) { - user.setEnable(StatusEnum.DISENABLED.getStatus()); - } else { - user.setEnable(StatusEnum.ENABLED.getStatus()); - } - return this.updateUser(user); - } - - @Override - @Transactional - public boolean delete(String userId) throws SystemException { - - if (StringUtils.isBlank(userId)) - return false; - // TODO 通过sql 修改 - SysUsers user = userMapper.selectById(userId); - if (user != null) { - Integer ifDel = user.getIfdel() ; - if (ifDel == null || ifDel == ValidityEnum.VALIDITY.getValidity()) { - ifDel = ValidityEnum.UNVALIDITY.getValidity(); - } else { - ifDel = ValidityEnum.VALIDITY.getValidity(); - } - user.setIfdel(ifDel); - Integer tag = userMapper.updateById(user); - return tag != null && tag >= 1; - } - return false; - } + @Autowired + private SysUsersMapper userMapper; + + /** + * 系统默认密码 + */ + private static final String DEFAULT_PWD = "123456"; + + // 模块基础操作信息 + private boolean empty(SysUsers user) { + return user == null; + } + + /** + * 初始密码设置 + */ + private void initPwd(SysUsers user) { + if (empty(user)) + return; + String pwd = user.getPwd(); + if (StringUtils.isBlank(pwd)) { + pwd = DEFAULT_PWD; + } + String encode = MD5Utils.md5(pwd); + user.setPwd(encode); + } + + @Override + @Transactional + public boolean addUser(SysUsers user) throws SystemException { + if (empty(user)) + return false; + // 设置user ID + user.setId(StrUtils.uuid()); + user.setIfdel(0); + if (null == user.getType()) {//没有勾选管理，就是用户 + user.setType(1); + } + if (null == user.getEnable()) { + user.setEnable(1); + } + // 设置用户密码 + this.initPwd(user); + + Integer tag = userMapper.insert(user); + return tag != null && tag >= 1; + } + + @Override + @Transactional + public boolean updateUser(SysUsers user) throws SystemException { + if (empty(user)) + return false; + if (null == user.getType()) {//没有勾选管理，就是用户 + user.setType(1); + } + if (null == user.getEnable()) { + user.setEnable(1); + } + if (StrUtils.isNotEmpty(user.getPwd())) { + // 初始密码 + this.initPwd(user); + } + + Integer tag = userMapper.updateById(user); + return tag != null && tag >= 1; + } + + /* + * @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.selectById(userId); + if (empty(user)) + return false; + + // 判断当前用户的启用，禁用情况 + if (StatusEnum.isEnabled(user.getEnable())) { + user.setEnable(StatusEnum.DISENABLED.getStatus()); + } else { + user.setEnable(StatusEnum.ENABLED.getStatus()); + } + return this.updateUser(user); + } + + @Override + @Transactional + public boolean delete(String userId) throws SystemException { + + if (StringUtils.isBlank(userId)) + return false; + // TODO 通过sql 修改 + SysUsers user = userMapper.selectById(userId); + if (user != null) { + Integer ifDel = user.getIfdel(); + if (ifDel == null || ifDel == ValidityEnum.VALIDITY.getValidity()) { + ifDel = ValidityEnum.UNVALIDITY.getValidity(); + } else { + ifDel = ValidityEnum.VALIDITY.getValidity(); + } + 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); } + @Override + public boolean isExistAccount(String username) { + SysUsers entity = selectOne(new EntityWrapper().where("account={0}", "'" + username + "'")); + if (null == entity) { + return false; + } + return true; + } + } 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 02397e8..788a59e 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 @@ -76,7 +76,7 @@ var default_dataColumns = [{ title: '发布人id' },{ field: 'enable', - title: '启用状态', + title: '启/停用', formatter:enableFormatter }]; 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 9b5757a..ce19cb0 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 @@ -2,27 +2,84 @@
    - -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    -
    - - -
    -
    -
    + + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + + +
    +
    +
    #end diff --git a/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java b/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java index 6a836dd..dd2f9de 100644 --- a/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java +++ b/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java @@ -44,7 +44,7 @@ public class MysqlGenerator { gc.setOutputDir("E://mybatis-plus-generate"); gc.setAuthor("fangcheng"); //strategy.setInclude(new String[] { "SYS_USERS","SYS_USER_ROLE_MAPS","SYS_ROLES" }); // 需要生成的表 - strategy.setInclude(new String[] { "SYS_ROLE_PERMISSION_MAPS" }); // 需要生成的表 + strategy.setInclude(new String[] { "SYS_USERS" }); // 需要生成的表 // pc.setParent("com.lyms.hospital"); pc.setParent("com.lyms.cm");