From 7629a5055f7a163570ec2052dd0bf53d2c59c5c5 Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Tue, 26 Apr 2016 10:41:48 +0800 Subject: [PATCH] platform permission add return pageinfo --- .../lyms/platform/permission/dao/UsersMapper.java | 3 + .../permission/model/DepartmentsQuery.java | 67 +++++++++++++--------- .../permission/model/OrganizationQuery.java | 17 ++++++ .../lyms/platform/permission/model/RolesQuery.java | 55 ++++++++++-------- .../com/lyms/platform/permission/model/Users.java | 2 +- .../lyms/platform/permission/model/UsersQuery.java | 21 ++++++- .../platform/permission/service/UsersService.java | 2 + .../permission/service/impl/UsersServiceImpl.java | 5 ++ .../src/main/resources/mainOrm/Departments.xml | 3 + .../src/main/resources/mainOrm/Organization.xml | 3 + .../src/main/resources/mainOrm/Roles.xml | 3 + .../src/main/resources/mainOrm/Users.xml | 30 ++++++++++ .../web/controller/DepartmentsController.java | 3 +- .../web/controller/OrganizationController.java | 2 +- .../operate/web/controller/RolesController.java | 6 +- .../operate/web/controller/UsersController.java | 22 ++++--- 16 files changed, 176 insertions(+), 68 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UsersMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UsersMapper.java index 8634121..a75da40 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UsersMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UsersMapper.java @@ -17,6 +17,9 @@ public interface UsersMapper { public int queryUsersCount(UsersQuery query); public List queryUsers(UsersQuery query); + public List queryUsers2(UsersQuery query); public Users getUsersByLoginCenterId(Integer id); + + } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/DepartmentsQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/DepartmentsQuery.java index 2927021..0a0f2d3 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/DepartmentsQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/DepartmentsQuery.java @@ -1,19 +1,45 @@ package com.lyms.platform.permission.model; - import com.lyms.platform.common.dao.BaseQuery; import java.util.Date; +public class DepartmentsQuery extends BaseQuery { + private Integer id; + private Integer parentId; + private String name; + private Integer orgId; + private String description; + private Integer publishId; + private String publishName; + private Integer yn; + private Date modified; + private Date created; + private Integer type; + private String shortCode; + private String keyword; + + public String getShortCode() { + return shortCode; + } -public class DepartmentsQuery extends BaseQuery {private Integer id;private Integer parentId;private String name;private Integer orgId;private String description;private Integer publishId;private String publishName;private Integer yn;private Date modified;private Date created;private Integer type;private String shortCode; + public void setShortCode(String shortCode) { + this.shortCode = shortCode; + } -public Integer getId() { - return id; + public String getKeyword() { + return keyword; } + public void setKeyword(String keyword) { + this.keyword = keyword; + } + + public Integer getId() { + return id; + } public void setId(Integer id) { @@ -21,122 +47,111 @@ public Integer getId() { } -public Integer getParentId() { + public Integer getParentId() { return parentId; } - public void setParentId(Integer parentId) { this.parentId = parentId; } -public String getName() { + public String getName() { return name; } - public void setName(String name) { this.name = name; } -public Integer getOrgId() { + public Integer getOrgId() { return orgId; } - public void setOrgId(Integer orgId) { this.orgId = orgId; } -public String getDescription() { + public String getDescription() { return description; } - public void setDescription(String description) { this.description = description; } -public Integer getPublishId() { + public Integer getPublishId() { return publishId; } - public void setPublishId(Integer publishId) { this.publishId = publishId; } -public String getPublishName() { + public String getPublishName() { return publishName; } - public void setPublishName(String publishName) { this.publishName = publishName; } -public Integer getYn() { + public Integer getYn() { return yn; } - public void setYn(Integer yn) { this.yn = yn; } -public Date getModified() { + public Date getModified() { return modified; } - public void setModified(Date modified) { this.modified = modified; } -public Date getCreated() { + public Date getCreated() { return created; } - public void setCreated(Date created) { this.created = created; } -public Integer getType() { + public Integer getType() { return type; } - public void setType(Integer type) { this.type = type; } -public String getShortcode() { + public String getShortcode() { return shortCode; } - public void setShortcode(String shortCode) { this.shortCode = shortCode; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java index 3dd2aff..f385a88 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java @@ -23,6 +23,23 @@ public class OrganizationQuery extends BaseQuery { private Date modified; private Date created; private String shortCode; + private String keyword; + + public String getShortCode() { + return shortCode; + } + + public void setShortCode(String shortCode) { + this.shortCode = shortCode; + } + + public String getKeyword() { + return keyword; + } + + public void setKeyword(String keyword) { + this.keyword = keyword; + } public Integer getId() { return id; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RolesQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RolesQuery.java index 9086b63..8a05221 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RolesQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RolesQuery.java @@ -1,20 +1,37 @@ package com.lyms.platform.permission.model; - import com.lyms.platform.common.dao.BaseQuery; import java.util.Date; +public class RolesQuery extends BaseQuery { + private Integer id; + private Integer type; + private String name; + private Integer publishId; + private String publishName; + private Integer yn; + private Integer enable; + private Date modified; + private Date created; + private String remarks; + private String shortCode; + private String keyword; -public class RolesQuery extends BaseQuery {private Integer id;private Integer type;private String name;private Integer publishId;private String publishName;private Integer yn;private Integer enable;private Date modified;private Date created;private String remarks;private String shortCode; + public String getKeyword() { + return keyword; + } -public Integer getId() { - return id; + public void setKeyword(String keyword) { + this.keyword = keyword; } + public Integer getId() { + return id; + } public void setId(Integer id) { @@ -22,111 +39,101 @@ public Integer getId() { } -public Integer getType() { + public Integer getType() { return type; } - public void setType(Integer type) { this.type = type; } -public String getName() { + public String getName() { return name; } - public void setName(String name) { this.name = name; } -public Integer getPublishId() { + public Integer getPublishId() { return publishId; } - public void setPublishId(Integer publishId) { this.publishId = publishId; } -public String getPublishName() { + public String getPublishName() { return publishName; } - public void setPublishName(String publishName) { this.publishName = publishName; } -public Integer getYn() { + public Integer getYn() { return yn; } - public void setYn(Integer yn) { this.yn = yn; } -public Integer getEnable() { + public Integer getEnable() { return enable; } - public void setEnable(Integer enable) { this.enable = enable; } -public Date getModified() { + public Date getModified() { return modified; } - public void setModified(Date modified) { this.modified = modified; } -public Date getCreated() { + public Date getCreated() { return created; } - public void setCreated(Date created) { this.created = created; } -public String getRemarks() { + public String getRemarks() { return remarks; } - public void setRemarks(String remarks) { this.remarks = remarks; } -public String getShortcode() { + public String getShortcode() { return shortCode; } - public void setShortcode(String shortCode) { this.shortCode = shortCode; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java index 14fee49..1062c0d 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java @@ -6,7 +6,7 @@ import java.util.List; public class Users { private Integer id; private Integer logincenterId; - private Integer type; + private Integer type; //0 管理员 1 用户 private Integer orgId; //机构ID private Integer deptId; //部门ID private Integer ksId; //科室ID diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java index 53578c3..a73897c 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java @@ -9,7 +9,7 @@ import java.util.Date; public class UsersQuery extends BaseQuery { private Integer id; private Integer logincenterId; - private Integer type; + private Integer type; //0Ա 1û private Integer orgId; private Integer deptId; private String name; @@ -26,6 +26,25 @@ public class UsersQuery extends BaseQuery { private Date lastLoginTime; private Integer ksId; + private String keyword; + private Integer roleId; + + public Integer getRoleId() { + return roleId; + } + + public void setRoleId(Integer roleId) { + this.roleId = roleId; + } + + public String getKeyword() { + return keyword; + } + + public void setKeyword(String keyword) { + this.keyword = keyword; + } + public Integer getKsId() { return ksId; } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UsersService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UsersService.java index 42186cb..d29fd47 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UsersService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UsersService.java @@ -18,6 +18,8 @@ public interface UsersService { public List queryUsers(UsersQuery query); + public List queryUsers2(UsersQuery query); + public Users getUsersByLoginCenterId(Integer id); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java index 3178d36..551c5b3 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java @@ -30,6 +30,11 @@ public int queryUsersCount (UsersQuery query){return usersMapper.queryUsersCount public List queryUsers (UsersQuery query){if (query.getNeed() != null) {query.mysqlBuild(usersMapper.queryUsersCount(query));}return usersMapper.queryUsers(query);} @Override + public List queryUsers2(UsersQuery query) { + return usersMapper.queryUsers2(query); + } + + @Override public Users getUsersByLoginCenterId(Integer id) { return usersMapper.getUsersByLoginCenterId(id); } diff --git a/platform-biz-service/src/main/resources/mainOrm/Departments.xml b/platform-biz-service/src/main/resources/mainOrm/Departments.xml index ff5ccbd..62f7219 100644 --- a/platform-biz-service/src/main/resources/mainOrm/Departments.xml +++ b/platform-biz-service/src/main/resources/mainOrm/Departments.xml @@ -126,6 +126,9 @@ and type = #{type,jdbcType=INTEGER} and shortCode = #{shortCode,jdbcType=VARCHAR} + + and name like CONCAT(#{keyword}, '%') + diff --git a/platform-biz-service/src/main/resources/mainOrm/Organization.xml b/platform-biz-service/src/main/resources/mainOrm/Organization.xml index b1d1d25..282c4d3 100644 --- a/platform-biz-service/src/main/resources/mainOrm/Organization.xml +++ b/platform-biz-service/src/main/resources/mainOrm/Organization.xml @@ -154,6 +154,9 @@ and created = #{created,jdbcType=TIMESTAMP} and shortCode = #{shortCode,jdbcType=VARCHAR} + + and name like CONCAT(#{keyword}, '%') + diff --git a/platform-biz-service/src/main/resources/mainOrm/Roles.xml b/platform-biz-service/src/main/resources/mainOrm/Roles.xml index 2bb8389..2d7bb82 100644 --- a/platform-biz-service/src/main/resources/mainOrm/Roles.xml +++ b/platform-biz-service/src/main/resources/mainOrm/Roles.xml @@ -119,6 +119,9 @@ and remarks = #{remarks,jdbcType=VARCHAR} and shortCode = #{shortCode,jdbcType=VARCHAR} + + and name like CONCAT(#{keyword}, '%') + diff --git a/platform-biz-service/src/main/resources/mainOrm/Users.xml b/platform-biz-service/src/main/resources/mainOrm/Users.xml index 29e3aa7..98b9599 100644 --- a/platform-biz-service/src/main/resources/mainOrm/Users.xml +++ b/platform-biz-service/src/main/resources/mainOrm/Users.xml @@ -186,6 +186,36 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p + +