项目结构

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

@@ -19,13 +19,14 @@ import java.io.Serializable;
// JPA 基类的标识
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
public abstract class IdEntity implements Serializable {
public abstract class UuidIdentityEntity implements Serializable {
	protected String id;  // 非业务主键
	@Id
	@GeneratedValue(generator = "uuid")
	@GenericGenerator(name = "uuid", strategy = "uuid")
	protected String id;  // 非业务主键
	public String getId() {
		return id;
	}

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

@@ -26,36 +26,21 @@ import java.util.Date;
// JPA 基类的标识
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
public abstract class IdEntityWithOperation extends IdEntity{
	@CreatedDate
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@Column(name = "create_time", nullable = false, length = 0,updatable = false)
public abstract class UuidIdentityEntityWithOperation extends UuidIdentityEntity {
    //创建时间
	protected Date createTime;
	@CreatedBy
	@Column(name = "create_user",updatable = false)
	//创建者
	protected String createUser;
	@CreatedBy
	@Column(name = "create_user_name",updatable = false)
	protected String createUserName;
	@LastModifiedDate
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@Column(name = "update_time", nullable = false, length = 0)
	//更新时间
	protected Date updateTime;
	@LastModifiedBy
	@Column(name = "update_user")
	//更新者
	protected String updateUser;
	@LastModifiedBy
	@Column(name = "update_user_name")
	protected String updateUserName;
	@CreatedDate
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@Column(name = "create_time", nullable = false, length = 0,updatable = false)
	public Date getCreateTime() {
		return createTime;
	}
@@ -64,6 +49,8 @@ public abstract class IdEntityWithOperation extends IdEntity{
		this.createTime = createTime;
	}
	@CreatedBy
	@Column(name = "create_user",updatable = false)
	public String getCreateUser() {
		return createUser;
	}
@@ -72,6 +59,8 @@ public abstract class IdEntityWithOperation extends IdEntity{
		this.createUser = createUser;
	}
	@CreatedBy
	@Column(name = "create_user_name",updatable = false)
	public String getCreateUserName() {
		return createUserName;
	}
@@ -80,6 +69,9 @@ public abstract class IdEntityWithOperation extends IdEntity{
		this.createUserName = createUserName;
	}
	@LastModifiedDate
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@Column(name = "update_time", nullable = false, length = 0)
	public Date getUpdateTime() {
		return updateTime;
	}
@@ -88,6 +80,8 @@ public abstract class IdEntityWithOperation extends IdEntity{
		this.updateTime = updateTime;
	}
	@LastModifiedBy
	@Column(name = "update_user")
	public String getUpdateUser() {
		return updateUser;
	}
@@ -96,6 +90,8 @@ public abstract class IdEntityWithOperation extends IdEntity{
		this.updateUser = updateUser;
	}
	@LastModifiedBy
	@Column(name = "update_user_name")
	public String getUpdateUserName() {
		return updateUserName;
	}
@@ -103,5 +99,4 @@ public abstract class IdEntityWithOperation extends IdEntity{
	public void setUpdateUserName(String updateUserName) {
		this.updateUserName = updateUserName;
	}
}

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

@@ -1,98 +0,0 @@
package com.yihu.jw.base.base;// default package
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.ArrayList;
import java.util.List;
/**
 * WlyyModule entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_module")
public class ModuleDO extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
	private String name; //模块名称
	private String saasId; //关联 Saas code
	private String parentId;//父id
	private Integer status; //-1 删除 0 禁用 可用
	private String remark;
	@Transient
	private String state ;   //closed:表示有子节点   open:表示没有子节点
	@Transient
	private List<ModuleDO> children = new ArrayList<>();
	// Constructors
	/** default constructor */
	public ModuleDO() {
	}
	@Column(name = "name", length = 200)
	public String getName() {
		return this.name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(name = "saas_id", length = 100)
	public String getSaasId() {
		return this.saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@Column(name = "parent_id", length = 100)
	public String getParentId() {
		return parentId;
	}
	public void setParentId(String parentId) {
		this.parentId = parentId;
	}
	@Column(name = "status", precision = 2, scale = 0)
	public Integer getStatus() {
		return this.status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
	@Column(name = "remark", length = 1000)
	public String getRemark() {
		return this.remark;
	}
	public void setRemark(String remark) {
		this.remark = remark;
	}
	public String getState() {
		return state;
	}
	public void setState(String state) {
		this.state = state;
	}
	public List<ModuleDO> getChildren() {
		return children;
	}
	public void setChildren(List<ModuleDO> children) {
		this.children = children;
	}
}

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

@@ -1,63 +0,0 @@
package com.yihu.jw.base.base;// default package
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * WlyySaas entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_saas")
public class SaasDO extends IdEntityWithOperation {
	// Fields
	private String name;//名称
	private Integer status;//状态 -1 已删除 0待审核 1审核通过 2 审核不通过
	private String remark;//备注
	private String familyTel; //电话号码
	// Constructors
	/** default constructor */
	public SaasDO() {
	}
	@Column(name = "name", length = 200)
	public String getName() {
		return this.name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(name = "status", precision = 2, scale = 0)
	public Integer getStatus() {
		return this.status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
	@Column(name = "remark", length = 1000)
	public String getRemark() {
		return this.remark;
	}
	public void setRemark(String remark) {
		this.remark = remark;
	}
	@Column(name = "family_tel", length = 100)
	public String getFamilyTel() {
		return familyTel;
	}
	public void setFamilyTel(String familyTel) {
		this.familyTel = familyTel;
	}
}

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

@@ -1,86 +0,0 @@
package com.yihu.jw.base.base;// default package
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * SystemDict entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "system_dict")
public class SystemDictDO extends IdEntity implements java.io.Serializable {
	// Fields
	private String saasId;
	private String dictName;
	private String code;
	private String value;
	private String pyCode;
	private Integer sort;
	// Constructors
	/** default constructor */
	public SystemDictDO() {
	}
	@Column(name = "saas_id", length = 100)
	public String getSaasId() {
		return this.saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@Column(name = "dict_name", nullable = false, length = 50)
	public String getDictName() {
		return this.dictName;
	}
	public void setDictName(String dictName) {
		this.dictName = dictName;
	}
	@Column(name = "code", nullable = false, length = 50)
	public String getCode() {
		return this.code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@Column(name = "value", nullable = false, length = 50)
	public String getValue() {
		return this.value;
	}
	public void setValue(String value) {
		this.value = value;
	}
	@Column(name = "py_code", length = 50)
	public String getPyCode() {
		return this.pyCode;
	}
	public void setPyCode(String pyCode) {
		this.pyCode = pyCode;
	}
	@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/base/base/SystemDictListDO.java

@@ -1,111 +0,0 @@
package com.yihu.jw.base.base;// default package
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * SystemDictList entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "system_dict_list")
public class SystemDictListDO extends IdEntity implements java.io.Serializable {
	// Fields
	private String dictName;
	private String chineseName;
	private String pyCode;
	private String pid;
	private String remark;
	private String relationTable;
	private String relationColCode;
	private String relationColValue;
	private String relationColExtend;
	@Column(name = "dict_name", nullable = false, length = 50)
	public String getDictName() {
		return this.dictName;
	}
	public void setDictName(String dictName) {
		this.dictName = dictName;
	}
	@Column(name = "chinese_name", nullable = false, length = 50)
	public String getChineseName() {
		return this.chineseName;
	}
	public void setChineseName(String chineseName) {
		this.chineseName = chineseName;
	}
	@Column(name = "py_code", length = 50)
	public String getPyCode() {
		return this.pyCode;
	}
	public void setPyCode(String pyCode) {
		this.pyCode = pyCode;
	}
	@Column(name = "pid", nullable = false, length = 50)
	public String getPid() {
		return this.pid;
	}
	public void setPid(String pid) {
		this.pid = pid;
	}
	@Column(name = "remark", length = 200)
	public String getRemark() {
		return this.remark;
	}
	public void setRemark(String remark) {
		this.remark = remark;
	}
	@Column(name = "relation_table", length = 50)
	public String getRelationTable() {
		return this.relationTable;
	}
	public void setRelationTable(String relationTable) {
		this.relationTable = relationTable;
	}
	@Column(name = "relation_col_code", length = 50)
	public String getRelationColCode() {
		return this.relationColCode;
	}
	public void setRelationColCode(String relationColCode) {
		this.relationColCode = relationColCode;
	}
	@Column(name = "relation_col_value", length = 50)
	public String getRelationColValue() {
		return this.relationColValue;
	}
	public void setRelationColValue(String relationColValue) {
		this.relationColValue = relationColValue;
	}
	@Column(name = "relation_col_extend", length = 50)
	public String getRelationColExtend() {
		return this.relationColExtend;
	}
	public void setRelationColExtend(String relationColExtend) {
		this.relationColExtend = relationColExtend;
	}
}

common/common-entity/src/main/java/com/yihu/jw/entity/archives/PatientArchivesDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.entity.archives;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_patient_archives")
public class PatientArchivesDO extends IdEntityWithOperation implements Serializable {
public class PatientArchivesDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId; //saasid
    @Column(name = "patient_code")

common/common-entity/src/main/java/com/yihu/jw/entity/archives/PatientArchivesInfoDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.entity.archives;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_patient_archives_info")
public class PatientArchivesInfoDO extends IdEntityWithOperation implements Serializable {
public class PatientArchivesInfoDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId; //saasid

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

@@ -1,8 +1,7 @@
package com.yihu.jw.base.base;// default package
package com.yihu.jw.entity.base.function;// default package
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,7 +15,7 @@ import java.util.List;
 */
@Entity
@Table(name = "base_function")
public class FunctionDO extends IdEntityWithOperation implements java.io.Serializable {
public class FunctionDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
    // Fields
@@ -26,9 +25,7 @@ public class FunctionDO extends IdEntityWithOperation implements java.io.Seriali
    private String parentCode; //父功能code
    private Integer status; //状态 -1 删除 0 禁用 可用
    private String remark; //备注
    @Transient
    private List<FunctionDO> children = new ArrayList<>();
    @Transient
    private String text;//用于jstree显示
    // Constructors
@@ -91,6 +88,7 @@ public class FunctionDO extends IdEntityWithOperation implements java.io.Seriali
        this.url = url;
    }
    @Transient
    public List<FunctionDO> getChildren() {
        return children;
    }
@@ -99,6 +97,7 @@ public class FunctionDO extends IdEntityWithOperation implements java.io.Seriali
        this.children = children;
    }
    @Transient
    public String getText() {
        return name;
    }

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

@@ -1,9 +1,7 @@
package com.yihu.jw.base.login;// default package
package com.yihu.jw.entity.base.login;// default package
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import org.springframework.data.annotation.CreatedBy;
import com.yihu.jw.UuidIdentityEntity;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
@@ -17,7 +15,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "base_login_account")
public class BaseLoginAccountDO extends IdEntity implements java.io.Serializable {
public class BaseLoginAccountDO extends UuidIdentityEntity implements java.io.Serializable {
	private String userName;//'账号
	private String userType;//'用户类型 1居民 2医生 或者行政管理员'

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

@@ -1,8 +1,7 @@
package com.yihu.jw.base.login;// default package
package com.yihu.jw.entity.base.login;// default package
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntity;
import javax.persistence.*;
import java.util.Date;
@@ -12,7 +11,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "base_login_log")
public class BaseLoginLogDO extends IdEntity implements java.io.Serializable {
public class BaseLoginLogDO extends UuidIdentityEntity implements java.io.Serializable {
	private String loginType;//'1 短信登录  2 密码登录'
	private String userId;//'登录用户主键 患者code或者医生code'

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

@@ -0,0 +1,32 @@
package com.yihu.jw.entity.base.message;
import com.yihu.jw.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by progr1mmer on 2018/8/14.
 */@Entity
@Table(name = "base_message")
public class Message extends UuidIdentityEntity {
    private String topic; //消息主题
    private String template; //消息模板
    public String getTopic() {
        return topic;
    }
    public void setTopic(String topic) {
        this.topic = topic;
    }
    public String getTemplate() {
        return template;
    }
    public void setTemplate(String template) {
        this.template = template;
    }
}

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

@@ -0,0 +1,51 @@
package com.yihu.jw.entity.base.message;
import com.yihu.jw.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by progr1mmer on 2018/8/14.
 */
@Entity
@Table(name = "base_message_subscriber")
public class MessageSubscriberDO extends UuidIdentityEntity {
    private String messageId; //消息ID
    private String saasId; //saas id
    private String url; //推送地址
    private String remark; //备注
    public String getMessageId() {
        return messageId;
    }
    public void setMessageId(String messageId) {
        this.messageId = messageId;
    }
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
}

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

@@ -0,0 +1,101 @@
package com.yihu.jw.entity.base.module;// default package
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.ArrayList;
import java.util.List;
/**
 * WlyyModule entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_module")
public class ModuleDO extends UuidIdentityEntityWithOperation {
    public enum Status {
        delete,
        disable,
        available;
    }
	private String saasId; //关联 Saas id
	private String name; //模块名称
	private String parentId; //父id
	private Status status; //0删除 1禁用 2可用
	private String remark; //备注
	private String state ;  //closed:表示有子节点   open:表示没有子节点
	private List<ModuleDO> children = new ArrayList<>();
	// Constructors
	/** default constructor */
	public ModuleDO() {
	}
    @Column(name = "saas_id", length = 100)
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    @Column(name = "name", length = 200)
    public String getName() {
        return this.name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "parent_id", length = 100)
	public String getParentId() {
		return parentId;
	}
	public void setParentId(String parentId) {
		this.parentId = parentId;
	}
    @Column(name = "status", precision = 2, scale = 0)
    public Status getStatus() {
        return status;
    }
    public void setStatus(Status status) {
        this.status = status;
    }
	@Column(name = "remark", length = 1000)
	public String getRemark() {
		return this.remark;
	}
	public void setRemark(String remark) {
		this.remark = remark;
	}
    @Transient
	public String getState() {
		return state;
	}
	public void setState(String state) {
		this.state = state;
	}
    @Transient
	public List<ModuleDO> getChildren() {
		return children;
	}
	public void setChildren(List<ModuleDO> children) {
		this.children = children;
	}
}

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

@@ -1,7 +1,6 @@
package com.yihu.jw.base.base;// default package
package com.yihu.jw.entity.base.module;// default package
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntity;
import javax.persistence.*;
@@ -10,7 +9,7 @@ import javax.persistence.*;
 */
@Entity
@Table(name = "base_module_function")
public class ModuleFunctionDO extends IdEntity implements java.io.Serializable {
public class ModuleFunctionDO extends UuidIdentityEntity implements java.io.Serializable {
	private String functionId;//关联 base_function    code
	private String moduleId;//关联 base_module  code

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

@@ -0,0 +1,150 @@
package com.yihu.jw.entity.base.org;
import com.yihu.jw.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by progr1mmer on 2018/8/14.
 */
@Entity
@Table(name = "base_organization")
public class OrganizationDO extends UuidIdentityEntity {
    private String saasId; //SAAS ID
    private String name; //名称
    private String code; //编码
    private String logo; //图片URL
    private String manager; //管理员
    private String email; //管理员邮箱
    private String tel; //管理员手机号码
    private Integer province; //省份ID
    private String province_name; //省份名称
    private Integer city; //城市ID
    private String cityName; //城市名称
    private Integer district; //区县ID
    private String districtName; //区县名称
    private Integer community; //社区
    private String communityName; //社区名称
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getLogo() {
        return logo;
    }
    public void setLogo(String logo) {
        this.logo = logo;
    }
    public String getManager() {
        return manager;
    }
    public void setManager(String manager) {
        this.manager = manager;
    }
    public String getEmail() {
        return email;
    }
    public void setEmail(String email) {
        this.email = email;
    }
    public String getTel() {
        return tel;
    }
    public void setTel(String tel) {
        this.tel = tel;
    }
    public Integer getProvince() {
        return province;
    }
    public void setProvince(Integer province) {
        this.province = province;
    }
    public String getProvince_name() {
        return province_name;
    }
    public void setProvince_name(String province_name) {
        this.province_name = province_name;
    }
    public Integer getCity() {
        return city;
    }
    public void setCity(Integer city) {
        this.city = city;
    }
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
    public Integer getDistrict() {
        return district;
    }
    public void setDistrict(Integer district) {
        this.district = district;
    }
    public String getDistrictName() {
        return districtName;
    }
    public void setDistrictName(String districtName) {
        this.districtName = districtName;
    }
    public Integer getCommunity() {
        return community;
    }
    public void setCommunity(Integer community) {
        this.community = community;
    }
    public String getCommunityName() {
        return communityName;
    }
    public void setCommunityName(String communityName) {
        this.communityName = communityName;
    }
}

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

@@ -0,0 +1,73 @@
package com.yihu.jw.entity.base.saas;// default package
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * WlyySaas entity. @author MyEclipse Persistence Tools
 *
 *
 */
@Entity
@Table(name = "base_saas")
public class SaasDO extends UuidIdentityEntityWithOperation {
    public enum Status {
        delete,
        auditWait,
        auditPassed,
        auditNotPassed
    }
	public enum Type {
	    //家医
        familyDoctor,
        //等级医院
        gradeHospital,
        //混合型
        hybrid
    }
	private String name; //系统名称
	private Status status; //状态 0 已删除 1待审核 2审核通过 3审核不通过
	private String remark; //备注
	private String logo; //远程fastDFS文件地址
    private Integer theme; //主题ID
    private Type type; //类型
    // Constructors
	/** default constructor */
	public SaasDO() {
	}
	@Column(name = "name", length = 200)
	public String getName() {
		return this.name;
	}
	public void setName(String name) {
		this.name = name;
	}
    public Status getStatus() {
        return status;
    }
    public void setStatus(Status status) {
        this.status = status;
    }
    @Column(name = "remark", length = 1000)
	public String getRemark() {
		return this.remark;
	}
	public void setRemark(String remark) {
		this.remark = remark;
	}
}

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

@@ -0,0 +1,33 @@
package com.yihu.jw.entity.base.saas;
import com.yihu.jw.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by progr1mmer on 2018/8/14.
 */
@Entity
@Table(name = "base_saas_default_module")
public class SaasDefaultModuleDO extends UuidIdentityEntity {
    private SaasDO.Type type;
    private Integer moduleId;
    public SaasDO.Type getType() {
        return type;
    }
    public void setType(SaasDO.Type type) {
        this.type = type;
    }
    public Integer getModuleId() {
        return moduleId;
    }
    public void setModuleId(Integer moduleId) {
        this.moduleId = moduleId;
    }
}

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

@@ -1,8 +1,7 @@
package com.yihu.jw.base.base;// default package
package com.yihu.jw.entity.base.saas;// default package
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntity;
import javax.persistence.*;
@@ -11,7 +10,7 @@ import javax.persistence.*;
 */
@Entity
@Table(name = "base_saas_module")
public class SaasModuleDO extends IdEntity implements java.io.Serializable {
public class SaasModuleDO extends UuidIdentityEntity implements java.io.Serializable {
	private String saasId; //关联WlyySaas code
	private String moduleId; //关联 WlyyModule code
@@ -20,7 +19,7 @@ public class SaasModuleDO extends IdEntity implements java.io.Serializable {
	@Column(name = "saas_id", length = 100)
	public String getSaasId() {
		return this.saasId;
		return saasId;
	}
	public void setSaasId(String saasId) {

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

@@ -1,8 +1,7 @@
package com.yihu.jw.base.sms;// default package
package com.yihu.jw.entity.base.sms;// default package
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.*;
import java.sql.Timestamp;
@@ -13,7 +12,8 @@ import java.util.Date;
 */
@Entity
@Table(name = "base_sms")
public class BaseSmsDO extends IdEntityWithOperation implements java.io.Serializable {
@Deprecated
public class BaseSmsDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
	// Fields

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

@@ -1,8 +1,7 @@
package com.yihu.jw.base.sms;// default package
package com.yihu.jw.entity.base.sms;// default package
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,56 +12,43 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_sms_gateway")
public class BaseSmsGatewayDO  extends IdEntity implements java.io.Serializable {
public class SmsGatewayDO extends UuidIdentityEntity implements java.io.Serializable {
	// Fields
	private String name;//名称
	private String saasId; //关联 base_saas code
	private String orgCode; //机构code
	private String ip; // 短信接口的ip地址
	//private String saasId;  //关联 base_saas code
	private String name;  //名称
    private String officialWebsite; //官网地址
	private String username;  //短信接口的账号
	private String password;	//短信接口的密码
	private String url;	//短信接口的url
	private Integer status;// -1 删除 0 禁用 可用
    private String password;  //短信接口的密码
    private String certificate; //调用凭证（json串）
    private String ip;  //短信接口的ip地址
    private String url;	 //短信接口的url
	private Integer status;  // -1 删除 0 禁用 可用
	// Constructors
	/** default constructor */
	public BaseSmsGatewayDO() {
	public SmsGatewayDO() {
	}
	/** full constructor */
	public BaseSmsGatewayDO(Long id, String code, String saasId,
			String orgCode, String ip, String username, String password,
			String url) {
		this.saasId = saasId;
		this.orgCode = orgCode;
	public SmsGatewayDO(Long id, String code, String saasId,
                        String orgCode, String ip, String username, String password,
                        String url) {
		//this.saasId = saasId;
		this.ip = ip;
		this.username = username;
		this.password = password;
		this.url = url;
	}
	@Column(name = "saas_id", length = 64)
	/*@Column(name = "saas_id", length = 64)
	public String getSaasId() {
		return this.saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@Column(name = "org_code", length = 64)
	public String getOrgCode() {
		return this.orgCode;
	}
	public void setOrgCode(String orgCode) {
		this.orgCode = orgCode;
	}
	}*/
	@Column(name = "ip", length = 20)
	public String getIp() {

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

@@ -0,0 +1,57 @@
package com.yihu.jw.entity.base.sms;
import com.yihu.jw.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by progr1mmer on 2018/8/14.
 */
@Entity
@Table(name = "base_sms_template")
public class SmsTemplateDO extends UuidIdentityEntity {
    public enum Label {
        verificationCode, //验证码
        notification, //服务通知
        dailyPush //日常推送
    }
    private String clientId; //应用ID
    private String label; //标签
    private String header; //头部
    private String content; //内容
    public String getClientId() {
        return clientId;
    }
    public void setClientId(String clientId) {
        this.clientId = clientId;
    }
    public String getLabel() {
        return label;
    }
    public void setLabel(String label) {
        this.label = label;
    }
    public String getHeader() {
        return header;
    }
    public void setHeader(String header) {
        this.header = header;
    }
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
}

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

@@ -0,0 +1,75 @@
package com.yihu.jw.entity.base.system;// default package
import com.yihu.jw.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * SystemDict entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "system_dict")
public class SystemDictDO extends UuidIdentityEntity implements java.io.Serializable {
	public enum Type {
		//基础字典
		basic,
		//扩展字典
		extend
	}
	// Fields
	//saas id 用于租户的自定义字典
	private String saasId;
	//编码（唯一）
	private String code;
	//拼音码
	private String pyCode;
	//名称
	private String name;
	//类型
	private Type type;
	public String getSaasId() {
		return saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	public String getPyCode() {
		return pyCode;
	}
	public void setPyCode(String pyCode) {
		this.pyCode = pyCode;
	}
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	public Type getType() {
		return type;
	}
	public void setType(Type type) {
		this.type = type;
	}
}

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

@@ -0,0 +1,76 @@
package com.yihu.jw.entity.base.system;// default package
import com.yihu.jw.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * SystemDictList entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "system_dict_entry")
public class SystemDictEntryDO extends UuidIdentityEntity implements java.io.Serializable {
	//所属字典编码
	private String dictCode;
	//编码
	private String code;
	//拼音码
	private String pyCode;
	//值
	private String value;
	//排序
	private Integer sort;
	//备注
	private String remark;
	public String getDictCode() {
		return dictCode;
	}
	public void setDictCode(String dictCode) {
		this.dictCode = dictCode;
	}
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	public String getPyCode() {
		return pyCode;
	}
	public void setPyCode(String pyCode) {
		this.pyCode = pyCode;
	}
	public String getValue() {
		return value;
	}
	public void setValue(String value) {
		this.value = value;
	}
	public Integer getSort() {
		return sort;
	}
	public void setSort(Integer sort) {
		this.sort = sort;
	}
	public String getRemark() {
		return remark;
	}
	public void setRemark(String remark) {
		this.remark = remark;
	}
}

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

@@ -0,0 +1,51 @@
package com.yihu.jw.entity.base.theme;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by progr1mmer on 2018/8/14.
 */
@Entity
@Table(name = "base_theme")
public class ThemeDO extends UuidIdentityEntityWithOperation {
    private String backgroundColor; //主体背景颜色
    private String fontColor; //主体字体颜色
    private String fontFamily; //主体字体系列
    private Integer fontSize; //主体字体大小
    public String getBackgroundColor() {
        return backgroundColor;
    }
    public void setBackgroundColor(String backgroundColor) {
        this.backgroundColor = backgroundColor;
    }
    public String getFontColor() {
        return fontColor;
    }
    public void setFontColor(String fontColor) {
        this.fontColor = fontColor;
    }
    public String getFontFamily() {
        return fontFamily;
    }
    public void setFontFamily(String fontFamily) {
        this.fontFamily = fontFamily;
    }
    public Integer getFontSize() {
        return fontSize;
    }
    public void setFontSize(Integer fontSize) {
        this.fontSize = fontSize;
    }
}

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

@@ -1,12 +1,10 @@
package com.yihu.jw.base.user;
package com.yihu.jw.entity.base.user;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import java.sql.Timestamp;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
@@ -14,20 +12,19 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_menu")
public class BaseMenuDO extends IdEntityWithOperation implements java.io.Serializable {
public class BaseMenuDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
	// Fields
	private String url;//请求路径
	private String method;//请求方式 get post
	private String saasId;
	private String parentId;
	private String name;
	private Integer sort;
	private Integer status;
	private String remark;
	private String parentId; //父级ID
	private String name; //名称
	private String url; //请求路径
	private String method; //请求方式 get post
	private Integer sort; //排序
	private Integer status; //状态
	private String remark; //备注
	// Constructors
	// Constructors
	/** default constructor */
	public BaseMenuDO() {
	}

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

@@ -1,10 +1,9 @@
package com.yihu.jw.base.user;
package com.yihu.jw.entity.base.user;
import com.yihu.jw.IdEntity;
import com.yihu.jw.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
@@ -12,7 +11,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_role_menu")
public class BaseRoleMenuDO extends IdEntity implements java.io.Serializable {
public class BaseRoleMenuDO extends UuidIdentityEntity implements java.io.Serializable {
	// Fields
	private String roleId;

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

@@ -1,11 +1,9 @@
package com.yihu.jw.base.user;
package com.yihu.jw.entity.base.user;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import java.sql.Timestamp;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
@@ -13,10 +11,9 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_employ")
public class BaseEmployDO extends IdEntityWithOperation implements java.io.Serializable {
public class EmployDO extends UuidIdentityEntityWithOperation {
	// Fields
	private String saasId; //saasIDF
	private String name; //名字
	private String pyCode; //拼音
@@ -43,11 +40,11 @@ public class BaseEmployDO extends IdEntityWithOperation implements java.io.Seria
	// Constructors
	/** default constructor */
	public BaseEmployDO() {
	public EmployDO() {
	}
	/** minimal constructor */
	public BaseEmployDO(String id, String saasId) {
	public EmployDO(String id, String saasId) {
		this.id = id;
		this.saasId = saasId;
	}

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

@@ -0,0 +1,20 @@
package com.yihu.jw.entity.base.user;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by progr1mmer on 2018/8/14.
 */
@Entity
@Table(name = "base_employ_hide_module_function")
public class EmployHideModuleFunctionDO {
    //用户ID
    private String employId;
    //模块ID
    private String moduleId;
    //功能ID（该字段为空则直接隐藏上级模块）
    private String functionId;
}

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

@@ -1,6 +1,6 @@
package com.yihu.jw.base.user;
package com.yihu.jw.entity.base.user;
import com.yihu.jw.IdEntity;
import com.yihu.jw.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -11,26 +11,25 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_employ_role")
public class BaseEmployRoleDO extends IdEntity implements java.io.Serializable {
public class EmployRoleDO extends UuidIdentityEntity implements java.io.Serializable {
	// Fields
	private String roleId;
	private String employId;
	private String roleId;
	// Constructors
	/** default constructor */
	public BaseEmployRoleDO() {
	public EmployRoleDO() {
	}
	/** minimal constructor */
	public BaseEmployRoleDO(String id) {
	public EmployRoleDO(String id) {
		this.id = id;
	}
	/** full constructor */
	public BaseEmployRoleDO(String id, String roleId, String employId) {
	public EmployRoleDO(String id, String roleId, String employId) {
		this.id = id;
		this.roleId = roleId;
		this.employId = employId;

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

@@ -1,11 +1,10 @@
package com.yihu.jw.base.user;
package com.yihu.jw.entity.base.user;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import java.sql.Timestamp;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
@@ -13,30 +12,30 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_role")
public class BaseRoleDO extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
public class RoleDO extends UuidIdentityEntityWithOperation {
	//saas id
	private String saasId;
	//角色名称
	private String name;
	private Integer status;
	private String remark;
	//角色编码
	private String code;
	//备注
	private String remark;
	// Constructors
	// Constructors
	/** default constructor */
	public BaseRoleDO() {
	public RoleDO() {
	}
	/** minimal constructor */
	public BaseRoleDO(String id, Timestamp createTime, Timestamp updateTime) {
	public RoleDO(String id, Timestamp createTime, Timestamp updateTime) {
		this.id = id;
		this.createTime = createTime;
		this.updateTime = updateTime;
	}
	// Property accessors
	@Column(name = "saas_id", length = 50)
@@ -57,15 +56,6 @@ public class BaseRoleDO extends IdEntityWithOperation implements java.io.Seriali
		this.name = name;
	}
	@Column(name = "status", precision = 2, scale = 0)
	public Integer getStatus() {
		return this.status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
	@Column(name = "remark", length = 1000)
	public String getRemark() {
		return this.remark;

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

@@ -0,0 +1,36 @@
package com.yihu.jw.entity.base.user;
import com.yihu.jw.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by progr1mmer on 2018/8/14.
 */
@Entity
@Table(name = "base_role_module_function")
public class RoleModuleFunctionDO extends UuidIdentityEntity {
    private String roleId; //角色ID
    private String moduleId; //模块ID
    private String functionId; //功能ID
    private String access; //访问权限
    public String getRoleId() {
        return roleId;
    }
    public void setRoleId(String roleId) {
        this.roleId = roleId;
    }
    public String getModuleId() {
        return moduleId;
    }
    public void setModuleId(String moduleId) {
        this.moduleId = moduleId;
    }
}

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

@@ -1,15 +1,12 @@
package com.yihu.jw.base.version;// default package
package com.yihu.jw.entity.base.version;// default package
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntity;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import java.sql.Timestamp;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
@@ -18,7 +15,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_user_version")
public class BaseUserVersionDO  extends IdEntity implements java.io.Serializable {
public class BaseUserVersionDO  extends UuidIdentityEntity implements java.io.Serializable {
	// Fields

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

@@ -1,11 +1,9 @@
package com.yihu.jw.base.version;// default package
package com.yihu.jw.entity.base.version;// default package
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import java.sql.Timestamp;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
@@ -13,7 +11,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "wlyy_version")
public class WlyyVersionDO  extends IdEntityWithOperation implements java.io.Serializable {
public class WlyyVersionDO  extends UuidIdentityEntityWithOperation implements java.io.Serializable {
	// Fields

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.wx;
package com.yihu.jw.entity.base.wx;
import java.io.Serializable;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.wx;
package com.yihu.jw.entity.base.wx;
import java.io.Serializable;
import java.util.Map;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.base.wx;
package com.yihu.jw.entity.base.wx;
import java.io.Serializable;

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

@@ -1,8 +1,7 @@
package com.yihu.jw.base.wx;
package com.yihu.jw.entity.base.wx;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntity;
import javax.persistence.*;
import java.util.Date;
@@ -12,7 +11,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wx_access_token")
public class WxAccessTokenDO extends IdEntity implements java.io.Serializable {
public class WxAccessTokenDO extends UuidIdentityEntity implements java.io.Serializable {
	// Fields

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

@@ -1,8 +1,7 @@
package com.yihu.jw.base.wx;
package com.yihu.jw.entity.base.wx;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -14,7 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wx_graphic_message")
public class WxGraphicMessageDO extends IdEntityWithOperation implements java.io.Serializable {
public class WxGraphicMessageDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
    private String saasId;
    private String title;//标题

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

@@ -1,8 +1,7 @@
package com.yihu.jw.base.wx;
package com.yihu.jw.entity.base.wx;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,7 +15,7 @@ import java.util.List;
 */
@Entity
@Table(name = "wx_menu")
public class WxMenuDO extends IdEntityWithOperation implements java.io.Serializable {
public class WxMenuDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
    private String wechatId;//关联的微信code 关联表 Wx_Wechat
    private String supMenuid;//父菜单id 如果是一级菜单 此字段为空
@@ -30,13 +29,9 @@ public class WxMenuDO extends IdEntityWithOperation implements java.io.Serializa
    private String pagepath;//小程序的页面程序
    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”表示是节点的打开关闭
    @Transient
    private List<WxMenuDO> children = new ArrayList<>();
@@ -47,6 +42,7 @@ public class WxMenuDO extends IdEntityWithOperation implements java.io.Serializa
    public WxMenuDO() {
    }
    @Transient
    public List<WxMenuDO> getChildren() {
        return children;
    }
@@ -161,6 +157,7 @@ public class WxMenuDO extends IdEntityWithOperation implements java.io.Serializa
        this.remark = remark;
    }
    @Transient
    public String getState() {
        return state;
    }
@@ -169,6 +166,7 @@ public class WxMenuDO extends IdEntityWithOperation implements java.io.Serializa
        this.state = state;
    }
    @Transient
    public String getWechatName() {
        return wechatName;
    }

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

@@ -1,20 +1,18 @@
package com.yihu.jw.base.wx;
package com.yihu.jw.entity.base.wx;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
/**
 * WxTemplate entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "wx_template")
public class WxTemplateDO extends IdEntityWithOperation implements java.io.Serializable {
public class WxTemplateDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
    // Fields
    private String title;//模板标题

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

@@ -1,7 +1,6 @@
package com.yihu.jw.base.wx;
package com.yihu.jw.entity.base.wx;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -17,7 +16,7 @@ import java.util.Map;
 */
@Entity
@Table(name = "wx_wechat")
public class WxWechatDO extends IdEntityWithOperation implements java.io.Serializable {
public class WxWechatDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
    // Fields
    private String saasId;//'saas配置id'
@@ -63,6 +62,7 @@ public class WxWechatDO extends IdEntityWithOperation implements java.io.Seriali
    public WxWechatDO() {
    }
    @Transient
    public List<Map<String, Object>> getChildren() {
        return children;
    }
@@ -170,6 +170,7 @@ public class WxWechatDO extends IdEntityWithOperation implements java.io.Seriali
        this.remark = remark;
    }
    @Transient
    public String getState() {
        return state;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/AccountDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.entity.health.bank;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -14,7 +14,7 @@ import java.util.List;
 */
@Entity
@Table(name = "wlyy_health_bank_account")
public class AccountDO extends IdEntityWithOperation implements Serializable {
public class AccountDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId; //saasId
@@ -43,40 +43,33 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
    @Column(name = "status")
    private Integer status;//状态（1有效，-1失效）
    @Transient
    private String idCard;//身份证号码
    @Transient
    private Long sum;//总积分（已用积分和剩余积分）
    @Transient
    private Integer usedTotal;//已用积分
    @Transient
    private Long nowTotal;//今日获取积分
    @Transient
    private Long activityTotal;//参与活动数;
    @Transient
    private Long taskTotal;//参与任务数;
    @Transient
    private Integer teamRanking;//团队排名
    @Transient
    private Integer cityRanking;//全市排名
    @Transient
    private List<String> patientIds;//团队居民id
    @Transient
    private String taskId;//任务id
    @Transient
    private Long activityRanking;//活动排名
    @Transient
    private Long activityIntegrate;//活动积分
    public String getSaasId() {
@@ -119,6 +112,7 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
        this.hospital = hospital;
    }
    @Transient
    public Integer getUsedTotal() {
        return usedTotal;
    }
@@ -151,6 +145,7 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
        this.hospitalName = hospitalName;
    }
    @Transient
    public Long getSum() {
        return sum;
    }
@@ -159,6 +154,7 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
        this.sum = sum;
    }
    @Transient
    public Long getNowTotal() {
        return nowTotal;
    }
@@ -167,6 +163,7 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
        this.nowTotal = nowTotal;
    }
    @Transient
    public Long getActivityTotal() {
        return activityTotal;
    }
@@ -175,6 +172,7 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
        this.activityTotal = activityTotal;
    }
    @Transient
    public Long getTaskTotal() {
        return taskTotal;
    }
@@ -183,6 +181,7 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
        this.taskTotal = taskTotal;
    }
    @Transient
    public Integer getTeamRanking() {
        return teamRanking;
    }
@@ -191,6 +190,7 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
        this.teamRanking = teamRanking;
    }
    @Transient
    public Integer getCityRanking() {
        return cityRanking;
    }
@@ -199,6 +199,7 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
        this.cityRanking = cityRanking;
    }
    @Transient
    public List<String> getPatientIds() {
        return patientIds;
    }
@@ -207,6 +208,7 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
        this.patientIds = patientIds;
    }
    @Transient
    public String getTaskId() {
        return taskId;
    }
@@ -215,6 +217,7 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
        this.taskId = taskId;
    }
    @Transient
    public Long getActivityRanking() {
        return activityRanking;
    }
@@ -223,6 +226,7 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
        this.activityRanking = activityRanking;
    }
    @Transient
    public Long getActivityIntegrate() {
        return activityIntegrate;
    }
@@ -231,6 +235,7 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
        this.activityIntegrate = activityIntegrate;
    }
    @Transient
    public String getIdCard() {
        return idCard;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/ActiveRecordDO.java

@@ -1,8 +1,7 @@
package com.yihu.jw.entity.health.bank;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntity;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
@@ -19,7 +18,7 @@ import java.util.Date;
@Entity
@Table(name = "wlyy_health_bank_active_record")
@EntityListeners(AuditingEntityListener.class)
public class ActiveRecordDO extends IdEntity implements Serializable {
public class ActiveRecordDO extends UuidIdentityEntity implements Serializable {
    private String saasId; //saasId
    private String taskId;  //wlyy_health_bank_task任务表的id
    private String taskTitle;//任务标题

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/ActivityDO.java

@@ -1,7 +1,7 @@
package com.yihu.jw.entity.health.bank;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,7 +16,7 @@ import java.util.List;
 */
@Entity
@Table(name = "wlyy_health_bank_activity")
public class ActivityDO extends IdEntityWithOperation implements Serializable {
public class ActivityDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//saasId
@@ -162,8 +162,6 @@ public class ActivityDO extends IdEntityWithOperation implements Serializable {
        this.isFlag = isFlag;
    }
    public String getRemark() {
        return remark;
    }
@@ -196,6 +194,7 @@ public class ActivityDO extends IdEntityWithOperation implements Serializable {
        this.areaType = areaType;
    }
    @Transient
    public String getOpenId() {
        return openId;
    }
@@ -204,6 +203,7 @@ public class ActivityDO extends IdEntityWithOperation implements Serializable {
        this.openId = openId;
    }
    @Transient
    public String getPatientId() {
        return patientId;
    }
@@ -212,6 +212,7 @@ public class ActivityDO extends IdEntityWithOperation implements Serializable {
        this.patientId = patientId;
    }
    @Transient
    public Long getTotal() {
        return total;
    }
@@ -228,6 +229,7 @@ public class ActivityDO extends IdEntityWithOperation implements Serializable {
        this.type = type;
    }
    @Transient
    public List<TaskPatientDetailDO> getTaskPatientDetailDOS() {
        return taskPatientDetailDOS;
    }
@@ -236,6 +238,7 @@ public class ActivityDO extends IdEntityWithOperation implements Serializable {
        this.taskPatientDetailDOS = taskPatientDetailDOS;
    }
    @Transient
    public String getUnionId() {
        return unionId;
    }
@@ -244,6 +247,7 @@ public class ActivityDO extends IdEntityWithOperation implements Serializable {
        this.unionId = unionId;
    }
    @Transient
    public String getPatientIdcard() {
        return patientIdcard;
    }
@@ -252,6 +256,7 @@ public class ActivityDO extends IdEntityWithOperation implements Serializable {
        this.patientIdcard = patientIdcard;
    }
    @Transient
    public Integer getActivityRanking() {
        return activityRanking;
    }
@@ -260,6 +265,7 @@ public class ActivityDO extends IdEntityWithOperation implements Serializable {
        this.activityRanking = activityRanking;
    }
    @Transient
    public Long getSum() {
        return sum;
    }
@@ -268,6 +274,7 @@ public class ActivityDO extends IdEntityWithOperation implements Serializable {
        this.sum = sum;
    }
    @Transient
    public List<TaskDO> getTaskDOS() {
        return taskDOS;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/CreditsDetailDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.entity.health.bank;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "wlyy_health_bank_credits_detail")
public class CreditsDetailDO extends IdEntityWithOperation implements Serializable{
public class CreditsDetailDO extends UuidIdentityEntityWithOperation implements Serializable{
    @Column(name = "saas_id")
    private String saasId; //saasid

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/ExchangeGoodsDO.java

@@ -2,7 +2,7 @@ package com.yihu.jw.entity.health.bank;/**
 * Created by nature of king on 2018/5/3.
 */
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -17,7 +17,7 @@ import java.io.Serializable;
 **/
@Entity
@Table(name = "wlyy_health_bank_exchange_goods")
public class ExchangeGoodsDO extends IdEntityWithOperation implements Serializable {
public class ExchangeGoodsDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//saasid

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/GoodsDO.java

@@ -1,7 +1,7 @@
package com.yihu.jw.entity.health.bank;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -14,7 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_health_bank_goods")
public class GoodsDO extends IdEntityWithOperation implements Serializable{
public class GoodsDO extends UuidIdentityEntityWithOperation implements Serializable{
    @Column(name = "saas_id")
    private String saasId;//saasid

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskDO.java

@@ -1,7 +1,7 @@
package com.yihu.jw.entity.health.bank;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,39 +16,29 @@ import java.util.List;
 */
@Entity
@Table(name = "wlyy_health_bank_task")
public class TaskDO extends IdEntityWithOperation implements Serializable{
public class TaskDO extends UuidIdentityEntityWithOperation implements Serializable{
    @Column(name = "saas_id")
    private String saasId; //saasid
    @Column(name = "title")
    private String title; //任务标题
    @Column(name = "content")
    private String content; //任务内容
    @Column(name = "type")
    private String type; //交易类型
    @Column(name = "transaction_id")
    private String transactionId; // 业务id
    @Column(name = "period")
    private Integer period; //周期性
    @Column(name = "task_code")
    private String taskCode ; // 标识是什么任务
    @Column(name = "status")
    private Integer status; //状态
    @Column(name = "rule_code")
    private String ruleCode;//规则code
    @Column(name = "start_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date startTime;//开始时间
    @Column(name = "end_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date endTime; //结束时间
@@ -156,6 +146,7 @@ public class TaskDO extends IdEntityWithOperation implements Serializable{
        this.endTime = endTime;
    }
    @Transient
    public ActivityDO getActivityDO() {
        return activityDO;
    }
@@ -164,6 +155,7 @@ public class TaskDO extends IdEntityWithOperation implements Serializable{
        this.activityDO = activityDO;
    }
    @Transient
    public String getPatientId() {
        return patientId;
    }
@@ -172,6 +164,7 @@ public class TaskDO extends IdEntityWithOperation implements Serializable{
        this.patientId = patientId;
    }
    @Transient
    public List<TaskPatientDetailDO> getTaskPatientDetailDOS() {
        return taskPatientDetailDOS;
    }
@@ -180,6 +173,7 @@ public class TaskDO extends IdEntityWithOperation implements Serializable{
        this.taskPatientDetailDOS = taskPatientDetailDOS;
    }
    @Transient
    public Long getTotal() {
        return total;
    }
@@ -188,6 +182,7 @@ public class TaskDO extends IdEntityWithOperation implements Serializable{
        this.total = total;
    }
    @Transient
    public String getOpenId() {
        return openId;
    }
@@ -196,6 +191,7 @@ public class TaskDO extends IdEntityWithOperation implements Serializable{
        this.openId = openId;
    }
    @Transient
    public String getRuleName() {
        return ruleName;
    }
@@ -204,6 +200,7 @@ public class TaskDO extends IdEntityWithOperation implements Serializable{
        this.ruleName = ruleName;
    }
    @Transient
    public List<CreditsDetailDO> getCreditsDetailDOS() {
        return creditsDetailDOS;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskDictDO.java

@@ -2,7 +2,7 @@ package com.yihu.jw.entity.health.bank;/**
 * Created by nature of king on 2018/6/8.
 */
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,7 +16,7 @@ import java.io.Serializable;
 **/
@Entity
@Table(name = "wlyy_health_bank_task_dict" )
public class TaskDictDO extends IdEntityWithOperation implements Serializable {
public class TaskDictDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private  String saasId;//环境id

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskGoodsDO.java

@@ -2,7 +2,7 @@ package com.yihu.jw.entity.health.bank;/**
 * Created by nature of king on 2018/6/8.
 */
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,7 +16,7 @@ import java.io.Serializable;
 **/
@Entity
@Table(name = "wlyy_health_bank_task_goods")
public class TaskGoodsDO extends IdEntityWithOperation implements Serializable {
public class TaskGoodsDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//环境id

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskPatientDetailDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.entity.health.bank;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "wlyy_health_bank_task_patient_detail")
public class TaskPatientDetailDO extends IdEntityWithOperation implements Serializable{
public class TaskPatientDetailDO extends UuidIdentityEntityWithOperation implements Serializable{
    @Column(name = "saas_id")
    private String saasId; //saasid

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskRangDO.java

@@ -2,7 +2,7 @@ package com.yihu.jw.entity.health.bank;/**
 * Created by nature of king on 2018/6/8.
 */
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,7 +16,7 @@ import java.io.Serializable;
 **/
@Entity
@Table(name = "wlyy_health_bank_task_rang")
public class TaskRangDO extends IdEntityWithOperation implements Serializable {
public class TaskRangDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//环境id

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskRuleDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.entity.health.bank;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -12,7 +12,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "wlyy_health_bank_task_rule")
public class TaskRuleDO extends IdEntityWithOperation implements Serializable{
public class TaskRuleDO extends UuidIdentityEntityWithOperation implements Serializable{
    @Column(name = "saas_id")
    private String saasId; //saasid

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/PatientHospitalRecordDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.entity.specialist;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -12,7 +12,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "wlyy_patient_hospital_record")
public class PatientHospitalRecordDO extends IdEntityWithOperation implements Serializable {
public class PatientHospitalRecordDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//
    @Column(name = "third_code")

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/SpecialistPatientRelationDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.entity.specialist;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_specialist_patient_relation")
public class SpecialistPatientRelationDO extends IdEntityWithOperation implements Serializable {
public class SpecialistPatientRelationDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;

common/common-entity/src/main/java/com/yihu/jw/iot/company/IotCompanyCertificateChangeRecordDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.company;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_company_certificate_change_record")
public class IotCompanyCertificateChangeRecordDO extends IdEntityWithOperation implements Serializable {
public class IotCompanyCertificateChangeRecordDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

common/common-entity/src/main/java/com/yihu/jw/iot/company/IotCompanyCertificateDO.java

@@ -1,7 +1,7 @@
package com.yihu.jw.iot.company;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -15,7 +15,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "iot_company_certificate")
public class IotCompanyCertificateDO extends IdEntityWithOperation implements Serializable {
public class IotCompanyCertificateDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

common/common-entity/src/main/java/com/yihu/jw/iot/company/IotCompanyDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.company;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,7 +16,7 @@ import java.util.List;
 */
@Entity
@Table(name = "iot_company")
public class IotCompanyDO extends IdEntityWithOperation implements Serializable {
public class IotCompanyDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//
@@ -222,6 +222,7 @@ public class IotCompanyDO extends IdEntityWithOperation implements Serializable
        this.del = del;
    }
    @Transient
    public List<IotCompanyTypeDO> getTypeList() {
        return typeList;
    }

common/common-entity/src/main/java/com/yihu/jw/iot/company/IotCompanyTypeDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.company;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_company_type")
public class IotCompanyTypeDO extends IdEntityWithOperation implements Serializable {
public class IotCompanyTypeDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

common/common-entity/src/main/java/com/yihu/jw/iot/datainput/DataProcessLogDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.datainput;
import com.yihu.jw.IdEntity;
import com.yihu.jw.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -9,7 +9,7 @@ import java.io.Serializable;
@Entity
@Table(name = "iot_data_process_log")
public class DataProcessLogDO extends IdEntity implements Serializable {
public class DataProcessLogDO extends UuidIdentityEntity implements Serializable {
    @Column(name = "data_id")
    private String dataId;

common/common-entity/src/main/java/com/yihu/jw/iot/datainput/DataStandardDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.datainput;
import com.yihu.jw.IdEntity;
import com.yihu.jw.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -9,7 +9,7 @@ import java.io.Serializable;
@Entity
@Table(name = "iot_base_data_def")
public class DataStandardDO extends IdEntity implements Serializable {
public class DataStandardDO extends UuidIdentityEntity implements Serializable {
    @Column(name = "base_name")
    private String baseName;

common/common-entity/src/main/java/com/yihu/jw/iot/device/IotDeviceDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.device;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -14,7 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "iot_device")
public class IotDeviceDO extends IdEntityWithOperation implements Serializable {
public class IotDeviceDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;

common/common-entity/src/main/java/com/yihu/jw/iot/device/IotDeviceImportRecordDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.device;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_device_import_record")
public class IotDeviceImportRecordDO extends IdEntityWithOperation implements Serializable {
public class IotDeviceImportRecordDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

common/common-entity/src/main/java/com/yihu/jw/iot/device/IotDeviceOrderDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.device;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -14,7 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "iot_device_order")
public class IotDeviceOrderDO extends IdEntityWithOperation implements Serializable{
public class IotDeviceOrderDO extends UuidIdentityEntityWithOperation implements Serializable{
    @Column(name = "saas_id")
    private String saasId;

common/common-entity/src/main/java/com/yihu/jw/iot/device/IotDeviceQualityInspectionPlanDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.device;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -14,7 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "iot_device_quality_inspection_plan")
public class IotDeviceQualityInspectionPlanDO extends IdEntityWithOperation implements Serializable{
public class IotDeviceQualityInspectionPlanDO extends UuidIdentityEntityWithOperation implements Serializable{
    @Column(name = "saas_id")
    private String saasId;

common/common-entity/src/main/java/com/yihu/jw/iot/device/IotOrderPurchaseDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.device;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -14,7 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "iot_order_purchase")
public class IotOrderPurchaseDO extends IdEntityWithOperation implements Serializable{
public class IotOrderPurchaseDO extends UuidIdentityEntityWithOperation implements Serializable{
    @Column(name = "saas_id")
    private String saasId;

common/common-entity/src/main/java/com/yihu/jw/iot/device/IotPatientDeviceDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.device;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_patient_device")
public class IotPatientDeviceDO extends IdEntityWithOperation implements Serializable {
public class IotPatientDeviceDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

common/common-entity/src/main/java/com/yihu/jw/iot/device/IotQualityRecordDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.device;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -14,7 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "iot_quality_record")
public class IotQualityRecordDO extends IdEntityWithOperation implements Serializable {
public class IotQualityRecordDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

common/common-entity/src/main/java/com/yihu/jw/iot/dict/IotDeviceDictDO.java

@@ -1,7 +1,7 @@
package com.yihu.jw.iot.dict;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_device_dict")
public class IotDeviceDictDO extends IdEntityWithOperation implements Serializable {
public class IotDeviceDictDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")

common/common-entity/src/main/java/com/yihu/jw/iot/dict/IotSystemDictDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.dict;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_system_dict")
public class IotSystemDictDO extends IdEntityWithOperation implements Serializable {
public class IotSystemDictDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

common/common-entity/src/main/java/com/yihu/jw/iot/label/IotDeviceLabelDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.label;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_device_label")
public class IotDeviceLabelDO extends IdEntityWithOperation implements Serializable {
public class IotDeviceLabelDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;

common/common-entity/src/main/java/com/yihu/jw/iot/label/IotDeviceLabelInfoDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.label;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_device_label_info")
public class IotDeviceLabelInfoDO extends IdEntityWithOperation implements Serializable {
public class IotDeviceLabelInfoDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;

common/common-entity/src/main/java/com/yihu/jw/iot/product/IotProductAttachmentDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.product;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_product_attachment")
public class IotProductAttachmentDO extends IdEntityWithOperation implements Serializable {
public class IotProductAttachmentDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

common/common-entity/src/main/java/com/yihu/jw/iot/product/IotProductBaseInfoDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.product;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -14,7 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "iot_product_base_info")
public class IotProductBaseInfoDO extends IdEntityWithOperation implements Serializable {
public class IotProductBaseInfoDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

common/common-entity/src/main/java/com/yihu/jw/iot/product/IotProductDataTransmissionDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.product;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_product_data_transmission")
public class IotProductDataTransmissionDO extends IdEntityWithOperation implements Serializable {
public class IotProductDataTransmissionDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

common/common-entity/src/main/java/com/yihu/jw/iot/product/IotProductExtendInfoDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.product;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_product_extend_info")
public class IotProductExtendInfoDO extends IdEntityWithOperation implements Serializable {
public class IotProductExtendInfoDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

common/common-entity/src/main/java/com/yihu/jw/iot/product/IotProductMeasuredDataDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.iot.product;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "iot_product_measured_data")
public class IotProductMeasuredDataDO extends IdEntityWithOperation implements Serializable {
public class IotProductMeasuredDataDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;//

common/common-entity/src/main/java/com/yihu/jw/rehabilitation/RehabilitationInformationDO.java

@@ -1,7 +1,7 @@
package com.yihu.jw.rehabilitation;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -15,7 +15,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "rehabilitation_information")
public class RehabilitationInformationDO extends IdEntityWithOperation implements Serializable {
public class RehabilitationInformationDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;

common/common-entity/src/main/java/com/yihu/jw/rehabilitation/RehabilitationPerformanceDO.java

@@ -1,7 +1,7 @@
package com.yihu.jw.rehabilitation;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -14,7 +14,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "rehabilitation_performance")
public class RehabilitationPerformanceDO extends IdEntityWithOperation implements Serializable {
public class RehabilitationPerformanceDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;

common/common-entity/src/main/java/com/yihu/jw/rehabilitation/RehabilitationPlanningDO.java

@@ -1,7 +1,7 @@
package com.yihu.jw.rehabilitation;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -15,7 +15,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "rehabilitation_planning")
public class RehabilitationPlanningDO extends IdEntityWithOperation implements Serializable {
public class RehabilitationPlanningDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;

common/common-entity/src/main/java/com/yihu/jw/rehabilitation/RehabilitationTreatmentProgramDO.java

@@ -1,6 +1,6 @@
package com.yihu.jw.rehabilitation;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "rehabilitation_treatment_program")
public class RehabilitationTreatmentProgramDO extends IdEntityWithOperation implements Serializable {
public class RehabilitationTreatmentProgramDO extends UuidIdentityEntityWithOperation implements Serializable {
    @Column(name = "saas_id")
    private String saasId;

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

@@ -3,22 +3,20 @@ package com.yihu.jw.wlyy.agreement;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
 * Created by Administrator on 2017/6/1 0001.
 */
@Entity
@Table(name = "wlyy_agreement")
public class WlyyAgreementDO extends IdEntityWithOperation implements Serializable{
public class WlyyAgreementDO extends UuidIdentityEntityWithOperation implements Serializable{
    private static final long serialVersionUID = -4343130835307199266L;

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

@@ -2,20 +2,18 @@ package com.yihu.jw.wlyy.agreement;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by Administrator on 2017/6/1 0001.
 */
@Entity
@Table(name = "wlyy_agreement_kpi")
public class WlyyAgreementKpiDO extends IdEntityWithOperation {
public class WlyyAgreementKpiDO extends UuidIdentityEntityWithOperation {
    private String saasId;//saasId
    private String agreementCode;//套餐代码
    private String kpiName;//服务项名称

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

@@ -1,8 +1,7 @@
package com.yihu.jw.wlyy.agreement;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntity;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
@@ -16,7 +15,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_agreement_kpi_log")
public class WlyyAgreementKpiLogDO extends IdEntity {
public class WlyyAgreementKpiLogDO extends UuidIdentityEntity {
    private static final long serialVersionUID = -3196907595969778396L;
    private String saasId;

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

@@ -1,8 +1,7 @@
package com.yihu.jw.wlyy.agreement;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -14,7 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_sign_family")
public class WlyySignFamilyDO extends IdEntityWithOperation {
public class WlyySignFamilyDO extends UuidIdentityEntityWithOperation {
    private static final long serialVersionUID = -6759565631854462880L;
    private String saasId;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.hospital;// default package
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import java.sql.Timestamp;
import javax.persistence.Column;
@@ -12,7 +12,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_org")
public class BaseOrgDO extends IdEntityWithOperation implements java.io.Serializable {
public class BaseOrgDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
	// Fields

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

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.hospital;// default package
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -11,7 +11,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_org_dept")
public class BaseOrgDeptDO extends IdEntityWithOperation implements java.io.Serializable {
public class BaseOrgDeptDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
	// Fields
	private String orgId;

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

@@ -2,7 +2,7 @@ package com.yihu.jw.wlyy.hospital;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_org_hospital")
public class BaseOrgHospitalDO extends IdEntityWithOperation {
public class BaseOrgHospitalDO extends UuidIdentityEntityWithOperation {
    private static final long serialVersionUID = 5463913446686402252L;
    private String orgId;//

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

@@ -1,11 +1,10 @@
package com.yihu.jw.wlyy.patient;// default package
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
@@ -13,7 +12,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_patient_extend")
public class BasePatientExtendDO extends IdEntityWithOperation implements java.io.Serializable {
public class BasePatientExtendDO extends UuidIdentityEntityWithOperation implements java.io.Serializable {
	// Fields

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

@@ -1,11 +1,10 @@
package com.yihu.jw.wlyy.patient;// default package
import com.yihu.jw.IdEntity;
import com.yihu.jw.UuidIdentityEntity;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
@@ -13,7 +12,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_patient_wechat")
public class BasePatientWechatDO extends IdEntity implements java.io.Serializable {
public class BasePatientWechatDO extends UuidIdentityEntity implements java.io.Serializable {
    // Fields

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

@@ -1,21 +1,19 @@
package com.yihu.jw.wlyy.patient;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import com.yihu.jw.UuidIdentityEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
/**
 * Created by Administrator on 2017/6/6 0006.
 */
@Entity
@Table(name = "wlyy_advertisement")
public class WlyyAdvertisementDO extends IdEntityWithOperation implements Serializable {
public class WlyyAdvertisementDO extends UuidIdentityEntityWithOperation implements Serializable {
    private static final long serialVersionUID = 1497635003375865515L;
    private String saasId;//0,为默认广告

svr/svr-base/src/main/java/com/yihu/SvrBaseApplication.java

@@ -4,12 +4,14 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
/**
 * Created by chenweida on 2017/5/10.
 * localhost:10020/refresh  刷新当个微服务的配置 可以在需要刷新的bean上面@RefreshScope
 */
@SpringBootApplication
//@EnableJpaAuditing
public class SvrBaseApplication  extends SpringBootServletInitializer  {
    public static void main(String[] args)  {

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.base.controller;
import com.yihu.jw.base.base.ModuleDO;
import com.yihu.jw.entity.base.module.ModuleDO;
import com.yihu.jw.business.base.service.ModuleService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.base.ModuleVO;
@@ -12,7 +12,6 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.base.controller;
import com.yihu.jw.base.base.SaasDO;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.business.base.service.SaasService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.common.Envelop;

svr/svr-base/src/main/java/com/yihu/jw/business/base/dao/FunctionDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.business.base.dao;
import com.yihu.jw.base.base.FunctionDO;
import com.yihu.jw.entity.base.function.FunctionDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-base/src/main/java/com/yihu/jw/business/base/dao/ModuleDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.business.base.dao;
import com.yihu.jw.base.base.ModuleDO;
import com.yihu.jw.entity.base.module.ModuleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-base/src/main/java/com/yihu/jw/business/base/dao/ModuleFunctionDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.business.base.dao;
import com.yihu.jw.base.base.ModuleFunctionDO;
import com.yihu.jw.entity.base.module.ModuleFunctionDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;

svr/svr-base/src/main/java/com/yihu/jw/business/base/dao/SaasDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.business.base.dao;
import com.yihu.jw.base.base.SaasDO;
import com.yihu.jw.entity.base.saas.SaasDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;