Skip to content

C
challenger-rmi
Commit 2b24d11c by Xujialin
Options

添加了APPversion

parent d035e901
Showing with 473 additions and 200 deletions
.gitignore
...@@ -10,3 +10,4 @@ ...@@ -10,3 +10,4 @@
out out
gen gen
/bin/ /bin/
.classpath
src/main/java/com/senthink/rmi/challenger/vo/EllaAppVersionVo.java 0 → 100644
/**
*
*/
package com.senthink.rmi.challenger.vo;
import java.util.Date;
/**
* @ClassName : EllaAppVersionVo
* @Description :
* @Author : xujialin
* @CreationDate : 2017年2月10日下午2:57:07
*/
public class EllaAppVersionVo extends PageVo {
private Integer id;
/** 版本号 */
private String versionCode;
/** android的更新地址 */
private String url;
/** 版本时间 */
private Date date;
/** 操作系统 */
private String operation;
/** */
private String versionName;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getVersionCode() {
return versionCode;
}
public void setVersionCode(String versionCode) {
this.versionCode = versionCode;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public Date getDate() {
return date;
}
public void setDate(Date date) {
this.date = date;
}
public String getOperation() {
return operation;
}
public void setOperation(String operation) {
this.operation = operation;
}
public String getVersionName() {
return versionName;
}
public void setVersionName(String versionName) {
this.versionName = versionName;
}
}
src/main/java/com/senthink/rmi/challenger/vo/EllaOrgStructureVo.java
package com.senthink.rmi.challenger.vo; package com.senthink.rmi.challenger.vo;
import org.hibernate.validator.constraints.NotEmpty;
import java.io.Serializable; import java.io.Serializable;
public class EllaOrgStructureVo implements Serializable { public class EllaOrgStructureVo implements Serializable {
private static final long serialVersionUID = -5620497436811285836L; private static final long serialVersionUID = -5620497436811285836L;
private Integer id; private Integer id;
/** /**
* 组织结构名称 * 组织结构名称
*/ */
@NotEmpty(message = "组织架构名不允许为空") private String name;
private String name; /**
/** * 上级架构的id
* 上级架构的id */
*/ private Integer parentId;
private Integer parentId; /**
/** * 组织架构的层级 0最高层级 向下递增
* 组织架构的层级 0最高层级 向下递增 */
*/ private Integer level;
private Integer level; /**
/** * 编号
* 编号 */
*/ private String number;
private String number; /**
/** * 英文缩写
* 英文缩写 */
*/ private String abbreviation;
private String abbreviation; /**
/** * 简称
* 简称 */
*/ private String shortName;
private String shortName;
/**
/** * 节点对应的英文名
* 节点对应的英文名 */
*/ private String enName;
private String enName;
public interface SEARCH {
};
public Integer getId() { public Integer getId() {
return id; return id;
...@@ -49,51 +48,59 @@ public class EllaOrgStructureVo implements Serializable { ...@@ -49,51 +48,59 @@ public class EllaOrgStructureVo implements Serializable {
} }
public String getName() { public String getName() {
return this.name; return this.name;
} }
public void setName (String name) {
this.name = name; public void setName(String name) {
} this.name = name;
}
public Integer getParentId () {
return this.parentId; public Integer getParentId() {
} return this.parentId;
public void setParentId (Integer parentId) { }
this.parentId = parentId;
} public void setParentId(Integer parentId) {
this.parentId = parentId;
public Integer getLevel () { }
return this.level;
} public Integer getLevel() {
public void setLevel (Integer level) { return this.level;
this.level = level; }
}
public void setLevel(Integer level) {
public String getNumber () { this.level = level;
return this.number; }
}
public void setNumber (String number) { public String getNumber() {
this.number = number; return this.number;
} }
public String getAbbreviation () { public void setNumber(String number) {
return this.abbreviation; this.number = number;
} }
public void setAbbreviation (String abbreviation) {
this.abbreviation = abbreviation; public String getAbbreviation() {
} return this.abbreviation;
}
public String getShortName () {
return this.shortName; public void setAbbreviation(String abbreviation) {
} this.abbreviation = abbreviation;
public void setShortName (String shortName) { }
this.shortName = shortName;
} public String getShortName() {
return this.shortName;
}
public void setShortName(String shortName) {
this.shortName = shortName;
}
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;
} }
} }
src/main/java/com/senthink/rmi/challenger/vo/EllaUserBaseVo.java
package com.senthink.rmi.challenger.vo; package com.senthink.rmi.challenger.vo;
import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.constraints.Pattern;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import javax.validation.constraints.Pattern;
import org.hibernate.validator.constraints.NotEmpty;
import org.springframework.web.multipart.MultipartFile;
public class EllaUserBaseVo implements Serializable { public class EllaUserBaseVo implements Serializable {
private static final long serialVersionUID = -3641762319070709334L; private static final long serialVersionUID = -3641762319070709334L;
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;
/** /**
* 登录名 * 登录名
*/ */
@NotEmpty(message = "{error_ue_loginname_null}") @NotEmpty(message = "{error_ue_loginname_null}")
private String loginName; private String loginName;
/** /**
* 密码 * 密码
*/ */
private String password; private String password;
/** /**
* 真实姓名 * 真实姓名
*/ */
@NotEmpty(message = "真实姓名不能为空") @NotEmpty(message = "真实姓名不能为空")
private String realName; private String realName;
/** /**
* 手机号 * 手机号
*/ */
@Pattern(regexp = phoneReg, message="手机格式不正确") @Pattern(regexp = phoneReg, message = "手机格式不正确")
private String telephone; private String telephone;
/** /**
* 邮箱 * 邮箱
*/ */
@Pattern(regexp = emailReg, message="邮箱格式不正确") @Pattern(regexp = emailReg, message = "邮箱格式不正确")
private String email; private String email;
/** /**
* 地址 * 地址
*/ */
private String address; private String address;
/** /**
* 注册日期 * 注册日期
*/ */
private Date regTime; private Date regTime;
/** /**
* 截止日期 * 截止日期
*/ */
private String endTime; private String endTime;
/** /**
* 用户类型id * 用户类型id
*/ */
private Integer userTypeId; private Integer userTypeId;
/** /**
* 用户状态 0 启用/ 1 禁用 * 用户状态 0 启用/ 1 禁用
*/ */
private Integer state; private Integer state;
/** /**
* 手机端登录时传过来的手机名 * 手机端登录时传过来的手机名
*/ */
private String phoneName; private String phoneName;
/** /**
* 手机端登录时传过来的手机uuid * 手机端登录时传过来的手机uuid
*/ */
private String phoneUuid; private String phoneUuid;
/** /**
* android的cid或iOS的devicetoken,由client_type来决定 * android的cid或iOS的devicetoken,由client_type来决定
*/ */
private String clientId; private String clientId;
/** /**
* android 或 ios * android 或 ios
*/ */
private String clientType; private String clientType;
/** /**
* 手机端注册请求的验证码 * 手机端注册请求的验证码
*/ */
private String virifyCode; private String virifyCode;
/** /**
* 门店对应的服务商id 0：服务商 * 门店对应的服务商id 0：服务商
*/ */
private Integer parentId; private Integer parentId;
private String picIds; private String picIds;
private String picUrls; private String picUrls;
private String tradeBgnTime; private String tradeBgnTime;
private String tradeEndTime; private String tradeEndTime;
private String gpsValue; private String gpsValue;
private String isUpdatePic; private String isUpdatePic;
private String roles;
private String orgid;
private String[] extendsValue;
private String orgs;
private MultipartFile file;
public String getOrgs() {
return orgs;
}
public void setOrgs(String orgs) {
this.orgs = orgs;
}
public MultipartFile getFile() {
return file;
}
public void setFile(MultipartFile file) {
this.file = file;
}
public String getRoles() {
return roles;
}
public void setRoles(String roles) {
this.roles = roles;
}
public String getOrgid() {
return orgid;
}
public void setOrgid(String orgid) {
this.orgid = orgid;
}
public String[] getExtendsValue() {
return extendsValue;
}
public void setExtendsValue(String[] extendsValue) {
this.extendsValue = extendsValue;
}
public static String getEmailreg() {
return emailReg;
}
public static String getPhonereg() {
return phoneReg;
}
public Integer getId() { public Integer getId() {
return id; return id;
...@@ -106,140 +166,177 @@ public class EllaUserBaseVo implements Serializable { ...@@ -106,140 +166,177 @@ public class EllaUserBaseVo implements Serializable {
public String getIsUpdatePic() { public String getIsUpdatePic() {
return isUpdatePic; return isUpdatePic;
} }
public void setIsUpdatePic(String isUpdatePic) { public void setIsUpdatePic(String isUpdatePic) {
this.isUpdatePic = isUpdatePic; this.isUpdatePic = isUpdatePic;
} }
public String getGpsValue() { public String getGpsValue() {
return gpsValue; return gpsValue;
} }
public void setGpsValue(String gpsValue) { public void setGpsValue(String gpsValue) {
this.gpsValue = gpsValue; this.gpsValue = gpsValue;
} }
public String getTradeBgnTime() { public String getTradeBgnTime() {
return tradeBgnTime; return tradeBgnTime;
} }
public void setTradeBgnTime(String tradeBgnTime) { public void setTradeBgnTime(String tradeBgnTime) {
this.tradeBgnTime = tradeBgnTime; this.tradeBgnTime = tradeBgnTime;
} }
public String getTradeEndTime() { public String getTradeEndTime() {
return tradeEndTime; return tradeEndTime;
} }
public void setTradeEndTime(String tradeEndTime) { public void setTradeEndTime(String tradeEndTime) {
this.tradeEndTime = tradeEndTime; this.tradeEndTime = tradeEndTime;
} }
public String getPicIds() { public String getPicIds() {
return picIds; return picIds;
} }
public void setPicIds(String picIds) { public void setPicIds(String picIds) {
this.picIds = picIds; this.picIds = picIds;
} }
public String getPicUrls() { public String getPicUrls() {
return picUrls; return picUrls;
} }
public void setPicUrls(String picUrls) { public void setPicUrls(String picUrls) {
this.picUrls = picUrls; this.picUrls = picUrls;
} }
public Integer getParentId() { public Integer getParentId() {
return parentId; return parentId;
} }
public void setParentId(Integer parentId) { public void setParentId(Integer parentId) {
this.parentId = parentId; this.parentId = parentId;
} }
public String getLoginName () {
return this.loginName; public String getLoginName() {
} return this.loginName;
public void setLoginName (String loginName) { }
this.loginName = loginName;
} public void setLoginName(String loginName) {
this.loginName = loginName;
public String getPassword () { }
return this.password;
} public String getPassword() {
public void setPassword (String password) { return this.password;
this.password = password; }
}
public void setPassword(String password) {
public String getTelephone () { this.password = password;
return this.telephone; }
}
public void setTelephone (String telephone) { public String getTelephone() {
this.telephone = telephone; return this.telephone;
} }
public String getEmail () { public void setTelephone(String telephone) {
return this.email; this.telephone = telephone;
} }
public void setEmail (String email) {
this.email = email; public String getEmail() {
} return this.email;
}
public String getAddress () {
return this.address; public void setEmail(String email) {
} this.email = email;
public void setAddress (String address) { }
this.address = address;
} public String getAddress() {
return this.address;
}
public void setAddress(String address) {
this.address = address;
}
public Date getRegTime() { public Date getRegTime() {
return regTime; return regTime;
} }
public void setRegTime(Date regTime) { public void setRegTime(Date regTime) {
this.regTime = regTime; this.regTime = regTime;
} }
public String getEndTime() { public String getEndTime() {
return endTime; return endTime;
} }
public void setEndTime(String endTime) { public void setEndTime(String endTime) {
this.endTime = endTime; this.endTime = endTime;
} }
public Integer getUserTypeId () {
return this.userTypeId; public Integer getUserTypeId() {
} return this.userTypeId;
public void setUserTypeId (Integer userTypeId) { }
this.userTypeId = userTypeId;
} public void setUserTypeId(Integer userTypeId) {
this.userTypeId = userTypeId;
}
public Integer getState() { public Integer getState() {
return state; return state;
} }
public void setState(Integer state) { public void setState(Integer state) {
this.state = state; this.state = state;
} }
public String getPhoneName() { public String getPhoneName() {
return phoneName; return phoneName;
} }
public void setPhoneName(String phoneName) { public void setPhoneName(String phoneName) {
this.phoneName = phoneName; this.phoneName = phoneName;
} }
public String getPhoneUuid() { public String getPhoneUuid() {
return phoneUuid; return phoneUuid;
} }
public void setPhoneUuid(String phoneUuid) { public void setPhoneUuid(String phoneUuid) {
this.phoneUuid = phoneUuid; this.phoneUuid = phoneUuid;
} }
public String getRealName() { public String getRealName() {
return realName; return realName;
} }
public void setRealName(String realName) { public void setRealName(String realName) {
this.realName = realName; this.realName = realName;
} }
public String getClientId() { public String getClientId() {
return clientId; return clientId;
} }
public void setClientId(String clientId) { public void setClientId(String clientId) {
this.clientId = clientId; this.clientId = clientId;
} }
public String getClientType() { public String getClientType() {
return clientType; return clientType;
} }
public void setClientType(String clientType) { public void setClientType(String clientType) {
this.clientType = clientType; this.clientType = clientType;
} }
public String getVirifyCode() { public String getVirifyCode() {
return virifyCode; return virifyCode;
} }
public void setVirifyCode(String virifyCode) { public void setVirifyCode(String virifyCode) {
this.virifyCode = virifyCode; this.virifyCode = virifyCode;
} }
} }
src/main/java/com/senthink/rmi/challenger/vo/PageVo.java 0 → 100644
package com.senthink.rmi.challenger.vo;
/**
* 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 PageVo {
private int current = 1;
private int size = 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;
}
public int getCurrent() {
return current;
}
public void setCurrent(int current) {
this.current = current;
}
public int getSize() {
return size;
}
public void setSize(int size) {
this.size = size;
}
public String getSearch() {
return search;
}
public void setSearch(String search) {
this.search = search;
}
public String getSearchBgnTime() {
return searchBgnTime;
}
public void setSearchBgnTime(String searchBgnTime) {
this.searchBgnTime = searchBgnTime;
}
public String getSort() {
return sort;
}
public void setSort(String sort) {
this.sort = 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