diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/DepartmentsMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/DepartmentsMapper.java new file mode 100644 index 0000000..5ef7413 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/DepartmentsMapper.java @@ -0,0 +1,10 @@ +package com.lyms.platform.permission.dao; + +import com.lyms.platform.permission.model.Departments; +import com.lyms.platform.permission.model.DepartmentsQuery; + +import java.util.List; + +public interface DepartmentsMapper {public void addDepartments(Departments obj);public void updateDepartments(Departments obj);public void deleteDepartments(Integer id);public Departments getDepartments(Integer id);public int queryDepartmentsCount(DepartmentsQuery query);public List queryDepartments(DepartmentsQuery query); + +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/OrganizationMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/OrganizationMapper.java new file mode 100644 index 0000000..20b11bf --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/OrganizationMapper.java @@ -0,0 +1,10 @@ +package com.lyms.platform.permission.dao; + +import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.OrganizationQuery; + +import java.util.List; + +public interface OrganizationMapper {public void addOrganization(Organization obj);public void updateOrganization(Organization obj);public void deleteOrganization(Integer id);public Organization getOrganization(Integer id);public int queryOrganizationCount(OrganizationQuery query);public List queryOrganization(OrganizationQuery query); + +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/PermissionsMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/PermissionsMapper.java new file mode 100644 index 0000000..99d053b --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/PermissionsMapper.java @@ -0,0 +1,10 @@ +package com.lyms.platform.permission.dao; + +import com.lyms.platform.permission.model.Permissions; +import com.lyms.platform.permission.model.PermissionsQuery; + +import java.util.List; + +public interface PermissionsMapper {public void addPermissions(Permissions obj);public void updatePermissions(Permissions obj);public void deletePermissions(Integer id);public Permissions getPermissions(Integer id);public int queryPermissionsCount(PermissionsQuery query);public List queryPermissions(PermissionsQuery query); + +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/RolePermissionMapsMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/RolePermissionMapsMapper.java new file mode 100644 index 0000000..9779a22 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/RolePermissionMapsMapper.java @@ -0,0 +1,10 @@ +package com.lyms.platform.permission.dao; + +import com.lyms.platform.permission.model.RolePermissionMaps; +import com.lyms.platform.permission.model.RolePermissionMapsQuery; + +import java.util.List; + +public interface RolePermissionMapsMapper {public void addRolePermissionMaps(RolePermissionMaps obj);public void updateRolePermissionMaps(RolePermissionMaps obj);public void deleteRolePermissionMaps(Integer id);public RolePermissionMaps getRolePermissionMaps(Integer id);public int queryRolePermissionMapsCount(RolePermissionMapsQuery query);public List queryRolePermissionMaps(RolePermissionMapsQuery query); + +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/RolesMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/RolesMapper.java new file mode 100644 index 0000000..61b804d --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/RolesMapper.java @@ -0,0 +1,10 @@ +package com.lyms.platform.permission.dao; + +import com.lyms.platform.permission.model.Roles; +import com.lyms.platform.permission.model.RolesQuery; + +import java.util.List; + +public interface RolesMapper {public void addRoles(Roles obj);public void updateRoles(Roles obj);public void deleteRoles(Integer id);public Roles getRoles(Integer id);public int queryRolesCount(RolesQuery query);public List queryRoles(RolesQuery query); + +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UserOrganizationMapsMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UserOrganizationMapsMapper.java new file mode 100644 index 0000000..c01c825 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UserOrganizationMapsMapper.java @@ -0,0 +1,10 @@ +package com.lyms.platform.permission.dao; + +import com.lyms.platform.permission.model.UserOrganizationMaps; +import com.lyms.platform.permission.model.UserOrganizationMapsQuery; + +import java.util.List; + +public interface UserOrganizationMapsMapper {public void addUserOrganizationMaps(UserOrganizationMaps obj);public void updateUserOrganizationMaps(UserOrganizationMaps obj);public void deleteUserOrganizationMaps(Integer id);public UserOrganizationMaps getUserOrganizationMaps(Integer id);public int queryUserOrganizationMapsCount(UserOrganizationMapsQuery query);public List queryUserOrganizationMaps(UserOrganizationMapsQuery query); + +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UserRoleMapsMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UserRoleMapsMapper.java new file mode 100644 index 0000000..9f2b70c --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UserRoleMapsMapper.java @@ -0,0 +1,10 @@ +package com.lyms.platform.permission.dao; + +import com.lyms.platform.permission.model.UserRoleMaps; +import com.lyms.platform.permission.model.UserRoleMapsQuery; + +import java.util.List; + +public interface UserRoleMapsMapper {public void addUserRoleMaps(UserRoleMaps obj);public void updateUserRoleMaps(UserRoleMaps obj);public void deleteUserRoleMaps(Integer id);public UserRoleMaps getUserRoleMaps(Integer id);public int queryUserRoleMapsCount(UserRoleMapsQuery query);public List queryUserRoleMaps(UserRoleMapsQuery query); + +} \ No newline at end of file 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 new file mode 100644 index 0000000..1f9c957 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UsersMapper.java @@ -0,0 +1,10 @@ +package com.lyms.platform.permission.dao; + +import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.model.UsersQuery; + +import java.util.List; + +public interface UsersMapper {public void addUsers(Users obj);public void updateUsers(Users obj);public void deleteUsers(Integer id);public Users getUsers(Integer id);public int queryUsersCount(UsersQuery query);public List queryUsers(UsersQuery query); + +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IDepartmentsDao.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IDepartmentsDao.java deleted file mode 100644 index 44d14fd..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IDepartmentsDao.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.lyms.platform.permission.intf; - - -import com.lyms.platform.permission.model.Departments; -import com.lyms.platform.permission.model.DepartmentsQuery; - -import java.util.List; - -public interface IDepartmentsDao { - public void addDepartments(Departments obj); - - public void updateDepartments(Departments obj); - - public void deleteDepartments(Integer id); - - public Departments getDepartments(Integer id); - - public int queryDepartmentsCount(DepartmentsQuery query); - - public List queryDepartments(DepartmentsQuery query); - -} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IPermissionsDao.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IPermissionsDao.java deleted file mode 100644 index 7e6d114..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IPermissionsDao.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.platform.permission.intf; - -import java.util.List; - -import com.lyms.platform.permission.model.Permissions; -import com.lyms.platform.permission.model.PermissionsQuery; - -public interface IPermissionsDao { - public void addPermissions(Permissions obj); - - public void updatePermissions(Permissions obj); - - public void deletePermissions(String id); - - public Permissions getPermissions(String id); - - public int queryPermissionsCount(PermissionsQuery query); - - public List queryPermissions(PermissionsQuery query); -} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IRolePermissionMapsDao.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IRolePermissionMapsDao.java deleted file mode 100644 index fd29686..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IRolePermissionMapsDao.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.lyms.platform.permission.intf; - -import java.util.List; - -import com.lyms.platform.permission.model.RolePermissionMaps; -import com.lyms.platform.permission.model.RolePermissionMapsQuery; - -public interface IRolePermissionMapsDao { - - public void addRolePermissionMaps(RolePermissionMaps obj); - - public void updateRolePermissionMaps(RolePermissionMaps obj); - - public void deleteRolePermissionMaps(String roleId, - String permissionId); - - public RolePermissionMaps getRolePermissionMaps(String id); - - public RolePermissionMaps getRolePermissionMaps(String roleId, - String permissionId); - - public int queryRolePermissionMapsCount(RolePermissionMapsQuery query); - - public List queryRolePermissionMaps( - RolePermissionMapsQuery query); - - public List queryRolePermissionMapsv2(RolePermissionMapsQuery query); -} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IRolePermissionsDao.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IRolePermissionsDao.java deleted file mode 100644 index 9106f63..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IRolePermissionsDao.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.lyms.platform.permission.intf; - -public interface IRolePermissionsDao { - -} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IRolesDao.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IRolesDao.java deleted file mode 100644 index 9b9595b..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IRolesDao.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.platform.permission.intf; - -import java.util.List; - -import com.lyms.platform.permission.model.Roles; -import com.lyms.platform.permission.model.RolesQuery; - -public interface IRolesDao { - public void addRoles(Roles obj); - - public void updateRoles(Roles obj); - - public void deleteRoles(String id); - - public Roles getRoles(String id); - - public int queryRolesCount(RolesQuery query); - - public List queryRoles(RolesQuery query); -} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IUserRoleMapsDao.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IUserRoleMapsDao.java deleted file mode 100644 index 4d24083..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IUserRoleMapsDao.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.lyms.platform.permission.intf; - -import java.util.List; - -import com.lyms.platform.permission.model.UserRoleMaps; -import com.lyms.platform.permission.model.UserRoleMapsQuery; - -public interface IUserRoleMapsDao { - - void addUserRoleMaps(UserRoleMaps obj); - - void updateUserRoleMaps(UserRoleMaps obj); - - void deleteUserRoleMaps(String id); - - UserRoleMaps getUserRoleMaps(String id); - - int queryUserRoleMapsCount(UserRoleMapsQuery query); - - List queryUserRoleMaps(UserRoleMapsQuery query); - - UserRoleMaps getUserRoleMaps(String userId, String roleId); -} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IUserRolesDao.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IUserRolesDao.java deleted file mode 100644 index 8f46826..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IUserRolesDao.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.lyms.platform.permission.intf; - -public interface IUserRolesDao { - -} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IUsersDao.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IUsersDao.java deleted file mode 100644 index bac4ada..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/intf/IUsersDao.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.lyms.platform.permission.intf; - -import java.util.List; - -import com.lyms.platform.permission.model.Users; -import com.lyms.platform.permission.model.UsersQuery; - -public interface IUsersDao { - - public void addUsers(Users obj); - - public void updateUsers(Users obj); - - public void deleteUsers(String id); - - public Users getUsers(String id); - - public int queryUsersCount(UsersQuery query); - - public List queryUsers(UsersQuery query); -} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BaseModel.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BaseModel.java deleted file mode 100644 index a37e6d6..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BaseModel.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.platform.permission.model; - -import java.io.Serializable; - -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; - -public class BaseModel implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 1L; - - @Override - public String toString() { - return ToStringBuilder.reflectionToString(this, - ToStringStyle.DEFAULT_STYLE); - } -} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Departments.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Departments.java index 8640ee5..4eeac26 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Departments.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Departments.java @@ -1,120 +1,138 @@ package com.lyms.platform.permission.model; -import org.apache.commons.lang.StringUtils; - import java.util.Date; -public class Departments { - private Integer id; - private String title; - private Integer hospitalId; - private String description; - private Integer publishId; - private String publishName; - private Integer yn; - private Date modified; - private Date created; - private Integer type; - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } +public class Departments {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 Integer getId() { +public Integer getId() { return id; } + public void setId(Integer id) { this.id = id; } - public String getTitle() { - return title; +public Integer getParentId() { + return parentId; + } + + + + public void setParentId(Integer parentId) { + this.parentId = parentId; + + } + +public String getName() { + return name; } - public void setTitle(String title) { - this.title = title; + + public void setName(String name) { + this.name = name; } - public Integer getHospitalId() { - return hospitalId; +public Integer getOrgId() { + return orgId; } - public void setHospitalId(Integer hospitalId) { - this.hospitalId = hospitalId; + + public void setOrgId(Integer orgId) { + this.orgId = orgId; } - public String getDescription() { +public String getDescription() { return description; } + public void setDescription(String description) { - if (StringUtils.isBlank(description)) { - this.description = " "; - } else { - this.description = 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() { + return type; + } + + + + public void setType(Integer type) { + this.type = type; + + } + +public String getShortcode() { + return shortCode; + } + + + + public void setShortcode(String shortCode) { + this.shortCode = shortCode; + + } } \ 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 095af34..2927021 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 @@ -7,113 +7,138 @@ import com.lyms.platform.common.dao.BaseQuery; import java.util.Date; -public class DepartmentsQuery extends BaseQuery { - private Integer id; - private String title; - private Integer hospitalId; - private String description; - private Integer publishId; - private String publishName; - private Integer yn; - private Date modified; - private Date created; - private Integer type; - - public Integer getType() { - return type; - } - public void setType(Integer type) { - this.type = type; - } +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 Integer getId() { +public Integer getId() { return id; } + public void setId(Integer id) { this.id = id; } - public String getTitle() { - return title; +public Integer getParentId() { + return parentId; } - public void setTitle(String title) { - this.title = title; + + public void setParentId(Integer parentId) { + this.parentId = parentId; } - public Integer getHospitalId() { - return hospitalId; +public String getName() { + return name; } - public void setHospitalId(Integer hospitalId) { - this.hospitalId = hospitalId; + public void setName(String name) { + this.name = name; + + } + +public Integer getOrgId() { + return orgId; } - public String getDescription() { + + + public void setOrgId(Integer orgId) { + this.orgId = orgId; + + } + +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() { + return type; + } + + + + public void setType(Integer type) { + this.type = type; + + } + +public String getShortcode() { + return shortCode; + } + + + + public void setShortcode(String shortCode) { + this.shortCode = shortCode; + + } } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java new file mode 100644 index 0000000..589054a --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java @@ -0,0 +1,182 @@ +package com.lyms.platform.permission.model; + +import java.util.Date; + +public class Organization {private Integer id;private String name;private Integer type;private Integer level;private Integer areaManage;private Integer provinceId;private Integer cityId;private Integer areaId;private String address;private String description;private Integer publishId;private String publishName;private Integer yn;private Date modified;private Date created;private String shortCode; + +public Integer getId() { + return id; + } + + + + public void setId(Integer id) { + this.id = id; + + } + +public String getName() { + return name; + } + + + + public void setName(String name) { + this.name = name; + + } + +public Integer getType() { + return type; + } + + + + public void setType(Integer type) { + this.type = type; + + } + +public Integer getLevel() { + return level; + } + + + + public void setLevel(Integer level) { + this.level = level; + + } + +public Integer getAreaManage() { + return areaManage; + } + + + + public void setAreaManage(Integer areaManage) { + this.areaManage = areaManage; + + } + +public Integer getProvinceId() { + return provinceId; + } + + + + public void setProvinceId(Integer provinceId) { + this.provinceId = provinceId; + + } + +public Integer getCityId() { + return cityId; + } + + + + public void setCityId(Integer cityId) { + this.cityId = cityId; + + } + +public Integer getAreaId() { + return areaId; + } + + + + public void setAreaId(Integer areaId) { + this.areaId = areaId; + + } + +public String getAddress() { + return address; + } + + + + public void setAddress(String address) { + this.address = address; + + } + +public String getDescription() { + return description; + } + + + + public void setDescription(String description) { + this.description = description; + + } + +public Integer getPublishId() { + return publishId; + } + + + + public void setPublishId(Integer publishId) { + this.publishId = publishId; + + } + +public String getPublishName() { + return publishName; + } + + + + public void setPublishName(String publishName) { + this.publishName = publishName; + + } + +public Integer getYn() { + return yn; + } + + + + public void setYn(Integer yn) { + this.yn = yn; + + } + +public Date getModified() { + return modified; + } + + + + public void setModified(Date modified) { + this.modified = modified; + + } + +public Date getCreated() { + return created; + } + + + + public void setCreated(Date created) { + this.created = created; + + } + +public String getShortcode() { + return shortCode; + } + + + + public void setShortcode(String shortCode) { + this.shortCode = shortCode; + + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..bd15b8f --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java @@ -0,0 +1,188 @@ +package com.lyms.platform.permission.model; + + + +import com.lyms.platform.common.dao.BaseQuery; + +import java.util.Date; + + + +public class OrganizationQuery extends BaseQuery {private Integer id;private String name;private Integer type;private Integer level;private Integer areaManage;private Integer provinceId;private Integer cityId;private Integer areaId;private String address;private String description;private Integer publishId;private String publishName;private Integer yn;private Date modified;private Date created;private String shortCode; + +public Integer getId() { + return id; + } + + + + public void setId(Integer id) { + this.id = id; + + } + +public String getName() { + return name; + } + + + + public void setName(String name) { + this.name = name; + + } + +public Integer getType() { + return type; + } + + + + public void setType(Integer type) { + this.type = type; + + } + +public Integer getLevel() { + return level; + } + + + + public void setLevel(Integer level) { + this.level = level; + + } + +public Integer getAreaManage() { + return areaManage; + } + + + + public void setAreaManage(Integer areaManage) { + this.areaManage = areaManage; + + } + +public Integer getProvinceId() { + return provinceId; + } + + + + public void setProvinceId(Integer provinceId) { + this.provinceId = provinceId; + + } + +public Integer getCityId() { + return cityId; + } + + + + public void setCityId(Integer cityId) { + this.cityId = cityId; + + } + +public Integer getAreaId() { + return areaId; + } + + + + public void setAreaId(Integer areaId) { + this.areaId = areaId; + + } + +public String getAddress() { + return address; + } + + + + public void setAddress(String address) { + this.address = address; + + } + +public String getDescription() { + return description; + } + + + + public void setDescription(String description) { + this.description = description; + + } + +public Integer getPublishId() { + return publishId; + } + + + + public void setPublishId(Integer publishId) { + this.publishId = publishId; + + } + +public String getPublishName() { + return publishName; + } + + + + public void setPublishName(String publishName) { + this.publishName = publishName; + + } + +public Integer getYn() { + return yn; + } + + + + public void setYn(Integer yn) { + this.yn = yn; + + } + +public Date getModified() { + return modified; + } + + + + public void setModified(Date modified) { + this.modified = modified; + + } + +public Date getCreated() { + return created; + } + + + + public void setCreated(Date created) { + this.created = created; + + } + +public String getShortcode() { + return shortCode; + } + + + + public void setShortcode(String shortCode) { + this.shortCode = shortCode; + + } +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Permissions.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Permissions.java index 0a41375..e02f102 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Permissions.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Permissions.java @@ -1,177 +1,182 @@ package com.lyms.platform.permission.model; - import java.util.Date; -public class Permissions { - private String id; - private Integer type; - private String moduleName; - private String functionName; - private String moduleCode; - private String functionCode; - private String permissionName; - private String action; - private String ext; - private String url; - private String publishId; - private String publishName; - private Integer yn; - private Date modified; - private Date created; - private Integer ismenu; - - public Integer getIsmenu() { - return ismenu; - } +public class Permissions {private Integer id;private Integer type;private String moduleName;private String moduleCode;private String functionName;private String functionCode;private String permissionName;private String action;private String ext;private String url;private Integer publishId;private String publishName;private Integer yn;private Date modified;private Date created;private Integer ismenu; - public void setIsmenu(Integer ismenu) { - this.ismenu = ismenu; - } - - - public String getModuleCode() { - return moduleCode; - } - - public void setModuleCode(String moduleCode) { - this.moduleCode = moduleCode; - } - - public String getFunctionCode() { - return functionCode; - } - - public void setFunctionCode(String functionCode) { - this.functionCode = functionCode; - } - - public String getId() { +public Integer getId() { return id; } - public void setId(String id) { + + public void setId(Integer id) { this.id = id; + } - public Integer getType() { +public Integer getType() { return type; } + public void setType(Integer type) { this.type = type; } - public String getModuleName() { +public String getModuleName() { return moduleName; } + public void setModuleName(String moduleName) { this.moduleName = moduleName; } - public String getFunctionName() { +public String getModuleCode() { + return moduleCode; + } + + + + public void setModuleCode(String moduleCode) { + this.moduleCode = moduleCode; + + } + +public String getFunctionName() { return functionName; } + public void setFunctionName(String functionName) { this.functionName = functionName; } - public String getPermissionName() { +public String getFunctionCode() { + return functionCode; + } + + + + public void setFunctionCode(String functionCode) { + this.functionCode = functionCode; + + } + +public String getPermissionName() { return permissionName; } + public void setPermissionName(String permissionName) { this.permissionName = permissionName; } - public String getAction() { +public String getAction() { return action; } + public void setAction(String action) { this.action = action; } - public String getExt() { +public String getExt() { return ext; } + public void setExt(String ext) { this.ext = ext; } - public String getUrl() { +public String getUrl() { return url; } + public void setUrl(String url) { this.url = url; } - public String getPublishId() { +public Integer getPublishId() { return publishId; } - public void setPublishId(String 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 getIsmenu() { + return ismenu; + } + + + + public void setIsmenu(Integer ismenu) { + this.ismenu = ismenu; + + } } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PermissionsQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PermissionsQuery.java index 83d59bc..4f5f046 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PermissionsQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PermissionsQuery.java @@ -1,157 +1,188 @@ package com.lyms.platform.permission.model; + + import com.lyms.platform.common.dao.BaseQuery; import java.util.Date; -public class PermissionsQuery extends BaseQuery { - private Integer id; - private Integer type; - private String moduleName; - private String functionName; - private String permissionName; - private String action; - private String ext; - private String url; - private Integer publishId; - private String publishName; - private Integer yn; - private Date modified; - private Date created; - private String moduleCode; - private String functionCode; - public String getModuleCode() { - return moduleCode; - } +public class PermissionsQuery extends BaseQuery {private Integer id;private Integer type;private String moduleName;private String moduleCode;private String functionName;private String functionCode;private String permissionName;private String action;private String ext;private String url;private Integer publishId;private String publishName;private Integer yn;private Date modified;private Date created;private Integer ismenu; + +public Integer getId() { + return id; + } + + + + public void setId(Integer id) { + this.id = id; + + } + +public Integer getType() { + return type; + } + + + + public void setType(Integer type) { + this.type = type; + + } + +public String getModuleName() { + return moduleName; + } + + + + public void setModuleName(String moduleName) { + this.moduleName = moduleName; + + } + +public String getModuleCode() { + return moduleCode; + } + + + + public void setModuleCode(String moduleCode) { + this.moduleCode = moduleCode; + + } + +public String getFunctionName() { + return functionName; + } + + + + public void setFunctionName(String functionName) { + this.functionName = functionName; + + } + +public String getFunctionCode() { + return functionCode; + } + + + + public void setFunctionCode(String functionCode) { + this.functionCode = functionCode; + + } + +public String getPermissionName() { + return permissionName; + } + + + + public void setPermissionName(String permissionName) { + this.permissionName = permissionName; + + } + +public String getAction() { + return action; + } + + - public void setModuleCode(String moduleCode) { - this.moduleCode = moduleCode; - } + public void setAction(String action) { + this.action = action; - public String getFunctionCode() { - return functionCode; - } + } - public void setFunctionCode(String functionCode) { - this.functionCode = functionCode; - } +public String getExt() { + return ext; + } - public Integer getId() { - return id; - } - public void setId(Integer id) { - this.id = id; - } + public void setExt(String ext) { + this.ext = ext; - public Integer getType() { - return type; - } + } - public void setType(Integer type) { - this.type = type; +public String getUrl() { + return url; + } - } - public String getModuleName() { - return moduleName; - } - public void setModuleName(String moduleName) { - this.moduleName = moduleName; + public void setUrl(String url) { + this.url = url; - } + } - public String getFunctionName() { - return functionName; - } +public Integer getPublishId() { + return publishId; + } - public void setFunctionName(String functionName) { - this.functionName = functionName; - } - public String getPermissionName() { - return permissionName; - } + public void setPublishId(Integer publishId) { + this.publishId = publishId; - public void setPermissionName(String permissionName) { - this.permissionName = permissionName; + } - } +public String getPublishName() { + return publishName; + } - public String getAction() { - return action; - } - public void setAction(String action) { - this.action = action; - } + public void setPublishName(String publishName) { + this.publishName = publishName; - public String getExt() { - return ext; - } + } - public void setExt(String ext) { - this.ext = ext; +public Integer getYn() { + return yn; + } - } - public String getUrl() { - return url; - } - public void setUrl(String url) { - this.url = url; + public void setYn(Integer yn) { + this.yn = yn; - } + } - public Integer getPublishId() { - return publishId; - } +public Date getModified() { + return modified; + } - public void setPublishId(Integer publishId) { - this.publishId = publishId; - } - public String getPublishName() { - return publishName; - } + public void setModified(Date modified) { + this.modified = modified; - public void setPublishName(String publishName) { - this.publishName = publishName; + } - } +public Date getCreated() { + return created; + } - public Integer getYn() { - return yn; - } - public void setYn(Integer yn) { - this.yn = yn; - } + public void setCreated(Date created) { + this.created = created; - public Date getModified() { - return modified; - } + } - public void setModified(Date modified) { - this.modified = modified; +public Integer getIsmenu() { + return ismenu; + } - } - public Date getCreated() { - return created; - } - public void setCreated(Date created) { - this.created = created; + public void setIsmenu(Integer ismenu) { + this.ismenu = ismenu; - } + } } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RolePermissionMaps.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RolePermissionMaps.java index f0e538f..ccb1c0d 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RolePermissionMaps.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RolePermissionMaps.java @@ -1,33 +1,50 @@ package com.lyms.platform.permission.model; -public class RolePermissionMaps { - private String roleId; - private String permissionId; - private Integer yn; +import java.util.Date; - public String getRoleId() { - return roleId; - } +public class RolePermissionMaps {private Integer id;private Integer roleId;private Integer permissionId;private Integer yn; - public void setRoleId(String roleId) { - this.roleId = roleId; +public Integer getId() { + return id; + } - } - public String getPermissionId() { - return permissionId; - } - public void setPermissionId(String permissionId) { - this.permissionId = permissionId; + public void setId(Integer id) { + this.id = id; - } + } - public Integer getYn() { - return yn; - } +public Integer getRoleId() { + return roleId; + } - public void setYn(Integer yn) { - this.yn = yn; - } + + + public void setRoleId(Integer roleId) { + this.roleId = roleId; + + } + +public Integer getPermissionId() { + return permissionId; + } + + + + public void setPermissionId(Integer permissionId) { + this.permissionId = permissionId; + + } + +public Integer getYn() { + return yn; + } + + + + public void setYn(Integer yn) { + this.yn = yn; + + } } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RolePermissionMapsQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RolePermissionMapsQuery.java index 5216acf..3988849 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RolePermissionMapsQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/RolePermissionMapsQuery.java @@ -1,37 +1,56 @@ package com.lyms.platform.permission.model; + import com.lyms.platform.common.dao.BaseQuery; -public class RolePermissionMapsQuery extends BaseQuery { - private String roleId; - private String permissionId; - private Integer yn; +import java.util.Date; + + + +public class RolePermissionMapsQuery extends BaseQuery {private Integer id;private Integer roleId;private Integer permissionId;private Integer yn; + +public Integer getId() { + return id; + } + + + + public void setId(Integer id) { + this.id = id; + + } + +public Integer getRoleId() { + return roleId; + } + + + + public void setRoleId(Integer roleId) { + this.roleId = roleId; + + } + +public Integer getPermissionId() { + return permissionId; + } - public String getRoleId() { - return roleId; - } - public void setRoleId(String roleId) { - this.roleId = roleId; - } + public void setPermissionId(Integer permissionId) { + this.permissionId = permissionId; - public String getPermissionId() { - return permissionId; - } + } - public void setPermissionId(String permissionId) { - this.permissionId = permissionId; +public Integer getYn() { + return yn; + } - } - public Integer getYn() { - return yn; - } - public void setYn(Integer yn) { - this.yn = yn; + public void setYn(Integer yn) { + this.yn = yn; - } + } } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java index 0a53c0f..f6752cd 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java @@ -1,106 +1,127 @@ package com.lyms.platform.permission.model; - import java.util.Date; -public class Roles { - private String id; - private Integer type; - private String parentId; - private String title; - private String publishId; - private String publishName; - private Integer yn; - private Date modified; - private Date created; - - public String getId() { +public class Roles {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 Integer getId() { return id; } - public void setId(String id) { + + public void setId(Integer id) { this.id = id; } - public Integer getType() { +public Integer getType() { return type; } + public void setType(Integer type) { this.type = type; } - public String getParentId() { - return parentId; +public String getName() { + return name; } - public void setParentId(String parentId) { - this.parentId = parentId; - - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; + public void setName(String name) { + this.name = name; } - public String getPublishId() { +public Integer getPublishId() { return publishId; } - public void setPublishId(String 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 Integer getEnable() { + return enable; + } + + + + public void setEnable(Integer enable) { + this.enable = enable; + + } + +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() { + return remarks; + } + + + + public void setRemarks(String remarks) { + this.remarks = remarks; + + } + +public String getShortcode() { + return shortCode; + } + + + + public void setShortcode(String shortCode) { + this.shortCode = shortCode; + + } } \ No newline at end of file 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 da7025a..9086b63 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,107 +1,134 @@ package com.lyms.platform.permission.model; + + import com.lyms.platform.common.dao.BaseQuery; import java.util.Date; -import java.util.List; -public class RolesQuery extends BaseQuery { - - private String id; - private Integer type; - private String parentId; - private String title; - private String publishId; - private String publishName; - private Integer yn; - private Date modified; - private Date created; - private List ids; - public List getIds() { - return ids; - } - public void setIds(List ids) { - this.ids = ids; - } +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 Integer getId() { + return id; + } + + + + public void setId(Integer id) { + this.id = id; + + } + +public Integer getType() { + return type; + } + + + + public void setType(Integer type) { + this.type = type; + + } + +public String getName() { + return name; + } + + + + public void setName(String name) { + this.name = name; + + } + +public Integer getPublishId() { + return publishId; + } + + + + public void setPublishId(Integer publishId) { + this.publishId = publishId; + + } + +public String getPublishName() { + return publishName; + } + + + + public void setPublishName(String publishName) { + this.publishName = publishName; + + } + +public Integer getYn() { + return yn; + } + + + + public void setYn(Integer yn) { + this.yn = yn; + + } + +public Integer getEnable() { + return enable; + } - public String getId() { - return id; - } - public void setId(String id) { - this.id = id; - } - public String getParentId() { - return parentId; - } + public void setEnable(Integer enable) { + this.enable = enable; - public void setParentId(String parentId) { - this.parentId = parentId; - } + } - public String getPublishId() { - return publishId; - } +public Date getModified() { + return modified; + } - public void setPublishId(String publishId) { - this.publishId = publishId; - } - public Integer getType() { - return type; - } - public void setType(Integer type) { - this.type = type; + public void setModified(Date modified) { + this.modified = modified; - } + } - public String getTitle() { - return title; - } +public Date getCreated() { + return created; + } - public void setTitle(String title) { - this.title = title; - } - public String getPublishName() { - return publishName; - } + public void setCreated(Date created) { + this.created = created; - public void setPublishName(String publishName) { - this.publishName = publishName; + } - } +public String getRemarks() { + return remarks; + } - public Integer getYn() { - return yn; - } - public void setYn(Integer yn) { - this.yn = yn; - } + public void setRemarks(String remarks) { + this.remarks = remarks; - public Date getModified() { - return modified; - } + } - public void setModified(Date modified) { - this.modified = modified; +public String getShortcode() { + return shortCode; + } - } - public Date getCreated() { - return created; - } - public void setCreated(Date created) { - this.created = created; + public void setShortcode(String shortCode) { + this.shortCode = shortCode; - } + } } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UserOrganizationMaps.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UserOrganizationMaps.java new file mode 100644 index 0000000..27109a2 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UserOrganizationMaps.java @@ -0,0 +1,61 @@ +package com.lyms.platform.permission.model; + +import java.util.Date; + +public class UserOrganizationMaps {private Integer id;private Integer userId;private Integer orgId;private Integer yn;private Date expirTime; + +public Integer getId() { + return id; + } + + + + public void setId(Integer id) { + this.id = id; + + } + +public Integer getUserId() { + return userId; + } + + + + public void setUserId(Integer userId) { + this.userId = userId; + + } + +public Integer getOrgId() { + return orgId; + } + + + + public void setOrgId(Integer orgId) { + this.orgId = orgId; + + } + +public Integer getYn() { + return yn; + } + + + + public void setYn(Integer yn) { + this.yn = yn; + + } + +public Date getExpirtime() { + return expirTime; + } + + + + public void setExpirtime(Date expirTime) { + this.expirTime = expirTime; + + } +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UserOrganizationMapsQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UserOrganizationMapsQuery.java new file mode 100644 index 0000000..65b8db7 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UserOrganizationMapsQuery.java @@ -0,0 +1,67 @@ +package com.lyms.platform.permission.model; + + + +import com.lyms.platform.common.dao.BaseQuery; + +import java.util.Date; + + + +public class UserOrganizationMapsQuery extends BaseQuery {private Integer id;private Integer userId;private Integer orgId;private Integer yn;private Date expirTime; + +public Integer getId() { + return id; + } + + + + public void setId(Integer id) { + this.id = id; + + } + +public Integer getUserId() { + return userId; + } + + + + public void setUserId(Integer userId) { + this.userId = userId; + + } + +public Integer getOrgId() { + return orgId; + } + + + + public void setOrgId(Integer orgId) { + this.orgId = orgId; + + } + +public Integer getYn() { + return yn; + } + + + + public void setYn(Integer yn) { + this.yn = yn; + + } + +public Date getExpirtime() { + return expirTime; + } + + + + public void setExpirtime(Date expirTime) { + this.expirTime = expirTime; + + } +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UserRoleMaps.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UserRoleMaps.java index 22af56b..9298194 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UserRoleMaps.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UserRoleMaps.java @@ -1,34 +1,61 @@ package com.lyms.platform.permission.model; +import java.util.Date; +public class UserRoleMaps {private Integer id;private Integer userId;private Integer roleId;private Integer yn;private Date expirTime; -public class UserRoleMaps { - private String userId; - private String roleId; - private Integer yn; +public Integer getId() { + return id; + } - public String getUserId() { - return userId; - } - public void setUserId(String userId) { - this.userId = userId; - } + public void setId(Integer id) { + this.id = id; - public String getRoleId() { - return roleId; - } + } - public void setRoleId(String roleId) { - this.roleId = roleId; - } +public Integer getUserId() { + return userId; + } - public Integer getYn() { - return yn; - } - public void setYn(Integer yn) { - this.yn = yn; - } + + public void setUserId(Integer userId) { + this.userId = userId; + + } + +public Integer getRoleId() { + return roleId; + } + + + + public void setRoleId(Integer roleId) { + this.roleId = roleId; + + } + +public Integer getYn() { + return yn; + } + + + + public void setYn(Integer yn) { + this.yn = yn; + + } + +public Date getExpirtime() { + return expirTime; + } + + + + public void setExpirtime(Date expirTime) { + this.expirTime = expirTime; + + } } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UserRoleMapsQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UserRoleMapsQuery.java index ddfbf2d..280fadd 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UserRoleMapsQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UserRoleMapsQuery.java @@ -1,36 +1,67 @@ package com.lyms.platform.permission.model; + import com.lyms.platform.common.dao.BaseQuery; -public class UserRoleMapsQuery extends BaseQuery { - private String userId; - private String roleId; - private Integer yn; +import java.util.Date; + + + +public class UserRoleMapsQuery extends BaseQuery {private Integer id;private Integer userId;private Integer roleId;private Integer yn;private Date expirTime; + +public Integer getId() { + return id; + } + + + + public void setId(Integer id) { + this.id = id; + + } + +public Integer getUserId() { + return userId; + } + + + + public void setUserId(Integer userId) { + this.userId = userId; + + } + +public Integer getRoleId() { + return roleId; + } + + + + public void setRoleId(Integer roleId) { + this.roleId = roleId; + + } + +public Integer getYn() { + return yn; + } + - public String getUserId() { - return userId; - } - public void setUserId(String userId) { - this.userId = userId; + public void setYn(Integer yn) { + this.yn = yn; - } - public String getRoleId() { - return roleId; - } + } - public void setRoleId(String roleId) { - this.roleId = roleId; +public Date getExpirtime() { + return expirTime; + } - } - public Integer getYn() { - return yn; - } - public void setYn(Integer yn) { - this.yn = yn; + public void setExpirtime(Date expirTime) { + this.expirTime = expirTime; - } + } } \ No newline at end of file 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 8c1eb34..46f54c3 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 @@ -2,144 +2,181 @@ package com.lyms.platform.permission.model; import java.util.Date; -public class Users { - private String id; - private Integer type; - private String parentId; - private Integer deptId; - private String username; - private String account; - private String pwd;// - private String phone; - private String publishId; - private String publishName; - private Integer yn; - private Date modified; - private Date created; - private Date lastLoginTime; +public class Users {private Integer id;private Integer type;private Integer orgId;private Integer deptId;private String name;private String account;private String pwd;private String phone;private Integer publishId;private String publishName;private Integer yn;private Integer enable;private Date modified;private Date created;private String remarks;private Date lastLoginTime; - public Date getLastLoginTime() { - return lastLoginTime; - } +public Integer getId() { + return id; + } - public void setLastLoginTime(Date lastLoginTime) { - this.lastLoginTime = lastLoginTime; - } - public String getId() { - return id; - } - public void setId(String id) { - this.id = id; + public void setId(Integer id) { + this.id = id; - } + } - public Integer getType() { - return type; - } +public Integer getType() { + return type; + } - public void setType(Integer type) { - this.type = type; - } - public String getParentId() { - return parentId; - } + public void setType(Integer type) { + this.type = type; - public void setParentId(String parentId) { - this.parentId = parentId; + } - } +public Integer getOrgId() { + return orgId; + } - public Integer getDeptId() { - return deptId; - } - public void setDeptId(Integer deptId) { - this.deptId = deptId; - } + public void setOrgId(Integer orgId) { + this.orgId = orgId; - public String getUsername() { - return username; - } + } - public void setUsername(String username) { - this.username = username; +public Integer getDeptId() { + return deptId; + } - } - public String getAccount() { - return account; - } - public void setAccount(String account) { - this.account = account; + public void setDeptId(Integer deptId) { + this.deptId = deptId; - } + } - public String getPwd() { - return pwd; - } +public String getName() { + return name; + } - public void setPwd(String pwd) { - this.pwd = pwd; - } - public String getPhone() { - return phone; - } + public void setName(String name) { + this.name = name; - public void setPhone(String phone) { - this.phone = phone; + } - } +public String getAccount() { + return account; + } - public String getPublishId() { - return publishId; - } - public void setPublishId(String publishId) { - this.publishId = publishId; - } + public void setAccount(String account) { + this.account = account; - public String getPublishName() { - return publishName; - } + } - public void setPublishName(String publishName) { - this.publishName = publishName; +public String getPwd() { + return pwd; + } - } - public Integer getYn() { - return yn; - } - public void setYn(Integer yn) { - this.yn = yn; + public void setPwd(String pwd) { + this.pwd = pwd; - } + } - public Date getModified() { - return modified; - } +public String getPhone() { + return phone; + } - public void setModified(Date modified) { - this.modified = modified; - } - public Date getCreated() { - return created; - } + public void setPhone(String phone) { + this.phone = phone; - public void setCreated(Date created) { - this.created = created; + } - } +public Integer getPublishId() { + return publishId; + } + + + + public void setPublishId(Integer publishId) { + this.publishId = publishId; + + } + +public String getPublishName() { + return publishName; + } + + + + public void setPublishName(String publishName) { + this.publishName = publishName; + + } + +public Integer getYn() { + return yn; + } + + + + public void setYn(Integer yn) { + this.yn = yn; + + } + +public Integer getEnable() { + return enable; + } + + + + public void setEnable(Integer enable) { + this.enable = enable; + + } + +public Date getModified() { + return modified; + } + + + + public void setModified(Date modified) { + this.modified = modified; + + } + +public Date getCreated() { + return created; + } + + + + public void setCreated(Date created) { + this.created = created; + + } + +public String getRemarks() { + return remarks; + } + + + + public void setRemarks(String remarks) { + this.remarks = remarks; + + } + +public Date getLastLoginTime() { + return lastLoginTime; + } + + + + public void setLastLoginTime(Date lastLoginTime) { + this.lastLoginTime = lastLoginTime; + + } } \ No newline at end of file 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 a6f2be1..5ae346f 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 @@ -1,138 +1,188 @@ package com.lyms.platform.permission.model; + + import com.lyms.platform.common.dao.BaseQuery; import java.util.Date; -public class UsersQuery extends BaseQuery { - private String id; - private Integer type; - private Integer parentId; - private Integer deptId; - private String username; - private String account; - private String pwd; - private String phone; - private Integer publishId; - private String publishName; - private Integer yn; - private Date modified; - private Date created; - public String getId() { - return id; - } +public class UsersQuery extends BaseQuery {private Integer id;private Integer type;private Integer orgId;private Integer deptId;private String name;private String account;private String pwd;private String phone;private Integer publishId;private String publishName;private Integer yn;private Integer enable;private Date modified;private Date created;private String remarks;private Date lastLoginTime; + +public Integer getId() { + return id; + } + + + + public void setId(Integer id) { + this.id = id; + + } + +public Integer getType() { + return type; + } + + + + public void setType(Integer type) { + this.type = type; + + } + +public Integer getOrgId() { + return orgId; + } + + + + public void setOrgId(Integer orgId) { + this.orgId = orgId; + + } + +public Integer getDeptId() { + return deptId; + } + + + + public void setDeptId(Integer deptId) { + this.deptId = deptId; + + } + +public String getName() { + return name; + } + + + + public void setName(String name) { + this.name = name; + + } + +public String getAccount() { + return account; + } + + + + public void setAccount(String account) { + 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 setId(String id) { - this.id = id; - } + public void setPublishId(Integer publishId) { + this.publishId = publishId; - public Integer getType() { - return type; - } + } - public void setType(Integer type) { - this.type = type; +public String getPublishName() { + return publishName; + } - } - public Integer getParentId() { - return parentId; - } - public void setParentId(Integer parentId) { - this.parentId = parentId; + public void setPublishName(String publishName) { + this.publishName = publishName; - } + } - public Integer getDeptId() { - return deptId; - } +public Integer getYn() { + return yn; + } - public void setDeptId(Integer deptId) { - this.deptId = deptId; - } - public String getUsername() { - return username; - } + public void setYn(Integer yn) { + this.yn = yn; - public void setUsername(String username) { - this.username = username; + } - } +public Integer getEnable() { + return enable; + } - public String getAccount() { - return account; - } - public void setAccount(String account) { - this.account = account; - } + public void setEnable(Integer enable) { + this.enable = enable; - public String getPwd() { - return pwd; - } + } - public void setPwd(String pwd) { - this.pwd = pwd; +public Date getModified() { + return modified; + } - } - public String getPhone() { - return phone; - } - public void setPhone(String phone) { - this.phone = phone; + public void setModified(Date modified) { + this.modified = modified; - } + } - public Integer getPublishId() { - return publishId; - } +public Date getCreated() { + return created; + } - public void setPublishId(Integer publishId) { - this.publishId = publishId; - } - public String getPublishName() { - return publishName; - } + public void setCreated(Date created) { + this.created = created; - public void setPublishName(String publishName) { - this.publishName = publishName; + } - } +public String getRemarks() { + return remarks; + } - public Integer getYn() { - return yn; - } - public void setYn(Integer yn) { - this.yn = yn; - } + public void setRemarks(String remarks) { + this.remarks = remarks; - public Date getModified() { - return modified; - } + } - public void setModified(Date modified) { - this.modified = modified; +public Date getLastLoginTime() { + return lastLoginTime; + } - } - public Date getCreated() { - return created; - } - public void setCreated(Date created) { - this.created = created; + public void setLastLoginTime(Date lastLoginTime) { + this.lastLoginTime = lastLoginTime; - } + } } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/DepartmentsService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/DepartmentsService.java new file mode 100644 index 0000000..6330572 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/DepartmentsService.java @@ -0,0 +1,10 @@ +package com.lyms.platform.permission.service; + +import com.lyms.platform.permission.model.Departments; +import com.lyms.platform.permission.model.DepartmentsQuery; + +import java.util.List; + +public interface DepartmentsService {public void addDepartments(Departments obj);public void updateDepartments(Departments obj);public void deleteDepartments(Integer id);public Departments getDepartments(Integer id);public int queryDepartmentsCount(DepartmentsQuery query);public List queryDepartments(DepartmentsQuery query); + +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/IDepartmentsService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/IDepartmentsService.java deleted file mode 100644 index 8a9e703..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/IDepartmentsService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.lyms.platform.permission.service; - - - -import com.lyms.platform.permission.model.Departments; -import com.lyms.platform.permission.model.DepartmentsQuery; - -import java.util.List; - -public interface IDepartmentsService {public void addDepartments(Departments obj);public void updateDepartments(Departments obj);public void deleteDepartments(Integer id);public Departments getDepartments(Integer id);public int queryDepartmentsCount(DepartmentsQuery query);public List queryDepartments(DepartmentsQuery query); - -} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/IPermissionsService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/IPermissionsService.java deleted file mode 100644 index 9fe88ba..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/IPermissionsService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.lyms.platform.permission.service; - -import com.lyms.platform.permission.model.Permissions; -import com.lyms.platform.permission.model.PermissionsQuery; - -import java.util.List; - - - -public interface IPermissionsService { - - public void addPermissions(Permissions obj); - - public void updatePermissions(Permissions obj); - - public void deletePermissions(String id); - - public Permissions getPermissions(String id); - - public int queryPermissionsCount(PermissionsQuery query); - - public List queryPermissions(PermissionsQuery query); -} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/IRolePermissionMapsService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/IRolePermissionMapsService.java deleted file mode 100644 index 0deb33c..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/IRolePermissionMapsService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.lyms.platform.permission.service; - -import com.lyms.platform.permission.model.RolePermissionMaps; -import com.lyms.platform.permission.model.RolePermissionMapsQuery; - -import java.util.List; - - -public interface IRolePermissionMapsService { - - public void addRolePermissionMaps(RolePermissionMaps obj); - - public void updateRolePermissionMaps(RolePermissionMaps obj); - - public void deleteRolePermissionMaps(String roleId, String permissionId); - - public RolePermissionMaps getRolePermissionMaps(String id); - - public RolePermissionMaps getRolePermissionMaps(String roleId, - String permissionId); - - public int queryRolePermissionMapsCount(RolePermissionMapsQuery query); - - public List queryRolePermissionMaps( - RolePermissionMapsQuery query); - - public List queryRolePermissionMapsv2(RolePermissionMapsQuery query); -} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/IRolesService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/IRolesService.java deleted file mode 100644 index 9d26e24..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/IRolesService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.lyms.platform.permission.service; - -import com.lyms.platform.permission.model.Roles; -import com.lyms.platform.permission.model.RolesQuery; - -import java.util.List; - - - -public interface IRolesService { - public void addRoles(Roles obj); - - public void updateRoles(Roles obj); - - public void deleteRoles(String id); - - public Roles getRoles(String id); - - public int queryRolesCount(RolesQuery query); - - public List queryRoles(RolesQuery query); -} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ITokenService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ITokenService.java deleted file mode 100644 index 453cff7..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ITokenService.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.lyms.platform.permission.service; - -/** - * Created by riecard on 15/9/22. - */ -public interface ITokenService { - - /** - * 创建token - * @return - */ - public String createToken(String userId); - - /** - * 创建token - * @return - */ - public String createToken(String userId, Integer second); - - /** - * 重置token有效时间（默认重置为7天) - * @param token - * @return - */ - public boolean resetToken(String token); - - /** - * 检查token是否存在 - * @param token - * @return - */ - public boolean validToken(String token); - - /** - * 根据token取userId，失败返回null - * @param token - * @return - */ - public String getUserId(String token); - - public void deleteAllToken(String userId); - - public void deleteAllToken(String userId, String prefix); - -} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/IUserRoleMapsService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/IUserRoleMapsService.java deleted file mode 100644 index b11e0d5..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/IUserRoleMapsService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.lyms.platform.permission.service; - -import com.lyms.platform.permission.model.UserRoleMaps; -import com.lyms.platform.permission.model.UserRoleMapsQuery; - -import java.util.List; - - - -public interface IUserRoleMapsService { - - public void addUserRoleMaps(UserRoleMaps obj); - - public void updateUserRoleMaps(UserRoleMaps obj); - - public void deleteUserRoleMaps(String id); - - public UserRoleMaps getUserRoleMaps(String id); - - public UserRoleMaps getUserRoleMaps(String userId, String roleId); - - public int queryUserRoleMapsCount(UserRoleMapsQuery query); - - public List queryUserRoleMaps(UserRoleMapsQuery query); - -} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/IUsersService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/IUsersService.java deleted file mode 100644 index 9ecc2b3..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/IUsersService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.lyms.platform.permission.service; - -import com.lyms.platform.permission.model.Users; -import com.lyms.platform.permission.model.UsersQuery; - -import java.util.List; - - - -public interface IUsersService { - public void addUsers(Users obj); - - public void updateUsers(Users obj); - - public void deleteUsers(String id); - - public Users getUsers(String id); - - public int queryUsersCount(UsersQuery query); - - public List queryUsers(UsersQuery query); - -} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java new file mode 100644 index 0000000..2519fe6 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java @@ -0,0 +1,10 @@ +package com.lyms.platform.permission.service; + +import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.OrganizationQuery; + +import java.util.List; + +public interface OrganizationService {public void addOrganization(Organization obj);public void updateOrganization(Organization obj);public void deleteOrganization(Integer id);public Organization getOrganization(Integer id);public int queryOrganizationCount(OrganizationQuery query);public List queryOrganization(OrganizationQuery query); + +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PermissionsService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PermissionsService.java new file mode 100644 index 0000000..d32bd05 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PermissionsService.java @@ -0,0 +1,10 @@ +package com.lyms.platform.permission.service; + +import com.lyms.platform.permission.model.Permissions; +import com.lyms.platform.permission.model.PermissionsQuery; + +import java.util.List; + +public interface PermissionsService {public void addPermissions(Permissions obj);public void updatePermissions(Permissions obj);public void deletePermissions(Integer id);public Permissions getPermissions(Integer id);public int queryPermissionsCount(PermissionsQuery query);public List queryPermissions(PermissionsQuery query); + +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/RolePermissionMapsService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/RolePermissionMapsService.java new file mode 100644 index 0000000..88d94fd --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/RolePermissionMapsService.java @@ -0,0 +1,10 @@ +package com.lyms.platform.permission.service; + +import com.lyms.platform.permission.model.RolePermissionMaps; +import com.lyms.platform.permission.model.RolePermissionMapsQuery; + +import java.util.List; + +public interface RolePermissionMapsService {public void addRolePermissionMaps(RolePermissionMaps obj);public void updateRolePermissionMaps(RolePermissionMaps obj);public void deleteRolePermissionMaps(Integer id);public RolePermissionMaps getRolePermissionMaps(Integer id);public int queryRolePermissionMapsCount(RolePermissionMapsQuery query);public List queryRolePermissionMaps(RolePermissionMapsQuery query); + +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/RolesService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/RolesService.java new file mode 100644 index 0000000..31898a7 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/RolesService.java @@ -0,0 +1,10 @@ +package com.lyms.platform.permission.service; + +import com.lyms.platform.permission.model.Roles; +import com.lyms.platform.permission.model.RolesQuery; + +import java.util.List; + +public interface RolesService {public void addRoles(Roles obj);public void updateRoles(Roles obj);public void deleteRoles(Integer id);public Roles getRoles(Integer id);public int queryRolesCount(RolesQuery query);public List queryRoles(RolesQuery query); + +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/TokenService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/TokenService.java new file mode 100644 index 0000000..8a69426 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/TokenService.java @@ -0,0 +1,52 @@ +package com.lyms.platform.permission.service; + +/** + * Created by riecard on 15/9/22. + */ +public interface TokenService { + + /** + * 创建token + * @return + */ + public String createToken(Integer userId); + + /** + * 创建token + * @return + */ + public String createToken(Integer userId, Integer second); + + /** + * 重置token有效时间（默认重置为7天) + * @param token + * @return + */ + public boolean resetToken(String token); + + /** + * 检查token是否存在 + * @param token + * @return + */ + public boolean validToken(String token); + + /** + * 检查token是否存在 + * @param token + * @return + */ + public boolean validToken(String token, Integer second); + + /** + * 根据token取userId，失败返回null + * @param token + * @return + */ + public Integer getUserId(String token); + + public void deleteAllToken(Integer userId); + + public void deleteAllToken(Integer userId, String prefix); + +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UserOrganizationMapsService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UserOrganizationMapsService.java new file mode 100644 index 0000000..8b4fcb6 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UserOrganizationMapsService.java @@ -0,0 +1,10 @@ +package com.lyms.platform.permission.service; + +import com.lyms.platform.permission.model.UserOrganizationMaps; +import com.lyms.platform.permission.model.UserOrganizationMapsQuery; + +import java.util.List; + +public interface UserOrganizationMapsService {public void addUserOrganizationMaps(UserOrganizationMaps obj);public void updateUserOrganizationMaps(UserOrganizationMaps obj);public void deleteUserOrganizationMaps(Integer id);public UserOrganizationMaps getUserOrganizationMaps(Integer id);public int queryUserOrganizationMapsCount(UserOrganizationMapsQuery query);public List queryUserOrganizationMaps(UserOrganizationMapsQuery query); + +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UserRoleMapsService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UserRoleMapsService.java new file mode 100644 index 0000000..07490fc --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UserRoleMapsService.java @@ -0,0 +1,10 @@ +package com.lyms.platform.permission.service; + +import com.lyms.platform.permission.model.UserRoleMaps; +import com.lyms.platform.permission.model.UserRoleMapsQuery; + +import java.util.List; + +public interface UserRoleMapsService {public void addUserRoleMaps(UserRoleMaps obj);public void updateUserRoleMaps(UserRoleMaps obj);public void deleteUserRoleMaps(Integer id);public UserRoleMaps getUserRoleMaps(Integer id);public int queryUserRoleMapsCount(UserRoleMapsQuery query);public List queryUserRoleMaps(UserRoleMapsQuery query); + +} \ No newline at end of file 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 new file mode 100644 index 0000000..c758a02 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UsersService.java @@ -0,0 +1,10 @@ +package com.lyms.platform.permission.service; + +import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.model.UsersQuery; + +import java.util.List; + +public interface UsersService {public void addUsers(Users obj);public void updateUsers(Users obj);public void deleteUsers(Integer id);public Users getUsers(Integer id);public int queryUsersCount(UsersQuery query);public List queryUsers(UsersQuery query); + +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/DepartmentsServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/DepartmentsServiceImpl.java index 6746102..01a47ee 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/DepartmentsServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/DepartmentsServiceImpl.java @@ -1,20 +1,20 @@ package com.lyms.platform.permission.service.impl; - -import com.lyms.platform.permission.intf.IDepartmentsDao; +import com.lyms.platform.permission.dao.DepartmentsMapper; import com.lyms.platform.permission.model.Departments; import com.lyms.platform.permission.model.DepartmentsQuery; -import com.lyms.platform.permission.service.IDepartmentsService; +import com.lyms.platform.permission.service.DepartmentsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; @Service -public class DepartmentsServiceImpl implements IDepartmentsService { +public class DepartmentsServiceImpl implements DepartmentsService { @Autowired -private IDepartmentsDao departmentsMapper; +private DepartmentsMapper departmentsMapper; @Override public void addDepartments(Departments obj){departmentsMapper.addDepartments(obj);} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java new file mode 100644 index 0000000..e2f8c10 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java @@ -0,0 +1,32 @@ +package com.lyms.platform.permission.service.impl; + +import com.lyms.platform.permission.dao.OrganizationMapper; +import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.OrganizationQuery; +import com.lyms.platform.permission.service.OrganizationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +@Service +public class OrganizationServiceImpl implements OrganizationService { + +@Autowired +private OrganizationMapper organizationMapper; + +@Override +public void addOrganization(Organization obj){organizationMapper.addOrganization(obj);} +@Override +public void updateOrganization(Organization obj){organizationMapper.updateOrganization(obj);} +@Override +public void deleteOrganization (Integer id){organizationMapper.deleteOrganization(id);} +@Override +public Organization getOrganization (Integer id){return organizationMapper.getOrganization(id);} +@Override +public int queryOrganizationCount (OrganizationQuery query){return organizationMapper.queryOrganizationCount(query);} +@Override +public List queryOrganization (OrganizationQuery query){if (query.getNeed() != null) {query.mysqlBuild(organizationMapper.queryOrganizationCount(query));}return organizationMapper.queryOrganization(query);} + +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PermissionsServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PermissionsServiceImpl.java index 64c1a92..5339cd0 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PermissionsServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PermissionsServiceImpl.java @@ -1,52 +1,32 @@ package com.lyms.platform.permission.service.impl; -import java.util.List; - -import com.lyms.platform.permission.intf.IPermissionsDao; +import com.lyms.platform.permission.dao.PermissionsMapper; import com.lyms.platform.permission.model.Permissions; import com.lyms.platform.permission.model.PermissionsQuery; -import com.lyms.platform.permission.service.IPermissionsService; +import com.lyms.platform.permission.service.PermissionsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - +import java.util.Date; +import java.util.List; @Service -public class PermissionsServiceImpl implements IPermissionsService { - - @Autowired - private IPermissionsDao iPermissionsDao; - - @Override - public void addPermissions(Permissions obj) { - iPermissionsDao.addPermissions(obj); - } - - @Override - public void updatePermissions(Permissions obj) { - iPermissionsDao.updatePermissions(obj); - } - - @Override - public void deletePermissions(String id) { - iPermissionsDao.deletePermissions(id); - } - - @Override - public Permissions getPermissions(String id) { - return iPermissionsDao.getPermissions(id); - } - - @Override - public int queryPermissionsCount(PermissionsQuery query) { - return iPermissionsDao.queryPermissionsCount(query); - } +public class PermissionsServiceImpl implements PermissionsService { + +@Autowired +private PermissionsMapper permissionsMapper; + +@Override +public void addPermissions(Permissions obj){permissionsMapper.addPermissions(obj);} +@Override +public void updatePermissions(Permissions obj){permissionsMapper.updatePermissions(obj);} +@Override +public void deletePermissions (Integer id){permissionsMapper.deletePermissions(id);} +@Override +public Permissions getPermissions (Integer id){return permissionsMapper.getPermissions(id);} +@Override +public int queryPermissionsCount (PermissionsQuery query){return permissionsMapper.queryPermissionsCount(query);} +@Override +public List queryPermissions (PermissionsQuery query){if (query.getNeed() != null) {query.mysqlBuild(permissionsMapper.queryPermissionsCount(query));}return permissionsMapper.queryPermissions(query);} - @Override - public List queryPermissions(PermissionsQuery query) { - if (query.getNeed() != null) { - query.mysqlBuild(iPermissionsDao.queryPermissionsCount(query)); - } - return iPermissionsDao.queryPermissions(query); - } } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RolePermissionMapsServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RolePermissionMapsServiceImpl.java index 188eda3..b3d66d2 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RolePermissionMapsServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RolePermissionMapsServiceImpl.java @@ -1,68 +1,32 @@ package com.lyms.platform.permission.service.impl; - -import java.util.List; - -import com.lyms.platform.permission.intf.IRolePermissionMapsDao; +import com.lyms.platform.permission.dao.RolePermissionMapsMapper; import com.lyms.platform.permission.model.RolePermissionMaps; import com.lyms.platform.permission.model.RolePermissionMapsQuery; -import com.lyms.platform.permission.service.IRolePermissionMapsService; +import com.lyms.platform.permission.service.RolePermissionMapsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - +import java.util.Date; +import java.util.List; @Service -public class RolePermissionMapsServiceImpl implements IRolePermissionMapsService { - - @Autowired - private IRolePermissionMapsDao iRolePermissionMapsDao; - - @Override - public void addRolePermissionMaps(RolePermissionMaps obj) { - iRolePermissionMapsDao.addRolePermissionMaps(obj); - } - - @Override - public void updateRolePermissionMaps(RolePermissionMaps obj) { - iRolePermissionMapsDao.updateRolePermissionMaps(obj); - } - - @Override - public void deleteRolePermissionMaps(String roleId, String permissionId) { - iRolePermissionMapsDao.deleteRolePermissionMaps(roleId, permissionId); - } - - @Override - public RolePermissionMaps getRolePermissionMaps(String id) { - return iRolePermissionMapsDao.getRolePermissionMaps(id); - } - - @Override - public RolePermissionMaps getRolePermissionMaps(String roleId, - String permissionId) { - return iRolePermissionMapsDao.getRolePermissionMaps(roleId, permissionId); - } - - @Override - public int queryRolePermissionMapsCount(RolePermissionMapsQuery query) { - return iRolePermissionMapsDao.queryRolePermissionMapsCount(query); - } - - @Override - public List queryRolePermissionMaps( - RolePermissionMapsQuery query) { - if (query.getNeed() != null){ - query.mysqlBuild(iRolePermissionMapsDao.queryRolePermissionMapsCount(query)); - } - return iRolePermissionMapsDao.queryRolePermissionMaps(query); - } +public class RolePermissionMapsServiceImpl implements RolePermissionMapsService { + +@Autowired +private RolePermissionMapsMapper rolePermissionMapsMapper; + +@Override +public void addRolePermissionMaps(RolePermissionMaps obj){rolePermissionMapsMapper.addRolePermissionMaps(obj);} +@Override +public void updateRolePermissionMaps(RolePermissionMaps obj){rolePermissionMapsMapper.updateRolePermissionMaps(obj);} +@Override +public void deleteRolePermissionMaps (Integer id){rolePermissionMapsMapper.deleteRolePermissionMaps(id);} +@Override +public RolePermissionMaps getRolePermissionMaps (Integer id){return rolePermissionMapsMapper.getRolePermissionMaps(id);} +@Override +public int queryRolePermissionMapsCount (RolePermissionMapsQuery query){return rolePermissionMapsMapper.queryRolePermissionMapsCount(query);} +@Override +public List queryRolePermissionMaps (RolePermissionMapsQuery query){if (query.getNeed() != null) {query.mysqlBuild(rolePermissionMapsMapper.queryRolePermissionMapsCount(query));}return rolePermissionMapsMapper.queryRolePermissionMaps(query);} - @Override - public List queryRolePermissionMapsv2(RolePermissionMapsQuery query) { - if (query.getNeed() != null) { - query.mysqlBuild(iRolePermissionMapsDao.queryRolePermissionMapsCount(query)); - } - return iRolePermissionMapsDao.queryRolePermissionMapsv2(query); - } } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RolesServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RolesServiceImpl.java index d288e12..7547cd8 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RolesServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/RolesServiceImpl.java @@ -1,53 +1,32 @@ package com.lyms.platform.permission.service.impl; - -import java.util.List; - -import com.lyms.platform.permission.intf.IRolesDao; +import com.lyms.platform.permission.dao.RolesMapper; import com.lyms.platform.permission.model.Roles; import com.lyms.platform.permission.model.RolesQuery; -import com.lyms.platform.permission.service.IRolesService; +import com.lyms.platform.permission.service.RolesService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - +import java.util.Date; +import java.util.List; @Service -public class RolesServiceImpl implements IRolesService { - - @Autowired - private IRolesDao iRolesDao; - - @Override - public void addRoles(Roles obj) { - iRolesDao.addRoles(obj); - } - - @Override - public void updateRoles(Roles obj) { - iRolesDao.updateRoles(obj); - } - - @Override - public void deleteRoles(String id) { - iRolesDao.deleteRoles(id); - } - - @Override - public Roles getRoles(String id) { - return iRolesDao.getRoles(id); - } - - @Override - public int queryRolesCount(RolesQuery query) { - return iRolesDao.queryRolesCount(query); - } +public class RolesServiceImpl implements RolesService { + +@Autowired +private RolesMapper rolesMapper; + +@Override +public void addRoles(Roles obj){rolesMapper.addRoles(obj);} +@Override +public void updateRoles(Roles obj){rolesMapper.updateRoles(obj);} +@Override +public void deleteRoles (Integer id){rolesMapper.deleteRoles(id);} +@Override +public Roles getRoles (Integer id){return rolesMapper.getRoles(id);} +@Override +public int queryRolesCount (RolesQuery query){return rolesMapper.queryRolesCount(query);} +@Override +public List queryRoles (RolesQuery query){if (query.getNeed() != null) {query.mysqlBuild(rolesMapper.queryRolesCount(query));}return rolesMapper.queryRoles(query);} - @Override - public List queryRoles(RolesQuery query) { - if (query.getNeed() != null){ - query.mysqlBuild(queryRolesCount(query)); - } - return iRolesDao.queryRoles(query); - } } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/TokenServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/TokenServiceImpl.java index 6f98e7b..5d55dcd 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/TokenServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/TokenServiceImpl.java @@ -1,24 +1,24 @@ package com.lyms.platform.permission.service.impl; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; import com.lyms.platform.common.cache.redis.RedisUtils; import com.lyms.platform.common.utils.Config; import com.lyms.platform.common.utils.TokenUtils; -import com.lyms.platform.permission.service.ITokenService; +import com.lyms.platform.permission.service.TokenService; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; /** * Created by riecard on 15/9/22. */ @Service -@SuppressWarnings("unchecked") -public class TokenServiceImpl implements ITokenService { +public class TokenServiceImpl implements TokenService { static final Integer seconds = 7*24*60*60; + static final Integer ams_seconds = 60*60; private String prefix = null; @@ -29,8 +29,16 @@ public class TokenServiceImpl implements ITokenService { return prefix; } + private Integer getSeconds() { + if ("ams".equals(prefix)) { + return ams_seconds; + } else { + return seconds; + } + } + @Override - public String createToken(String userId, Integer second) { + public String createToken(Integer userId, Integer second) { String token = getPrefix() + TokenUtils.getToken(UUID.randomUUID().toString()); RedisUtils.setObj(token, userId, second); @@ -51,28 +59,10 @@ public class TokenServiceImpl implements ITokenService { RedisUtils.setObj(tempKey,list,second); return token; } - - @Override - public String createToken(String userId) { - String token = getPrefix() + TokenUtils.getToken(UUID.randomUUID().toString()); - RedisUtils.setObj(token, userId, seconds); - List list = new ArrayList<>(); - List delList = new ArrayList(); - String tempKey = getPrefix() + "_tokenlist_" + userId; - Object obj = RedisUtils.getObj(tempKey); - if (obj != null) { - list = (List)obj; - } - for (String key:list) { - if (!RedisUtils.existsObj(key)) { - delList.add(key); - } - } - list.removeAll(delList); - list.add(token); - RedisUtils.setObj(tempKey,list,seconds); - return token; + @Override + public String createToken(Integer userId) { + return createToken(userId, seconds); } @Override @@ -87,24 +77,31 @@ public class TokenServiceImpl implements ITokenService { @Override public boolean validToken(String token) { + return validToken(token, seconds); + } + + @Override + public boolean validToken(String token, Integer second) { Object obj = RedisUtils.getObj(token); if (obj != null) { + RedisUtils.setObj(token, obj, second); return true; } return false; } @Override - public String getUserId(String token) { + public Integer getUserId(String token) { Object obj = RedisUtils.getObj(token); if (obj != null) { - return obj.toString(); + RedisUtils.setObj(token, obj, getSeconds()); + return (Integer)obj; } return null; } @Override - public void deleteAllToken(String userId) { + public void deleteAllToken(Integer userId) { String tempKey = getPrefix() + "_tokenlist_" + userId; Object obj = RedisUtils.getObj(tempKey); if (obj != null) { @@ -117,7 +114,7 @@ public class TokenServiceImpl implements ITokenService { } @Override - public void deleteAllToken(String userId, String prefix) { + public void deleteAllToken(Integer userId, String prefix) { String tempKey = prefix + "_tokenlist_" + userId; Object obj = RedisUtils.getObj(tempKey); if (obj != null) { diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UserOrganizationMapsServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UserOrganizationMapsServiceImpl.java new file mode 100644 index 0000000..72e0e6a --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UserOrganizationMapsServiceImpl.java @@ -0,0 +1,32 @@ +package com.lyms.platform.permission.service.impl; + +import com.lyms.platform.permission.dao.UserOrganizationMapsMapper; +import com.lyms.platform.permission.model.UserOrganizationMaps; +import com.lyms.platform.permission.model.UserOrganizationMapsQuery; +import com.lyms.platform.permission.service.UserOrganizationMapsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +@Service +public class UserOrganizationMapsServiceImpl implements UserOrganizationMapsService { + +@Autowired +private UserOrganizationMapsMapper userOrganizationMapsMapper; + +@Override +public void addUserOrganizationMaps(UserOrganizationMaps obj){userOrganizationMapsMapper.addUserOrganizationMaps(obj);} +@Override +public void updateUserOrganizationMaps(UserOrganizationMaps obj){userOrganizationMapsMapper.updateUserOrganizationMaps(obj);} +@Override +public void deleteUserOrganizationMaps (Integer id){userOrganizationMapsMapper.deleteUserOrganizationMaps(id);} +@Override +public UserOrganizationMaps getUserOrganizationMaps (Integer id){return userOrganizationMapsMapper.getUserOrganizationMaps(id);} +@Override +public int queryUserOrganizationMapsCount (UserOrganizationMapsQuery query){return userOrganizationMapsMapper.queryUserOrganizationMapsCount(query);} +@Override +public List queryUserOrganizationMaps (UserOrganizationMapsQuery query){if (query.getNeed() != null) {query.mysqlBuild(userOrganizationMapsMapper.queryUserOrganizationMapsCount(query));}return userOrganizationMapsMapper.queryUserOrganizationMaps(query);} + +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UserRoleMapsServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UserRoleMapsServiceImpl.java index 098179b..53c861f 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UserRoleMapsServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UserRoleMapsServiceImpl.java @@ -1,58 +1,32 @@ package com.lyms.platform.permission.service.impl; - -import java.util.List; - -import com.lyms.platform.permission.intf.IUserRoleMapsDao; +import com.lyms.platform.permission.dao.UserRoleMapsMapper; import com.lyms.platform.permission.model.UserRoleMaps; import com.lyms.platform.permission.model.UserRoleMapsQuery; -import com.lyms.platform.permission.service.IUserRoleMapsService; +import com.lyms.platform.permission.service.UserRoleMapsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - +import java.util.Date; +import java.util.List; @Service -public class UserRoleMapsServiceImpl implements IUserRoleMapsService { - - @Autowired - private IUserRoleMapsDao iUserRoleMapsDao; - - @Override - public void addUserRoleMaps(UserRoleMaps obj) { - iUserRoleMapsDao.addUserRoleMaps(obj); - } - - @Override - public void updateUserRoleMaps(UserRoleMaps obj) { - iUserRoleMapsDao.updateUserRoleMaps(obj); - } - - @Override - public void deleteUserRoleMaps(String id) { - iUserRoleMapsDao.deleteUserRoleMaps(id); - } - - @Override - public UserRoleMaps getUserRoleMaps(String id) { - return iUserRoleMapsDao.getUserRoleMaps(id); - } - - @Override - public UserRoleMaps getUserRoleMaps(String userId, String roleId) { - return iUserRoleMapsDao.getUserRoleMaps(userId, roleId); - } - - @Override - public int queryUserRoleMapsCount(UserRoleMapsQuery query) { - return iUserRoleMapsDao.queryUserRoleMapsCount(query); - } +public class UserRoleMapsServiceImpl implements UserRoleMapsService { + +@Autowired +private UserRoleMapsMapper userRoleMapsMapper; + +@Override +public void addUserRoleMaps(UserRoleMaps obj){userRoleMapsMapper.addUserRoleMaps(obj);} +@Override +public void updateUserRoleMaps(UserRoleMaps obj){userRoleMapsMapper.updateUserRoleMaps(obj);} +@Override +public void deleteUserRoleMaps (Integer id){userRoleMapsMapper.deleteUserRoleMaps(id);} +@Override +public UserRoleMaps getUserRoleMaps (Integer id){return userRoleMapsMapper.getUserRoleMaps(id);} +@Override +public int queryUserRoleMapsCount (UserRoleMapsQuery query){return userRoleMapsMapper.queryUserRoleMapsCount(query);} +@Override +public List queryUserRoleMaps (UserRoleMapsQuery query){if (query.getNeed() != null) {query.mysqlBuild(userRoleMapsMapper.queryUserRoleMapsCount(query));}return userRoleMapsMapper.queryUserRoleMaps(query);} - @Override - public List queryUserRoleMaps(UserRoleMapsQuery query) { - if(query.getNeed()!=null){ - query.mysqlBuild(queryUserRoleMapsCount(query)); - } - return iUserRoleMapsDao.queryUserRoleMaps(query); - } } \ 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 8c04103..b7d7321 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 @@ -1,51 +1,32 @@ package com.lyms.platform.permission.service.impl; -import java.util.List; - -import com.lyms.platform.permission.intf.IUsersDao; +import com.lyms.platform.permission.dao.UsersMapper; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.model.UsersQuery; -import com.lyms.platform.permission.service.IUsersService; +import com.lyms.platform.permission.service.UsersService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; @Service -public class UsersServiceImpl implements IUsersService { - - @Autowired - private IUsersDao usersMapper; - - @Override - public void addUsers(Users obj) { - usersMapper.addUsers(obj); - } - - @Override - public void updateUsers(Users obj) { - usersMapper.updateUsers(obj); - } - - @Override - public void deleteUsers(String id) { - usersMapper.deleteUsers(id); - } - - @Override - public Users getUsers(String id) { - return usersMapper.getUsers(id); - } - - @Override - public int queryUsersCount(UsersQuery query) { - return usersMapper.queryUsersCount(query); - } +public class UsersServiceImpl implements UsersService { + +@Autowired +private UsersMapper usersMapper; + +@Override +public void addUsers(Users obj){usersMapper.addUsers(obj);} +@Override +public void updateUsers(Users obj){usersMapper.updateUsers(obj);} +@Override +public void deleteUsers (Integer id){usersMapper.deleteUsers(id);} +@Override +public Users getUsers (Integer id){return usersMapper.getUsers(id);} +@Override +public int queryUsersCount (UsersQuery query){return usersMapper.queryUsersCount(query);} +@Override +public List queryUsers (UsersQuery query){if (query.getNeed() != null) {query.mysqlBuild(usersMapper.queryUsersCount(query));}return usersMapper.queryUsers(query);} - @Override - public List queryUsers(UsersQuery query) { - if (query.getNeed() != null) { - query.mysqlBuild(usersMapper.queryUsersCount(query)); - } - return usersMapper.queryUsers(query); - } } \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/Departments.xml b/platform-biz-service/src/main/resources/mainOrm/Departments.xml index 57024b9..ff5ccbd 100644 --- a/platform-biz-service/src/main/resources/mainOrm/Departments.xml +++ b/platform-biz-service/src/main/resources/mainOrm/Departments.xml @@ -1,131 +1,150 @@ - - - - - - - - - - - - - - - - - -insert into departments (type,title,hospital_id,description,publish_id,publish_name,yn,modified,created) values (#{type},#{title},#{hospitalId},#{description},#{publishId},#{publishName},#{yn},#{modified},#{created}) + + + + + + + + + + + + + + + + + + + + +insert into departments (parent_id,name,org_id,description,publish_id,publish_name,yn,modified,created,type,shortCode) values (#{parentId},#{name},#{orgId},#{description},#{publishId},#{publishName},#{yn},#{modified},#{created},#{type},#{shortCode}) - - update departments - - - title = #{title,jdbcType=VARCHAR}, - - - hospital_id = #{hospitalId,jdbcType=INTEGER}, - - - type = #{type,jdbcType=INTEGER}, - - - description = #{description,jdbcType=VARCHAR}, - - - publish_id = #{publishId,jdbcType=INTEGER}, - - - publish_name = #{publishName,jdbcType=VARCHAR}, - - - yn = #{yn,jdbcType=INTEGER}, - - - modified = #{modified,jdbcType=TIMESTAMP}, - - - created = #{created,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=INTEGER} - - - - + + +update departments +parent_id = #{parentId,jdbcType=INTEGER}, + + +name = #{name,jdbcType=VARCHAR}, + + +org_id = #{orgId,jdbcType=INTEGER}, + + +description = #{description,jdbcType=VARCHAR}, + + +publish_id = #{publishId,jdbcType=INTEGER}, + + +publish_name = #{publishName,jdbcType=VARCHAR}, + + +yn = #{yn,jdbcType=INTEGER}, + + +modified = #{modified,jdbcType=TIMESTAMP}, + + +created = #{created,jdbcType=TIMESTAMP}, + + +type = #{type,jdbcType=INTEGER}, + + +shortCode = #{shortCode,jdbcType=VARCHAR}, + + +where id = #{id,jdbcType=INTEGER} + + + + delete from departments where id = #{id,jdbcType=INTEGER} - +select id,parent_id,name,org_id,description,publish_id,publish_name,yn,modified,created,type,shortCode from departments where id = #{id,jdbcType=INTEGER} - - - order by ${sort} - - limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} - - - - - - - - 1 = 1 - - and id = #{id,jdbcType=INTEGER} - - - and title = #{title,jdbcType=VARCHAR} - - - and hospital_id = #{hospitalId,jdbcType=INTEGER} - - - and type = #{type,jdbcType=INTEGER} - - - and description = #{description,jdbcType=VARCHAR} - - - and publish_id = #{publishId,jdbcType=INTEGER} - - - and publish_name = #{publishName,jdbcType=VARCHAR} - - - and yn = #{yn,jdbcType=INTEGER} - - - and modified = #{modified,jdbcType=TIMESTAMP} - - - and created = #{created,jdbcType=TIMESTAMP} - - - - - - - - - + + +order by ${sort} + +limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} + + + + + + + + + 1 = 1 + +and id = #{id,jdbcType=INTEGER} + + +and parent_id = #{parentId,jdbcType=INTEGER} + + +and name = #{name,jdbcType=VARCHAR} + + +and org_id = #{orgId,jdbcType=INTEGER} + + +and description = #{description,jdbcType=VARCHAR} + + +and publish_id = #{publishId,jdbcType=INTEGER} + + +and publish_name = #{publishName,jdbcType=VARCHAR} + + +and yn = #{yn,jdbcType=INTEGER} + + +and modified = #{modified,jdbcType=TIMESTAMP} + + +and created = #{created,jdbcType=TIMESTAMP} + + +and type = #{type,jdbcType=INTEGER} + + +and shortCode = #{shortCode,jdbcType=VARCHAR} + + + + + + + + + + + + \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/Organization.xml b/platform-biz-service/src/main/resources/mainOrm/Organization.xml new file mode 100644 index 0000000..b1d1d25 --- /dev/null +++ b/platform-biz-service/src/main/resources/mainOrm/Organization.xml @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +insert into organization (name,type,level,area_manage,province_id,city_id,area_id,address,description,publish_id,publish_name,yn,modified,created,shortCode) values (#{name},#{type},#{level},#{areaManage},#{provinceId},#{cityId},#{areaId},#{address},#{description},#{publishId},#{publishName},#{yn},#{modified},#{created},#{shortCode}) + + + + + +update organization +name = #{name,jdbcType=VARCHAR}, + + +type = #{type,jdbcType=INTEGER}, + + +level = #{level,jdbcType=INTEGER}, + + +area_manage = #{areaManage,jdbcType=INTEGER}, + + +province_id = #{provinceId,jdbcType=INTEGER}, + + +city_id = #{cityId,jdbcType=INTEGER}, + + +area_id = #{areaId,jdbcType=INTEGER}, + + +address = #{address,jdbcType=VARCHAR}, + + +description = #{description,jdbcType=VARCHAR}, + + +publish_id = #{publishId,jdbcType=INTEGER}, + + +publish_name = #{publishName,jdbcType=VARCHAR}, + + +yn = #{yn,jdbcType=INTEGER}, + + +modified = #{modified,jdbcType=TIMESTAMP}, + + +created = #{created,jdbcType=TIMESTAMP}, + + +shortCode = #{shortCode,jdbcType=VARCHAR}, + + +where id = #{id,jdbcType=INTEGER} + + + + +delete from organization where id = #{id,jdbcType=INTEGER} + + + + + + + + + +order by ${sort} + +limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} + + + + + + + + + 1 = 1 + +and id = #{id,jdbcType=INTEGER} + + +and name = #{name,jdbcType=VARCHAR} + + +and type = #{type,jdbcType=INTEGER} + + +and level = #{level,jdbcType=INTEGER} + + +and area_manage = #{areaManage,jdbcType=INTEGER} + + +and province_id = #{provinceId,jdbcType=INTEGER} + + +and city_id = #{cityId,jdbcType=INTEGER} + + +and area_id = #{areaId,jdbcType=INTEGER} + + +and address = #{address,jdbcType=VARCHAR} + + +and description = #{description,jdbcType=VARCHAR} + + +and publish_id = #{publishId,jdbcType=INTEGER} + + +and publish_name = #{publishName,jdbcType=VARCHAR} + + +and yn = #{yn,jdbcType=INTEGER} + + +and modified = #{modified,jdbcType=TIMESTAMP} + + +and created = #{created,jdbcType=TIMESTAMP} + + +and shortCode = #{shortCode,jdbcType=VARCHAR} + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/Permissions.xml b/platform-biz-service/src/main/resources/mainOrm/Permissions.xml index f609cdc..0a6f6ca 100644 --- a/platform-biz-service/src/main/resources/mainOrm/Permissions.xml +++ b/platform-biz-service/src/main/resources/mainOrm/Permissions.xml @@ -1,161 +1,178 @@ - - - - - - - - - - - - - - - - - - - - - - -insert into permissions (type,module_name,function_name,module_code,function_code,permission_name,action,ext,url,publish_id,publish_name,yn,modified,created) values (#{type},#{moduleName},#{functionName},#{moduleCode},#{functionCode},#{permissionName},#{action},#{ext},#{url},#{publishId},#{publishName},#{yn},#{modified},#{created}) + + + + + + + + + + + + + + + + + + + + + + + + +insert into permissions (type,module_name,module_code,function_name,function_code,permission_name,action,ext,url,publish_id,publish_name,yn,modified,created,ismenu) values (#{type},#{moduleName},#{moduleCode},#{functionName},#{functionCode},#{permissionName},#{action},#{ext},#{url},#{publishId},#{publishName},#{yn},#{modified},#{created},#{ismenu}) - - update permissions - - - type = #{type,jdbcType=INTEGER}, - - - module_name = #{moduleName,jdbcType=VARCHAR}, - - - function_name = #{functionName,jdbcType=VARCHAR}, - - - module_code = #{moduleCode,jdbcType=VARCHAR}, - - - function_code = #{functionCode,jdbcType=VARCHAR}, - - - permission_name = #{permissionName,jdbcType=VARCHAR}, - - - action = #{action,jdbcType=VARCHAR}, - - - ext = #{ext,jdbcType=VARCHAR}, - - - url = #{url,jdbcType=VARCHAR}, - - - publish_id = #{publishId,jdbcType=INTEGER}, - - - publish_name = #{publishName,jdbcType=VARCHAR}, - - - yn = #{yn,jdbcType=INTEGER}, - - - modified = #{modified,jdbcType=TIMESTAMP}, - - - created = #{created,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=INTEGER} - - - - + + +update permissions +type = #{type,jdbcType=INTEGER}, + + +module_name = #{moduleName,jdbcType=VARCHAR}, + + +module_code = #{moduleCode,jdbcType=VARCHAR}, + + +function_name = #{functionName,jdbcType=VARCHAR}, + + +function_code = #{functionCode,jdbcType=VARCHAR}, + + +permission_name = #{permissionName,jdbcType=VARCHAR}, + + +action = #{action,jdbcType=VARCHAR}, + + +ext = #{ext,jdbcType=VARCHAR}, + + +url = #{url,jdbcType=VARCHAR}, + + +publish_id = #{publishId,jdbcType=INTEGER}, + + +publish_name = #{publishName,jdbcType=VARCHAR}, + + +yn = #{yn,jdbcType=INTEGER}, + + +modified = #{modified,jdbcType=TIMESTAMP}, + + +created = #{created,jdbcType=TIMESTAMP}, + + +ismenu = #{ismenu,jdbcType=INTEGER}, + + +where id = #{id,jdbcType=INTEGER} + + + + delete from permissions where id = #{id,jdbcType=INTEGER} - +select id,type,module_name,module_code,function_name,function_code,permission_name,action,ext,url,publish_id,publish_name,yn,modified,created,ismenu from permissions where id = #{id,jdbcType=INTEGER} - - - order by ${sort} - - limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} - - - - - - - - 1 = 1 - - and id = #{id,jdbcType=INTEGER} - - - and type = #{type,jdbcType=INTEGER} - - - and module_name = #{moduleName,jdbcType=VARCHAR} - - - and function_name = #{functionName,jdbcType=VARCHAR} - - - and permission_name = #{permissionName,jdbcType=VARCHAR} - - - and action = #{action,jdbcType=VARCHAR} - - - and ext = #{ext,jdbcType=VARCHAR} - - - and url = #{url,jdbcType=VARCHAR} - - - and publish_id = #{publishId,jdbcType=INTEGER} - - - and publish_name = #{publishName,jdbcType=VARCHAR} - - - and yn = #{yn,jdbcType=INTEGER} - - - and modified = #{modified,jdbcType=TIMESTAMP} - - - and created = #{created,jdbcType=TIMESTAMP} - - - - - - - - - + + +order by ${sort} + +limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} + + + + + + + + + 1 = 1 + +and id = #{id,jdbcType=INTEGER} + + +and type = #{type,jdbcType=INTEGER} + + +and module_name = #{moduleName,jdbcType=VARCHAR} + + +and module_code = #{moduleCode,jdbcType=VARCHAR} + + +and function_name = #{functionName,jdbcType=VARCHAR} + + +and function_code = #{functionCode,jdbcType=VARCHAR} + + +and permission_name = #{permissionName,jdbcType=VARCHAR} + + +and action = #{action,jdbcType=VARCHAR} + + +and ext = #{ext,jdbcType=VARCHAR} + + +and url = #{url,jdbcType=VARCHAR} + + +and publish_id = #{publishId,jdbcType=INTEGER} + + +and publish_name = #{publishName,jdbcType=VARCHAR} + + +and yn = #{yn,jdbcType=INTEGER} + + +and modified = #{modified,jdbcType=TIMESTAMP} + + +and created = #{created,jdbcType=TIMESTAMP} + + +and ismenu = #{ismenu,jdbcType=INTEGER} + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/RolePermissionMaps.xml b/platform-biz-service/src/main/resources/mainOrm/RolePermissionMaps.xml index 11cf272..9670804 100644 --- a/platform-biz-service/src/main/resources/mainOrm/RolePermissionMaps.xml +++ b/platform-biz-service/src/main/resources/mainOrm/RolePermissionMaps.xml @@ -1,102 +1,94 @@ - + - - - - - + + + + + + - - - - + insert into role_permission_maps (role_id,permission_id,yn) values (#{roleId},#{permissionId},#{yn}) - - update role_permission_maps - - - role_id = #{roleId,jdbcType=INTEGER}, - - - permission_id = #{permissionId,jdbcType=INTEGER}, - - - yn = #{yn,jdbcType=INTEGER}, - - - where role_id = #{roleId,jdbcType=INTEGER} and permission_id = #{permissionId,jdbcType=INTEGER} - - - - - delete from role_permission_maps where role_id = #{roleId,jdbcType=INTEGER} and permission_id = #{permissionId,jdbcType=INTEGER} - - - - +select id,role_id,permission_id,yn + from role_permission_maps where id = #{id,jdbcType=INTEGER} + + + + + +order by ${sort} + +limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} + + + + + + + + + 1 = 1 + +and id = #{id,jdbcType=INTEGER} + + +and role_id = #{roleId,jdbcType=INTEGER} + + +and permission_id = #{permissionId,jdbcType=INTEGER} + + +and yn = #{yn,jdbcType=INTEGER} + + + + + + + + + + + - - - order by ${sort} - - limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} - - - - - - - - 1 = 1 - - and role_id = #{roleId,jdbcType=INTEGER} - - - and permission_id = #{permissionId,jdbcType=INTEGER} - - - and yn = #{yn,jdbcType=INTEGER} - - - - - - - - - \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/Roles.xml b/platform-biz-service/src/main/resources/mainOrm/Roles.xml index 59c296a..2bb8389 100644 --- a/platform-biz-service/src/main/resources/mainOrm/Roles.xml +++ b/platform-biz-service/src/main/resources/mainOrm/Roles.xml @@ -1,127 +1,143 @@ - - - - - - - - - - - - - - - - - - SELECT LAST_INSERT_ID() - - insert into roles (type,parent_id,title,publish_id,publish_name,yn,modified,created) values (#{type},#{parentId},#{title},#{publishId},#{publishName},#{yn},#{modified},#{created}) - - - - - update roles - - - type = #{type,jdbcType=INTEGER}, - - - parent_id = #{parentId,jdbcType=INTEGER}, - - - title = #{title,jdbcType=VARCHAR}, - - - publish_id = #{publishId,jdbcType=INTEGER}, - - - publish_name = #{publishName,jdbcType=VARCHAR}, - - - yn = #{yn,jdbcType=INTEGER}, - - - modified = #{modified,jdbcType=TIMESTAMP}, - - - created = #{created,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=INTEGER} - - - - + + + + + + + + + + + + + + + + + + + +insert into roles (type,name,publish_id,publish_name,yn,enable,modified,created,remarks,shortCode) values (#{type},#{name},#{publishId},#{publishName},#{yn},#{enable},#{modified},#{created},#{remarks},#{shortCode}) + + + + + +update roles +type = #{type,jdbcType=INTEGER}, + + +name = #{name,jdbcType=VARCHAR}, + + +publish_id = #{publishId,jdbcType=INTEGER}, + + +publish_name = #{publishName,jdbcType=VARCHAR}, + + +yn = #{yn,jdbcType=INTEGER}, + + +enable = #{enable,jdbcType=INTEGER}, + + +modified = #{modified,jdbcType=TIMESTAMP}, + + +created = #{created,jdbcType=TIMESTAMP}, + + +remarks = #{remarks,jdbcType=VARCHAR}, + + +shortCode = #{shortCode,jdbcType=VARCHAR}, + + +where id = #{id,jdbcType=INTEGER} + + + + delete from roles where id = #{id,jdbcType=INTEGER} - +select id,type,name,publish_id,publish_name,yn,enable,modified,created,remarks,shortCode + from roles where id = #{id,jdbcType=INTEGER} + + + + + +order by ${sort} + +limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} + + + + + + + + + 1 = 1 + +and id = #{id,jdbcType=INTEGER} + + +and type = #{type,jdbcType=INTEGER} + + +and name = #{name,jdbcType=VARCHAR} + + +and publish_id = #{publishId,jdbcType=INTEGER} + + +and publish_name = #{publishName,jdbcType=VARCHAR} + + +and yn = #{yn,jdbcType=INTEGER} + + +and enable = #{enable,jdbcType=INTEGER} + + +and modified = #{modified,jdbcType=TIMESTAMP} + + +and created = #{created,jdbcType=TIMESTAMP} + + +and remarks = #{remarks,jdbcType=VARCHAR} + + +and shortCode = #{shortCode,jdbcType=VARCHAR} + + + + + + + - - - order by ${sort} - - limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} - - - - - - - - 1 = 1 - - and id = #{id,jdbcType=INTEGER} - - - and type = #{type,jdbcType=INTEGER} - - - and parent_id = #{parentId,jdbcType=INTEGER} - - - and title like CONCAT(#{title}, '%') - - - and publish_id = #{publishId,jdbcType=INTEGER} - - - and publish_name = #{publishName,jdbcType=VARCHAR} - - - and yn = #{yn,jdbcType=INTEGER} - - - and modified = #{modified,jdbcType=TIMESTAMP} - - - and created = #{created,jdbcType=TIMESTAMP} - - - - - - - - - + + + \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/UserOrganizationMaps.xml b/platform-biz-service/src/main/resources/mainOrm/UserOrganizationMaps.xml new file mode 100644 index 0000000..61a0e09 --- /dev/null +++ b/platform-biz-service/src/main/resources/mainOrm/UserOrganizationMaps.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + +insert into user_organization_maps (user_id,org_id,yn,expirTime) values (#{userId},#{orgId},#{yn},#{expirTime}) + + + + + +update user_organization_maps +user_id = #{userId,jdbcType=INTEGER}, + + +org_id = #{orgId,jdbcType=INTEGER}, + + +yn = #{yn,jdbcType=INTEGER}, + + +expirTime = #{expirTime,jdbcType=TIMESTAMP}, + + +where id = #{id,jdbcType=INTEGER} + + + + +delete from user_organization_maps where id = #{id,jdbcType=INTEGER} + + + + + + + + + +order by ${sort} + +limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} + + + + + + + + + 1 = 1 + +and id = #{id,jdbcType=INTEGER} + + +and user_id = #{userId,jdbcType=INTEGER} + + +and org_id = #{orgId,jdbcType=INTEGER} + + +and yn = #{yn,jdbcType=INTEGER} + + +and expirTime = #{expirTime,jdbcType=TIMESTAMP} + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/UserRoleMaps.xml b/platform-biz-service/src/main/resources/mainOrm/UserRoleMaps.xml index fd3a429..cb0b89b 100644 --- a/platform-biz-service/src/main/resources/mainOrm/UserRoleMaps.xml +++ b/platform-biz-service/src/main/resources/mainOrm/UserRoleMaps.xml @@ -1,83 +1,101 @@ - + - - - - - + + + + + + + - -insert into user_role_maps (user_id,role_id,yn) values (#{userId},#{roleId},#{yn}) + + +insert into user_role_maps (user_id,role_id,yn,expirTime) values (#{userId},#{roleId},#{yn},#{expirTime}) - - update user_role_maps - - - user_id = #{userId,jdbcType=INTEGER}, - - - role_id = #{roleId,jdbcType=INTEGER}, - - - yn = #{yn,jdbcType=INTEGER}, - - - where user_id = #{userId,jdbcType=INTEGER} and role_id = #{roleId,jdbcType=INTEGER} - + +update user_role_maps +user_id = #{userId,jdbcType=INTEGER}, + + +role_id = #{roleId,jdbcType=INTEGER}, + + +yn = #{yn,jdbcType=INTEGER}, + + +expirTime = #{expirTime,jdbcType=TIMESTAMP}, + + +where id = #{id,jdbcType=INTEGER} + + + + +delete from user_role_maps where id = #{id,jdbcType=INTEGER} + - - - +select id,user_id,role_id,yn,expirTime + from user_role_maps where id = #{id,jdbcType=INTEGER} - - - order by ${sort} - - limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} - - - - - - - - 1 = 1 - - and user_id = #{userId,jdbcType=INTEGER} - - - and role_id = #{roleId,jdbcType=INTEGER} - - - and yn = #{yn,jdbcType=INTEGER} - - - - - - - - - + + +order by ${sort} + +limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} + + + + + + + + + 1 = 1 + +and id = #{id,jdbcType=INTEGER} + + +and user_id = #{userId,jdbcType=INTEGER} + + +and role_id = #{roleId,jdbcType=INTEGER} + + +and yn = #{yn,jdbcType=INTEGER} + + +and expirTime = #{expirTime,jdbcType=TIMESTAMP} + + + + + + + + + + + + \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/Users.xml b/platform-biz-service/src/main/resources/mainOrm/Users.xml index d1aea56..d3a4e3b 100644 --- a/platform-biz-service/src/main/resources/mainOrm/Users.xml +++ b/platform-biz-service/src/main/resources/mainOrm/Users.xml @@ -1,170 +1,178 @@ - - - - - - - - - - - - - - - - - - - - - - - SELECT LAST_INSERT_ID() - - insert into users - (type,parent_id,dept_id,username,account,pwd,phone,publish_id,publish_name,yn,modified,created,last_login_time) - values - (#{type},#{parentId},#{deptId},#{username},#{account},#{pwd},#{phone},#{publishId},#{publishName},#{yn},#{modified},#{created},#{lastLoginTime}) - - - - - update users - - - type = #{type,jdbcType=INTEGER}, - - - parent_id = #{parentId,jdbcType=INTEGER}, - - - dept_id = #{deptId,jdbcType=INTEGER}, - - - username = #{username,jdbcType=VARCHAR}, - - - account = #{account,jdbcType=VARCHAR}, - - - pwd = #{pwd,jdbcType=VARCHAR}, - - - phone = #{phone,jdbcType=VARCHAR}, - - - publish_id = #{publishId,jdbcType=INTEGER}, - - - publish_name = #{publishName,jdbcType=VARCHAR}, - - - yn = #{yn,jdbcType=INTEGER}, - - - modified = #{modified,jdbcType=TIMESTAMP}, - - - created = #{created,jdbcType=TIMESTAMP}, - - - last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=INTEGER} - - - - - delete from users where - id = #{id,jdbcType=INTEGER} - - - - - - - - - order by ${sort} - - limit #{offset, jdbcType=INTEGER} , #{limit, - jdbcType=INTEGER} - - - - - - - - 1 = 1 - - and id = #{id,jdbcType=INTEGER} - - - and type = #{type,jdbcType=INTEGER} - - - and parent_id = #{parentId,jdbcType=INTEGER} - - - and dept_id = #{deptId,jdbcType=INTEGER} - - - and username like CONCAT(#{username}, '%') - - - and account = #{account,jdbcType=VARCHAR} - - - and pwd = #{pwd,jdbcType=VARCHAR} - - - and phone = #{phone,jdbcType=VARCHAR} - - - and publish_id = #{publishId,jdbcType=INTEGER} - - - and publish_name = #{publishName,jdbcType=VARCHAR} - - - and yn = #{yn,jdbcType=INTEGER} - - - and modified = #{modified,jdbcType=TIMESTAMP} - - - and created = #{created,jdbcType=TIMESTAMP} - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +insert into users (type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time) values (#{type},#{orgId},#{deptId},#{name},#{account},#{pwd},#{phone},#{publishId},#{publishName},#{yn},#{enable},#{modified},#{created},#{remarks},#{lastLoginTime}) + + + + + +update users +type = #{type,jdbcType=INTEGER}, + + +org_id = #{orgId,jdbcType=INTEGER}, + + +dept_id = #{deptId,jdbcType=INTEGER}, + + +name = #{name,jdbcType=VARCHAR}, + + +account = #{account,jdbcType=VARCHAR}, + + +pwd = #{pwd,jdbcType=VARCHAR}, + + +phone = #{phone,jdbcType=VARCHAR}, + + +publish_id = #{publishId,jdbcType=INTEGER}, + + +publish_name = #{publishName,jdbcType=VARCHAR}, + + +yn = #{yn,jdbcType=INTEGER}, + + +enable = #{enable,jdbcType=INTEGER}, + + +modified = #{modified,jdbcType=TIMESTAMP}, + + +created = #{created,jdbcType=TIMESTAMP}, + + +remarks = #{remarks,jdbcType=VARCHAR}, + + +last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP}, + + +where id = #{id,jdbcType=INTEGER} + + + + +delete from users where id = #{id,jdbcType=INTEGER} + + + + + + + + + +order by ${sort} + +limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} + + + + + + + + + 1 = 1 + +and id = #{id,jdbcType=INTEGER} + + +and type = #{type,jdbcType=INTEGER} + + +and org_id = #{orgId,jdbcType=INTEGER} + + +and dept_id = #{deptId,jdbcType=INTEGER} + + +and name = #{name,jdbcType=VARCHAR} + + +and account = #{account,jdbcType=VARCHAR} + + +and pwd = #{pwd,jdbcType=VARCHAR} + + +and phone = #{phone,jdbcType=VARCHAR} + + +and publish_id = #{publishId,jdbcType=INTEGER} + + +and publish_name = #{publishName,jdbcType=VARCHAR} + + +and yn = #{yn,jdbcType=INTEGER} + + +and enable = #{enable,jdbcType=INTEGER} + + +and modified = #{modified,jdbcType=TIMESTAMP} + + +and created = #{created,jdbcType=TIMESTAMP} + + +and remarks = #{remarks,jdbcType=VARCHAR} + + +and last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP} + + + + + + + + + + + + \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/base/ContextHolder.java b/platform-common/src/main/java/com/lyms/platform/common/base/ContextHolder.java index 965c639..9bc6bb6 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/base/ContextHolder.java +++ b/platform-common/src/main/java/com/lyms/platform/common/base/ContextHolder.java @@ -9,17 +9,17 @@ package com.lyms.platform.common.base; */ public class ContextHolder { - private static final ThreadLocal contextHolder =new ThreadLocal(); + private static final ThreadLocal contextHolder =new ThreadLocal(); - public static MommyBabyContext getContext (){ - MommyBabyContext context = contextHolder.get(); + public static PlatformContext getContext (){ + PlatformContext context = contextHolder.get(); if(null==context){ throw new UnsupportedOperationException("请配置TokenRequired注解."); } return context; } - public static void setContext(MommyBabyContext context){ + public static void setContext(PlatformContext context){ if(null == context){ throw new NullPointerException("context must not null."); } diff --git a/platform-common/src/main/java/com/lyms/platform/common/base/MommyBabyContext.java b/platform-common/src/main/java/com/lyms/platform/common/base/MommyBabyContext.java deleted file mode 100644 index c584929..0000000 --- a/platform-common/src/main/java/com/lyms/platform/common/base/MommyBabyContext.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.lyms.platform.common.base; - - -/** - * - * - * Created by Administrator on 2015/9/25 0025. - */ -public class MommyBabyContext { - - private String token; - - private String userId; - - private String ipAddr; - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - - public String getToken() { - return token; - } - - public void setToken(String token) { - this.token = token; - } - public String getIpAddr() { - return ipAddr; - } - - public void setIpAddr(String ipAddr) { - this.ipAddr = ipAddr; - } -} \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/base/PlatformContext.java b/platform-common/src/main/java/com/lyms/platform/common/base/PlatformContext.java new file mode 100644 index 0000000..e537f57 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/base/PlatformContext.java @@ -0,0 +1,39 @@ +package com.lyms.platform.common.base; + + +/** + * + * + * Created by Administrator on 2015/9/25 0025. + */ +public class PlatformContext { + + private String token; + + private String userId; + + private String ipAddr; + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } +} \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/constants/ErrorCodeConstants.java b/platform-common/src/main/java/com/lyms/platform/common/constants/ErrorCodeConstants.java index c465556..0282d3e 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/constants/ErrorCodeConstants.java +++ b/platform-common/src/main/java/com/lyms/platform/common/constants/ErrorCodeConstants.java @@ -38,4 +38,7 @@ public class ErrorCodeConstants { //验证码已过期 public static final int VER_CODE_EXPIRE=4008; + + //名称已存在 + public static final int NAME_EXIST=4100; } diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/ResultUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/ResultUtils.java index e319a90..dc5ed79 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/ResultUtils.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/ResultUtils.java @@ -16,6 +16,17 @@ public final class ResultUtils { public static final String ERROR_MSG="errormsg"; /** + * 返回自定义消息 + */ + public static void buildResultAndWrite(HttpServletResponse httpServletResponse, Integer errorCodeConstants, String msg){ + Map result= new HashMap(); + result.put(ERROR_CODE, errorCodeConstants); + result.put(ERROR_MSG,msg); + writeJson(httpServletResponse, JsonUtil.obj2JsonString(result)); + } + + + /** * 参数错误返回 */ public static void buildParameterErrorResultAndWrite(HttpServletResponse httpServletResponse){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java new file mode 100644 index 0000000..23990f3 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java @@ -0,0 +1,162 @@ +package com.lyms.platform.operate.web.controller; + + +import com.lyms.platform.common.annotation.TokenRequired; +import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.base.ContextHolder; +import com.lyms.platform.common.base.PlatformContext; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.utils.ResultUtils; +import com.lyms.platform.permission.model.Departments; +import com.lyms.platform.permission.model.DepartmentsQuery; +import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.service.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +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.RequestParam; + +import javax.servlet.http.HttpServletResponse; +import java.util.Date; + +/** + * Created by zhang.rui on 2015/9/28 0028. + */ +@Controller +@RequestMapping("/v1") +public class DepartmentsController extends BaseController { + @Autowired + private DepartmentsService departmentsService; + @Autowired + private PermissionsService permissionsService; + @Autowired + private UsersService usersService; + @Autowired + private TokenService tokenService; + @Autowired + private UserRoleMapsService userRoleMapsService; + @Autowired + private RolePermissionMapsService rolePermissionMapsService; + + + + + /** + * 删除部门 + */ + @RequestMapping(value = "/departments/{id}", method = RequestMethod.DELETE) + @TokenRequired + public void addDepartments(HttpServletResponse response, @PathVariable(value = "id") Integer id) { + if (null == id ) { + ResultUtils.buildParameterErrorResultAndWrite(response); + return; + } + Departments departments = departmentsService.getDepartments(id); + if(null == departments) { + ResultUtils.buildParameterErrorResultAndWrite(response,"该部门不存在"); + return; + } + + departments.setYn(YnEnums.NO.getId()); + departments.setModified(new Date()); + departmentsService.updateDepartments(departments); + + ResultUtils.buildSuccessResultAndWrite(response); + } + + + /** + * 修改部门 + */ + @RequestMapping(value = "/departments", method = RequestMethod.PUT) + @TokenRequired + public void addDepartments(HttpServletResponse response, + @RequestParam(value = "id") Integer id, + @RequestParam(value = "pid") Integer pid, + @RequestParam(value = "name") String name, + @RequestParam(value = "orgId") Integer orgId, + @RequestParam(value = "description") String description, + @RequestParam(value = "shortCode") String shortCode) { + + if (null == name || null == orgId) { + ResultUtils.buildParameterErrorResultAndWrite(response); + return; + } + DepartmentsQuery departmentsQuery = new DepartmentsQuery(); + departmentsQuery.setName(name); + if(0 == departmentsService.queryDepartmentsCount(departmentsQuery)) { + ResultUtils.buildParameterErrorResultAndWrite(response,"该部门不存在"); + return; + } + + + Departments departments = new Departments(); + pid = pid == null ? 0 : pid; + departments.setParentId(pid); + departments.setName(name); + departments.setOrgId(orgId); + departments.setDescription(description); + departments.setShortcode(shortCode); + departments.setModified(new Date()); + departments.setYn(YnEnums.YES.getId()); + departmentsService.updateDepartments(departments); + + ResultUtils.buildSuccessResultAndWrite(response); + } + + + + + + /** + * 添加部门 + */ + @RequestMapping(value = "/departments", method = RequestMethod.POST) + @TokenRequired + public void addDepartments(HttpServletResponse response, + @RequestParam(value = "pid") Integer pid, + @RequestParam(value = "name") String name, + @RequestParam(value = "orgId") Integer orgId, + @RequestParam(value = "description") String description, + @RequestParam(value = "shortCode") String shortCode) { + + //获取登录用户 + PlatformContext mommyBobyContext = ContextHolder.getContext(); + String token = mommyBobyContext.getToken(); + Users users = usersService.getUsers(tokenService.getUserId(token)); + + if (null == name || null == orgId || null == users) { + ResultUtils.buildParameterErrorResultAndWrite(response); + return; + } + DepartmentsQuery departmentsQuery = new DepartmentsQuery(); + departmentsQuery.setName(name); + if(0 < departmentsService.queryDepartmentsCount(departmentsQuery)) { + ResultUtils.buildParameterErrorResultAndWrite(response,"该部门已存在"); + return; + } + + + Departments departments = new Departments(); + pid = pid == null ? 0 : pid; + departments.setParentId(pid); + departments.setName(name); + departments.setOrgId(orgId); + departments.setDescription(description); + departments.setShortcode(shortCode); + departments.setCreated(new Date()); + departments.setModified(new Date()); + departments.setPublishId(users.getId()); + departments.setPublishName(users.getName()); + departments.setYn(YnEnums.YES.getId()); + departmentsService.addDepartments(departments); + + ResultUtils.buildSuccessResultAndWrite(response); + + } + + + +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java new file mode 100644 index 0000000..5822f64 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -0,0 +1,192 @@ +package com.lyms.platform.operate.web.controller; + + +import com.lyms.platform.common.annotation.TokenRequired; +import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.base.ContextHolder; +import com.lyms.platform.common.base.PlatformContext; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.utils.ResultUtils; +import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.OrganizationQuery; +import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.service.*; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +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.RequestParam; + +import javax.servlet.http.HttpServletResponse; +import java.util.Date; + +/** + * Created by zhang.rui on 2015/9/28 0028. + */ +@Controller +@RequestMapping("/v1") +public class OrganizationController extends BaseController { + @Autowired + private UsersService usersService; + @Autowired + private TokenService tokenService; + @Autowired + private OrganizationService organizationService; + + + /** + * 删除机构 + */ + @RequestMapping(value = "/organization/{id}", method = RequestMethod.DELETE) + @TokenRequired + public void updateOrganization(HttpServletResponse response, @PathVariable(value = "id") Integer id) { + if (id == null ) { + ResultUtils.buildParameterErrorResultAndWrite(response); + return; + } + + //判断ID是否存在 + Organization organization = organizationService.getOrganization(id); + if(null == organization) { + ResultUtils.buildParameterErrorResultAndWrite(response, "id不存在!"); + return; + } + + organization.setYn(YnEnums.NO.getId()); + organization.setModified(new Date()); + organizationService.updateOrganization(organization); + + ResultUtils.buildSuccessResultAndWrite(response); + } + + + /** + * 修改机构 + */ + @RequestMapping(value = "/organization", method = RequestMethod.PUT) + @TokenRequired + public void updateOrganization(HttpServletResponse response, + @RequestParam(value = "id") Integer id, + @RequestParam(value = "name") String name, + @RequestParam(value = "type") Integer type, + @RequestParam(value = "level") Integer level, + @RequestParam(value = "areaManage") Integer areaManage, + @RequestParam(value = "provinceId") Integer provinceId, + @RequestParam(value = "cityId") Integer cityId, + @RequestParam(value = "areaId") Integer areaId, + @RequestParam(value = "address") String address, + @RequestParam(value = "description") String description, + @RequestParam(value = "shortCode") String shortCode) { + + + if (type == null || StringUtils.isBlank(name) ) { + ResultUtils.buildParameterErrorResultAndWrite(response); + return; + } + + //判断ID是否存在 + Organization organization = organizationService.getOrganization(id); + if(null == organization) { + ResultUtils.buildParameterErrorResultAndWrite(response, "id不存在!"); + return; + } + + organization.setName(name); + organization.setType(type); + organization.setLevel(level); + organization.setAreaManage(areaManage); + organization.setProvinceId(provinceId); + organization.setCityId(cityId); + organization.setAreaId(areaId); + organization.setAddress(address); + organization.setDescription(description); + organization.setShortcode(shortCode); + organization.setYn(YnEnums.YES.getId()); + organization.setModified(new Date()); + organizationService.updateOrganization(organization); + + ResultUtils.buildSuccessResultAndWrite(response); + } + + + + /** + * 添加机构 + */ + @RequestMapping(value = "/organization", method = RequestMethod.POST) + @TokenRequired + public void addOrganization(HttpServletResponse response, + @RequestParam(value = "name") String name, + @RequestParam(value = "type") Integer type, + @RequestParam(value = "level") Integer level, + @RequestParam(value = "areaManage") Integer areaManage, + @RequestParam(value = "provinceId") Integer provinceId, + @RequestParam(value = "cityId") Integer cityId, + @RequestParam(value = "areaId") Integer areaId, + @RequestParam(value = "address") String address, + @RequestParam(value = "description") String description, + @RequestParam(value = "shortCode") String shortCode) { + + //获取登录用户 + PlatformContext mommyBobyContext = ContextHolder.getContext(); + String token = mommyBobyContext.getToken(); + Users users = usersService.getUsers(tokenService.getUserId(token)); + + if (type == null || StringUtils.isBlank(name) || null == users) { + ResultUtils.buildParameterErrorResultAndWrite(response); + return; + } + + OrganizationQuery organizationQuery = new OrganizationQuery(); + organizationQuery.setName(name); + if(0 < organizationService.queryOrganizationCount(organizationQuery)) { + ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.NAME_EXIST,"机构名称已存在!"); + return; + } + + Organization organization = new Organization(); + organization.setName(name); + organization.setType(type); + organization.setLevel(level); + organization.setAreaManage(areaManage); + organization.setProvinceId(provinceId); + organization.setCityId(cityId); + organization.setAreaId(areaId); + organization.setAddress(address); + organization.setDescription(description); + organization.setShortcode(shortCode); + organization.setYn(YnEnums.YES.getId()); + organization.setCreated(new Date()); + organization.setModified(new Date()); + organization.setPublishName(users.getName()); + organization.setPublishId(users.getId()); + organizationService.addOrganization(organization); + + ResultUtils.buildSuccessResultAndWrite(response); + } + + + + + + + + /** + * 获取列表 + */ + @RequestMapping(value = "/organization", method = RequestMethod.GET) + @TokenRequired + public void getPermissions(HttpServletResponse response, + @RequestParam(value = "type") Integer type, + @RequestParam(value = "page") Integer page, + @RequestParam(value = "limit") Integer limit, + @RequestParam(value = "id", required = false) Integer id) { + + } + + + +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java index 68b2eb6..d8fa0b3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java @@ -4,15 +4,12 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.ContextHolder; -import com.lyms.platform.common.base.PageInfo; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.exception.BusinessException; -import com.lyms.platform.common.result.CommonResult; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -32,130 +29,24 @@ import java.util.*; public class PermissionsController extends BaseController { @Autowired - private IPermissionsService permissionsService; + private PermissionsService permissionsService; @Autowired - private IUsersService usersService; + private UsersService usersService; @Autowired - private ITokenService tokenService; + private TokenService tokenService; @Autowired - private IUserRoleMapsService userRoleMapsService; + private UserRoleMapsService userRoleMapsService; @Autowired - private IRolePermissionMapsService rolePermissionMapsService; + private RolePermissionMapsService rolePermissionMapsService; private static String NODE="children"; private static String CHECK="check"; private Integer TYPE = 1; - /** - * 新增权限 - */ - @RequestMapping(value = "/permissions", method = RequestMethod.POST) - @TokenRequired - public void addPermissions(HttpServletResponse response, - @RequestParam(value = "moduleName") String moduleName, - @RequestParam(value = "functionName") String functionName, - @RequestParam(value = "permissionName") String permissionName, - @RequestParam(value = "action") String action, - @RequestParam(value = "ext", required = false) String ext, - @RequestParam(value = "url", required = false) String url, - @RequestParam("functionCode") String functionCode, - @RequestParam("moduleCode") String moduleCode) { - String token = ContextHolder.getContext().getToken(); - if (StringUtils.isEmpty(moduleName) || StringUtils.isEmpty(functionName) || StringUtils.isEmpty(permissionName) || StringUtils.isEmpty(action)) { - ResultUtils.buildParameterErrorResultAndWrite(response); - return; - } - Integer userId = Integer.valueOf(tokenService.getUserId(token)); - Users users = usersService.getUsers(String.valueOf(userId)); - - Permissions permissions = new Permissions(); - - permissions.setType(TYPE); - permissions.setFunctionCode(functionCode); - permissions.setModuleCode(moduleCode); - permissions.setModuleName(moduleName); - permissions.setFunctionName(functionName); - permissions.setPermissionName(permissionName); - permissions.setAction(action); - permissions.setExt(ext); - permissions.setUrl(url); - permissions.setPublishId(users.getId()); - permissions.setPublishName(users.getUsername()); - permissions.setYn(YnEnums.YES.getId()); - permissions.setModified(new Date()); - permissions.setCreated(new Date()); - permissionsService.addPermissions(permissions); - ResultUtils.buildSuccessResultAndWrite(response); - } /** - * 权限修改 - */ - @RequestMapping(value = "/permissions/{id}", method = RequestMethod.PUT) - @TokenRequired - public void updatePermissions(HttpServletResponse response, - @RequestParam(value = "moduleName") String moduleName, - @RequestParam(value = "functionName") String functionName, - @PathVariable Integer id, String permissionName, - @RequestParam(value = "action") String action, - @RequestParam(value = "ext", required = false) String ext, - @RequestParam(value = "url", required = false) String url, - @RequestParam("functionCode") String functionCode, - @RequestParam("moduleCode") String moduleCode) { - - Permissions permissions = permissionsService.getPermissions(String.valueOf(id)); - - if (permissions == null) { - new BusinessException("", "根据id获取信息不存在"); - return; - } - - if (id == null || StringUtils.isEmpty(moduleName) || StringUtils.isEmpty(functionName) || StringUtils.isEmpty(permissionName) || StringUtils.isEmpty(action)) { - ResultUtils.buildParameterErrorResultAndWrite(response); - return; - } - permissions.setFunctionCode(functionCode); - permissions.setModuleCode(moduleCode); - permissions.setId(String.valueOf(id)); - permissions.setModuleName(moduleName); - permissions.setFunctionName(functionName); - permissions.setPermissionName(permissionName); - permissions.setAction(action); - permissions.setExt(ext); - permissions.setUrl(url); - permissions.setModified(new Date()); - permissionsService.updatePermissions(permissions); - ResultUtils.buildSuccessResultAndWrite(response); - } - - /** - * 删除权限 - */ - @RequestMapping(value = "/permissions", method = RequestMethod.DELETE) - @TokenRequired - public void deletePermissions(HttpServletResponse response, @RequestParam(value = "ids") String ids) { - if (StringUtils.isEmpty(ids)) { - ResultUtils.buildIdIsNull(response); - return; - } - String[] idArray = ids.split(","); - for (String id : idArray) { - Permissions permissions = permissionsService.getPermissions(String.valueOf(id)); - if (permissions == null) { - ResultUtils.buildIdResultData(response); - return; - } - permissions.setYn(YnEnums.NO.getId()); - permissions.setModified(new Date()); - permissionsService.updatePermissions(permissions); - - } - ResultUtils.buildSuccessResultAndWrite(response); - } - - /** - * 获取权限信息 + * 获取权限列表 */ @RequestMapping(value = "/permissions", method = RequestMethod.GET) @TokenRequired @@ -164,317 +55,9 @@ public class PermissionsController extends BaseController { @RequestParam(value = "page") Integer page, @RequestParam(value = "limit") Integer limit, @RequestParam(value = "id", required = false) Integer id) { - String token = ContextHolder.getContext().getToken(); - if (type == null) { - ResultUtils.buildParameterErrorResultAndWrite(response); - return; - } - if (type == 1) { - Integer userId = Integer.valueOf(tokenService.getUserId(token)); - Users users = usersService.getUsers(String.valueOf(userId)); - UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery(); - userRoleMapsQuery.setUserId(users.getId()); - userRoleMapsQuery.setYn(YnEnums.YES.getId()); -// userRoleMapsQuery.setExpirTime(new Date()); - List userRoleMapsList = userRoleMapsService.queryUserRoleMaps(userRoleMapsQuery); - List list = new ArrayList<>(); - for (UserRoleMaps userRoleMaps : userRoleMapsList) { - Integer roleIds = Integer.valueOf(userRoleMaps.getRoleId()); - RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery(); - rolePermissionMapsQuery.setRoleId(String.valueOf(roleIds)); - rolePermissionMapsQuery.setYn(YnEnums.YES.getId()); - List rolePermissionMapsList = rolePermissionMapsService.queryRolePermissionMapsv2(rolePermissionMapsQuery); - - for (RolePermissionMaps rolePermissionMaps : rolePermissionMapsList) { - Integer permissionsId = Integer.valueOf(rolePermissionMaps.getPermissionId()); - Permissions permissions = permissionsService.getPermissions(String.valueOf(permissionsId)); - Map map = new HashMap<>(); - if (null != permissions && permissions.getYn() == YnEnums.YES.getId()) { - map.put("id", permissions.getId()); - map.put("moduleName", permissions.getModuleName()); - map.put("functionName", permissions.getFunctionName()); - map.put("permissionName", permissions.getPermissionName()); - map.put("action", permissions.getAction()); - map.put("ext", permissions.getExt()); - map.put("url", permissions.getUrl()); - map.put("functionCode", permissions.getFunctionCode()); - map.put("moduleCode", permissions.getModuleCode()); - list.add(map); - } - } - } - CommonResult result = new CommonResult(); - result.setList(list); - result.setPageInfo(new PageInfo(page, 1, list.size(), limit)); - ResultUtils.buildSuccessResultAndWrite(response, result); - return; - } - - if (type == 2) { - PermissionsQuery permissionQuery = new PermissionsQuery(); - if (id != null) { - permissionQuery.setId(id); - } - permissionQuery.setPage(page); - permissionQuery.setLimit(limit); - permissionQuery.setYn(YnEnums.YES.getId()); - permissionQuery.setSort(" module_name desc"); - permissionQuery.setNeed("y"); - List permissionsList = permissionsService.queryPermissions(permissionQuery); - - List list = new ArrayList<>(); - for (Permissions p : permissionsList) { - Map map = new HashMap<>(); - map.put("id", p.getId()); - map.put("moduleName", p.getModuleName()); - map.put("functionName", p.getFunctionName()); - map.put("permissionName", p.getPermissionName()); - map.put("action", p.getAction()); - map.put("functionCode", p.getFunctionCode()); - map.put("moduleCode", p.getModuleCode()); - if (StringUtils.isNotEmpty(p.getUrl())) { - map.put("url", p.getUrl()); - } - if (StringUtils.isNotEmpty(p.getExt())) { - map.put("ext", p.getExt()); - } - list.add(map); - } - CommonResult result = new CommonResult(); - result.setList(list); - result.setPageInfo(null == permissionQuery ? new PageInfo(page, 0, 0, limit) : permissionQuery.getPageInfo()); - ResultUtils.buildSuccessResultAndWrite(response, result); - } - } - - - /** - * 获取权限信息 - */ - @RequestMapping(value = "/permissionsv2", method = RequestMethod.GET) - @TokenRequired - public void getPermissionsV2(HttpServletResponse response, - @RequestParam(value = "type") Integer type, - @RequestParam(value = "page") Integer page, - @RequestParam(value = "limit") Integer limit, - @RequestParam(value = "id", required = false) Integer id) { - Integer userId = Integer.valueOf(ContextHolder.getContext().getUserId()); - if (type == 1) { - UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery(); - userRoleMapsQuery.setUserId(String.valueOf(userId)); - userRoleMapsQuery.setYn(YnEnums.YES.getId()); -// userRoleMapsQuery.setExpirTime(new Date()); - List userRoleMapsList = userRoleMapsService.queryUserRoleMaps(userRoleMapsQuery); - - - List list = new ArrayList<>(); - - for (UserRoleMaps userRoleMaps : userRoleMapsList) { - - //如果是超级管理员,就返回所有的权限信息(roleId=1为超级管理员) - if (userRoleMaps.getRoleId().equals(1)) { - PermissionsQuery permissionQuery = new PermissionsQuery(); - if (id != null) { - permissionQuery.setId(id); - } - permissionQuery.setPage(page); - permissionQuery.setLimit(limit); - permissionQuery.setYn(YnEnums.YES.getId()); - permissionQuery.setSort(" module_name desc"); - permissionQuery.setNeed("y"); - List permissionsList = permissionsService.queryPermissions(permissionQuery); - - CommonResult result = new CommonResult(); - if (CollectionUtils.isNotEmpty(permissionsList)) { - result.setList(convertToMap(permissionsList)); - } - result.setPageInfo(null == permissionQuery ? new PageInfo(page, 0, 0, limit) : permissionQuery.getPageInfo()); - ResultUtils.buildSuccessResultAndWrite(response, result); - return; - } else { - RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery(); - rolePermissionMapsQuery.setRoleId(userRoleMaps.getRoleId()); - rolePermissionMapsQuery.setYn(YnEnums.YES.getId()); - - List rolePermissionMapsList = rolePermissionMapsService.queryRolePermissionMapsv2(rolePermissionMapsQuery); - for (RolePermissionMaps rolePermissionMaps : rolePermissionMapsList) { - - PermissionsQuery permissionsQuery = new PermissionsQuery(); - permissionsQuery.setYn(YnEnums.YES.getId()); - permissionsQuery.setId(Integer.valueOf(rolePermissionMaps.getPermissionId())); - permissionsQuery.setLimit(1); - List permissions = permissionsService.queryPermissions(permissionsQuery); - if (CollectionUtils.isNotEmpty(permissions)) { - list.add(permissions.get(0)); - } - } - } - } - CommonResult result = new CommonResult(); - result.setList(convertToMap(list)); - result.setPageInfo(new PageInfo(page, 1, list.size(), limit)); - ResultUtils.buildSuccessResultAndWrite(response, result); - - } else if (type == 2) { - PermissionsQuery permissionQuery = new PermissionsQuery(); - if (id != null) { - permissionQuery.setId(id); - } - permissionQuery.setPage(page); - permissionQuery.setLimit(limit); - permissionQuery.setYn(YnEnums.YES.getId()); - permissionQuery.setSort(" module_name desc"); - permissionQuery.setNeed("y"); - List permissionsList = permissionsService.queryPermissions(permissionQuery); - - CommonResult result = new CommonResult(); - if (CollectionUtils.isNotEmpty(permissionsList)) { - result.setList(convertToMap(permissionsList)); - } - result.setPageInfo(null == permissionQuery ? new PageInfo(page, 0, 0, limit) : permissionQuery.getPageInfo()); - ResultUtils.buildSuccessResultAndWrite(response, result); - } } - private static List convertToMap(List permissiones) { - List list = new ArrayList(); - //存放模块名字和索引映射 - Map nameToIndex = new HashMap<>(); - - int index = 0; - - for (Permissions permissions : permissiones) { - Map moduleMap = new HashMap<>(); - //如果存在就加下一级节点 - if (nameToIndex.containsKey(permissions.getModuleName())) { - Map list11 = (Map) list.get(nameToIndex.get(permissions.getModuleName())); - List f = (List) list11.get(NODE); - boolean exist = false; - for (Map map : f) { - //如果FunctionName存在 - if (map.containsValue(permissions.getFunctionName())) { - List dataLi = (List) map.get(NODE); - dataLi.add(buildDataNode(permissions)); - exist = true; - break; - } - } - if (!exist) { - Map functionMap = new HashMap<>(); - functionMap.put("functionName", permissions.getFunctionName()); - functionMap.put("functionCode", permissions.getFunctionCode()); - functionMap.put(CHECK, Boolean.FALSE); - if (functionMap.get("ismenu") == null || !Integer.valueOf(1).equals(moduleMap.get("ismenu"))) { - functionMap.put("ismenu", permissions.getIsmenu()); - } - List dataList = new ArrayList<>(); - dataList.add(buildDataNode(permissions)); - functionMap.put(NODE, dataList); - f.add(functionMap); - } - } else { - moduleMap.put("moduleName", permissions.getModuleName()); - moduleMap.put("moduleCode", permissions.getModuleCode()); - moduleMap.put(CHECK,Boolean.FALSE); - List dataList = new ArrayList<>(); - Map functionMap = new HashMap<>(); - List funList = new ArrayList<>(); - functionMap.put(CHECK,Boolean.FALSE); - functionMap.put("functionName", permissions.getFunctionName()); - functionMap.put("functionCode", permissions.getFunctionCode()); - if (functionMap.get("ismenu") == null || !Integer.valueOf(1).equals(moduleMap.get("ismenu"))) { - functionMap.put("ismenu", permissions.getIsmenu()); - } - functionMap.put(NODE, dataList); - - funList.add(functionMap); - dataList.add(buildDataNode(permissions)); - moduleMap.put(NODE, funList); - if (moduleMap.get("ismenu") == null || !Integer.valueOf(1).equals(moduleMap.get("ismenu"))) { - moduleMap.put("ismenu", permissions.getIsmenu()); - } - list.add(moduleMap); - nameToIndex.put(permissions.getModuleName(), index); - index++; - } - } - System.out.print(JsonUtil.array2JsonString(list)); - return list; - } - - /** - * 创建数据节点 - * - * @param permissions - * @return - */ - private static Map buildDataNode(Permissions permissions) { - Map data = new HashMap<>(); - data.put("id", permissions.getId()); - data.put("action", permissions.getAction()); - data.put("permissionName", permissions.getPermissionName()); - data.put("ext", permissions.getExt()); - data.put("url", permissions.getUrl()); - data.put(CHECK, Boolean.FALSE); - data.put("ismenu", permissions.getIsmenu()); - return data; - } -// -// public static void main(String[] args) { -// List permissionses = new ArrayList<>(); -// Permissions permissions = new Permissions(); -// permissions.setModuleName("平台管理-医院管理"); -// permissions.setFunctionName("床位类型管理"); -// permissions.setId(1); -// permissions.setAction("view"); -// permissions.setPermissionName("查看"); -// permissions.setExt("/v1/sickbedTypes"); -// -// -// Permissions permissions1 = new Permissions(); -// permissions1.setModuleName("平台管理-医院管理"); -// permissions1.setFunctionName("床位类型管理"); -// permissions1.setId(2); -// permissions1.setAction("edit"); -// permissions1.setPermissionName("修改"); -// permissions1.setExt("/v1/sickbedTypes"); -// -// -// Permissions permissions2 = new Permissions(); -// permissions2.setModuleName("内容管理"); -// permissions2.setFunctionName("床位类型管理"); -// permissions2.setId(3); -// permissions2.setAction("edit"); -// permissions2.setPermissionName("修改"); -// permissions2.setExt("/v1/sickbedTypes"); -// -// -// Permissions permissions3 = new Permissions(); -// permissions3.setModuleName("内容管理"); -// permissions3.setFunctionName("床位管理"); -// permissions3.setId(4); -// permissions3.setAction("edit"); -// permissions3.setPermissionName("修改"); -// permissions3.setExt("/v1/sickbedTypes"); -// -// -// Permissions permissions4 = new Permissions(); -// permissions4.setModuleName("内容管理"); -// permissions4.setFunctionName("床位类型管理"); -// permissions4.setId(5); -// permissions4.setAction("edit"); -// permissions4.setPermissionName("查询"); -// permissions4.setExt("/v1/sickbedTypes1"); -// -// permissionses.add(permissions); -// permissionses.add(permissions3); -// permissionses.add(permissions1); -// permissionses.add(permissions2); -// permissionses.add(permissions4); -// convertToMap(permissionses); -// -// } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java index 33a3f66..179d094 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java @@ -4,14 +4,14 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.ContextHolder; -import com.lyms.platform.common.base.MommyBabyContext; -import com.lyms.platform.common.enums.SortTypeEnum; +import com.lyms.platform.common.base.PlatformContext; +import com.lyms.platform.common.constants.ConstantInterface; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.exception.BusinessException; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -31,85 +31,108 @@ import java.util.*; public class RolesController extends BaseController { @Autowired - private IRolesService rolesService; + private RolesService rolesService; @Autowired - private ITokenService tokenService; + private TokenService tokenService; @Autowired - private IUsersService usersService; + private UsersService usersService; @Autowired - private IRolePermissionMapsService rolePermissionMapsService; - + private RolePermissionMapsService rolePermissionMapsService; @Autowired - private IPermissionsService permissionsService; - + private PermissionsService permissionsService; @Autowired - private IUserRoleMapsService userRoleMapsService; + private UserRoleMapsService userRoleMapsService; + + + /** + * 角色权限 + */ + @RequestMapping(value = "/roles/permission", method = RequestMethod.POST) + @TokenRequired + public void updateUsers(HttpServletResponse response, + @RequestParam(value = "id") Integer id, + @RequestParam(value = "ids") String ids) { + + + //判断是否存在该角色 + Roles roles = rolesService.getRoles(id); + if(null == roles || id == null || StringUtils.isBlank(ids)) { + ResultUtils.buildParameterErrorResultAndWrite(response); + return; + } + + //修改映射表数据,先删除后修改 + RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery(); + rolePermissionMapsQuery.setRoleId(roles.getId()); + List rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery); + if(null != rolePermissionMapses) { + for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) { + rolePermissionMaps.setYn(YnEnums.NO.getId()); + rolePermissionMapsService.updateRolePermissionMaps(rolePermissionMaps); + } + } + + + RolePermissionMaps rolePermissionMaps = null; + String[] roleArrayIds = ids.split(","); + for (String tmp : roleArrayIds) { + Permissions permissions = permissionsService.getPermissions(Integer.valueOf(tmp)); + //权限是否存在 + if (permissions == null || permissions.getYn() == YnEnums.NO.getId()) { + continue; + } + + rolePermissionMaps = new RolePermissionMaps(); + if (roles.getId() != null) { + rolePermissionMaps.setYn(YnEnums.YES.getId()); + rolePermissionMaps.setRoleId(roles.getId()); + rolePermissionMaps.setPermissionId(Integer.valueOf(tmp)); + rolePermissionMapsService.addRolePermissionMaps(rolePermissionMaps); + } + } + ResultUtils.buildSuccessResultAndWrite(response); + + } + /** * 创建角色 * @param response * @param type 类型 - * @param parentId 父 ID - * @param title 角色名称 - * @param permissionIds 权限 ID */ @RequestMapping(value = "/roles",method = RequestMethod.POST) @TokenRequired public void addRoles(HttpServletResponse response, @RequestParam(value = "type")Integer type, - @RequestParam(value = "parentId",required = false)Integer parentId, - @RequestParam(value = "title")String title, - @RequestParam(value = "permissionIds")String permissionIds) { + @RequestParam(value = "name")String name, + @RequestParam(value = "enable")Integer enable, + @RequestParam(value = "remarks")String remarks, + @RequestParam(value = "shortCode")String shortCode) { - MommyBabyContext mommyBobyContext = ContextHolder.getContext(); + //获取登录用户 + PlatformContext mommyBobyContext = ContextHolder.getContext(); String token = mommyBobyContext.getToken(); + Users users = usersService.getUsers(tokenService.getUserId(token)); - if (type == null || StringUtils.isBlank(title) || StringUtils.isBlank(permissionIds)) { + if (type == null || StringUtils.isBlank(name) || null == users) { ResultUtils.buildParameterErrorResultAndWrite(response); return; } - String userId = tokenService.getUserId(token); - - Users users = usersService.getUsers(userId); - Roles roles = new Roles(); roles.setType(type); - if (type == 2){ - roles.setParentId(String.valueOf(parentId)); - }else { - roles.setParentId(String.valueOf(0)); - } - roles.setTitle(title); - roles.setPublishId(users.getId()); - roles.setPublishName(users.getUsername()); - + roles.setName(name); + roles.setEnable(enable); + roles.setRemarks(remarks); + roles.setShortcode(shortCode); roles.setYn(YnEnums.YES.getId()); + roles.setPublishId(users.getId()); + roles.setPublishName(users.getName()); roles.setModified(new Date()); roles.setCreated(new Date()); rolesService.addRoles(roles); - //中间表数据的添加 - RolePermissionMaps rolePermissionMaps = new RolePermissionMaps(); - - String[] permissionId = permissionIds.split(","); - - for (String pIds : permissionId) { - Permissions permissions = permissionsService.getPermissions(String.valueOf(Integer.valueOf(pIds))); - - if (permissions==null || permissions.getYn()==YnEnums.NO.getId()){ - //ResultUtils.buildParameterErrorResultAndWrite(response, "权限ID不存在"); - continue; - } - - if (roles.getId() != null) { - rolePermissionMaps.setPermissionId(String.valueOf(Integer.valueOf(pIds))); - rolePermissionMaps.setRoleId(roles.getId()); - rolePermissionMaps.setYn(YnEnums.YES.getId()); - rolePermissionMapsService.addRolePermissionMaps(rolePermissionMaps); - } - } ResultUtils.buildSuccessResultAndWrite(response); } @@ -119,97 +142,98 @@ public class RolesController extends BaseController { @RequestMapping(value = "/roles/{id}",method = RequestMethod.PUT) @TokenRequired public void updateRoles(HttpServletResponse response ,@PathVariable Integer id, - @RequestParam(value = "type")Integer type, - @RequestParam(value = "title")String title, - @RequestParam(value = "permissionIds")String permissionIds, - @RequestParam(value = "parentId",required = false)Integer parentId) { + @RequestParam(value = "name")String name, + @RequestParam(value = "enable")Integer enable, + @RequestParam(value = "remarks")String remarks, + @RequestParam(value = "shortCode")String shortCode) { - if (type == null || StringUtils.isBlank(title) || StringUtils.isBlank(permissionIds)) { + if ( StringUtils.isBlank(name) || null != id ) { ResultUtils.buildParameterErrorResultAndWrite(response); return; } - Roles roles = rolesService.getRoles(String.valueOf(id)); + Roles roles = rolesService.getRoles(id); if (roles==null){ new BusinessException("", "根据id获取信息不存在."); return; } - roles.setId(String.valueOf(id)); - roles.setType(type); - if (type==2){ - roles.setParentId(String.valueOf(parentId)); - }else { - roles.setParentId(String.valueOf(0)); + + roles.setName(name); + roles.setEnable(enable); + roles.setRemarks(remarks); + roles.setShortcode(shortCode); + rolesService.updateRoles(roles); + + ResultUtils.buildSuccessResultAndWrite(response); + } + + /** + * 角色删除 + */ + @RequestMapping(value = "/roles/{id}",method = RequestMethod.DELETE) + @TokenRequired + public void deleteRoles(HttpServletResponse response ,@PathVariable(value = "id")Integer id) { + if (null == id) { + ResultUtils.buildIdIsNull(response); + return; } - roles.setTitle(title); + Roles roles = rolesService.getRoles(id); + if (roles==null){ + ResultUtils.buildIdResultData(response); + return; + } + + roles.setYn(YnEnums.NO.getId()); roles.setModified(new Date()); rolesService.updateRoles(roles); - //中间表数据的修改 - String roleId = String.valueOf(id); - System.out.println("roleId" + roleId);//19 + //中间表数据处理 + UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery(); + userRoleMapsQuery.setRoleId(id); + List userRoleMapses = userRoleMapsService.queryUserRoleMaps(userRoleMapsQuery); + if(null != userRoleMapses) { + for(UserRoleMaps userRoleMaps : userRoleMapses) { + userRoleMaps.setYn(YnEnums.NO.getId()); + userRoleMapsService.updateUserRoleMaps(userRoleMaps); + } + } + RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery(); - rolePermissionMapsQuery.setRoleId(roleId); + rolePermissionMapsQuery.setRoleId(id); List rolePermissionMapsList = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery); - for (RolePermissionMaps rolePermissionMaps : rolePermissionMapsList) { - rolePermissionMaps.setYn(YnEnums.NO.getId()); - rolePermissionMapsService.updateRolePermissionMaps(rolePermissionMaps); - } - String[] ids = permissionIds.split(",");//2,3 - for (String pIds : ids) { - String permissionId = pIds; - Permissions permissions = permissionsService.getPermissions(permissionId); - if (permissions==null || permissions.getYn()==YnEnums.NO.getId()){ - //ResultUtils.buildParameterErrorResultAndWrite(response, "权限ID不存在"); - continue; - } - RolePermissionMaps temp = rolePermissionMapsService.getRolePermissionMaps(roleId, permissionId); - if (temp == null) { - RolePermissionMaps maps = new RolePermissionMaps(); - maps.setRoleId(roleId); - maps.setPermissionId(permissionId); - maps.setYn(YnEnums.YES.getId()); - rolePermissionMapsService.addRolePermissionMaps(maps); - } else if (temp.getYn() == YnEnums.NO.getId()) { - temp.setYn(YnEnums.YES.getId()); - rolePermissionMapsService.updateRolePermissionMaps(temp); + if(null != rolePermissionMapsList) { + for (RolePermissionMaps rolePermissionMaps : rolePermissionMapsList) { + rolePermissionMaps.setYn(YnEnums.NO.getId()); + rolePermissionMapsService.updateRolePermissionMaps(rolePermissionMaps);//把状态设置成无效 } } + ResultUtils.buildSuccessResultAndWrite(response); } + /** - * 角色删除 + * 角色停用 */ - @RequestMapping(value = "/roles",method = RequestMethod.DELETE) + @RequestMapping(value = "/roles/enable", method = RequestMethod.POST) @TokenRequired - public void deleteRoles(HttpServletResponse response ,@RequestParam(value = "ids")String ids) { - if (StringUtils.isBlank(ids)) { + public void enableUsers(HttpServletResponse response,@RequestParam Integer id, @RequestParam Integer flag) { + if (null == id && null == flag) { ResultUtils.buildIdIsNull(response); return; } - String[] idArray = ids.split(","); - for (String id : idArray) { - String roleId = id; - Roles roles = rolesService.getRoles(roleId); - if (roles==null){ - ResultUtils.buildIdResultData(response); - return; - } - roles.setYn(YnEnums.NO.getId()); - roles.setModified(new Date()); - rolesService.updateRoles(roles); - //中间表数据的删除 - RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery(); - rolePermissionMapsQuery.setRoleId(roleId); - List rolePermissionMapsList = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery); - if(null != rolePermissionMapsList) { - for (RolePermissionMaps rolePermissionMaps : rolePermissionMapsList) { - rolePermissionMaps.setYn(YnEnums.NO.getId()); - rolePermissionMapsService.updateRolePermissionMaps(rolePermissionMaps);//修改权限,把状态设置成无效 - } - } + + //判断是否存在 + Roles roles = rolesService.getRoles(id); + if(null == roles) { + ResultUtils.buildIdIsNull(response); + return; } + + //修改字段 + roles.setEnable(flag); + roles.setModified(new Date()); + rolesService.updateRoles(roles); ResultUtils.buildSuccessResultAndWrite(response); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index e9b5dec..76bbb5f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -4,7 +4,7 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.ContextHolder; -import com.lyms.platform.common.base.MommyBabyContext; +import com.lyms.platform.common.base.PlatformContext; import com.lyms.platform.common.cache.redis.RedisUtils; import com.lyms.platform.common.constants.ConstantInterface; import com.lyms.platform.common.constants.TimeConstants; @@ -34,20 +34,18 @@ import java.util.*; public class UsersController extends BaseController { @Autowired - private IUsersService usersService; + private UsersService usersService; @Autowired - private ITokenService tokenService; + private TokenService tokenService; @Autowired - private IUserRoleMapsService userRoleMapsService; + private UserRoleMapsService userRoleMapsService; @Autowired - private IRolesService rolesService; + private RolesService rolesService; @Autowired - private IDepartmentsService departmentsService; + UserOrganizationMapsService userOrganizationMapsService; + @Autowired + OrganizationService organizationService; -// @Autowired -// private IHospitalsService hospitalsService; -// @Autowired -// private ISectionsService sectionsService; private static final String LYMS = "龙源美生"; @@ -134,7 +132,7 @@ public class UsersController extends BaseController { //设置缓存10分钟验证码 RedisUtils.setObj(countKey, code, TimeConstants.TEN_MINUTE); //发送短信 - MessageUtil.send(phone, ConstantInterface.SHORT_MESSAGE_PRE + MessageFormat.format("验证码{0}，您正在登录AMS，若非本人操作，请勿泄露。", code)); + MessageUtil.send(phone, ConstantInterface.SHORT_MESSAGE_PRE + MessageFormat.format("验证码{0}，您正在登录区域平台，若非本人操作，请勿泄露。", code)); ResultUtils.buildSuccessResultAndWrite(httpServletResponse); int count = 0; @@ -176,6 +174,74 @@ public class UsersController extends BaseController { } + + + + /** + * 管理员权限设置 + */ + @RequestMapping(value = "/adminPermissions", method = RequestMethod.POST) + @TokenRequired + public void adminPermissions(HttpServletResponse response,@RequestParam(value = "userId") Integer userId, @RequestParam(value = "ids") String ids){ + PlatformContext mommyBobyContext = ContextHolder.getContext(); + String token = mommyBobyContext.getToken(); + + if (ids == null) { + ResultUtils.buildParameterErrorResultAndWrite(response); + return; + } + + //检查账户是否存在 + UsersQuery usersQuery = new UsersQuery(); + usersQuery.setId(userId); + List usersList = usersService.queryUsers(usersQuery); + if (usersList.size() == 0) { + Map map = new HashMap<>(); + map.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR); + map.put(ResultUtils.ERROR_MSG, "用户不存在"); + writeJson(response, JsonUtil.obj2JsonString(map)); + return; + } + + //将已有映射设为失效 + UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery(); + userOrganizationMapsQuery.setUserId(userId); + List userOrganizationMapsList = userOrganizationMapsService.queryUserOrganizationMaps(userOrganizationMapsQuery); + if(0 < userOrganizationMapsList.size()) { + for(UserOrganizationMaps userOrganizationMaps : userOrganizationMapsList) { + userOrganizationMaps.setYn(YnEnums.NO.getId()); + userOrganizationMapsService.updateUserOrganizationMaps(userOrganizationMaps); + } + } + + //添加最新权限映射 + String[] roleArrayIds = ids.split(","); + Users user = usersList.get(0); + UserOrganizationMaps userOrganizationMaps = null; + Organization organization = null; + for (String id : roleArrayIds) { + organization = organizationService.getOrganization(Integer.valueOf(id)); + if(null != organization) { + userOrganizationMaps = new UserOrganizationMaps(); + userOrganizationMaps.setUserId(user.getId()); + userOrganizationMaps.setOrgId(Integer.valueOf(id)); + userOrganizationMaps.setYn(YnEnums.YES.getId()); + userOrganizationMapsService.addUserOrganizationMaps(userOrganizationMaps); + } + } + + + //修改user相关字段 + user.setModified(new Date()); + usersService.updateUsers(user); + + ResultUtils.buildSuccessResultAndWrite(response); + } + + + + + /** * 添加用户信息 */ @@ -183,39 +249,32 @@ public class UsersController extends BaseController { @TokenRequired public void addUsers(HttpServletResponse response, @RequestParam(value = "type") Integer type, - @RequestParam(value = "parentId", required = false) Integer parentId, - @RequestParam(value = "roleIds") String roleIds, @RequestParam(value = "deptId") Integer deptId, - @RequestParam(value = "username") String username, + @RequestParam(value = "orgId") Integer orgId, + @RequestParam(value = "name") String name, @RequestParam(value = "account")String account, - @RequestParam(value = "phone") String phone) { + @RequestParam(value = "phone") String phone, + @RequestParam(value = "enable") Integer enable, + @RequestParam(value = "remarks") String remarks, + @RequestParam(value = "roleIds") String roleIds) { - MommyBabyContext mommyBobyContext = ContextHolder.getContext(); + PlatformContext mommyBobyContext = ContextHolder.getContext(); String token = mommyBobyContext.getToken(); + //获取登录用户ID + Users user = usersService.getUsers(Integer.valueOf(tokenService.getUserId(token))); if (type == null || StringUtils.isBlank(roleIds) || deptId == null || - StringUtils.isBlank(username) /*|| StringUtils.isBlank(account) || - StringUtils.isBlank(pwd) */ || StringUtils.isBlank(phone)) { + StringUtils.isBlank(name) /*|| StringUtils.isBlank(account) || + StringUtils.isBlank(pwd) */ || StringUtils.isBlank(phone) || null == user) { ResultUtils.buildParameterErrorResultAndWrite(response); return; } - Integer userId = Integer.valueOf(tokenService.getUserId(token)); - if (userId != null) { - Users u = usersService.getUsers(String.valueOf(userId)); - Users users = new Users(); - users.setType(type); - if (type == 2) { - users.setParentId(String.valueOf(parentId)); - } else { - users.setParentId("0"); - } + if (user != null) { - users.setDeptId(deptId); - users.setUsername(username); + //检查注册账户是否存在 UsersQuery usersQuery = new UsersQuery(); usersQuery.setPhone(phone); -// usersQuery.setAccount(account); List usersList = usersService.queryUsers(usersQuery); if (usersList.size() != 0) { Map map = new HashMap<>(); @@ -224,50 +283,43 @@ public class UsersController extends BaseController { writeJson(response, JsonUtil.obj2JsonString(map)); return; } -// users.setAccount(account); -// users.setPwd(LoginUtil.md5(NumberUtils.getRandomString(6))); - users.setPhone(phone); - users.setPublishId(u.getId()); - users.setPublishName(u.getUsername()); + Users users = new Users(); + users.setType(type); + users.setDeptId(deptId); + users.setOrgId(orgId); + users.setName(name); + users.setAccount(account); + users.setPhone(phone); + users.setEnable(enable); + users.setRemarks(remarks); + users.setPublishId(user.getId()); + users.setPublishName(user.getName()); users.setYn(YnEnums.YES.getId()); users.setModified(new Date()); users.setCreated(new Date()); users.setLastLoginTime(new Date()); - +// users.setPwd(LoginUtil.md5(NumberUtils.getRandomString(6))); usersService.addUsers(users); - - - //用户对角色中间表新增 + //如有角色,则对用户角色中间表新增 UserRoleMaps userRoleMaps = new UserRoleMaps(); - String[] roleArray = roleIds.split(","); - List user = usersService.queryUsers(usersQuery); - for (String rIds : roleArray) { - String[] ar = rIds.split("\\:"); - if (ar.length == 2) { - long time; - try { - time = Long.valueOf(ar[1]); - Roles roles = rolesService.getRoles(String.valueOf(Integer.valueOf(ar[0]))); - if (roles == null || roles.getYn() == YnEnums.NO.getId()) { - //ResultUtils.buildParameterErrorResultAndWrite(response,"角色ID不存在"); - continue; - } - - if (user.get(0).getId() != null) { - userRoleMaps.setRoleId(String.valueOf(Integer.valueOf(Integer.valueOf(ar[0])))); - userRoleMaps.setUserId(user.get(0).getId()); -// userRoleMaps.setExpirTime(new Date(time* 1000)); - userRoleMaps.setYn(YnEnums.YES.getId()); - userRoleMapsService.addUserRoleMaps(userRoleMaps); - } - } catch (Exception e) { + String[] roleArrayIds = roleIds.split(","); + List user1 = usersService.queryUsers(usersQuery); + for (String id : roleArrayIds) { + Roles roles = rolesService.getRoles(Integer.valueOf(id)); + if (roles == null || roles.getYn() == YnEnums.NO.getId()) { continue; } - } + + if (user1.get(0).getId() != null) { + userRoleMaps.setRoleId(Integer.valueOf(Integer.valueOf(id))); + userRoleMaps.setUserId(user1.get(0).getId()); + userRoleMaps.setYn(YnEnums.YES.getId()); + userRoleMapsService.addUserRoleMaps(userRoleMaps); + } } ResultUtils.buildSuccessResultAndWrite(response); } @@ -276,55 +328,168 @@ public class UsersController extends BaseController { /** * 用户修改 */ - @RequestMapping(value = "/users/{id}", method = RequestMethod.PUT) + @RequestMapping(value = "/users", method = RequestMethod.PUT) @TokenRequired - public void updateUsers(HttpServletResponse response, @PathVariable Integer id, - @RequestParam(value = "type") Integer type, - @RequestParam(value = "roleIds") String roleIds, + public void updateUsers(HttpServletResponse response, + @RequestParam(value = "id") Integer id, @RequestParam(value = "deptId") Integer deptId, - @RequestParam(value = "username") String username, + @RequestParam(value = "orgId") Integer orgId, + @RequestParam(value = "name") String name, + @RequestParam(value = "account")String account, @RequestParam(value = "phone") String phone, - @RequestParam(value = "parentId", required = false) Integer parentId) { + @RequestParam(value = "enable") Integer enable, + @RequestParam(value = "remarks") String remarks, + @RequestParam(value = "roleIds") String roleIds) { + + PlatformContext mommyBobyContext = ContextHolder.getContext(); + String token = mommyBobyContext.getToken(); + + if ( StringUtils.isBlank(roleIds) || deptId == null || + StringUtils.isBlank(name) /*|| StringUtils.isBlank(account) || + StringUtils.isBlank(pwd) */ || StringUtils.isBlank(phone)) { + ResultUtils.buildParameterErrorResultAndWrite(response); + return; + } + //获取登录用户ID + Integer userId = Integer.valueOf(tokenService.getUserId(token)); + if (userId != null) { + Users u = usersService.getUsers(userId); + + //检查账户是否存在 + UsersQuery usersQuery = new UsersQuery(); + usersQuery.setPhone(phone); + List usersList = usersService.queryUsers(usersQuery); + if (usersList.size() == 0) { + Map map = new HashMap<>(); + map.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR); + map.put(ResultUtils.ERROR_MSG, "用户不存在"); + writeJson(response, JsonUtil.obj2JsonString(map)); + return; + } + + Users users = new Users(); + users.setId(id); + users.setDeptId(deptId); + users.setOrgId(orgId); + users.setName(name); + users.setAccount(account); + users.setPhone(phone); + users.setEnable(enable); + users.setRemarks(remarks); + users.setPublishId(u.getId()); + users.setPublishName(u.getName()); + users.setYn(YnEnums.YES.getId()); + users.setModified(new Date()); +// users.setPwd(LoginUtil.md5(NumberUtils.getRandomString(6))); + usersService.updateUsers(users); + + + //如有角色,则对用户角色中间表先删除后新增 + Integer _userId = usersList.get(0).getId(); + UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery(); + userRoleMapsQuery.setUserId(_userId); + List roleMapsList = userRoleMapsService.queryUserRoleMaps(userRoleMapsQuery); + for (UserRoleMaps userRoleMaps : roleMapsList) { + userRoleMaps.setYn(YnEnums.NO.getId()); + userRoleMapsService.updateUserRoleMaps(userRoleMaps); + } + + UserRoleMaps userRoleMaps = new UserRoleMaps(); + String[] roleArrayIds = roleIds.split(","); + List user = usersService.queryUsers(usersQuery); + for (String tmp : roleArrayIds) { + Roles roles = rolesService.getRoles(Integer.valueOf(tmp)); + if (roles == null || roles.getYn() == YnEnums.NO.getId()) { + continue; + } + if (user.get(0).getId() != null) { + userRoleMaps.setRoleId(Integer.valueOf(Integer.valueOf(tmp))); + userRoleMaps.setUserId(user.get(0).getId()); + userRoleMaps.setYn(YnEnums.YES.getId()); + userRoleMapsService.addUserRoleMaps(userRoleMaps); + } + } + ResultUtils.buildSuccessResultAndWrite(response); + } } /** + * 用户停用 + */ + @RequestMapping(value = "/users/enable", method = RequestMethod.POST) + @TokenRequired + public void enableUsers(HttpServletResponse response,@RequestParam Integer id, @RequestParam Integer flag) { + PlatformContext mommyBobyContext = ContextHolder.getContext(); + String token = mommyBobyContext.getToken(); + + //检查账户是否存在 + UsersQuery usersQuery = new UsersQuery(); + usersQuery.setId(id); + List usersList = usersService.queryUsers(usersQuery); + if (usersList.size() == 0) { + Map map = new HashMap<>(); + map.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR); + map.put(ResultUtils.ERROR_MSG, "用户不存在"); + writeJson(response, JsonUtil.obj2JsonString(map)); + return; + } + + Users users = new Users(); + users.setId(id); + users.setEnable(flag); + users.setModified(new Date()); + usersService.updateUsers(users); + ResultUtils.buildSuccessResultAndWrite(response); + } + + + + + /** * 用户删除 */ - @RequestMapping(value = "/users", method = RequestMethod.DELETE) + @RequestMapping(value = "/users/{id}", method = RequestMethod.DELETE) @TokenRequired - public void deleteUsers(HttpServletResponse response, @RequestParam(value = "ids") String ids) { - if (StringUtils.isBlank(ids)) { + public void deleteUsers(HttpServletResponse response,@PathVariable Integer id) { + if (null != id) { ResultUtils.buildIdIsNull(response); return; } - String[] idArray = ids.split(","); - for (String id : idArray) { - String userId = String.valueOf(Integer.valueOf(id)); - Users users = usersService.getUsers(userId); - if (users == null) { - ResultUtils.buildIdResultData(response); - return; - } + Integer userId = id; + Users users = usersService.getUsers(userId); + if (users == null) { + ResultUtils.buildIdResultData(response); + return; + } - if ("admin".equals(users.getAccount())) { - ResultUtils.buildParameterErrorResultAndWrite(response, "超级管理员无法删除"); - return; - } - users.setYn(YnEnums.NO.getId()); - users.setModified(new Date()); + if ("admin".equals(users.getAccount())) { + ResultUtils.buildParameterErrorResultAndWrite(response, "超级管理员无法删除"); + return; + } + users.setYn(YnEnums.NO.getId()); + users.setModified(new Date()); + usersService.updateUsers(users); - usersService.updateUsers(users); - //中间表数据的删除 - UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery(); - userRoleMapsQuery.setUserId(userId); - List userRoleMapsList = userRoleMapsService.queryUserRoleMaps(userRoleMapsQuery); - for (UserRoleMaps userRoleMaps : userRoleMapsList) { - userRoleMaps.setYn(YnEnums.NO.getId()); - userRoleMapsService.updateUserRoleMaps(userRoleMaps);//修改权限,把状态设置成无效 - } + + //中间表数据的删除 + UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery(); + userRoleMapsQuery.setUserId(userId); + List userRoleMapsList = userRoleMapsService.queryUserRoleMaps(userRoleMapsQuery); + for (UserRoleMaps userRoleMaps : userRoleMapsList) { + userRoleMaps.setYn(YnEnums.NO.getId()); + userRoleMapsService.updateUserRoleMaps(userRoleMaps);//把状态设置成无效 + } + + UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery(); + userOrganizationMapsQuery.setUserId(userId); + List userOrganizationMapsList = userOrganizationMapsService.queryUserOrganizationMaps(userOrganizationMapsQuery); + for (UserOrganizationMaps userOrganizationMaps : userOrganizationMapsList) { + userOrganizationMaps.setYn(YnEnums.NO.getId()); + userOrganizationMapsService.updateUserOrganizationMaps(userOrganizationMaps);//把状态设置成无效 } + ResultUtils.buildSuccessResultAndWrite(response); } @@ -339,6 +504,11 @@ public class UsersController extends BaseController { @RequestParam(value = "parentId", required = false) Integer parentId, @RequestParam(value = "username", required = false) String username) { + + + + + } /** @@ -349,17 +519,15 @@ public class UsersController extends BaseController { public void updateUserPwd(HttpServletResponse httpServletResponse, @RequestParam(value = "oldPwd") String oldPwd, @RequestParam(value = "newPwd") String newPwd) { - Map resultMsgMap = new HashMap(); if (StringUtils.isBlank(oldPwd) || StringUtils.isBlank(newPwd)) { ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse); return; } - MommyBabyContext mommyBobyContext = ContextHolder.getContext(); - String userId = tokenService.getUserId(mommyBobyContext.getToken()); + PlatformContext mommyBobyContext = ContextHolder.getContext(); + Integer userId = tokenService.getUserId(mommyBobyContext.getToken()); if (null != userId) { - //修改前的密码 Users users = usersService.getUsers(userId); //验证之前的密码和数据库中的密码是否一致 @@ -381,13 +549,14 @@ public class UsersController extends BaseController { } } + /** * 重置用户密码 */ @RequestMapping(value = "/passwords/reset", method = RequestMethod.PUT) @TokenRequired public void updatePassword(HttpServletResponse response, @RequestParam(value = "id") Integer id) { - Users users = usersService.getUsers(String.valueOf(id)); + Users users = usersService.getUsers(id); if (users == null) { ResultUtils.buildParameterErrorResultAndWrite(response, "用户ID不存在"); return; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java index a68ff66..10305b8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java @@ -4,12 +4,12 @@ package com.lyms.platform.operate.web.inteceptor; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.ContextHolder; -import com.lyms.platform.common.base.MommyBabyContext; +import com.lyms.platform.common.base.PlatformContext; import com.lyms.platform.common.exception.ParameterException; import com.lyms.platform.common.exception.TokenException; import com.lyms.platform.common.utils.LogUtil; import com.lyms.platform.common.utils.TokenUtils; -import com.lyms.platform.permission.service.ITokenService; +import com.lyms.platform.permission.service.TokenService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.method.HandlerMethod; @@ -32,7 +32,7 @@ import java.lang.annotation.Annotation; */ public class TokenValidateInteceptor extends HandlerInterceptorAdapter { @Autowired - private ITokenService tokenService; + private TokenService tokenService; public static boolean isSiteController(Object handler) { return handler instanceof HandlerMethod && (((HandlerMethod) handler).getBean() instanceof BaseController); @@ -70,7 +70,7 @@ public class TokenValidateInteceptor extends HandlerInterceptorAdapter { if(null==object){ throw new TokenException(); } - MommyBabyContext mommyBabyContext = new MommyBabyContext(); + PlatformContext mommyBabyContext = new PlatformContext(); mommyBabyContext.setToken(token); mommyBabyContext.setUserId( object.toString()); mommyBabyContext.setIpAddr(TokenUtils.getIpAddr(httpServletRequest)); diff --git a/platform-operate-api/src/main/resources/spring/applicationContext-dal.xml b/platform-operate-api/src/main/resources/spring/applicationContext-dal.xml index d44e0f7..0b857a5 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext-dal.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext-dal.xml @@ -50,7 +50,7 @@ - +