Merge branch 'dev' of chenweida/jw2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/IdEntity.java

@@ -0,0 +1,44 @@
/*******************************************************************************
 * Copyright (c) 2005, 2014 springside.github.io
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.jw;
import org.hibernate.annotations.GenericGenerator;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.*;
import java.util.Date;
/**
 * 统一定义id的entity基类.
 * 
 * 基类统一定义id的属性名称、数据类型、列名映射及生成策略.
 * Oracle需要每个Entity独立定义id的SEQUCENCE时，不继承于本类而改为实现一个Idable的接口。
 * 
 * @author calvin
 */
// JPA 基类的标识
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
public abstract class IdEntity {
	@Id
	@GeneratedValue(generator = "uuid")
	@GenericGenerator(name = "uuid", strategy = "uuid")
	protected String id;  // 非业务主键
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
}

common/common-entity/src/main/java/com/yihu/jw/base/IdEntity.java

@@ -3,8 +3,9 @@
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.jw.base;
package com.yihu.jw;
import org.hibernate.annotations.GenericGenerator;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy;
@@ -25,14 +26,8 @@ import java.util.Date;
// JPA 基类的标识
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
public abstract class IdEntity {
public abstract class IdEntityWithOperation extends IdEntity{
	@Id
	@GeneratedValue(strategy = GenerationType.AUTO)
	protected Long id;  // 非业务主键
	@Column(name="code")
	protected String code;
	@CreatedDate
	@Column(name = "create_time", nullable = false, length = 0,updatable = false)
@@ -59,14 +54,6 @@ public abstract class IdEntity {
	protected String updateUserName;
	public Long getId() {
		return id;
	}
	public void setId(Long id) {
		this.id = id;
	}
	public Date getCreateTime() {
		return createTime;
	}
@@ -115,11 +102,4 @@ public abstract class IdEntity {
		this.updateUserName = updateUserName;
	}
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
}

common/common-entity/src/main/java/com/yihu/jw/base/base/Function.java

@@ -1,7 +1,8 @@
package com.yihu.jw.base.base;// default package
import com.yihu.jw.base.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -15,15 +16,15 @@ import java.util.List;
 */
@Entity
@Table(name = "base_function")
public class Function extends IdEntity implements java.io.Serializable {
public class Function extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
	private String name; //功能名称
	private String url;//功能对应的后台url路径
	private String saasId; // saasid
	private String parentCode; //父功能code
	private Integer status; //状态 -1 删除 0 禁用 可用
	private String url;//功能对应的后台url路径
	private String remark; //备注
	@Transient
	private List<Function> children = new ArrayList<>();
@@ -35,19 +36,6 @@ public class Function extends IdEntity implements java.io.Serializable {
	public Function() {
	}
	public void setId(Long id) {
		this.id = id;
	}
	@Column(name = "code", length = 100)
	public String getCode() {
		return this.code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@Column(name = "name", length = 200)
	public String getName() {
		return this.name;

common/common-entity/src/main/java/com/yihu/jw/base/base/Module.java

@@ -1,6 +1,7 @@
package com.yihu.jw.base.base;// default package
import com.yihu.jw.base.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -14,12 +15,12 @@ import java.util.List;
 */
@Entity
@Table(name = "base_module")
public class Module extends IdEntity implements java.io.Serializable {
public class Module extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
	private String name; //模块名称
	private String saasId; //关联 Saas code
	private String parentCode;//父id
	private String parentId;//父id
	private Integer status; //-1 删除 0 禁用 可用
	private String remark;
	@Transient
@@ -52,13 +53,13 @@ public class Module extends IdEntity implements java.io.Serializable {
		this.saasId = saasId;
	}
	@Column(name = "parent_code", length = 100)
	public String getParentCode() {
		return this.parentCode;
	@Column(name = "parent_id", length = 100)
	public String getParentId() {
		return parentId;
	}
	public void setParentCode(String parentCode) {
		this.parentCode = parentCode;
	public void setParentId(String parentId) {
		this.parentId = parentId;
	}
	@Column(name = "status", precision = 2, scale = 0)

common/common-entity/src/main/java/com/yihu/jw/base/base/ModuleFunction.java

@@ -1,5 +1,8 @@
package com.yihu.jw.base.base;// default package
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.*;
/**
@@ -7,12 +10,8 @@ import javax.persistence.*;
 */
@Entity
@Table(name = "base_module_function")
public class ModuleFunction implements java.io.Serializable {
public class ModuleFunction extends IdEntity implements java.io.Serializable {
	// Fields
	@Id
	@GeneratedValue(strategy = GenerationType.AUTO)
	private Long id;
	private String functionId;//关联 base_function    code
	private String moduleId;//关联 base_module  code
@@ -39,12 +38,4 @@ public class ModuleFunction implements java.io.Serializable {
	public void setModuleId(String moduleId) {
		this.moduleId = moduleId;
	}
	public Long getId() {
		return id;
	}
	public void setId(Long id) {
		this.id = id;
	}
}

common/common-entity/src/main/java/com/yihu/jw/base/base/Saas.java

@@ -1,7 +1,8 @@
package com.yihu.jw.base.base;// default package
import com.yihu.jw.base.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -12,7 +13,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_saas")
public class Saas extends IdEntity implements java.io.Serializable {
public class Saas extends IdEntityWithOperation implements java.io.Serializable {
	// Fields

common/common-entity/src/main/java/com/yihu/jw/base/base/SaasModule.java

@@ -1,7 +1,8 @@
package com.yihu.jw.base.base;// default package
import com.yihu.jw.base.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.*;
@@ -12,10 +13,6 @@ import javax.persistence.*;
@Table(name = "base_saas_module")
public class SaasModule extends IdEntity implements java.io.Serializable {
	// Fields
	@Id
	@GeneratedValue(strategy = GenerationType.AUTO)
	private Long id;
	private String saasId; //关联WlyySaas code
	private String moduleId; //关联 WlyyModule code
@@ -38,14 +35,4 @@ public class SaasModule extends IdEntity implements java.io.Serializable {
	public void setModuleId(String moduleId) {
		this.moduleId = moduleId;
	}
	@Override
	public Long getId() {
		return id;
	}
	@Override
	public void setId(Long id) {
		this.id = id;
	}
}

common/common-entity/src/main/java/com/yihu/jw/base/base/SystemDict.java

@@ -1,6 +1,7 @@
package com.yihu.jw.base.base;// default package
import com.yihu.jw.base.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -11,7 +12,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "system_dict")
public class SystemDict extends IdEntity implements java.io.Serializable {
public class SystemDict extends IdEntityWithOperation implements java.io.Serializable {
	// Fields

common/common-entity/src/main/java/com/yihu/jw/base/base/SystemDictList.java

@@ -1,6 +1,7 @@
package com.yihu.jw.base.base;// default package
import com.yihu.jw.base.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -11,7 +12,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "system_dict_list")
public class SystemDictList extends IdEntity implements java.io.Serializable {
public class SystemDictList extends IdEntityWithOperation implements java.io.Serializable {
	// Fields

common/common-entity/src/main/java/com/yihu/jw/base/login/BaseLoginAccount.java

@@ -1,7 +1,11 @@
package com.yihu.jw.base.login;// default package
import com.yihu.jw.base.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -22,6 +26,16 @@ public class BaseLoginAccount extends IdEntity implements java.io.Serializable {
	private String saasId;//'saas配置id'
	private String email;//'邮箱'
	@CreatedDate
	@Column(name = "create_time", nullable = false, length = 0,updatable = false)
	protected Date createTime;
	@LastModifiedDate
	@Column(name = "update_time", nullable = false, length = 0)
	protected Date updateTime;
	// Constructors
	/** default constructor */
@@ -33,13 +47,10 @@ public class BaseLoginAccount extends IdEntity implements java.io.Serializable {
	public BaseLoginAccount(Integer id, String code, String userType,
							String password, String salt, String accountStatus, Date createTime,
							Date updateTime, String saasId, String email) {
		this.code = code;
		this.userType = userType;
		this.password = password;
		this.salt = salt;
		this.accountStatus = accountStatus;
		this.createTime = createTime;
		this.updateTime = updateTime;
		this.saasId = saasId;
		this.email = email;
	}
@@ -99,4 +110,19 @@ public class BaseLoginAccount extends IdEntity implements java.io.Serializable {
		this.email = email;
	}
	public Date getCreateTime() {
		return createTime;
	}
	public void setCreateTime(Date createTime) {
		this.createTime = createTime;
	}
	public Date getUpdateTime() {
		return updateTime;
	}
	public void setUpdateTime(Date updateTime) {
		this.updateTime = updateTime;
	}
}

common/common-entity/src/main/java/com/yihu/jw/base/login/BaseLoginLog.java

@@ -1,7 +1,8 @@
package com.yihu.jw.base.login;// default package
import com.yihu.jw.base.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.*;
import java.util.Date;
@@ -14,7 +15,7 @@ import java.util.Date;
public class BaseLoginLog extends IdEntity implements java.io.Serializable {
	private String loginType;//'1 短信登录  2 密码登录'
	private String userCode;//'登录用户主键 患者code或者医生code'
	private String userId;//'登录用户主键 患者code或者医生code'
	private String saasId;//'saas配置id'
	private String userType;//'1 患者 2医生 '
	private Date createTime;
@@ -34,20 +35,7 @@ public class BaseLoginLog extends IdEntity implements java.io.Serializable {
		this.createTime = createTime;
	}
	/** full constructor */
	public BaseLoginLog(Integer id, String loginType, String userCode,
						String saasId, String userType, Date createTime, Integer tokenId,
						String type, String errorMessage, String phone) {
		this.loginType = loginType;
		this.userCode = userCode;
		this.saasId = saasId;
		this.userType = userType;
		this.createTime = createTime;
		this.tokenId = tokenId;
		this.type = type;
		this.errorMessage = errorMessage;
		this.phone = phone;
	}
	@Column(name = "login_type", length = 2)
@@ -59,15 +47,17 @@ public class BaseLoginLog extends IdEntity implements java.io.Serializable {
		this.loginType = loginType;
	}
	@Column(name = "user_code", length = 100)
	public String getUserCode() {
		return this.userCode;
	@Column(name = "user_id", length = 100)
	public String getUserId() {
		return userId;
	}
	public void setUserCode(String userCode) {
		this.userCode = userCode;
	public void setUserId(String userId) {
		this.userId = userId;
	}
	@Column(name = "saas_id", length = 100)
	public String getSaasId() {
		return this.saasId;

common/common-entity/src/main/java/com/yihu/jw/base/login/WlyyLoginAccount.java

@@ -1,5 +1,7 @@
package com.yihu.jw.base.login;// default package
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.*;
import java.util.Date;
@@ -8,17 +10,12 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_login_account")
public class WlyyLoginAccount implements java.io.Serializable {
public class WlyyLoginAccount extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
	private Integer id;//'主键'
	private String code;//'业务code'
	private String userType;//'用户类型 1居民 2医生 或者行政管理员'
	private String password;//'密码'
	private String salt;//'盐值'
	private String accountStatus;//'状态 ( -2  锁定 -1 删除，0可用 )'
	private Date createTime;//'创建时间'
	private Date updateTime;//'修改时间'
	private String saasId;//'saas配置id'
	private String email;//'邮箱'
@@ -29,18 +26,16 @@ public class WlyyLoginAccount implements java.io.Serializable {
	}
	/** minimal constructor */
	public WlyyLoginAccount(Integer id, Date createTime, Date updateTime) {
		this.id = id;
	public WlyyLoginAccount(Date createTime, Date updateTime) {
		this.createTime = createTime;
		this.updateTime = updateTime;
	}
	/** full constructor */
	public WlyyLoginAccount(Integer id, String code, String userType,
	public WlyyLoginAccount( String userType,
			String password, String salt, String accountStatus, Date createTime,
			Date updateTime, String saasId, String email) {
		this.id = id;
		this.code = code;
		this.userType = userType;
		this.password = password;
		this.salt = salt;
@@ -51,27 +46,6 @@ public class WlyyLoginAccount implements java.io.Serializable {
		this.email = email;
	}
	// Property accessors
	@Id
	@Column(name = "id", unique = true, nullable = false)
	@GeneratedValue(strategy = GenerationType.IDENTITY)
	public Integer getId() {
		return this.id;
	}
	public void setId(Integer id) {
		this.id = id;
	}
	@Column(name = "code", length = 100)
	public String getCode() {
		return this.code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@Column(name = "user_type", precision = 2, scale = 0)
	public String getUserType() {
		return this.userType;

common/common-entity/src/main/java/com/yihu/jw/base/login/WlyyLoginLog.java

@@ -1,5 +1,7 @@
package com.yihu.jw.base.login;// default package
import com.yihu.jw.IdEntity;
import javax.persistence.*;
import java.util.Date;
@@ -8,10 +10,8 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_login_log")
public class WlyyLoginLog implements java.io.Serializable {
public class WlyyLoginLog extends IdEntity implements java.io.Serializable {
	// Fields
	private Integer id;//'主键'
	private String loginType;//'1 短信登录  2 密码登录'
	private String userCode;//'登录用户主键 患者code或者医生code'
	private String saasId;//'saas配置id'
@@ -28,40 +28,6 @@ public class WlyyLoginLog implements java.io.Serializable {
	public WlyyLoginLog() {
	}
	/** minimal constructor */
	public WlyyLoginLog(Integer id, Date createTime) {
		this.id = id;
		this.createTime = createTime;
	}
	/** full constructor */
	public WlyyLoginLog(Integer id, String loginType, String userCode,
			String saasId, String userType, Date createTime, Integer tokenId,
			String type, String errorMessage, String phone) {
		this.id = id;
		this.loginType = loginType;
		this.userCode = userCode;
		this.saasId = saasId;
		this.userType = userType;
		this.createTime = createTime;
		this.tokenId = tokenId;
		this.type = type;
		this.errorMessage = errorMessage;
		this.phone = phone;
	}
	// Property accessors
	@Id
	@Column(name = "id", unique = true, nullable = false)
	@GeneratedValue(strategy = GenerationType.IDENTITY)
	public Integer getId() {
		return this.id;
	}
	public void setId(Integer id) {
		this.id = id;
	}
	@Column(name = "login_type", length = 2)
	public String getLoginType() {
		return this.loginType;

common/common-entity/src/main/java/com/yihu/jw/base/sms/BaseSms.java

@@ -1,7 +1,8 @@
package com.yihu.jw.base.sms;// default package
import com.yihu.jw.base.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.*;
import java.sql.Timestamp;
@@ -12,7 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "base_sms")
public class BaseSms extends IdEntity implements java.io.Serializable {
public class BaseSms extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
@@ -24,7 +25,7 @@ public class BaseSms extends IdEntity implements java.io.Serializable {
	private String content;	// 短信内容
	private Date deadline;	//过期时间
	private Integer status;	//短信状态 状态，0未发送，1已发送
	private Date czrq; //操作时间
	private Date czrq;//操作日期
	// Constructors
@@ -42,7 +43,6 @@ public class BaseSms extends IdEntity implements java.io.Serializable {
		this.content = content;
		this.deadline = deadline;
		this.status = status;
		this.czrq = czrq;
	}
	/** full constructor */
@@ -57,7 +57,6 @@ public class BaseSms extends IdEntity implements java.io.Serializable {
		this.content = content;
		this.deadline = deadline;
		this.status = status;
		this.czrq = czrq;
	}
@@ -134,14 +133,12 @@ public class BaseSms extends IdEntity implements java.io.Serializable {
		this.status = status;
	}
	@Temporal(TemporalType.TIMESTAMP)
	@Column(name = "czrq", nullable = false, length = 0)
	@Column(name = "czrq")
	public Date getCzrq() {
		return this.czrq;
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
}

common/common-entity/src/main/java/com/yihu/jw/base/sms/BaseSmsGateway.java

@@ -1,7 +1,8 @@
package com.yihu.jw.base.sms;// default package
import com.yihu.jw.base.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,7 +17,6 @@ public class BaseSmsGateway  extends IdEntity implements java.io.Serializable {
	// Fields
	private String code; //业务code
	private String name;//名称
	private String saasId; //关联 base_saas code
	private String orgCode; //机构code
@@ -33,17 +33,10 @@ public class BaseSmsGateway  extends IdEntity implements java.io.Serializable {
	public BaseSmsGateway() {
	}
	/** minimal constructor */
	public BaseSmsGateway(Long id) {
		this.id = id;
	}
	/** full constructor */
	public BaseSmsGateway(Long id, String code, String saasId,
			String orgCode, String ip, String username, String password,
			String url) {
		this.id = id;
		this.code = code;
		this.saasId = saasId;
		this.orgCode = orgCode;
		this.ip = ip;
@@ -53,15 +46,6 @@ public class BaseSmsGateway  extends IdEntity implements java.io.Serializable {
	}
	@Column(name = "code", length = 64)
	public String getCode() {
		return this.code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@Column(name = "saas_id", length = 64)
	public String getSaasId() {
		return this.saasId;

common/common-entity/src/main/java/com/yihu/jw/base/version/BaseUserVersion.java

@@ -0,0 +1,69 @@
package com.yihu.jw.base.version;// default package
import com.yihu.jw.IdEntityWithOperation;
import java.sql.Timestamp;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
 * BaseUserVersion entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_user_version")
public class BaseUserVersion  extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
	private String saasId;
	private String userCode;
	private String version;
	private Integer status;
	// Constructors
	/** default constructor */
	public BaseUserVersion() {
	}
	@Column(name = "saas_id", length = 100)
	public String getSaasId() {
		return this.saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@Column(name = "user_code", length = 100)
	public String getUserCode() {
		return this.userCode;
	}
	public void setUserCode(String userCode) {
		this.userCode = userCode;
	}
	@Column(name = "version", length = 100)
	public String getVersion() {
		return this.version;
	}
	public void setVersion(String version) {
		this.version = version;
	}
	@Column(name = "status")
	public Integer getStatus() {
		return this.status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
}

common/common-entity/src/main/java/com/yihu/jw/base/version/WlyyVersion.java

@@ -0,0 +1,120 @@
package com.yihu.jw.base.version;// default package
import com.yihu.jw.IdEntityWithOperation;
import java.sql.Timestamp;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
 * WlyyVersion entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "wlyy_version")
public class WlyyVersion  extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
	private String saasId;
	private String code;
	private String name;
	private Double versionInt;
	private String versionStr;
	private String url;
	private String info;
	private Double size;
	private Integer status;
	// Constructors
	/** default constructor */
	public WlyyVersion() {
	}
	@Column(name = "saas_id", length = 100)
	public String getSaasId() {
		return this.saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@Column(name = "code", nullable = false, length = 50)
	public String getCode() {
		return this.code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@Column(name = "name", nullable = false, length = 10)
	public String getName() {
		return this.name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(name = "version_int", precision = 22, scale = 0)
	public Double getVersionInt() {
		return this.versionInt;
	}
	public void setVersionInt(Double versionInt) {
		this.versionInt = versionInt;
	}
	@Column(name = "version_str", length = 10)
	public String getVersionStr() {
		return this.versionStr;
	}
	public void setVersionStr(String versionStr) {
		this.versionStr = versionStr;
	}
	@Column(name = "url", length = 300)
	public String getUrl() {
		return this.url;
	}
	public void setUrl(String url) {
		this.url = url;
	}
	@Column(name = "info", length = 1000)
	public String getInfo() {
		return this.info;
	}
	public void setInfo(String info) {
		this.info = info;
	}
	@Column(name = "size", precision = 22, scale = 0)
	public Double getSize() {
		return this.size;
	}
	public void setSize(Double size) {
		this.size = size;
	}
	@Column(name = "status")
	public Integer getStatus() {
		return this.status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
}

common/common-entity/src/main/java/com/yihu/jw/base/wx/WxAccessToken.java

@@ -1,7 +1,8 @@
package com.yihu.jw.base.wx;
import com.yihu.jw.base.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.*;
import java.util.Date;
@@ -15,53 +16,26 @@ public class WxAccessToken extends IdEntity implements java.io.Serializable {
	// Fields
	private String code;//业务code
	private String wechatCode;//关联的微信code 关联表 Wx_Wechat
	private String wechatId;//关联的微信code 关联表 Wx_Wechat
	private String accessToken;//调用微信返回的accesstoken
	private long addTimestamp;//创建时间
	private long expiresIn;//凭证有效时间（秒）
	private Long addTimestamp;//创建时间 秒数
	private Long expiresIn;//凭证有效时间（秒）
	private Date czrq;//操作时间
	private String code;
	/** default constructor */
	public WxAccessToken() {
	}
	/** minimal constructor */
	public WxAccessToken(Long id, String accessToken, long addTimestamp,
			long expiresIn, Date czrq) {
		this.id = id;
		this.accessToken = accessToken;
		this.addTimestamp = addTimestamp;
		this.expiresIn = expiresIn;
		this.czrq = czrq;
	}
	// Constructors
	public WxAccessToken(Long id, String code, String wechatCode, String accessToken, long addTimestamp, Integer expiresIn, Date czrq) {
		this.id = id;
		this.code = code;
		this.wechatCode = wechatCode;
		this.accessToken = accessToken;
		this.addTimestamp = addTimestamp;
		this.expiresIn = expiresIn;
		this.czrq = czrq;
	@Column(name = "wechat_id", length = 64)
	public String getWechatId() {
		return wechatId;
	}
	public String getCode() {
		return code;
	public void setWechatId(String wechatId) {
		this.wechatId = wechatId;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@Column(name = "wechat_code", length = 64)
	public String getWechatCode() {
		return this.wechatCode;
	}
	public void setWechatCode(String wechatCode) {
		this.wechatCode = wechatCode;
	}
	@Column(name = "access_token", nullable = false, length = 300)
	public String getAccessToken() {
@@ -100,4 +74,15 @@ public class WxAccessToken extends IdEntity implements java.io.Serializable {
		this.czrq = czrq;
	}
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	public void setExpiresIn(long expiresIn) {
		this.expiresIn = expiresIn;
	}
}

common/common-entity/src/main/java/com/yihu/jw/base/wx/WxGraphicMessage.java

@@ -1,7 +1,8 @@
package com.yihu.jw.base.wx;
import com.yihu.jw.base.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wx_graphic_message")
public class WxGraphicMessage extends IdEntity implements java.io.Serializable {
public class WxGraphicMessage extends IdEntityWithOperation implements java.io.Serializable {
    private String saasId;
    private String title;//标题
@@ -28,7 +29,6 @@ public class WxGraphicMessage extends IdEntity implements java.io.Serializable {
    }
    public WxGraphicMessage(String code, String title, String description, String url, String picUrl, String createUser, String createUserName, Date createTime, String updateUser, String updateUserName, Date updateTime, String remark, Integer status) {
        this.code = code;
        this.title = title;
        this.description = description;
        this.url = url;

common/common-entity/src/main/java/com/yihu/jw/base/wx/WxMenu.java

@@ -1,7 +1,8 @@
package com.yihu.jw.base.wx;
import com.yihu.jw.base.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -15,12 +16,10 @@ import java.util.List;
 */
@Entity
@Table(name = "wx_menu")
public class WxMenu extends IdEntity implements java.io.Serializable {
public class WxMenu extends IdEntityWithOperation implements java.io.Serializable {
    private String wechatCode;//关联的微信code 关联表 Wx_Wechat
    @Transient
    private String wechatName;
    private String supMenucode;//父菜单id 如果是一级菜单 此字段为空
    private String wechatId;//关联的微信code 关联表 Wx_Wechat
    private String supMenuid;//父菜单id 如果是一级菜单 此字段为空
    private String type;//菜单类型
    private String name;//菜单名称
    private String menuKey;//click等点击类型必须
@@ -32,6 +31,8 @@ public class WxMenu extends IdEntity implements java.io.Serializable {
    private String remark;//备注
    private Integer status; //状态 -1删除 0 冻结 1可用
    @Transient
    private String wechatName;
    @Transient
    private String state;                //children长度为0时    state  “open”表示是子节点，“closed”表示为父节点；
                                         // children长度>0时,    state   “open,closed”表示是节点的打开关闭
@@ -97,22 +98,22 @@ public class WxMenu extends IdEntity implements java.io.Serializable {
        this.status = status;
    }
    @Column(name = "wechat_code", length = 200)
    public String getWechatCode() {
        return this.wechatCode;
    @Column(name = "wechat_id", length = 200)
    public String getWechatId() {
        return this.wechatId;
    }
    public void setWechatCode(String wechatCode) {
        this.wechatCode = wechatCode;
    public void setWechatId(String wechatId) {
        this.wechatId = wechatId;
    }
    @Column(name = "sup_menucode", length = 200)
    public String getSupMenucode() {
        return this.supMenucode;
    @Column(name = "sup_menuid", length = 200)
    public String getSupMenuid() {
        return this.supMenuid;
    }
    public void setSupMenucode(String supMenucode) {
        this.supMenucode = supMenucode;
    public void setSupMenuid(String supMenuid) {
        this.supMenuid = supMenuid;
    }
    @Column(name = "type", length = 20)

common/common-entity/src/main/java/com/yihu/jw/base/wx/WxTemplate.java

@@ -1,6 +1,7 @@
package com.yihu.jw.base.wx;
import com.yihu.jw.base.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,11 +14,11 @@ import java.util.Date;
 */
@Entity
@Table(name = "wx_template")
public class WxTemplate extends IdEntity implements java.io.Serializable {
public class WxTemplate extends IdEntityWithOperation implements java.io.Serializable {
    // Fields
    private String title;//模板标题
    private String wechatCode;//关联的微信code 关联表 Wx_Wechat
    private String wechatId;//关联的微信code 关联表 Wx_Wechat
    @Transient
    private String wechatName;
    private String templateId;//微信模板id
@@ -25,22 +26,6 @@ public class WxTemplate extends IdEntity implements java.io.Serializable {
    private String remark;
    private Integer status;  //状态 -1删除 0 冻结 1可用
    public WxTemplate(String code, String title, String wechatCode, String templateId, String content, String createUser, String createUserName, Date createTime, String updateUser, String updateUserName, Date updateTime, String remark, Integer status) {
        this.code = code;
        this.title = title;
        this.wechatCode = wechatCode;
        this.templateId = templateId;
        this.content = content;
        this.createUser = createUser;
        this.createUserName = createUserName;
        this.createTime = createTime;
        this.updateUser = updateUser;
        this.updateUserName = updateUserName;
        this.updateTime = updateTime;
        this.remark = remark;
        this.status = status;
    }
    /**
     * default constructor
     */
@@ -56,13 +41,13 @@ public class WxTemplate extends IdEntity implements java.io.Serializable {
        this.title = title;
    }
    @Column(name="wechat_code")
    public String getWechatCode() {
        return wechatCode;
    @Column(name="wechat_id")
    public String getWechatId() {
        return wechatId;
    }
    public void setWechatCode(String wechatCode) {
        this.wechatCode = wechatCode;
    public void setWechatId(String wechatId) {
        this.wechatId = wechatId;
    }
    @Column(name="template_id")

common/common-entity/src/main/java/com/yihu/jw/base/wx/WxWechat.java

@@ -1,6 +1,7 @@
package com.yihu.jw.base.wx;
import com.yihu.jw.base.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,7 +17,7 @@ import java.util.Map;
 */
@Entity
@Table(name = "wx_wechat")
public class WxWechat extends IdEntity implements java.io.Serializable {
public class WxWechat extends IdEntityWithOperation implements java.io.Serializable {
    // Fields
    private String saasId;//'saas配置id'
@@ -38,7 +39,6 @@ public class WxWechat extends IdEntity implements java.io.Serializable {
    private String state;
    public WxWechat(String code, String saasId, String name, String token, String encodingAesKey, Integer encType, Integer status, String type, String appId, String appSecret, String baseUrl, String createUser, String createUserName, Date createTime, String updateUser, String updateUserName, Date updateTime, String remark) {
        this.code = code;
        this.saasId = saasId;
        this.name = name;
        this.token = token;

common/common-entity/src/main/java/com/yihu/jw/wlyy/IdEntity.java

@@ -1,38 +0,0 @@
/*******************************************************************************
 * Copyright (c) 2005, 2014 springside.github.io
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.jw.wlyy;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
import java.io.Serializable;
/**
 * 统一定义id的entity基类.
 * 
 * 基类统一定义id的属性名称、数据类型、列名映射及生成策略.
 * Oracle需要每个Entity独立定义id的SEQUCENCE时，不继承于本类而改为实现一个Idable的接口。
 * 
 * @author calvin
 */
// JPA 基类的标识
@MappedSuperclass
public abstract class IdEntity implements Serializable {
	private static final long serialVersionUID = 3673803562328635206L;
	protected Long id;  // 非业务主键
	@Id
	@GeneratedValue(strategy = GenerationType.IDENTITY)
	public Long getId() {
		return id;
	}
	public void setId(Long id) {
		this.id = id;
	}
}

common/common-entity/src/main/java/com/yihu/jw/wlyy/agreement/WlyyAgreement.java

@@ -3,7 +3,8 @@ package com.yihu.jw.wlyy.agreement;
import com.yihu.jw.wlyy.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -17,49 +18,22 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_agreement")
public class WlyyAgreement extends IdEntity implements Serializable{
public class WlyyAgreement extends IdEntityWithOperation implements Serializable{
    private static final long serialVersionUID = -4343130835307199266L;
    private String code;//业务code
    private String saasId;
    private String name;//套餐名称
    private BigDecimal price;//套餐价格
    private String posterPic;//海报图
    private String remark;//描述
    private String type;//类型
    private Date createTime;
    private Date updateTime;
    private Integer status;//状态 -1删除 0 冻结 1可用
    private String createUser;
    public WlyyAgreement(String code, String parentCode, String saasId, String name, BigDecimal price, String posterPic, String remark, String type, Date createTime, Date updateTime, Integer status, String createUser) {
        this.code = code;
        this.saasId = saasId;
        this.name = name;
        this.price = price;
        this.posterPic = posterPic;
        this.remark = remark;
        this.type = type;
        this.createTime = createTime;
        this.updateTime = updateTime;
        this.status = status;
        this.createUser = createUser;
    }
    public WlyyAgreement(){
    }
    @Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
@@ -114,23 +88,6 @@ public class WlyyAgreement extends IdEntity implements Serializable{
        this.type = type;
    }
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @Column(name = "update_time")
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    @Column(name = "status")
    public Integer getStatus() {
@@ -140,13 +97,4 @@ public class WlyyAgreement extends IdEntity implements Serializable{
    public void setStatus(Integer status) {
        this.status = status;
    }
    @Column(name = "create_user")
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
}

common/common-entity/src/main/java/com/yihu/jw/wlyy/agreement/WlyyAgreementKpi.java

@@ -2,7 +2,8 @@ package com.yihu.jw.wlyy.agreement;
import com.yihu.jw.wlyy.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -14,8 +15,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_agreement_kpi")
public class WlyyAgreementKpi extends IdEntity {
    private String code;//业务code
public class WlyyAgreementKpi extends IdEntityWithOperation {
    private String saasId;//saasId
    private String agreementCode;//套餐代码
    private String kpiName;//服务项名称
@@ -24,9 +24,6 @@ public class WlyyAgreementKpi extends IdEntity {
    private Integer status;//状态  -1删除 0 冻结 1可用
    private String kpiContent;//服务内容描述
    private String keyword;//关键字
    private Date createTime;
    private String createUser;
    private Date updaateTime;
    @Column(name="saas_id")
    public String getSaasId() {
@@ -46,14 +43,6 @@ public class WlyyAgreementKpi extends IdEntity {
        this.agreementCode = agreementCode;
    }
    @Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name = "kpi_name")
    public String getKpiName() {
@@ -108,31 +97,4 @@ public class WlyyAgreementKpi extends IdEntity {
    public void setKeyword(String keyword) {
        this.keyword = keyword;
    }
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @Column(name = "create_user")
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    @Column(name = "updaate_time")
    public Date getUpdaateTime() {
        return updaateTime;
    }
    public void setUpdaateTime(Date updaateTime) {
        this.updaateTime = updaateTime;
    }
}

common/common-entity/src/main/java/com/yihu/jw/wlyy/agreement/WlyyAgreementKpiLog.java

@@ -1,7 +1,10 @@
package com.yihu.jw.wlyy.agreement;
import com.yihu.jw.wlyy.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,26 +19,21 @@ import java.util.Date;
public class WlyyAgreementKpiLog extends IdEntity {
    private static final long serialVersionUID = -3196907595969778396L;
    private String code;//业务code
    private String saasId;
    private String patientCode;//患者code
    private String signCode;
    private String kpiCode;
    private String agreementCode;//套餐代码
    private String kpiName;//服务项名称
    private Date createTime;
    private String createUser;
    @CreatedDate
    @Column(name = "create_time", nullable = false, length = 0,updatable = false)
    protected Date createTime;
    @Column(name = "code")
    public String getCode() {
        return code;
    }
    @CreatedBy
    @Column(name = "create_user",updatable = false)
    protected String createUser;
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name="saas_id")
    public String getSaasId() {
@@ -91,7 +89,6 @@ public class WlyyAgreementKpiLog extends IdEntity {
        this.kpiName = kpiName;
    }
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
@@ -100,7 +97,6 @@ public class WlyyAgreementKpiLog extends IdEntity {
        this.createTime = createTime;
    }
    @Column(name = "create_user")
    public String getCreateUser() {
        return createUser;
    }
@@ -108,5 +104,4 @@ public class WlyyAgreementKpiLog extends IdEntity {
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
}

common/common-entity/src/main/java/com/yihu/jw/wlyy/agreement/WlyySignFamily.java

@@ -1,7 +1,8 @@
package com.yihu.jw.wlyy.agreement;
import com.yihu.jw.wlyy.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,11 +14,9 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_sign_family")
public class WlyySignFamily extends IdEntity {
public class WlyySignFamily extends IdEntityWithOperation {
    private static final long serialVersionUID = -6759565631854462880L;
    private String code;//业务code
    private String saasId;
    private int type;//签约类型：1三师签约，2家庭签约
    private String patient;//患者标识
@@ -66,14 +65,6 @@ public class WlyySignFamily extends IdEntity {
    private String criticalPeopleMobile;//紧急联系人电话
    private String criticalPeople;//紧急联系人
    @Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name="saas_id")
    public String getSaasId() {

common/common-entity/src/main/java/com/yihu/jw/wlyy/doctor/Doctors.java

@@ -2,22 +2,24 @@ package com.yihu.jw.wlyy.doctor;
import com.yihu.jw.wlyy.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by Administrator on 2017/6/7 0007.
 */
@Entity
public class Doctors extends IdEntity {
@Table(name = "base_doctors")
public class BaseDoctors extends IdEntityWithOperation {
    private static final long serialVersionUID = 3138130150854187709L;
    private String userId;//云平台用户ID
    private String code;//业务code
    private String name;//姓名
    private String pyCode;//姓名首字母
    private String sex;//性别(1男,2女)
@@ -35,8 +37,6 @@ public class Doctors extends IdEntity {
    private String xlzc;//学历职称
    private String xzzc;//行政职称
    private Integer status;//状态:-1 删除 0 禁用 1可用
    private Date createTime;//
    private Date updateTime;
    @Column(name = "user_id")
@@ -48,15 +48,6 @@ public class Doctors extends IdEntity {
        this.userId = userId;
    }
    @Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    
    @Column(name = "name")
    public String getName() {
@@ -227,24 +218,5 @@ public class Doctors extends IdEntity {
        this.status = status;
    }
    
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    
    @Column(name = "update_time")
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
}

common/common-entity/src/main/java/com/yihu/jw/wlyy/doctor/BaseOrg.java

@@ -0,0 +1,286 @@
package com.yihu.jw.wlyy.doctor;// default package
import com.yihu.jw.IdEntityWithOperation;
import java.sql.Timestamp;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
 * BaseOrg entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_org")
public class BaseOrg extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
	private String province;
	private String provinceName;
	private String city;
	private String cityName;
	private String town;
	private String townName;
	private String name;
	private String alias;
	private String spell;
	private String type;
	private String address;
	private String traffic;
	private String photo;
	private String saasId;
	private String longitude;
	private String latitude;
	private String legalperson;
	private String parentCode;
	private String combinationCode;
	private String orgUrl;
	private String del;
	private String intro;
	// Constructors
	/** default constructor */
	public BaseOrg() {
	}
	/** full constructor */
	public BaseOrg(String id, String province, String provinceName,
			String city, String cityName, String town, String townName,
			String name, String alias, String spell, String type,
			String address, String traffic, String photo, String saasId,
			String longitude, String latitude, String legalperson,
			String parentCode, String combinationCode, String orgUrl,
			String del, String intro, Timestamp createTime, Timestamp updateTime) {
		this.id = id;
		this.province = province;
		this.provinceName = provinceName;
		this.city = city;
		this.cityName = cityName;
		this.town = town;
		this.townName = townName;
		this.name = name;
		this.alias = alias;
		this.spell = spell;
		this.type = type;
		this.address = address;
		this.traffic = traffic;
		this.photo = photo;
		this.saasId = saasId;
		this.longitude = longitude;
		this.latitude = latitude;
		this.legalperson = legalperson;
		this.parentCode = parentCode;
		this.combinationCode = combinationCode;
		this.orgUrl = orgUrl;
		this.del = del;
		this.intro = intro;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(name = "province", length = 50)
	public String getProvince() {
		return this.province;
	}
	public void setProvince(String province) {
		this.province = province;
	}
	@Column(name = "province_name", length = 50)
	public String getProvinceName() {
		return this.provinceName;
	}
	public void setProvinceName(String provinceName) {
		this.provinceName = provinceName;
	}
	@Column(name = "city", length = 50)
	public String getCity() {
		return this.city;
	}
	public void setCity(String city) {
		this.city = city;
	}
	@Column(name = "city_name", length = 50)
	public String getCityName() {
		return this.cityName;
	}
	public void setCityName(String cityName) {
		this.cityName = cityName;
	}
	@Column(name = "town", length = 50)
	public String getTown() {
		return this.town;
	}
	public void setTown(String town) {
		this.town = town;
	}
	@Column(name = "town_name", length = 50)
	public String getTownName() {
		return this.townName;
	}
	public void setTownName(String townName) {
		this.townName = townName;
	}
	@Column(name = "name", length = 100)
	public String getName() {
		return this.name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(name = "alias", length = 10)
	public String getAlias() {
		return this.alias;
	}
	public void setAlias(String alias) {
		this.alias = alias;
	}
	@Column(name = "spell", length = 20)
	public String getSpell() {
		return this.spell;
	}
	public void setSpell(String spell) {
		this.spell = spell;
	}
	@Column(name = "type", length = 2)
	public String getType() {
		return this.type;
	}
	public void setType(String type) {
		this.type = type;
	}
	@Column(name = "address", length = 300)
	public String getAddress() {
		return this.address;
	}
	public void setAddress(String address) {
		this.address = address;
	}
	@Column(name = "traffic", length = 500)
	public String getTraffic() {
		return this.traffic;
	}
	public void setTraffic(String traffic) {
		this.traffic = traffic;
	}
	@Column(name = "photo", length = 200)
	public String getPhoto() {
		return this.photo;
	}
	public void setPhoto(String photo) {
		this.photo = photo;
	}
	@Column(name = "saas_id", length = 100)
	public String getSaasId() {
		return this.saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@Column(name = "longitude", length = 10)
	public String getLongitude() {
		return this.longitude;
	}
	public void setLongitude(String longitude) {
		this.longitude = longitude;
	}
	@Column(name = "latitude", length = 10)
	public String getLatitude() {
		return this.latitude;
	}
	public void setLatitude(String latitude) {
		this.latitude = latitude;
	}
	@Column(name = "legalperson", length = 50)
	public String getLegalperson() {
		return this.legalperson;
	}
	public void setLegalperson(String legalperson) {
		this.legalperson = legalperson;
	}
	@Column(name = "parent_code", length = 100)
	public String getParentCode() {
		return this.parentCode;
	}
	public void setParentCode(String parentCode) {
		this.parentCode = parentCode;
	}
	@Column(name = "combination_code", length = 100)
	public String getCombinationCode() {
		return this.combinationCode;
	}
	public void setCombinationCode(String combinationCode) {
		this.combinationCode = combinationCode;
	}
	@Column(name = "org_url", length = 200)
	public String getOrgUrl() {
		return this.orgUrl;
	}
	public void setOrgUrl(String orgUrl) {
		this.orgUrl = orgUrl;
	}
	@Column(name = "del", length = 1)
	public String getDel() {
		return this.del;
	}
	public void setDel(String del) {
		this.del = del;
	}
	@Column(name = "intro", length = 65535)
	public String getIntro() {
		return this.intro;
	}
	public void setIntro(String intro) {
		this.intro = intro;
	}
}

common/common-entity/src/main/java/com/yihu/jw/wlyy/doctor/BaseOrgDept.java

@@ -0,0 +1,136 @@
package com.yihu.jw.wlyy.doctor;// default package
import com.yihu.jw.IdEntityWithOperation;
import java.sql.Timestamp;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
 * BaseOrgDept entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_org_dept")
public class BaseOrgDept extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
	private String orgId;
	private String parentId;
	private String name;
	private String spell;
	private String del;
	private String bigdepartmentSn;
	private String deptTel;
	private String gloryName;
	private String intro;
	private String floor;
	private Integer sort;
	// Constructors
	/** default constructor */
	public BaseOrgDept() {
	}
	@Column(name = "org_id", nullable = false, length = 100)
	public String getOrgId() {
		return this.orgId;
	}
	public void setOrgId(String orgId) {
		this.orgId = orgId;
	}
	@Column(name = "parent_id", nullable = false, length = 100)
	public String getParentId() {
		return this.parentId;
	}
	public void setParentId(String parentId) {
		this.parentId = parentId;
	}
	@Column(name = "name", nullable = false, length = 50)
	public String getName() {
		return this.name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(name = "spell", length = 20)
	public String getSpell() {
		return this.spell;
	}
	public void setSpell(String spell) {
		this.spell = spell;
	}
	@Column(name = "del", length = 1)
	public String getDel() {
		return this.del;
	}
	public void setDel(String del) {
		this.del = del;
	}
	@Column(name = "bigdepartment_sn", length = 22)
	public String getBigdepartmentSn() {
		return this.bigdepartmentSn;
	}
	public void setBigdepartmentSn(String bigdepartmentSn) {
		this.bigdepartmentSn = bigdepartmentSn;
	}
	@Column(name = "dept_tel", length = 30)
	public String getDeptTel() {
		return this.deptTel;
	}
	public void setDeptTel(String deptTel) {
		this.deptTel = deptTel;
	}
	@Column(name = "glory_name", length = 500)
	public String getGloryName() {
		return this.gloryName;
	}
	public void setGloryName(String gloryName) {
		this.gloryName = gloryName;
	}
	@Column(name = "intro", length = 1000)
	public String getIntro() {
		return this.intro;
	}
	public void setIntro(String intro) {
		this.intro = intro;
	}
	@Column(name = "floor", length = 20)
	public String getFloor() {
		return this.floor;
	}
	public void setFloor(String floor) {
		this.floor = floor;
	}
	@Column(name = "sort")
	public Integer getSort() {
		return this.sort;
	}
	public void setSort(Integer sort) {
		this.sort = sort;
	}
}

common/common-entity/src/main/java/com/yihu/jw/wlyy/doctor/BaseOrgHospital.java

@@ -2,7 +2,8 @@ package com.yihu.jw.wlyy.doctor;
import com.yihu.jw.wlyy.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,38 +14,25 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_org_hospital")
public class BaseOrgHospital extends IdEntity {
public class BaseOrgHospital extends IdEntityWithOperation {
    private static final long serialVersionUID = 5463913446686402252L;
    private String code;//业务code
    private String orgCode;//
    private String orgId;//
    private String roadCode;
    private String centerSite;
    private String ascriptionType;
    private String levelId;
    private String levelName;
    
    
    @Column(name = "code")
    public String getCode() {
        return code;
    @Column(name = "org_id")
    public String getOrgId() {
        return orgId;
    }
    public void setCode(String code) {
        this.code = code;
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
    
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    
    @Column(name = "road_code")

common/common-entity/src/main/java/com/yihu/jw/wlyy/patient/BasePatient.java

@@ -1,6 +1,7 @@
package com.yihu.jw.wlyy.patient;
import com.yihu.jw.wlyy.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,11 +14,10 @@ import java.sql.Date;
 */
@Entity
@Table(name = "base_patient")
public class BasePatient extends IdEntity implements Serializable {
public class BasePatient extends IdEntityWithOperation implements Serializable {
    private static final long serialVersionUID = -5371957917251091855L;
    private String code;//业务code
    private String accountCode;//关联wlyy_login_account账号code
    private String accountId;//关联wlyy_login_account账号id
    private String idcard;//身份证
    private String name;//姓名
    private Date birthday;//生日
@@ -36,32 +36,21 @@ public class BasePatient extends IdEntity implements Serializable {
    private String streetName;//街道名称
    private String address;//详细地址
    private Integer status;//用户状态：1正常，0禁用，-1恶意注册，2审核中
    private Date updateTime;//更新时间
    private Date createTime;//创建时间
    private String saasId;//saas配置id
    private String email;//邮箱
    private String nation;//籍贯
    private String spell;//名称拼音首字母
    
    @Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    @Column(name = "account_id")
    public String getAccountId() {
        return accountId;
    }
    
    @Column(name = "account_code")
    public String getAccountCode() {
        return accountCode;
    public void setAccountId(String accountId) {
        this.accountId = accountId;
    }
    public void setAccountCode(String accountCode) {
        this.accountCode = accountCode;
    }
    
    @Column(name = "idcard")
@@ -244,26 +233,6 @@ public class BasePatient extends IdEntity implements Serializable {
    }
    
    @Column(name = "update_time")
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    
    @Column(name = "saas_id")
    public String getSaasId() {
        return saasId;

common/common-entity/src/main/java/com/yihu/jw/wlyy/patient/BasePatientExtend.java

@@ -0,0 +1,157 @@
package com.yihu.jw.wlyy.patient;// default package
import com.yihu.jw.IdEntityWithOperation;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
 * BasePatientExtend entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_patient_extend")
public class BasePatientExtend extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
	private String id;
	private String patientId;
	private Date entryDate;
	private String workState;
	private Date workStateTime;
	private String jobNumber;
	private String companyId;
	private String companyName;
	private String companyEmail;
	private String remark;
	// Constructors
	/** default constructor */
	public BasePatientExtend() {
	}
	/** minimal constructor */
	public BasePatientExtend(String id, Date entryDate,
			Date workStateTime, Date createTime, Date updateTime) {
		this.id = id;
		this.entryDate = entryDate;
		this.workStateTime = workStateTime;
	}
	/** full constructor */
	public BasePatientExtend(String id, String patientId, Date entryDate,
			String workState, Date workStateTime, String jobNumber,
			String companyId, String companyName, String companyEmail,
			String remark, String createUser, String createUserName,
			Date createTime, String updateUser, String updateUserName,
			Date updateTime) {
		this.id = id;
		this.patientId = patientId;
		this.entryDate = entryDate;
		this.workState = workState;
		this.workStateTime = workStateTime;
		this.jobNumber = jobNumber;
		this.companyId = companyId;
		this.companyName = companyName;
		this.companyEmail = companyEmail;
		this.remark = remark;
	}
	// Property accessors
	@Id
	@Column(name = "id", unique = true, nullable = false, length = 50)
	public String getId() {
		return this.id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(name = "patient_id", length = 100)
	public String getPatientId() {
		return this.patientId;
	}
	public void setPatientId(String patientId) {
		this.patientId = patientId;
	}
	@Column(name = "entry_date", nullable = false, length = 0)
	public Date getEntryDate() {
		return this.entryDate;
	}
	public void setEntryDate(Date entryDate) {
		this.entryDate = entryDate;
	}
	@Column(name = "work_state", length = 2)
	public String getWorkState() {
		return this.workState;
	}
	public void setWorkState(String workState) {
		this.workState = workState;
	}
	@Column(name = "work_state_time", nullable = false, length = 0)
	public Date getWorkStateTime() {
		return this.workStateTime;
	}
	public void setWorkStateTime(Date workStateTime) {
		this.workStateTime = workStateTime;
	}
	@Column(name = "job_number", length = 20)
	public String getJobNumber() {
		return this.jobNumber;
	}
	public void setJobNumber(String jobNumber) {
		this.jobNumber = jobNumber;
	}
	@Column(name = "company_id", length = 100)
	public String getCompanyId() {
		return this.companyId;
	}
	public void setCompanyId(String companyId) {
		this.companyId = companyId;
	}
	@Column(name = "company_name", length = 30)
	public String getCompanyName() {
		return this.companyName;
	}
	public void setCompanyName(String companyName) {
		this.companyName = companyName;
	}
	@Column(name = "company_email", length = 50)
	public String getCompanyEmail() {
		return this.companyEmail;
	}
	public void setCompanyEmail(String companyEmail) {
		this.companyEmail = companyEmail;
	}
	@Column(name = "remark", length = 2000)
	public String getRemark() {
		return this.remark;
	}
	public void setRemark(String remark) {
		this.remark = remark;
	}
}

common/common-entity/src/main/java/com/yihu/jw/wlyy/patient/BasePatientWechat.java

@@ -0,0 +1,124 @@
package com.yihu.jw.wlyy.patient;// default package
import com.yihu.jw.IdEntity;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
 * BasePatientWechat entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_patient_wechat")
public class BasePatientWechat extends IdEntity implements java.io.Serializable {
    // Fields
    private String id;
    private String saasId;
    private String wechatId;
    private String patientId;
    private String openid;
    private String unionid;
    private Date createTime;
    // Constructors
    /**
     * default constructor
     */
    public BasePatientWechat() {
    }
    /**
     * minimal constructor
     */
    public BasePatientWechat(String id, Date createTime) {
        this.id = id;
        this.createTime = createTime;
    }
    /**
     * full constructor
     */
    public BasePatientWechat(String id, String saasId, String wechatId,
                             String patientId, String openid, String unionid,
                             Date createTime) {
        this.id = id;
        this.saasId = saasId;
        this.wechatId = wechatId;
        this.patientId = patientId;
        this.openid = openid;
        this.unionid = unionid;
        this.createTime = createTime;
    }
    // Property accessors
    @Id
    @Column(name = "id", unique = true, nullable = false, length = 50)
    public String getId() {
        return this.id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(name = "saas_id", length = 64)
    public String getSaasId() {
        return this.saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    @Column(name = "wechat_id", length = 10)
    public String getWechatId() {
        return this.wechatId;
    }
    public void setWechatId(String wechatId) {
        this.wechatId = wechatId;
    }
    @Column(name = "patient_id", length = 100)
    public String getPatientId() {
        return this.patientId;
    }
    public void setPatientId(String patientId) {
        this.patientId = patientId;
    }
    @Column(name = "openid", length = 50)
    public String getOpenid() {
        return this.openid;
    }
    public void setOpenid(String openid) {
        this.openid = openid;
    }
    @Column(name = "unionid", length = 50)
    public String getUnionid() {
        return this.unionid;
    }
    public void setUnionid(String unionid) {
        this.unionid = unionid;
    }
    @Column(name = "create_time", nullable = false, length = 0)
    public Date getCreateTime() {
        return this.createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

common/common-entity/src/main/java/com/yihu/jw/wlyy/patient/WlyyAdvertisement.java

@@ -1,7 +1,8 @@
package com.yihu.jw.wlyy.patient;
import com.yihu.jw.wlyy.IdEntity;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -14,33 +15,18 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_advertisement")
public class WlyyAdvertisement extends IdEntity implements Serializable {
public class WlyyAdvertisement extends IdEntityWithOperation implements Serializable {
    private static final long serialVersionUID = 1497635003375865515L;
    private String code;//业务code
    private String saasId;//0,为默认广告
    private String name;//名称
    private String picture;//展示的图片
    private String url;//链接
    private Integer sort;//排序( 数字越小排越前面)
    private Integer status;//状态 -1 删除 0 禁用 1可用
    private String createUser;//创建人
    private String createUserName;////创建人名
    private Date createTime;//创建时间
    private String updateUser;//修改人
    private String updateUserName;//修改人名
    private Date updateTime;//修改时间
    private String remark;//备注
    
    @Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    
    @Column(name = "saas_id")
@@ -103,66 +89,6 @@ public class WlyyAdvertisement extends IdEntity implements Serializable {
    }
    
    @Column(name = "create_user")
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    
    @Column(name = "create_user_name")
    public String getCreateUserName() {
        return createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
    
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    
    @Column(name = "update_user")
    public String getUpdateUser() {
        return updateUser;
    }
    public void setUpdateUser(String updateUser) {
        this.updateUser = updateUser;
    }
    
    @Column(name = "update_user_name")
    public String getUpdateUserName() {
        return updateUserName;
    }
    public void setUpdateUserName(String updateUserName) {
        this.updateUserName = updateUserName;
    }
    
    @Column(name = "update_time")
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    
    @Column(name = "remark")
    public String getRemark() {
        return remark;

svr/svr-base/src/main/java/com/yihu/jw/business/version/controller/UserVersionController.java

@@ -0,0 +1,7 @@
package com.yihu.jw.business.version.controller;
/**
 * Created by chenweida on 2017/11/10.
 */
public class UserVersionController {
}

svr/svr-base/src/main/java/com/yihu/jw/business/version/service/UserVersionService.java

@@ -0,0 +1,7 @@
package com.yihu.jw.business.version.service;
/**
 * Created by chenweida on 2017/11/10.
 */
public class UserVersionService {
}