Skip to content

C
challenger-rmi
Commit 3bba0276 by Xujialin
Options

rmi更新

parent 2b24d11c
Showing with 500 additions and 1253 deletions
src/main/java/com/senthink/rmi/challenger/param/EllaOrgStructureParam.java deleted 100644 → 0
package com.senthink.rmi.challenger.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ApiModel("协议定义")
public class EllaOrgStructureParam extends PageParam {
@ApiModelProperty("模糊查询")
private String search;
/**
* 组织结构名称
*/
@ApiModelProperty("组织结构名称")
private String name;
/**
* 上级架构的id
*/
@ApiModelProperty("上级架构的id")
private Integer parentId;
/**
* 组织架构的层级 0最高层级 向下递增
*/
@ApiModelProperty("组织架构的层级 0最高层级 向下递增")
private Integer level;
/**
* 编号
*/
@ApiModelProperty("编号")
private String number;
/**
* 英文缩写
*/
@ApiModelProperty("英文缩写")
private String abbreviation;
/**
* 简称
*/
@ApiModelProperty("简称")
private String shortName;
@ApiModelProperty("节点对应的英文名")
private String enName;
public String getSearch() {
return this.search;
}
public void setSearch(String search) {
this.search = search;
}
public String getName() {
return this.name;
}
public void setName(String name) {
this.name = name;
}
public Integer getParentId() {
return this.parentId;
}
public void setParentId(Integer parentId) {
this.parentId = parentId;
}
public Integer getLevel() {
return this.level;
}
public void setLevel(Integer level) {
this.level = level;
}
public String getNumber() {
return this.number;
}
public void setNumber(String number) {
this.number = number;
}
public String getAbbreviation() {
return this.abbreviation;
}
public void setAbbreviation(String abbreviation) {
this.abbreviation = abbreviation;
}
public String getShortName() {
return this.shortName;
}
public void setShortName(String shortName) {
this.shortName = shortName;
}
public String getEnName() {
return enName;
}
public void setEnName(String enName) {
this.enName = enName;
}
}
src/main/java/com/senthink/rmi/challenger/param/EllaPagePermissionParam.java deleted 100644 → 0
package com.senthink.rmi.challenger.param;
import java.util.List;
import io.swagger.annotations.ApiModelProperty;
public class EllaPagePermissionParam extends PageParam {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ApiModelProperty("ID")
private Integer id;
/**
* 权限名称
*/
@ApiModelProperty("权限名称")
private String name;
/**
* 权限编号
*/
@ApiModelProperty("权限编号")
private String number;
/**
* 权限的路径
*/
@ApiModelProperty("权限的路径")
private String url;
/**
* 权限类型 0页面权限 1数据权限
*/
@ApiModelProperty("权限类型 0页面权限 1数据权限")
private Integer type;
/**
* 上级权限ID
*/
@ApiModelProperty("上级权限ID")
private Integer parentId;
/**
* 层级，最高级为0，依次下降，1,2,3...
*/
@ApiModelProperty("层级，最高级为0，依次下降，1,2,3... ")
private Integer level;
/**
* 所属系统ID
*/
@ApiModelProperty("所属系统ID")
private Integer subsystemId;
/**
* 是否是菜单 0 否 1是
*/
@ApiModelProperty("是否是菜单 0 否 1是")
private Integer isMenu;
/**
* 权限英文名称
*/
@ApiModelProperty("权限英文名称")
private String enName;
@ApiModelProperty("子节点集")
private List<EllaPagePermissionParam> children;
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 String getNumber() {
return number;
}
public void setNumber(String number) {
this.number = number;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public Integer getParentId() {
return parentId;
}
public void setParentId(Integer parentId) {
this.parentId = parentId;
}
public Integer getLevel() {
return level;
}
public void setLevel(Integer level) {
this.level = level;
}
public Integer getSubsystemId() {
return subsystemId;
}
public void setSubsystemId(Integer subsystemId) {
this.subsystemId = subsystemId;
}
public Integer getIsMenu() {
return isMenu;
}
public void setIsMenu(Integer isMenu) {
this.isMenu = isMenu;
}
public String getEnName() {
return enName;
}
public void setEnName(String enName) {
this.enName = enName;
}
public List<EllaPagePermissionParam> getChildren() {
return children;
}
public void setChildren(List<EllaPagePermissionParam> children) {
this.children = children;
}
}
src/main/java/com/senthink/rmi/challenger/param/EllaRoleParam.java deleted 100644 → 0
package com.senthink.rmi.challenger.param;
import io.swagger.annotations.ApiModelProperty;
public class EllaRoleParam extends PageParam {
@ApiModelProperty("模糊查询")
private String search;
/**
* 角色名称
*/
@ApiModelProperty("角色名称")
private String roleName;
/**
* 角色编号
*/
@ApiModelProperty("角色编号")
private String roleNumber;
/**
* 权限集合用 id_level,id_level... 表示
*/
@ApiModelProperty("权限集合用 id_level,id_level... 表示")
private String permissions;
/**
* 用户数据权限信息，id的集合,分割
*/
@ApiModelProperty("用户数据权限信息，id的集合,分割")
private String userdatas;
/**
* 角色备注
*/
@ApiModelProperty("角色备注")
private String remark;
public String getSearch() {
return this.search;
}
public void setSearch(String search) {
this.search = search;
}
public String getRoleName() {
return this.roleName;
}
public void setRoleName(String roleName) {
this.roleName = roleName;
}
public String getRoleNumber() {
return this.roleNumber;
}
public void setRoleNumber(String roleNumber) {
this.roleNumber = roleNumber;
}
public String getPermissions() {
return this.permissions;
}
public void setPermissions(String permissions) {
this.permissions = permissions;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getUserdatas() {
return userdatas;
}
public void setUserdatas(String userdatas) {
this.userdatas = userdatas;
}
}
src/main/java/com/senthink/rmi/challenger/param/EllaSubsystemParam.java deleted 100644 → 0
package com.senthink.rmi.challenger.param;
import java.util.List;
import io.swagger.annotations.ApiModelProperty;
public class EllaSubsystemParam extends PageParam {
@ApiModelProperty("模糊查询")
private String search;
/** 主键 */
@ApiModelProperty("主键ID")
private Integer id;
/** 系统名称 */
@ApiModelProperty("系统名称")
private String name;
/** 系统编号 */
@ApiModelProperty("系统编号")
private String number;
/** 系统访问路径 */
@ApiModelProperty("系统访问路径")
private String url;
/** 系统备注 */
@ApiModelProperty("系统备注")
private String remark;
/** 系统英文名称 */
@ApiModelProperty("系统英文名称")
private String enName;
@ApiModelProperty("权限集")
private List<EllaPagePermissionParam> permissions;
private String isDefault;
public String getIsDefault() {
return isDefault;
}
public void setIsDefault(String isDefault) {
this.isDefault = isDefault;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getEnName() {
return enName;
}
public void setEnName(String enName) {
this.enName = enName;
}
public List<EllaPagePermissionParam> getPermissions() {
return permissions;
}
public void setPermissions(List<EllaPagePermissionParam> permissions) {
this.permissions = permissions;
}
public String getSearch() {
return this.search;
}
public void setSearch (String search) {
this.search = search;
}
public String getName () {
return this.name;
}
public void setName (String name) {
this.name = name;
}
public String getNumber () {
return this.number;
}
public void setNumber (String number) {
this.number = number;
}
public String getUrl () {
return this.url;
}
public void setUrl (String url) {
this.url = url;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
}
src/main/java/com/senthink/rmi/challenger/param/EllaSubsystemSyncParam.java deleted 100644 → 0
package com.senthink.rmi.challenger.param;
import io.swagger.annotations.ApiModelProperty;
public class EllaSubsystemSyncParam extends PageParam {
@ApiModelProperty("模糊查询")
private String search;
/**
* 系统名称
*/
@ApiModelProperty("系统名称")
private String name;
/**
* 接口地址
*/
@ApiModelProperty("接口地址")
private String url;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("接口状态")
private Integer status;
public String getSearch() {
return this.search;
}
public void setSearch(String search) {
this.search = search;
}
public String getName() {
return this.name;
}
public void setName(String name) {
this.name = name;
}
public String getUrl() {
return this.url;
}
public void setUrl(String url) {
this.url = url;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
}
src/main/java/com/senthink/rmi/challenger/param/EllaUserBaseParam.java deleted 100644 → 0
package com.senthink.rmi.challenger.param;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import java.util.List;
public class EllaUserBaseParam extends PageParam {
public EllaUserBaseParam() {
super();
}
public EllaUserBaseParam(String loginName, String password) {
this.loginName = loginName;
this.password = password;
}
@ApiModelProperty("模糊查询")
private String search;
/**
* 登录名
*/
@ApiModelProperty("登录名")
private String loginName;
/**
* 密码
*/
@ApiModelProperty("密码")
private String password;
/**
* 真实姓名
*/
@ApiModelProperty("真实姓名")
private String realName;
/**
* 手机号
*/
@ApiModelProperty("手机号")
private String telephone;
/**
* 邮箱
*/
@ApiModelProperty("邮箱")
private String email;
/**
* 地址
*/
@ApiModelProperty("地址")
private String address;
/**
* 注册日期
*/
@ApiModelProperty("注册日期")
private Date regTime;
/**
* 截止日期
*/
@ApiModelProperty("截止日期")
private Date endTime;
/**
* 用户类型id
*/
@ApiModelProperty("用户类型id")
private Integer userTypeId;
/**
* 用户状态 0 启用/ 1 禁用 / 2待审核 /3 驳回
*/
@ApiModelProperty("用户状态 0 启用/ 1 禁用 / 2待审核 /3 驳回")
private Integer state;
@ApiModelProperty("用户状态集")
private List<Integer> states;
/**
* 父级帐号ID
*/
@ApiModelProperty("父级帐号ID")
private Integer parentId;
@ApiModelProperty("拒绝理由")
private String rejectReason;
@ApiModelProperty("拒绝时间")
private String rejectTime;
public String getRejectReason() {
return rejectReason;
}
public void setRejectReason(String rejectReason) {
this.rejectReason = rejectReason;
}
public String getRejectTime() {
return rejectTime;
}
public void setRejectTime(String rejectTime) {
this.rejectTime = rejectTime;
}
public Integer getParentId() {
return parentId;
}
public void setParentId(Integer parentId) {
this.parentId = parentId;
}
public List<Integer> getStates() {
return states;
}
public void setStates(List<Integer> states) {
this.states = states;
}
public String getSearch() {
return this.search;
}
public void setSearch(String search) {
this.search = search;
}
public String getLoginName() {
return this.loginName;
}
public void setLoginName(String loginName) {
this.loginName = loginName;
}
public String getPassword() {
return this.password;
}
public void setPassword(String password) {
this.password = password;
}
public String getTelephone() {
return this.telephone;
}
public void setTelephone(String telephone) {
this.telephone = telephone;
}
public String getEmail() {
return this.email;
}
public void setEmail(String email) {
this.email = email;
}
public String getAddress() {
return this.address;
}
public void setAddress(String address) {
this.address = address;
}
public Date getRegTime() {
return this.regTime;
}
public void setRegTime(Date regTime) {
this.regTime = regTime;
}
public Date getEndTime() {
return this.endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public Integer getUserTypeId() {
return this.userTypeId;
}
public void setUserTypeId(Integer userTypeId) {
this.userTypeId = userTypeId;
}
public Integer getState() {
return state;
}
public void setState(Integer state) {
this.state = state;
}
public String getRealName() {
return realName;
}
public void setRealName(String realName) {
this.realName = realName;
}
}
src/main/java/com/senthink/rmi/challenger/param/EllaUserExtendsParam.java deleted 100644 → 0
package com.senthink.rmi.challenger.param;
import io.swagger.annotations.ApiModelProperty;
public class EllaUserExtendsParam extends PageParam {
@ApiModelProperty("模糊查询")
private String search;
/**
* 用户类型id
*/
@ApiModelProperty("用户类型id")
private Integer userTypeId;
/**
* 扩展属性code即属性列code,唯一的
*/
@ApiModelProperty("扩展属性code即属性列code,唯一的")
private String attributeCode;
/**
* 扩展属性名即属性列名
*/
@ApiModelProperty("扩展属性名即属性列名")
private String attributeName;
/**
* 表单类型
*/
@ApiModelProperty("表单类型")
private Integer formType;
/**
* 备注
*/
@ApiModelProperty("备注")
private String remark;
/**
* 单选框或复选框的待选值,用,隔开
*/
@ApiModelProperty("单选框或复选框的待选值,用,隔开")
private String content;
public String getSearch() {
return this.search;
}
public void setSearch(String search) {
this.search = search;
}
public Integer getUserTypeId() {
return this.userTypeId;
}
public void setUserTypeId(Integer userTypeId) {
this.userTypeId = userTypeId;
}
public String getAttributeName() {
return this.attributeName;
}
public void setAttributeName(String attributeName) {
this.attributeName = attributeName;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getAttributeCode() {
return attributeCode;
}
public void setAttributeCode(String attributeCode) {
this.attributeCode = attributeCode;
}
public Integer getFormType() {
return formType;
}
public void setFormType(Integer formType) {
this.formType = formType;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
}
src/main/java/com/senthink/rmi/challenger/param/EllaUserTypeParam.java deleted 100644 → 0
package com.senthink.rmi.challenger.param;
import io.swagger.annotations.ApiModelProperty;
public class EllaUserTypeParam extends PageParam {
@ApiModelProperty("模糊查询")
private String search;
/**
* 用户类型名称
*/
@ApiModelProperty("用户类型名称")
private String name;
/**
* 用户类型备注
*/
@ApiModelProperty("用户类型备注")
private String remark;
public String getSearch() {
return this.search;
}
public void setSearch(String search) {
this.search = search;
}
public String getName() {
return this.name;
}
public void setName(String name) {
this.name = name;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
}
src/main/java/com/senthink/rmi/challenger/param/PageParam.java deleted 100644 → 0
package com.senthink.rmi.challenger.param;
/**
* The type Page param.
*
* @Project : Columbia
* @Package Name : com.senthink.www.domain.param
* @Class Name : ${CLASS_NAME}
* @Description :
* @Author : lingcy@lierda.com
* @Creation Date : 2016年11月23日 上午11:29
* @ModificationHistory Who When What -------- ---------- -----------------------------------
*/
public class PageParam {
private int page = 1;
private int pageSize = 10;
private String search;
private String searchBgnTime;
private String searchEndTime;
private String sort;
/**
* Gets search end time.
*
* @return the search end time
*/
public String getSearchEndTime() {
return searchEndTime;
}
/**
* Sets search end time.
*
* @param searchEndTime the search end time
*/
public void setSearchEndTime(String searchEndTime) {
this.searchEndTime = searchEndTime;
}
/**
* Gets search bgn time.
*
* @return the search bgn time
*/
public String getSearchBgnTime() {
return searchBgnTime;
}
/**
* Sets search bgn time.
*
* @param searchBgnTime the search bgn time
*/
public void setSearchBgnTime(String searchBgnTime) {
this.searchBgnTime = searchBgnTime;
}
/**
* Gets page size.
*
* @return the page size
*/
public int getPageSize() {
return pageSize;
}
/**
* Sets page size.
*
* @param pageSize the page size
*/
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
/**
* Gets page.
*
* @return the page
*/
public int getPage() {
return page;
}
/**
* Sets page.
*
* @param page the page
*/
public void setPage(int page) {
this.page = page;
}
/**
* Gets search.
*
* @return the search
*/
public String getSearch() {
return search;
}
/**
* Sets search.
*
* @param search the search
*/
public void setSearch(String search) {
this.search = search;
}
/**
* Gets sort.
*
* @return the sort
*/
public String getSort() {
return sort;
}
/**
* Sets sort.
*
* @param sort the sort
*/
public void setSort(String sort) {
this.sort = sort;
}
}
src/main/java/com/senthink/rmi/challenger/rmi/EllaPagePermissionHystrix.java
...@@ -4,7 +4,6 @@ package com.senthink.rmi.challenger.rmi; ...@@ -4,7 +4,6 @@ package com.senthink.rmi.challenger.rmi;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import com.senthink.rmi.challenger.param.EllaPagePermissionParam;
import com.senthink.rmi.challenger.response.Message; import com.senthink.rmi.challenger.response.Message;
import com.senthink.rmi.challenger.vo.EllaPagePermissionVo; import com.senthink.rmi.challenger.vo.EllaPagePermissionVo;
...@@ -18,7 +17,7 @@ public abstract class EllaPagePermissionHystrix implements EllaPagePermissionRem ...@@ -18,7 +17,7 @@ public abstract class EllaPagePermissionHystrix implements EllaPagePermissionRem
public abstract Message index(); public abstract Message index();
public abstract Message searchList(EllaPagePermissionParam param); public abstract Message searchList(EllaPagePermissionVo param);
public abstract Message toUpdate(@RequestBody EllaPagePermissionVo pageperVo); public abstract Message toUpdate(@RequestBody EllaPagePermissionVo pageperVo);
......
src/main/java/com/senthink/rmi/challenger/rmi/EllaPagePermissionRemoteService.java
...@@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import com.senthink.rmi.challenger.param.EllaPagePermissionParam;
import com.senthink.rmi.challenger.response.Message; import com.senthink.rmi.challenger.response.Message;
import com.senthink.rmi.challenger.vo.EllaPagePermissionVo; import com.senthink.rmi.challenger.vo.EllaPagePermissionVo;
...@@ -27,7 +26,7 @@ public interface EllaPagePermissionRemoteService { ...@@ -27,7 +26,7 @@ public interface EllaPagePermissionRemoteService {
Message index(); Message index();
@RequestMapping(value = { "/pageper/searchList" }, method = RequestMethod.POST) @RequestMapping(value = { "/pageper/searchList" }, method = RequestMethod.POST)
Message searchList(EllaPagePermissionParam param); Message searchList(EllaPagePermissionVo vo);
@ApiOperation(value = "获取当前节点信息，或插入") @ApiOperation(value = "获取当前节点信息，或插入")
@RequestMapping(value = "/pageper/toUpdate", method = RequestMethod.POST) @RequestMapping(value = "/pageper/toUpdate", method = RequestMethod.POST)
......
src/main/java/com/senthink/rmi/challenger/rmi/EllaRoleHystrix.java
...@@ -4,7 +4,6 @@ package com.senthink.rmi.challenger.rmi; ...@@ -4,7 +4,6 @@ package com.senthink.rmi.challenger.rmi;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import com.senthink.rmi.challenger.param.EllaRoleParam;
import com.senthink.rmi.challenger.response.Message; import com.senthink.rmi.challenger.response.Message;
import com.senthink.rmi.challenger.vo.EllaRoleVo; import com.senthink.rmi.challenger.vo.EllaRoleVo;
...@@ -16,7 +15,7 @@ import com.senthink.rmi.challenger.vo.EllaRoleVo; ...@@ -16,7 +15,7 @@ import com.senthink.rmi.challenger.vo.EllaRoleVo;
*/ */
public abstract class EllaRoleHystrix implements EllaRoleRemoteService { public abstract class EllaRoleHystrix implements EllaRoleRemoteService {
public abstract Message searchList(@RequestBody EllaRoleParam param); public abstract Message searchList(@RequestBody EllaRoleVo vo);
public abstract Message toAdd(@PathVariable Integer id); public abstract Message toAdd(@PathVariable Integer id);
......
src/main/java/com/senthink/rmi/challenger/rmi/EllaRoleRemoteService.java
...@@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import com.senthink.rmi.challenger.param.EllaRoleParam;
import com.senthink.rmi.challenger.response.Message; import com.senthink.rmi.challenger.response.Message;
import com.senthink.rmi.challenger.vo.EllaRoleVo; import com.senthink.rmi.challenger.vo.EllaRoleVo;
...@@ -24,7 +23,7 @@ public interface EllaRoleRemoteService { ...@@ -24,7 +23,7 @@ public interface EllaRoleRemoteService {
@ApiOperation("角色列表") @ApiOperation("角色列表")
@RequestMapping(value = { "/role/searchList", "/back/role/list" }, method = RequestMethod.POST) @RequestMapping(value = { "/role/searchList", "/back/role/list" }, method = RequestMethod.POST)
Message searchList(@RequestBody EllaRoleParam param); Message searchList(@RequestBody EllaRoleVo vo);
@RequestMapping(value = "/role/toAdd/{id}", method = RequestMethod.GET) @RequestMapping(value = "/role/toAdd/{id}", method = RequestMethod.GET)
Message toAdd(@PathVariable Integer id); Message toAdd(@PathVariable Integer id);
......
src/main/java/com/senthink/rmi/challenger/rmi/EllaSubsystemHystrix.java
...@@ -4,7 +4,6 @@ package com.senthink.rmi.challenger.rmi; ...@@ -4,7 +4,6 @@ package com.senthink.rmi.challenger.rmi;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import com.senthink.rmi.challenger.param.EllaSubsystemParam;
import com.senthink.rmi.challenger.response.Message; import com.senthink.rmi.challenger.response.Message;
import com.senthink.rmi.challenger.vo.EllaSubsystemVo; import com.senthink.rmi.challenger.vo.EllaSubsystemVo;
...@@ -16,7 +15,7 @@ import com.senthink.rmi.challenger.vo.EllaSubsystemVo; ...@@ -16,7 +15,7 @@ import com.senthink.rmi.challenger.vo.EllaSubsystemVo;
*/ */
public abstract class EllaSubsystemHystrix implements EllaSubsystemRemoteService { public abstract class EllaSubsystemHystrix implements EllaSubsystemRemoteService {
public abstract Message searchList(@RequestBody EllaSubsystemParam param); public abstract Message searchList(@RequestBody EllaSubsystemVo vo);
public abstract Message toUpdate(@PathVariable Integer subsystemId); public abstract Message toUpdate(@PathVariable Integer subsystemId);
......
src/main/java/com/senthink/rmi/challenger/rmi/EllaSubsystemRemoteService.java
...@@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import com.senthink.rmi.challenger.param.EllaSubsystemParam;
import com.senthink.rmi.challenger.response.Message; import com.senthink.rmi.challenger.response.Message;
import com.senthink.rmi.challenger.vo.EllaSubsystemVo; import com.senthink.rmi.challenger.vo.EllaSubsystemVo;
...@@ -24,7 +23,7 @@ public interface EllaSubsystemRemoteService { ...@@ -24,7 +23,7 @@ public interface EllaSubsystemRemoteService {
@ApiOperation("查询") @ApiOperation("查询")
@RequestMapping(value = { "/subsystem/searchList", "/back/subsystem/list" }, method = RequestMethod.POST) @RequestMapping(value = { "/subsystem/searchList", "/back/subsystem/list" }, method = RequestMethod.POST)
Message searchList(@RequestBody EllaSubsystemParam param); Message searchList(@RequestBody EllaSubsystemVo vo);
@ApiOperation("根据id获取要更新的系统信息") @ApiOperation("根据id获取要更新的系统信息")
@RequestMapping(value = "/subsystem/toUpdate/{subsystemId}", method = RequestMethod.GET) @RequestMapping(value = "/subsystem/toUpdate/{subsystemId}", method = RequestMethod.GET)
......
src/main/java/com/senthink/rmi/challenger/rmi/EllaSubsystemSyncHystrix.java
...@@ -5,7 +5,6 @@ import javax.validation.Valid; ...@@ -5,7 +5,6 @@ import javax.validation.Valid;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import com.senthink.rmi.challenger.param.EllaSubsystemSyncParam;
import com.senthink.rmi.challenger.response.Message; import com.senthink.rmi.challenger.response.Message;
import com.senthink.rmi.challenger.vo.EllaSubsystemSyncVo; import com.senthink.rmi.challenger.vo.EllaSubsystemSyncVo;
...@@ -25,6 +24,6 @@ public abstract class EllaSubsystemSyncHystrix implements EllaSubsystemSyncRemot ...@@ -25,6 +24,6 @@ public abstract class EllaSubsystemSyncHystrix implements EllaSubsystemSyncRemot
public abstract Message doDelete(@PathVariable Integer id); public abstract Message doDelete(@PathVariable Integer id);
public abstract Message searchList(EllaSubsystemSyncParam param); public abstract Message searchList(EllaSubsystemSyncVo vo);
} }
\ No newline at end of file
src/main/java/com/senthink/rmi/challenger/rmi/EllaSubsystemSyncRemoteService.java
...@@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.PathVariable; ...@@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import com.senthink.rmi.challenger.param.EllaSubsystemSyncParam;
import com.senthink.rmi.challenger.response.Message; import com.senthink.rmi.challenger.response.Message;
import com.senthink.rmi.challenger.vo.EllaSubsystemSyncVo; import com.senthink.rmi.challenger.vo.EllaSubsystemSyncVo;
...@@ -34,6 +33,6 @@ public interface EllaSubsystemSyncRemoteService { ...@@ -34,6 +33,6 @@ public interface EllaSubsystemSyncRemoteService {
Message doDelete(@PathVariable Integer id); Message doDelete(@PathVariable Integer id);
@RequestMapping(value = { "/subsystemsync/searchList" }, method = RequestMethod.POST) @RequestMapping(value = { "/subsystemsync/searchList" }, method = RequestMethod.POST)
Message searchList(EllaSubsystemSyncParam param); Message searchList(EllaSubsystemSyncVo vo);
} }
\ No newline at end of file
src/main/java/com/senthink/rmi/challenger/rmi/EllaUserBaseHystrix.java
...@@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.senthink.rmi.challenger.param.EllaUserBaseParam;
import com.senthink.rmi.challenger.response.Message; import com.senthink.rmi.challenger.response.Message;
import com.senthink.rmi.challenger.vo.EllaUserBaseVo; import com.senthink.rmi.challenger.vo.EllaUserBaseVo;
import com.senthink.rmi.challenger.vo.UserUpdatePwdVo; import com.senthink.rmi.challenger.vo.UserUpdatePwdVo;
...@@ -23,11 +22,11 @@ public abstract class EllaUserBaseHystrix implements EllaUserBaseRemoteService { ...@@ -23,11 +22,11 @@ public abstract class EllaUserBaseHystrix implements EllaUserBaseRemoteService {
public abstract Message index(); public abstract Message index();
public abstract Message adminPage(@RequestBody EllaUserBaseParam param); public abstract Message adminPage(@RequestBody EllaUserBaseVo vo);
public abstract Message normalPage(@RequestBody EllaUserBaseParam param); public abstract Message normalPage(@RequestBody EllaUserBaseVo vo);
public abstract Message dealerSearchList(@RequestBody EllaUserBaseParam param); public abstract Message dealerSearchList(@RequestBody EllaUserBaseVo vo);
public abstract Message toAdd(); public abstract Message toAdd();
......
src/main/java/com/senthink/rmi/challenger/rmi/EllaUserBaseRemoteService.java
...@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestMethod; ...@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import com.senthink.rmi.challenger.param.EllaUserBaseParam;
import com.senthink.rmi.challenger.response.Message; import com.senthink.rmi.challenger.response.Message;
import com.senthink.rmi.challenger.vo.EllaUserBaseVo; import com.senthink.rmi.challenger.vo.EllaUserBaseVo;
import com.senthink.rmi.challenger.vo.UserUpdatePwdVo; import com.senthink.rmi.challenger.vo.UserUpdatePwdVo;
...@@ -29,13 +28,13 @@ public interface EllaUserBaseRemoteService { ...@@ -29,13 +28,13 @@ public interface EllaUserBaseRemoteService {
Message index(); Message index();
@RequestMapping(value = { "admin/user/list", "/back/user/list" }, method = RequestMethod.GET) @RequestMapping(value = { "admin/user/list", "/back/user/list" }, method = RequestMethod.GET)
Message adminPage(@RequestBody EllaUserBaseParam param); Message adminPage(@RequestBody EllaUserBaseVo vo);
@RequestMapping(value = { "normal/user/list", "/back/consumer/list" }, method = RequestMethod.GET) @RequestMapping(value = { "normal/user/list", "/back/consumer/list" }, method = RequestMethod.GET)
Message normalPage(@RequestBody EllaUserBaseParam param); Message normalPage(@RequestBody EllaUserBaseVo vo);
@RequestMapping(value = { "/user/searchList" }, method = RequestMethod.POST) @RequestMapping(value = { "/user/searchList" }, method = RequestMethod.POST)
Message dealerSearchList(@RequestBody EllaUserBaseParam param); Message dealerSearchList(@RequestBody EllaUserBaseVo vo);
@RequestMapping(value = "/user/toAdd", method = RequestMethod.GET) @RequestMapping(value = "/user/toAdd", method = RequestMethod.GET)
Message toAdd(); Message toAdd();
......
src/main/java/com/senthink/rmi/challenger/rmi/EllaUserExtendsHystrix.java
...@@ -6,7 +6,6 @@ import javax.validation.Valid; ...@@ -6,7 +6,6 @@ import javax.validation.Valid;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import com.senthink.rmi.challenger.param.EllaUserExtendsParam;
import com.senthink.rmi.challenger.response.Message; import com.senthink.rmi.challenger.response.Message;
import com.senthink.rmi.challenger.vo.EllaUserExtendsVo; import com.senthink.rmi.challenger.vo.EllaUserExtendsVo;
...@@ -18,7 +17,7 @@ import com.senthink.rmi.challenger.vo.EllaUserExtendsVo; ...@@ -18,7 +17,7 @@ import com.senthink.rmi.challenger.vo.EllaUserExtendsVo;
*/ */
public abstract class EllaUserExtendsHystrix implements EllaUserExtendsRemoteService { public abstract class EllaUserExtendsHystrix implements EllaUserExtendsRemoteService {
public abstract Message searchList(EllaUserExtendsParam param); public abstract Message searchList(EllaUserExtendsVo vo);
public abstract Message index(@PathVariable Integer userTypeId); public abstract Message index(@PathVariable Integer userTypeId);
......
src/main/java/com/senthink/rmi/challenger/rmi/EllaUserExtendsRemoteService.java
...@@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.PathVariable; ...@@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import com.senthink.rmi.challenger.param.EllaUserExtendsParam;
import com.senthink.rmi.challenger.response.Message; import com.senthink.rmi.challenger.response.Message;
import com.senthink.rmi.challenger.vo.EllaUserExtendsVo; import com.senthink.rmi.challenger.vo.EllaUserExtendsVo;
...@@ -25,7 +24,7 @@ import io.swagger.annotations.ApiOperation; ...@@ -25,7 +24,7 @@ import io.swagger.annotations.ApiOperation;
public interface EllaUserExtendsRemoteService { public interface EllaUserExtendsRemoteService {
@RequestMapping(value = { "/userextends/searchList" }, method = RequestMethod.POST) @RequestMapping(value = { "/userextends/searchList" }, method = RequestMethod.POST)
Message searchList(EllaUserExtendsParam param); Message searchList(EllaUserExtendsVo vo);
@ApiOperation("根据用户类型查询扩展属性") @ApiOperation("根据用户类型查询扩展属性")
@RequestMapping(value = { "/userextends/list/{userTypeId}" }, method = RequestMethod.GET) @RequestMapping(value = { "/userextends/list/{userTypeId}" }, method = RequestMethod.GET)
......
src/main/java/com/senthink/rmi/challenger/rmi/EllaUserTypeHystrix.java
...@@ -4,7 +4,6 @@ package com.senthink.rmi.challenger.rmi; ...@@ -4,7 +4,6 @@ package com.senthink.rmi.challenger.rmi;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import com.senthink.rmi.challenger.param.EllaUserTypeParam;
import com.senthink.rmi.challenger.response.Message; import com.senthink.rmi.challenger.response.Message;
import com.senthink.rmi.challenger.vo.EllaUserTypeVo; import com.senthink.rmi.challenger.vo.EllaUserTypeVo;
...@@ -16,7 +15,7 @@ import com.senthink.rmi.challenger.vo.EllaUserTypeVo; ...@@ -16,7 +15,7 @@ import com.senthink.rmi.challenger.vo.EllaUserTypeVo;
*/ */
public abstract class EllaUserTypeHystrix implements EllaUserTypeRemoteService { public abstract class EllaUserTypeHystrix implements EllaUserTypeRemoteService {
public abstract Message searchList(@RequestBody EllaUserTypeParam param); public abstract Message searchList(@RequestBody EllaUserTypeVo vo);
public abstract Message toUpdate(@PathVariable Integer userTypeId); public abstract Message toUpdate(@PathVariable Integer userTypeId);
......
src/main/java/com/senthink/rmi/challenger/rmi/EllaUserTypeRemoteService.java
...@@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import com.senthink.rmi.challenger.param.EllaUserTypeParam;
import com.senthink.rmi.challenger.response.Message; import com.senthink.rmi.challenger.response.Message;
import com.senthink.rmi.challenger.vo.EllaUserTypeVo; import com.senthink.rmi.challenger.vo.EllaUserTypeVo;
...@@ -21,7 +20,7 @@ import com.senthink.rmi.challenger.vo.EllaUserTypeVo; ...@@ -21,7 +20,7 @@ import com.senthink.rmi.challenger.vo.EllaUserTypeVo;
public interface EllaUserTypeRemoteService { public interface EllaUserTypeRemoteService {
@RequestMapping(value = { "/usertype/searchList", "/back/usertype/list" }, method = RequestMethod.POST) @RequestMapping(value = { "/usertype/searchList", "/back/usertype/list" }, method = RequestMethod.POST)
Message searchList(@RequestBody EllaUserTypeParam param); Message searchList(@RequestBody EllaUserTypeVo vo);
@RequestMapping(value = "/usertype/toUpdate/{userTypeId}", method = RequestMethod.GET) @RequestMapping(value = "/usertype/toUpdate/{userTypeId}", method = RequestMethod.GET)
Message toUpdate(@PathVariable Integer userTypeId); Message toUpdate(@PathVariable Integer userTypeId);
......
src/main/java/com/senthink/rmi/challenger/vo/EllaOrgStructureVo.java
package com.senthink.rmi.challenger.vo; package com.senthink.rmi.challenger.vo;
import java.io.Serializable; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
public class EllaOrgStructureVo implements Serializable { @ApiModel("协议定义")
public class EllaOrgStructureVo extends PageVo {
private static final long serialVersionUID = -5620497436811285836L;
private Integer id; private Integer id;
/**
* 组织结构名称 @ApiModelProperty("组织结构名称")
*/
private String name; private String name;
/** /**
* 上级架构的id * 上级架构的id
*/ */
@ApiModelProperty("上级架构的id")
private Integer parentId; private Integer parentId;
/** /**
* 组织架构的层级 0最高层级 向下递增 * 组织架构的层级 0最高层级 向下递增
*/ */
@ApiModelProperty("组织架构的层级 0最高层级 向下递增")
private Integer level; private Integer level;
/** /**
* 编号 * 编号
*/ */
@ApiModelProperty("编号")
private String number; private String number;
/** /**
* 英文缩写 * 英文缩写
*/ */
@ApiModelProperty("英文缩写")
private String abbreviation; private String abbreviation;
/** /**
* 简称 * 简称
*/ */
@ApiModelProperty("简称")
private String shortName; private String shortName;
/** @ApiModelProperty("节点对应的英文名")
* 节点对应的英文名
*/
private String enName; private String enName;
public interface SEARCH { public interface SEARCH {
......
src/main/java/com/senthink/rmi/challenger/vo/EllaPagePermissionVo.java
package com.senthink.rmi.challenger.vo; package com.senthink.rmi.challenger.vo;
import java.util.List;
import org.hibernate.validator.constraints.NotEmpty; import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import io.swagger.annotations.ApiModel;
import java.io.Serializable; import io.swagger.annotations.ApiModelProperty;
public class EllaPagePermissionVo extends Entity implements Serializable{ @ApiModel
public class EllaPagePermissionVo extends PageVo {
private static final long serialVersionUID = -7961685214504407072L; private static final long serialVersionUID = -7961685214504407072L;
/**
@ApiModelProperty("ID")
private Integer id;
/**
* 权限名称 * 权限名称
*/ */
@ApiModelProperty("权限名称")
@NotEmpty(message = "权限名称不允许为空") @NotEmpty(message = "权限名称不允许为空")
private String name; private String name;
/**
/**
* 权限编号 * 权限编号
*/ */
@ApiModelProperty("权限编号")
@NotEmpty(message = "权限编号不允许为空") @NotEmpty(message = "权限编号不允许为空")
private String number; private String number;
/**
/**
* 权限的路径 * 权限的路径
*/ */
@ApiModelProperty("权限的路径")
private String url; private String url;
/**
/**
* 权限类型 0页面权限 1数据权限 * 权限类型 0页面权限 1数据权限
*/ */
@ApiModelProperty("权限类型 0页面权限 1数据权限")
private Integer type; private Integer type;
/**
/**
* 上级权限ID * 上级权限ID
*/ */
@NotNull(message = "父类ID不允许为空") @ApiModelProperty("上级权限ID")
@NotEmpty(message = "父类ID不允许为空")
private Integer parentId; private Integer parentId;
/**
* 级别、层级，最高级为0，依次下降，1,2,3... /**
* 层级，最高级为0，依次下降，1,2,3...
*/ */
@NotNull(message = "级别不允许为空") @ApiModelProperty("层级，最高级为0，依次下降，1,2,3... ")
@NotEmpty(message = "级别不允许为空")
private Integer level; private Integer level;
/**
/**
* 所属系统ID * 所属系统ID
*/ */
// @NotNull(message = "所属系统不允许为空") @ApiModelProperty("所属系统ID")
private Integer subsystemId; private Integer subsystemId;
/** /**
* 是否是菜单 0否 1是 * 是否是菜单 0 否 1是
*/ */
@ApiModelProperty("是否是菜单 0 否 1是")
private Integer isMenu; private Integer isMenu;
/**
* 权限英文名称
*/
@ApiModelProperty("权限英文名称")
private String enName; private String enName;
public String getName () { @ApiModelProperty("子节点集")
private List<EllaPagePermissionVo> children;
public String getName() {
return this.name; return this.name;
} }
public void setName (String name) {
public void setName(String name) {
this.name = name; this.name = name;
} }
public String getNumber () { public String getNumber() {
return this.number; return this.number;
} }
public void setNumber (String number) {
public void setNumber(String number) {
this.number = number; this.number = number;
} }
public String getUrl () { public String getUrl() {
return this.url; return this.url;
} }
public void setUrl (String url) {
public void setUrl(String url) {
this.url = url; this.url = url;
} }
public Integer getType () { public Integer getType() {
return this.type; return this.type;
} }
public void setType (Integer type) {
public void setType(Integer type) {
this.type = type; this.type = type;
} }
public Integer getParentId () { public Integer getParentId() {
return this.parentId; return this.parentId;
} }
public void setParentId (Integer parentId) {
public void setParentId(Integer parentId) {
this.parentId = parentId; this.parentId = parentId;
} }
public Integer getLevel () { public Integer getLevel() {
return this.level; return this.level;
} }
public void setLevel (Integer level) {
public void setLevel(Integer level) {
this.level = level; this.level = level;
} }
public Integer getSubsystemId () { public Integer getSubsystemId() {
return this.subsystemId; return this.subsystemId;
} }
public void setSubsystemId (Integer subsystemId) {
public void setSubsystemId(Integer subsystemId) {
this.subsystemId = subsystemId; this.subsystemId = subsystemId;
} }
public Integer getIsMenu() { public Integer getIsMenu() {
return isMenu; return isMenu;
} }
public void setIsMenu(Integer isMenu) { public void setIsMenu(Integer isMenu) {
this.isMenu = isMenu; this.isMenu = isMenu;
} }
public String getEnName() { public String getEnName() {
return enName; return enName;
} }
public void setEnName(String enName) { public void setEnName(String enName) {
this.enName = enName; this.enName = enName;
} }
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public List<EllaPagePermissionVo> getChildren() {
return children;
}
public void setChildren(List<EllaPagePermissionVo> children) {
this.children = children;
}
} }
src/main/java/com/senthink/rmi/challenger/vo/EllaRoleVo.java
package com.senthink.rmi.challenger.vo; package com.senthink.rmi.challenger.vo;
import javax.validation.constraints.Pattern;
import org.hibernate.validator.constraints.NotEmpty; import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.constraints.Pattern; import io.swagger.annotations.ApiModel;
import java.io.Serializable; import io.swagger.annotations.ApiModelProperty;
public class EllaRoleVo extends Entity implements Serializable {
private static final long serialVersionUID = -2100630863868299080L; @ApiModel("角色")
public class EllaRoleVo extends PageVo {
private static final String numReg = "^[A-Za-z][A-Za-z1-9_-]+$"; private static final String numReg = "^[A-Za-z][A-Za-z1-9_-]+$";
/**
* 角色名称 @ApiModelProperty("角色名称")
*/
@NotEmpty(message = "角色名称不允许为空") @NotEmpty(message = "角色名称不允许为空")
private String roleName; private String roleName;
/** /**
* 角色编号 * 角色编号
*/ */
@Pattern(regexp = numReg ,message = "请输入英文或数字") @ApiModelProperty("角色编号")
@Pattern(regexp = numReg, message = "请输入英文或数字")
private String roleNumber; private String roleNumber;
/** /**
* 权限集合用 id_level,id_level... 表示 * 权限集合用 id_level,id_level... 表示
*/ */
// @NotEmpty(message = "请选择权限") @ApiModelProperty("权限集合用 id_level,id_level... 表示")
private String permissions; private String permissions;
/** /**
* 用户数据权限信息，id的集合,分割 * 用户数据权限信息，id的集合,分割
*/ */
// @NotEmpty(message = "请选择用户") @ApiModelProperty("用户数据权限信息，id的集合,分割")
private String userdatas; private String userdatas;
/** /**
* 角色备注 * 角色备注
*/ */
@ApiModelProperty("角色备注")
private String remark; private String remark;
public String getRoleName() { public String getRoleName() {
......
src/main/java/com/senthink/rmi/challenger/vo/EllaSubsystemSyncVo.java
...@@ -2,48 +2,59 @@ package com.senthink.rmi.challenger.vo; ...@@ -2,48 +2,59 @@ package com.senthink.rmi.challenger.vo;
import org.hibernate.validator.constraints.NotBlank; import org.hibernate.validator.constraints.NotBlank;
import java.io.Serializable; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
public class EllaSubsystemSyncVo extends Entity implements Serializable { @ApiModel
public class EllaSubsystemSyncVo extends PageVo {
private static final long serialVersionUID = -4888387947052885316L; /**
/**
* 系统名称 * 系统名称
*/ */
@ApiModelProperty("系统名称")
@NotBlank(message = "系统名称不允许为空") @NotBlank(message = "系统名称不允许为空")
private String name; private String name;
/** /**
* 接口地址 * 接口地址
*/ */
@ApiModelProperty("接口地址")
@NotBlank(message = "访问路径不允许为空") @NotBlank(message = "访问路径不允许为空")
private String url; private String url;
@ApiModelProperty("备注")
private String remark; private String remark;
@ApiModelProperty("接口状态")
private Integer status; private Integer status;
public String getName () { public String getName() {
return this.name; return this.name;
} }
public void setName (String name) {
public void setName(String name) {
this.name = name; this.name = name;
} }
public String getUrl () { public String getUrl() {
return this.url; return this.url;
} }
public void setUrl (String url) {
public void setUrl(String url) {
this.url = url; this.url = url;
} }
public String getRemark() { public String getRemark() {
return remark; return remark;
} }
public void setRemark(String remark) { public void setRemark(String remark) {
this.remark = remark; this.remark = remark;
} }
public Integer getStatus() { public Integer getStatus() {
return status; return status;
} }
public void setStatus(Integer status) { public void setStatus(Integer status) {
this.status = status; this.status = status;
} }
......
src/main/java/com/senthink/rmi/challenger/vo/EllaSubsystemVo.java
package com.senthink.rmi.challenger.vo; package com.senthink.rmi.challenger.vo;
import java.util.List;
import org.hibernate.validator.constraints.NotEmpty; import org.hibernate.validator.constraints.NotEmpty;
import java.io.Serializable; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
public class EllaSubsystemVo extends Entity implements Serializable { @ApiModel
public class EllaSubsystemVo extends PageVo {
private static final long serialVersionUID = -3691640953750630217L; private static final long serialVersionUID = -3691640953750630217L;
/**
* 系统名称 @ApiModelProperty("模糊查询")
*/ private String search;
/** 主键 */
@ApiModelProperty("主键ID")
private Integer id;
/** 系统名称 */
@ApiModelProperty("系统名称")
@NotEmpty(message = "系统名称不允许为空") @NotEmpty(message = "系统名称不允许为空")
private String name; private String name;
/**
* 系统编号 /** 系统编号 */
*/ @ApiModelProperty("系统编号")
@NotEmpty(message = "系统编号不允许为空") @NotEmpty(message = "系统编号不允许为空")
private String number; private String number;
/**
* 系统访问路径 /** 系统访问路径 */
*/ @ApiModelProperty("系统访问路径")
@NotEmpty(message = "系统访问路径不允许为空") @NotEmpty(message = "系统访问路径不允许为空")
private String url; private String url;
/**
* 系统备注 /** 系统备注 */
*/ @ApiModelProperty("系统备注")
private String remark; private String remark;
public String getName () { /** 系统英文名称 */
@ApiModelProperty("系统英文名称")
private String enName;
@ApiModelProperty("权限集")
private List<EllaPagePermissionVo> permissions;
private String isDefault;
public String getName() {
return this.name; return this.name;
} }
public void setName (String name) {
public void setName(String name) {
this.name = name; this.name = name;
} }
public String getNumber () { public String getNumber() {
return this.number; return this.number;
} }
public void setNumber (String number) {
public void setNumber(String number) {
this.number = number; this.number = number;
} }
public String getUrl () { public String getUrl() {
return this.url; return this.url;
} }
public void setUrl (String url) {
public void setUrl(String url) {
this.url = url; this.url = url;
} }
public String getRemark() { public String getRemark() {
return remark; return remark;
} }
public void setRemark(String remark) { public void setRemark(String remark) {
this.remark = remark; this.remark = remark;
} }
public String getSearch() {
return search;
}
public void setSearch(String search) {
this.search = search;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getEnName() {
return enName;
}
public void setEnName(String enName) {
this.enName = enName;
}
public List<EllaPagePermissionVo> getPermissions() {
return permissions;
}
public void setPermissions(List<EllaPagePermissionVo> permissions) {
this.permissions = permissions;
}
public String getIsDefault() {
return isDefault;
}
public void setIsDefault(String isDefault) {
this.isDefault = isDefault;
}
} }
src/main/java/com/senthink/rmi/challenger/vo/EllaUserBaseSignInVo.java 0 → 100644
/**
*
*/
package com.senthink.rmi.challenger.vo;
import javax.validation.constraints.Pattern;
import org.hibernate.validator.constraints.NotEmpty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* @ClassName : EllaUserBaseSignInVo
* @Description :
* @Author : xujialin
* @CreationDate : 2017年2月15日下午2:48:22
*/
@ApiModel
public class EllaUserBaseSignInVo {
private static final String emailReg = "^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$";
private static final String phoneReg = "^(13|15|18|17)\\d{9}$";
@ApiModelProperty("登录名")
@NotEmpty(message = "登录名不能为空", groups = { phone.class, mail.class })
private String loginName;
@ApiModelProperty("真实姓名")
@NotEmpty(message = "真实姓名不能为空", groups = { phone.class, mail.class })
private String realName;
@ApiModelProperty("手机号")
@NotEmpty(message = "手机不能为空", groups = phone.class)
@Pattern(regexp = phoneReg, message = "手机格式不正确", groups = phone.class)
private String telephone;
@ApiModelProperty("邮箱")
@NotEmpty(message = "邮箱不能为空", groups = mail.class)
@Pattern(regexp = emailReg, message = "邮箱格式不正确", groups = mail.class)
private String email;
@ApiModelProperty("地址")
private String address;
public interface phone {
}
public interface mail {
}
public String getLoginName() {
return loginName;
}
public void setLoginName(String loginName) {
this.loginName = loginName;
}
public String getRealName() {
return realName;
}
public void setRealName(String realName) {
this.realName = realName;
}
public String getTelephone() {
return telephone;
}
public void setTelephone(String telephone) {
this.telephone = telephone;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
}
src/main/java/com/senthink/rmi/challenger/vo/EllaUserBaseVo.java
package com.senthink.rmi.challenger.vo; package com.senthink.rmi.challenger.vo;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List;
import javax.validation.constraints.Pattern; import javax.validation.constraints.Pattern;
import org.hibernate.validator.constraints.NotEmpty; import org.hibernate.validator.constraints.NotEmpty;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
public class EllaUserBaseVo implements Serializable { import io.swagger.annotations.ApiModelProperty;
private static final long serialVersionUID = -3641762319070709334L; public class EllaUserBaseVo extends PageVo {
private static final String emailReg = "^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$"; private static final String emailReg = "^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$";
private static final String phoneReg = "^(13|15|18|17)\\d{9}$"; private static final String phoneReg = "^(13|15|18|17)\\d{9}$";
private Integer id; private Integer id;
/**
* 手机端登录时传过来的手机名
*/
private String phoneName;
/**
* 手机端登录时传过来的手机uuid
*/
private String phoneUuid;
/**
* android的cid或iOS的devicetoken,由client_type来决定
*/
private String clientId;
/**
* android 或 ios
*/
private String clientType;
/**
* 手机端注册请求的验证码
*/
private String virifyCode;
private String picIds;
private String picUrls;
private String tradeBgnTime;
private String tradeEndTime;
private String gpsValue;
private String isUpdatePic;
private String roles;
private String orgid;
private String[] extendsValue;
private String orgs;
private MultipartFile file;
public EllaUserBaseVo() {
super();
}
public EllaUserBaseVo(String loginName, String password) {
this.loginName = loginName;
this.password = password;
}
@ApiModelProperty("模糊查询")
private String search;
/** /**
* 登录名 * 登录名
*/ */
@NotEmpty(message = "{error_ue_loginname_null}") @ApiModelProperty("登录名")
@NotEmpty(message = "登录名不能为空")
private String loginName; private String loginName;
/** /**
* 密码 * 密码
*/ */
@ApiModelProperty("密码")
private String password; private String password;
/** /**
* 真实姓名 * 真实姓名
*/ */
@ApiModelProperty("真实姓名")
@NotEmpty(message = "真实姓名不能为空") @NotEmpty(message = "真实姓名不能为空")
private String realName; private String realName;
/** /**
* 手机号 * 手机号
*/ */
@ApiModelProperty("手机号")
@Pattern(regexp = phoneReg, message = "手机格式不正确") @Pattern(regexp = phoneReg, message = "手机格式不正确")
private String telephone; private String telephone;
/** /**
* 邮箱 * 邮箱
*/ */
@ApiModelProperty("邮箱")
@Pattern(regexp = emailReg, message = "邮箱格式不正确") @Pattern(regexp = emailReg, message = "邮箱格式不正确")
private String email; private String email;
/** /**
* 地址 * 地址
*/ */
@ApiModelProperty("地址")
private String address; private String address;
/** /**
* 注册日期 * 注册日期
*/ */
@ApiModelProperty("注册日期")
private Date regTime; private Date regTime;
/** /**
* 截止日期 * 截止日期
*/ */
private String endTime; @ApiModelProperty("截止日期")
private Date endTime;
/** /**
* 用户类型id * 用户类型id
*/ */
@ApiModelProperty("用户类型id")
private Integer userTypeId; private Integer userTypeId;
/** /**
* 用户状态 0 启用/ 1 禁用 * 用户状态 0 启用/ 1 禁用 / 2待审核 /3 驳回
*/ */
@ApiModelProperty("用户状态 0 启用/ 1 禁用 / 2待审核 /3 驳回")
private Integer state; private Integer state;
/** @ApiModelProperty("用户状态集")
* 手机端登录时传过来的手机名 private List<Integer> states;
*/
private String phoneName;
/**
* 手机端登录时传过来的手机uuid
*/
private String phoneUuid;
/**
* android的cid或iOS的devicetoken,由client_type来决定
*/
private String clientId;
/**
* android 或 ios
*/
private String clientType;
/** /**
* 手机端注册请求的验证码 * 父级帐号ID
*/
private String virifyCode;
/**
* 门店对应的服务商id 0：服务商
*/ */
@ApiModelProperty("父级帐号ID")
private Integer parentId; private Integer parentId;
private String picIds; @ApiModelProperty("拒绝理由")
private String picUrls; private String rejectReason;
private String tradeBgnTime;
private String tradeEndTime;
private String gpsValue;
private String isUpdatePic;
private String roles; @ApiModelProperty("拒绝时间")
private String rejectTime;
private String orgid;
private String[] extendsValue;
private String orgs;
private MultipartFile file;
public String getOrgs() { public String getOrgs() {
return orgs; return orgs;
...@@ -267,14 +300,46 @@ public class EllaUserBaseVo implements Serializable { ...@@ -267,14 +300,46 @@ public class EllaUserBaseVo implements Serializable {
this.regTime = regTime; this.regTime = regTime;
} }
public String getEndTime() { public String getSearch() {
return search;
}
public void setSearch(String search) {
this.search = search;
}
public Date getEndTime() {
return endTime; return endTime;
} }
public void setEndTime(String endTime) { public void setEndTime(Date endTime) {
this.endTime = endTime; this.endTime = endTime;
} }
public List<Integer> getStates() {
return states;
}
public void setStates(List<Integer> states) {
this.states = states;
}
public String getRejectReason() {
return rejectReason;
}
public void setRejectReason(String rejectReason) {
this.rejectReason = rejectReason;
}
public String getRejectTime() {
return rejectTime;
}
public void setRejectTime(String rejectTime) {
this.rejectTime = rejectTime;
}
public Integer getUserTypeId() { public Integer getUserTypeId() {
return this.userTypeId; return this.userTypeId;
} }
......
src/main/java/com/senthink/rmi/challenger/vo/EllaUserExtendsVo.java
...@@ -2,49 +2,58 @@ package com.senthink.rmi.challenger.vo; ...@@ -2,49 +2,58 @@ package com.senthink.rmi.challenger.vo;
import org.hibernate.validator.constraints.NotEmpty; import org.hibernate.validator.constraints.NotEmpty;
import java.io.Serializable; import io.swagger.annotations.ApiModelProperty;
public class EllaUserExtendsVo extends Entity implements Serializable { public class EllaUserExtendsVo extends PageVo {
private static final long serialVersionUID = -1480244651888427349L; @NotEmpty(message = "用户类型id不能为空")
/** @ApiModelProperty("用户类型id")
* 用户类型id private Integer userTypeId;
*/
@NotEmpty(message = "{error_ue_usertype_null}")
private String userTypeId;
/** /**
* 扩展属性code即属性列code,唯一的 * 扩展属性code即属性列code,唯一的
*/ */
@NotEmpty(message = "{error_ue_extendcode_null}") @ApiModelProperty("扩展属性code即属性列code,唯一的")
@NotEmpty(message = "扩展属性code不能为空")
private String attributeCode; private String attributeCode;
/** /**
* 扩展属性名即属性列名 * 扩展属性名即属性列名
*/ */
@NotEmpty(message = "{error_ue_extendname_null}") @ApiModelProperty("扩展属性名即属性列名")
@NotEmpty(message = "扩展属性名不能为空")
private String attributeName; private String attributeName;
/** /**
* 表单类型 * 表单类型
*/ */
@NotEmpty(message = "{error_ue_formtype_null}") @ApiModelProperty("表单类型")
private String formType; private Integer formType;
/** /**
* 备注 * 备注
*/ */
@ApiModelProperty("备注")
private String remark; private String remark;
/** /**
* 单选框或复选框的待选值,用,隔开 * 单选框或复选框的待选值,用,隔开
*/ */
@ApiModelProperty("单选框或复选框的待选值,用,隔开")
private String content; private String content;
public Integer getUserTypeId() {
public String getUserTypeId() { return userTypeId;
return this.userTypeId;
} }
public void setUserTypeId(String userTypeId) { public void setUserTypeId(Integer userTypeId) {
this.userTypeId = userTypeId; this.userTypeId = userTypeId;
} }
public Integer getFormType() {
return formType;
}
public void setFormType(Integer formType) {
this.formType = formType;
}
public String getAttributeName() { public String getAttributeName() {
return this.attributeName; return this.attributeName;
} }
...@@ -69,14 +78,6 @@ public class EllaUserExtendsVo extends Entity implements Serializable { ...@@ -69,14 +78,6 @@ public class EllaUserExtendsVo extends Entity implements Serializable {
this.attributeCode = attributeCode; this.attributeCode = attributeCode;
} }
public String getFormType() {
return formType;
}
public void setFormType(String formType) {
this.formType = formType;
}
public String getContent() { public String getContent() {
return content; return content;
} }
...@@ -85,5 +86,4 @@ public class EllaUserExtendsVo extends Entity implements Serializable { ...@@ -85,5 +86,4 @@ public class EllaUserExtendsVo extends Entity implements Serializable {
this.content = content; this.content = content;
} }
} }
src/main/java/com/senthink/rmi/challenger/param/EllaUserOrgParam.java → src/main/java/com/senthink/rmi/challenger/vo/EllaUserOrgVo.java
package com.senthink.rmi.challenger.param; package com.senthink.rmi.challenger.vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
public class EllaUserOrgParam extends PageParam { public class EllaUserOrgVo extends PageVo {
@ApiModelProperty("模糊查询") @ApiModelProperty("模糊查询")
private String search; private String search;
......
src/main/java/com/senthink/rmi/challenger/param/EllaUserRoleParam.java → src/main/java/com/senthink/rmi/challenger/vo/EllaUserRoleVo.java
package com.senthink.rmi.challenger.param; package com.senthink.rmi.challenger.vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
public class EllaUserRoleParam extends PageParam { public class EllaUserRoleVo extends PageVo {
@ApiModelProperty("模糊查询") @ApiModelProperty("模糊查询")
private String search; private String search;
......
src/main/java/com/senthink/rmi/challenger/vo/EllaUserTypeVo.java
package com.senthink.rmi.challenger.vo; package com.senthink.rmi.challenger.vo;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import org.hibernate.validator.constraints.NotEmpty; import org.hibernate.validator.constraints.NotEmpty;
import java.io.Serializable; import io.swagger.annotations.ApiModelProperty;
public class EllaUserTypeVo extends Entity implements Serializable{ public class EllaUserTypeVo extends PageVo {
private Integer id;
private static final long serialVersionUID = -3642681516157405674L; /**
/**
* 用户类型名称 * 用户类型名称
*/ */
@ApiModelProperty("用户类型名称")
@NotEmpty(message = "用户类型名称不允许为空") @NotEmpty(message = "用户类型名称不允许为空")
@Length(min=1, max=20, message="用户类型名称长度必须在1-20之间") @Length(min = 1, max = 20, message = "用户类型名称长度必须在1-20之间")
private String name; private String name;
/** /**
* 用户类型备注 * 用户类型备注
*/ */
@ApiModelProperty("用户类型备注")
private String remark; private String remark;
public String getName () { public String getName() {
return this.name; return this.name;
} }
public void setName (String name) {
public void setName(String name) {
this.name = name; this.name = name;
} }
public String getRemark() { public String getRemark() {
return remark; return remark;
} }
public void setRemark(String remark) { public void setRemark(String remark) {
this.remark = remark; this.remark = remark;
} }
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
} }
src/main/java/com/senthink/rmi/challenger/param/EmaillogParam.java → src/main/java/com/senthink/rmi/challenger/vo/EmaillogVo.java
package com.senthink.rmi.challenger.param; package com.senthink.rmi.challenger.vo;
import java.util.Date; import java.util.Date;
...@@ -7,7 +7,7 @@ import java.util.Date; ...@@ -7,7 +7,7 @@ import java.util.Date;
* *
* *
*/ */
public class EmaillogParam extends PageParam { public class EmaillogVo extends PageVo {
private Integer id; private Integer id;
......
src/main/java/com/senthink/rmi/challenger/param/MessagelogParam.java → src/main/java/com/senthink/rmi/challenger/vo/MessagelogVo.java
package com.senthink.rmi.challenger.param; package com.senthink.rmi.challenger.vo;
import java.util.Date; import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
/** /**
* *
* *
* *
*/ */
public class MessagelogParam extends PageParam { public class MessagelogVo extends PageVo {
private Integer id; private Integer id;
/** 短信接收手机号 */ /** 短信接收手机号 */
@ApiModelProperty("短信接收手机号")
private String telNo; private String telNo;
/** 短信发送内容 */ /** 短信发送内容 */
@ApiModelProperty("短信发送内容")
private String content; private String content;
/** 短信发送时间 */ /** 短信发送时间 */
@ApiModelProperty("短信发送时间")
private Date gmtSend; private Date gmtSend;
private Date satrtTime;
private Date endTime;
private String search;
public String getTelNo() { public String getTelNo() {
return telNo; return telNo;
} }
...@@ -51,38 +49,12 @@ public class MessagelogParam extends PageParam { ...@@ -51,38 +49,12 @@ public class MessagelogParam extends PageParam {
this.gmtSend = gmtSend; this.gmtSend = gmtSend;
} }
public String getSearch() {
return search;
}
public void setSearch(String search) {
this.search = search;
}
public void setId(Integer id) { public void setId(Integer id) {
this.id = id; this.id = id;
} }
public Date getSatrtTime() {
return satrtTime;
}
public void setSatrtTime(Date satrtTime) {
this.satrtTime = satrtTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public Integer getId() { public Integer getId() {
return this.id; return this.id;
} }
} }
src/main/java/com/senthink/rmi/challenger/vo/PageVo.java
package com.senthink.rmi.challenger.vo; package com.senthink.rmi.challenger.vo;
import io.swagger.annotations.ApiModelProperty;
/** /**
* The type Page param. * The type Page param.
* *
...@@ -13,17 +15,22 @@ package com.senthink.rmi.challenger.vo; ...@@ -13,17 +15,22 @@ package com.senthink.rmi.challenger.vo;
* ----------------------------------- * -----------------------------------
*/ */
public class PageVo { public class PageVo {
@ApiModelProperty("当前页码")
private int current = 1; private int current = 1;
@ApiModelProperty("每页条目，默认10")
private int size = 10; private int size = 10;
@ApiModelProperty("模糊查询")
private String search; private String search;
@ApiModelProperty("查询时间起始")
private String searchBgnTime; private String searchBgnTime;
@ApiModelProperty("时间结束")
private String searchEndTime; private String searchEndTime;
@ApiModelProperty("排序")
private String sort; private String sort;
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment