Merge remote-tracking branch 'jiwei/dev' into dev

Conflicts:
	svr/svr-demo/src/main/java/com/yihu/jw/controller/DemoController.java

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

@@ -1,107 +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;
/**
 * WlyyFunction entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_function")
public class Function extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
	private String name; //功能名称
	private String url;//功能对应的后台url路径
	private String saasId; // saasid
	private String parentCode; //父功能code
	private Integer status; //状态 -1 删除 0 禁用 可用
	private String remark; //备注
	@Transient
	private List<Function> children = new ArrayList<>();
	@Transient
	private String text;//用于jstree显示
	// Constructors
	/** default constructor */
	public Function() {
	}
	@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_code", length = 100)
	public String getParentCode() {
		return this.parentCode;
	}
	public void setParentCode(String parentCode) {
		this.parentCode = parentCode;
	}
	@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 getUrl() {
		return url;
	}
	public void setUrl(String url) {
		this.url = url;
	}
	public List<Function> getChildren() {
		return children;
	}
	public void setChildren(List<Function> children) {
		this.children = children;
	}
	public String getText() {
		return name;
	}
	public void setText(String text) {
		this.text = text;
	}
}

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

@@ -0,0 +1,109 @@
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;
/**
 * WlyyFunction entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_function")
public class FunctionDO extends IdEntityWithOperation implements java.io.Serializable {
    // Fields
    private String name; //功能名称
    private String url;//功能对应的后台url路径
    private String saasId; // saasid
    private String parentCode; //父功能code
    private Integer status; //状态 -1 删除 0 禁用 可用
    private String remark; //备注
    @Transient
    private List<FunctionDO> children = new ArrayList<>();
    @Transient
    private String text;//用于jstree显示
    // Constructors
    /**
     * default constructor
     */
    public FunctionDO() {
    }
    @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_code", length = 100)
    public String getParentCode() {
        return this.parentCode;
    }
    public void setParentCode(String parentCode) {
        this.parentCode = parentCode;
    }
    @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 getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
    public List<FunctionDO> getChildren() {
        return children;
    }
    public void setChildren(List<FunctionDO> children) {
        this.children = children;
    }
    public String getText() {
        return name;
    }
    public void setText(String text) {
        this.text = text;
    }
}

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

@@ -15,7 +15,7 @@ import java.util.List;
 */
@Entity
@Table(name = "base_module")
public class Module extends IdEntityWithOperation implements java.io.Serializable {
public class ModuleDO extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
	private String name; //模块名称
@@ -26,12 +26,12 @@ public class Module extends IdEntityWithOperation implements java.io.Serializabl
	@Transient
	private String state ;   //closed:表示有子节点   open:表示没有子节点
	@Transient
	private List<Module> children = new ArrayList<>();
	private List<ModuleDO> children = new ArrayList<>();
	// Constructors
	/** default constructor */
	public Module() {
	public ModuleDO() {
	}
@@ -88,11 +88,11 @@ public class Module extends IdEntityWithOperation implements java.io.Serializabl
		this.state = state;
	}
	public List<Module> getChildren() {
	public List<ModuleDO> getChildren() {
		return children;
	}
	public void setChildren(List<Module> children) {
	public void setChildren(List<ModuleDO> children) {
		this.children = children;
	}
}

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

@@ -10,7 +10,7 @@ import javax.persistence.*;
 */
@Entity
@Table(name = "base_module_function")
public class ModuleFunction extends IdEntity implements java.io.Serializable {
public class ModuleFunctionDO extends IdEntity implements java.io.Serializable {
	private String functionId;//关联 base_function    code
	private String moduleId;//关联 base_module  code
@@ -18,7 +18,7 @@ public class ModuleFunction extends IdEntity implements java.io.Serializable {
	// Constructors
	/** default constructor */
	public ModuleFunction() {
	public ModuleFunctionDO() {
	}
	@Column(name = "function_id", length = 100)

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

@@ -13,7 +13,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_saas")
public class Saas extends IdEntityWithOperation implements java.io.Serializable {
public class SaasDO extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
@@ -23,7 +23,7 @@ public class Saas extends IdEntityWithOperation implements java.io.Serializable
	// Constructors
	/** default constructor */
	public Saas() {
	public SaasDO() {
	}

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

@@ -11,7 +11,7 @@ import javax.persistence.*;
 */
@Entity
@Table(name = "base_saas_module")
public class SaasModule extends IdEntity implements java.io.Serializable {
public class SaasModuleDO extends IdEntity implements java.io.Serializable {
	private String saasId; //关联WlyySaas code
	private String moduleId; //关联 WlyyModule code

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

@@ -12,7 +12,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "system_dict")
public class SystemDict extends IdEntityWithOperation implements java.io.Serializable {
public class SystemDictDO extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
@@ -26,7 +26,7 @@ public class SystemDict extends IdEntityWithOperation implements java.io.Seriali
	// Constructors
	/** default constructor */
	public SystemDict() {
	public SystemDictDO() {
	}
	@Column(name = "saas_id", length = 100)

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

@@ -12,7 +12,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "system_dict_list")
public class SystemDictList extends IdEntityWithOperation implements java.io.Serializable {
public class SystemDictListDO extends IdEntityWithOperation implements java.io.Serializable {
	// Fields

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

@@ -17,7 +17,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "base_login_account")
public class BaseLoginAccount extends IdEntity implements java.io.Serializable {
public class BaseLoginAccountDO extends IdEntity implements java.io.Serializable {
	private String userType;//'用户类型 1居民 2医生 或者行政管理员'
	private String password;//'密码'
@@ -39,12 +39,12 @@ public class BaseLoginAccount extends IdEntity implements java.io.Serializable {
	// Constructors
	/** default constructor */
	public BaseLoginAccount() {
	public BaseLoginAccountDO() {
	}
	/** full constructor */
	public BaseLoginAccount(Integer id, String code, String userType,
	public BaseLoginAccountDO(Integer id, String code, String userType,
							String password, String salt, String accountStatus, Date createTime,
							Date updateTime, String saasId, String email) {
		this.userType = userType;

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

@@ -12,7 +12,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "base_login_log")
public class BaseLoginLog extends IdEntity implements java.io.Serializable {
public class BaseLoginLogDO extends IdEntity implements java.io.Serializable {
	private String loginType;//'1 短信登录  2 密码登录'
	private String userId;//'登录用户主键 患者code或者医生code'
@@ -27,11 +27,11 @@ public class BaseLoginLog extends IdEntity implements java.io.Serializable {
	// Constructors
	/** default constructor */
	public BaseLoginLog() {
	public BaseLoginLogDO() {
	}
	/** minimal constructor */
	public BaseLoginLog(Integer id, Date createTime) {
	public BaseLoginLogDO(Integer id, Date createTime) {
		this.createTime = createTime;
	}

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

@@ -10,7 +10,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_login_account")
public class WlyyLoginAccount extends IdEntityWithOperation implements java.io.Serializable {
public class WlyyLoginAccountDO extends IdEntityWithOperation implements java.io.Serializable {
	private String userType;//'用户类型 1居民 2医生 或者行政管理员'
	private String password;//'密码'
@@ -22,18 +22,18 @@ public class WlyyLoginAccount extends IdEntityWithOperation implements java.io.S
	// Constructors
	/** default constructor */
	public WlyyLoginAccount() {
	public WlyyLoginAccountDO() {
	}
	/** minimal constructor */
	public WlyyLoginAccount(Date createTime, Date updateTime) {
	public WlyyLoginAccountDO(Date createTime, Date updateTime) {
		this.createTime = createTime;
		this.updateTime = updateTime;
	}
	/** full constructor */
	public WlyyLoginAccount( String userType,
	public WlyyLoginAccountDO( String userType,
			String password, String salt, String accountStatus, Date createTime,
			Date updateTime, String saasId, String email) {
		this.userType = userType;

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

@@ -10,7 +10,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_login_log")
public class WlyyLoginLog extends IdEntity implements java.io.Serializable {
public class WlyyLoginLogDO extends IdEntity implements java.io.Serializable {
	private String loginType;//'1 短信登录  2 密码登录'
	private String userCode;//'登录用户主键 患者code或者医生code'
@@ -25,7 +25,7 @@ public class WlyyLoginLog extends IdEntity implements java.io.Serializable {
	// Constructors
	/** default constructor */
	public WlyyLoginLog() {
	public WlyyLoginLogDO() {
	}
	@Column(name = "login_type", length = 2)

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

@@ -13,7 +13,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "base_sms")
public class BaseSms extends IdEntityWithOperation implements java.io.Serializable {
public class BaseSmsDO extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
@@ -30,11 +30,11 @@ public class BaseSms extends IdEntityWithOperation implements java.io.Serializab
	// Constructors
	/** default constructor */
	public BaseSms() {
	public BaseSmsDO() {
	}
	/** minimal constructor */
	public BaseSms(String mobile, String ip, Integer type, String captcha,
	public BaseSmsDO(String mobile, String ip, Integer type, String captcha,
			String content, Timestamp deadline, Integer status, Timestamp czrq) {
		this.mobile = mobile;
		this.ip = ip;
@@ -46,7 +46,7 @@ public class BaseSms extends IdEntityWithOperation implements java.io.Serializab
	}
	/** full constructor */
	public BaseSms(String saasId, String mobile, String ip, Integer type,
	public BaseSmsDO(String saasId, String mobile, String ip, Integer type,
			String captcha, String content, Timestamp deadline, Integer status,
			Timestamp czrq) {
		this.saasId = saasId;

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

@@ -13,7 +13,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_sms_gateway")
public class BaseSmsGateway  extends IdEntity implements java.io.Serializable {
public class BaseSmsGatewayDO  extends IdEntity implements java.io.Serializable {
	// Fields
@@ -30,11 +30,11 @@ public class BaseSmsGateway  extends IdEntity implements java.io.Serializable {
	// Constructors
	/** default constructor */
	public BaseSmsGateway() {
	public BaseSmsGatewayDO() {
	}
	/** full constructor */
	public BaseSmsGateway(Long id, String code, String saasId,
	public BaseSmsGatewayDO(Long id, String code, String saasId,
			String orgCode, String ip, String username, String password,
			String url) {
		this.saasId = saasId;

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

@@ -0,0 +1,215 @@
package com.yihu.jw.base.user;
import com.yihu.jw.IdEntityWithOperation;
import java.sql.Timestamp;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
 * BaseEmploy entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_employ")
public class BaseEmployDO extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
	private String saasId;
	private String name;
	private String pyCode;
	private String sex;
	private String photo;
	private String skill;
	private String workPortal;
	private String email;
	private String phone;
	private String secondPhone;
	private String familyTel;
	private String officeTel;
	private String introduction;
	private String jxzc;
	private String lczc;
	private String xlzc;
	private String xzzc;
	private Integer status;
	// Constructors
	/** default constructor */
	public BaseEmployDO() {
	}
	/** minimal constructor */
	public BaseEmployDO(String id, String saasId) {
		this.id = id;
		this.saasId = saasId;
	}
	@Column(name = "saas_id", nullable = false, length = 50)
	public String getSaasId() {
		return this.saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@Column(name = "name", length = 50)
	public String getName() {
		return this.name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(name = "py_code", length = 50)
	public String getPyCode() {
		return this.pyCode;
	}
	public void setPyCode(String pyCode) {
		this.pyCode = pyCode;
	}
	@Column(name = "sex", length = 10)
	public String getSex() {
		return this.sex;
	}
	public void setSex(String sex) {
		this.sex = sex;
	}
	@Column(name = "photo", length = 256)
	public String getPhoto() {
		return this.photo;
	}
	public void setPhoto(String photo) {
		this.photo = photo;
	}
	@Column(name = "skill", length = 100)
	public String getSkill() {
		return this.skill;
	}
	public void setSkill(String skill) {
		this.skill = skill;
	}
	@Column(name = "work_portal", length = 256)
	public String getWorkPortal() {
		return this.workPortal;
	}
	public void setWorkPortal(String workPortal) {
		this.workPortal = workPortal;
	}
	@Column(name = "email", length = 64)
	public String getEmail() {
		return this.email;
	}
	public void setEmail(String email) {
		this.email = email;
	}
	@Column(name = "phone", length = 20)
	public String getPhone() {
		return this.phone;
	}
	public void setPhone(String phone) {
		this.phone = phone;
	}
	@Column(name = "second_phone", length = 20)
	public String getSecondPhone() {
		return this.secondPhone;
	}
	public void setSecondPhone(String secondPhone) {
		this.secondPhone = secondPhone;
	}
	@Column(name = "family_tel", length = 20)
	public String getFamilyTel() {
		return this.familyTel;
	}
	public void setFamilyTel(String familyTel) {
		this.familyTel = familyTel;
	}
	@Column(name = "office_tel", length = 20)
	public String getOfficeTel() {
		return this.officeTel;
	}
	public void setOfficeTel(String officeTel) {
		this.officeTel = officeTel;
	}
	@Column(name = "introduction", length = 256)
	public String getIntroduction() {
		return this.introduction;
	}
	public void setIntroduction(String introduction) {
		this.introduction = introduction;
	}
	@Column(name = "jxzc", length = 50)
	public String getJxzc() {
		return this.jxzc;
	}
	public void setJxzc(String jxzc) {
		this.jxzc = jxzc;
	}
	@Column(name = "lczc", length = 50)
	public String getLczc() {
		return this.lczc;
	}
	public void setLczc(String lczc) {
		this.lczc = lczc;
	}
	@Column(name = "xlzc", length = 50)
	public String getXlzc() {
		return this.xlzc;
	}
	public void setXlzc(String xlzc) {
		this.xlzc = xlzc;
	}
	@Column(name = "xzzc", length = 50)
	public String getXzzc() {
		return this.xzzc;
	}
	public void setXzzc(String xzzc) {
		this.xzzc = xzzc;
	}
	@Column(name = "status")
	public Integer getStatus() {
		return this.status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
}

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

@@ -0,0 +1,58 @@
package com.yihu.jw.base.user;
import com.yihu.jw.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
 * BaseEmployRole entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_employ_role")
public class BaseEmployRoleDO extends IdEntity implements java.io.Serializable {
	// Fields
	private String roleId;
	private String employId;
	// Constructors
	/** default constructor */
	public BaseEmployRoleDO() {
	}
	/** minimal constructor */
	public BaseEmployRoleDO(String id) {
		this.id = id;
	}
	/** full constructor */
	public BaseEmployRoleDO(String id, String roleId, String employId) {
		this.id = id;
		this.roleId = roleId;
		this.employId = employId;
	}
	@Column(name = "role_id", length = 50)
	public String getRoleId() {
		return this.roleId;
	}
	public void setRoleId(String roleId) {
		this.roleId = roleId;
	}
	@Column(name = "employ_id", length = 50)
	public String getEmployId() {
		return this.employId;
	}
	public void setEmployId(String employId) {
		this.employId = employId;
	}
}

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

@@ -0,0 +1,107 @@
package com.yihu.jw.base.user;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import java.sql.Timestamp;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
 * BaseMenu entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_menu")
public class BaseMenuDO extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
	private String saasId;
	private String parentId;
	private String name;
	private Integer sort;
	private Integer status;
	private String remark;
	// Constructors
	/** default constructor */
	public BaseMenuDO() {
	}
	/** minimal constructor */
	public BaseMenuDO(String id, Timestamp createTime, Timestamp updateTime) {
		this.id = id;
		this.createTime = createTime;
		this.updateTime = updateTime;
	}
	// Property accessors
	@Id
	@Column(name = "id", unique = true, nullable = false, length = 50)
	public String getId() {
		return this.id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(name = "saas_id", length = 50)
	public String getSaasId() {
		return this.saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@Column(name = "parent_id", length = 50)
	public String getParentId() {
		return this.parentId;
	}
	public void setParentId(String parentId) {
		this.parentId = parentId;
	}
	@Column(name = "name", length = 50)
	public String getName() {
		return this.name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(name = "sort")
	public Integer getSort() {
		return this.sort;
	}
	public void setSort(Integer sort) {
		this.sort = sort;
	}
	@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;
	}
}

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

@@ -0,0 +1,86 @@
package com.yihu.jw.base.user;
import com.yihu.jw.IdEntityWithOperation;
import java.sql.Timestamp;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
 * BaseRole entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_role")
public class BaseRoleDO extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
	private String saasId;
	private String name;
	private Integer status;
	private String remark;
	// Constructors
	/** default constructor */
	public BaseRoleDO() {
	}
	/** minimal constructor */
	public BaseRoleDO(String id, Timestamp createTime, Timestamp updateTime) {
		this.id = id;
		this.createTime = createTime;
		this.updateTime = updateTime;
	}
	// Property accessors
	@Id
	@Column(name = "id", unique = true, nullable = false, length = 50)
	public String getId() {
		return this.id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(name = "saas_id", length = 50)
	public String getSaasId() {
		return this.saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@Column(name = "name", length = 50)
	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;
	}
}

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

@@ -0,0 +1,52 @@
package com.yihu.jw.base.user;
import com.yihu.jw.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
 * BaseRoleMenu entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_role_menu")
public class BaseRoleMenuDO extends IdEntity implements java.io.Serializable {
	// Fields
	private String roleId;
	private String menuId;
	// Constructors
	/** default constructor */
	public BaseRoleMenuDO() {
	}
	/** minimal constructor */
	public BaseRoleMenuDO(String id) {
		this.id = id;
	}
	@Column(name = "role_id", length = 50)
	public String getRoleId() {
		return this.roleId;
	}
	public void setRoleId(String roleId) {
		this.roleId = roleId;
	}
	@Column(name = "menu_id", length = 50)
	public String getMenuId() {
		return this.menuId;
	}
	public void setMenuId(String menuId) {
		this.menuId = menuId;
	}
}

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

@@ -18,30 +18,31 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_user_version")
public class BaseUserVersion  extends IdEntity implements java.io.Serializable {
public class BaseUserVersionDO  extends IdEntity implements java.io.Serializable {
	// Fields
	private String userId;
	private String employeeId;
	private String version;
	// Constructors
	/** default constructor */
	public BaseUserVersion() {
	public BaseUserVersionDO() {
	}
	@Column(name = "user_id", length = 100)
	public String getUserId() {
		return userId;
	@Column(name = "employee_id", length = 100)
	public String getEmployeeId() {
		return employeeId;
	}
	public void setUserId(String userId) {
		this.userId = userId;
	public void setEmployeeId(String employeeId) {
		this.employeeId = employeeId;
	}
	@Column(name = "version", length = 100)
	public String getVersion() {
		return this.version;

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

@@ -13,7 +13,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "wlyy_version")
public class WlyyVersion  extends IdEntityWithOperation implements java.io.Serializable {
public class WlyyVersionDO  extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
@@ -30,7 +30,7 @@ public class WlyyVersion  extends IdEntityWithOperation implements java.io.Seria
	// Constructors
	/** default constructor */
	public WlyyVersion() {
	public WlyyVersionDO() {
	}

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

@@ -7,7 +7,7 @@ import java.util.Map;
 * 微信消息模板推送内容
 * @author George
 */
public class WechatTemplate implements Serializable {
public class WechatTemplateDO implements Serializable {
	private static final long serialVersionUID = 3877107913397496785L;
@@ -19,7 +19,7 @@ public class WechatTemplate implements Serializable {
    private Miniprogram miniprogram;
    private Map<String,WechatTemplateData> data;//详细内容
    private Map<String,WechatTemplateDataDO> data;//详细内容
    public Miniprogram getMiniprogram() {
@@ -48,10 +48,10 @@ public class WechatTemplate implements Serializable {
    public void setUrl(String url) {
        this.url = url;
    }
    public Map<String, WechatTemplateData> getData() {
    public Map<String, WechatTemplateDataDO> getData() {
        return data;
    }
    public void setData(Map<String, WechatTemplateData> data) {
    public void setData(Map<String, WechatTemplateDataDO> data) {
        this.data = data;
    }
    

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

@@ -7,7 +7,7 @@ import java.io.Serializable;
 * 微信消息模板
 * @author George
 */
public class WechatTemplateData implements Serializable {
public class WechatTemplateDataDO implements Serializable {
	private static final long serialVersionUID = -7399054549159698617L;
	private String value;

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

@@ -12,7 +12,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wx_access_token")
public class WxAccessToken extends IdEntity implements java.io.Serializable {
public class WxAccessTokenDO extends IdEntity implements java.io.Serializable {
	// Fields
@@ -23,7 +23,7 @@ public class WxAccessToken extends IdEntity implements java.io.Serializable {
	private Date czrq;//操作时间
	private String code;
	/** default constructor */
	public WxAccessToken() {
	public WxAccessTokenDO() {
	}

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

@@ -14,7 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wx_graphic_message")
public class WxGraphicMessage extends IdEntityWithOperation implements java.io.Serializable {
public class WxGraphicMessageDO extends IdEntityWithOperation implements java.io.Serializable {
    private String saasId;
    private String title;//标题
@@ -25,10 +25,10 @@ public class WxGraphicMessage extends IdEntityWithOperation implements java.io.S
    private Integer status;  //状态 -1删除 0 冻结 1可用
    public WxGraphicMessage() {
    public WxGraphicMessageDO() {
    }
    public WxGraphicMessage(String code, String title, String description, String url, String picUrl, String createUser, String createUserName, Date createTime, String updateUser, String updateUserName, Date updateTime, String remark, Integer status) {
    public WxGraphicMessageDO(String code, String title, String description, String url, String picUrl, String createUser, String createUserName, Date createTime, String updateUser, String updateUserName, Date updateTime, String remark, Integer status) {
        this.title = title;
        this.description = description;
        this.url = url;

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

@@ -16,7 +16,7 @@ import java.util.List;
 */
@Entity
@Table(name = "wx_menu")
public class WxMenu extends IdEntityWithOperation implements java.io.Serializable {
public class WxMenuDO extends IdEntityWithOperation implements java.io.Serializable {
    private String wechatId;//关联的微信code 关联表 Wx_Wechat
    private String supMenuid;//父菜单id 如果是一级菜单 此字段为空
@@ -37,21 +37,21 @@ public class WxMenu extends IdEntityWithOperation implements java.io.Serializabl
    private String state;                //children长度为0时    state  “open”表示是子节点，“closed”表示为父节点；
                                         // children长度>0时,    state   “open,closed”表示是节点的打开关闭
    @Transient
    private List<WxMenu> children = new ArrayList<>();
    private List<WxMenuDO> children = new ArrayList<>();
    /**
     * default constructor
     */
    public WxMenu() {
    public WxMenuDO() {
    }
    public List<WxMenu> getChildren() {
    public List<WxMenuDO> getChildren() {
        return children;
    }
    public void setChildren(List<WxMenu> children) {
    public void setChildren(List<WxMenuDO> children) {
        this.children = children;
    }

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

@@ -14,7 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wx_template")
public class WxTemplate extends IdEntityWithOperation implements java.io.Serializable {
public class WxTemplateDO extends IdEntityWithOperation implements java.io.Serializable {
    // Fields
    private String title;//模板标题
@@ -29,7 +29,7 @@ public class WxTemplate extends IdEntityWithOperation implements java.io.Seriali
    /**
     * default constructor
     */
    public WxTemplate() {
    public WxTemplateDO() {
    }
    @Column(name = "title")

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

@@ -17,7 +17,7 @@ import java.util.Map;
 */
@Entity
@Table(name = "wx_wechat")
public class WxWechat extends IdEntityWithOperation implements java.io.Serializable {
public class WxWechatDO extends IdEntityWithOperation implements java.io.Serializable {
    // Fields
    private String saasId;//'saas配置id'
@@ -38,7 +38,7 @@ public class WxWechat extends IdEntityWithOperation implements java.io.Serializa
    @Transient
    private String state;
    public WxWechat(String code, String saasId, String name, String token, String encodingAesKey, Integer encType, Integer status, String type, String appId, String appSecret, String baseUrl, String createUser, String createUserName, Date createTime, String updateUser, String updateUserName, Date updateTime, String remark) {
    public WxWechatDO(String code, String saasId, String name, String token, String encodingAesKey, Integer encType, Integer status, String type, String appId, String appSecret, String baseUrl, String createUser, String createUserName, Date createTime, String updateUser, String updateUserName, Date updateTime, String remark) {
        this.saasId = saasId;
        this.name = name;
        this.token = token;
@@ -60,7 +60,7 @@ public class WxWechat extends IdEntityWithOperation implements java.io.Serializa
    /**
     * default constructor
     */
    public WxWechat() {
    public WxWechatDO() {
    }
    public List<Map<String, Object>> getChildren() {

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

@@ -18,7 +18,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_agreement")
public class WlyyAgreement extends IdEntityWithOperation implements Serializable{
public class WlyyAgreementDO extends IdEntityWithOperation implements Serializable{
    private static final long serialVersionUID = -4343130835307199266L;
@@ -30,7 +30,7 @@ public class WlyyAgreement extends IdEntityWithOperation implements Serializable
    private String type;//类型
    private Integer status;//状态 -1删除 0 冻结 1可用
    public WlyyAgreement(){
    public WlyyAgreementDO(){
    }

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

@@ -15,7 +15,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_agreement_kpi")
public class WlyyAgreementKpi extends IdEntityWithOperation {
public class WlyyAgreementKpiDO extends IdEntityWithOperation {
    private String saasId;//saasId
    private String agreementCode;//套餐代码
    private String kpiName;//服务项名称

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

@@ -16,7 +16,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_agreement_kpi_log")
public class WlyyAgreementKpiLog extends IdEntity {
public class WlyyAgreementKpiLogDO extends IdEntity {
    private static final long serialVersionUID = -3196907595969778396L;
    private String saasId;

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

@@ -14,7 +14,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_sign_family")
public class WlyySignFamily extends IdEntityWithOperation {
public class WlyySignFamilyDO extends IdEntityWithOperation {
    private static final long serialVersionUID = -6759565631854462880L;
    private String saasId;

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

@@ -1,222 +0,0 @@
package com.yihu.jw.wlyy.doctor;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by Administrator on 2017/6/7 0007.
 */
@Entity
@Table(name = "base_doctors")
public class BaseDoctors extends IdEntityWithOperation {
    private static final long serialVersionUID = 3138130150854187709L;
    private String userId;//云平台用户ID
    private String name;//姓名
    private String pyCode;//姓名首字母
    private String sex;//性别(1男,2女)
    private String photo;//医生头像
    private String skill;//医生专长
    private String workPortal;//医生门户首页
    private String email;//邮箱
    private String phone;//联系电话
    private String secondPhone;//备用电话
    private String familyTel;//家庭电话(固)
    private String officeTel;//办公电话(固)
    private String introduction;//简介
    private String jxzc;//教学职称
    private String lczc;//临床职称
    private String xlzc;//学历职称
    private String xzzc;//行政职称
    private Integer status;//状态:-1 删除 0 禁用 1可用
    @Column(name = "user_id")
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    
    @Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    
    @Column(name = "py_code")
    public String getPyCode() {
        return pyCode;
    }
    public void setPyCode(String pyCode) {
        this.pyCode = pyCode;
    }
    
    @Column(name = "sex")
    public String getSex() {
        return sex;
    }
    public void setSex(String sex) {
        this.sex = sex;
    }
    
    @Column(name = "photo")
    public String getPhoto() {
        return photo;
    }
    public void setPhoto(String photo) {
        this.photo = photo;
    }
    
    @Column(name = "skill")
    public String getSkill() {
        return skill;
    }
    public void setSkill(String skill) {
        this.skill = skill;
    }
    
    @Column(name = "work_portal")
    public String getWorkPortal() {
        return workPortal;
    }
    public void setWorkPortal(String workPortal) {
        this.workPortal = workPortal;
    }
    
    @Column(name = "email")
    public String getEmail() {
        return email;
    }
    public void setEmail(String email) {
        this.email = email;
    }
    
    @Column(name = "phone")
    public String getPhone() {
        return phone;
    }
    public void setPhone(String phone) {
        this.phone = phone;
    }
    
    @Column(name = "second_phone")
    public String getSecondPhone() {
        return secondPhone;
    }
    public void setSecondPhone(String secondPhone) {
        this.secondPhone = secondPhone;
    }
    
    @Column(name = "family_tel")
    public String getFamilyTel() {
        return familyTel;
    }
    public void setFamilyTel(String familyTel) {
        this.familyTel = familyTel;
    }
    
    @Column(name = "office_tel")
    public String getOfficeTel() {
        return officeTel;
    }
    public void setOfficeTel(String officeTel) {
        this.officeTel = officeTel;
    }
    
    @Column(name = "introduction")
    public String getIntroduction() {
        return introduction;
    }
    public void setIntroduction(String introduction) {
        this.introduction = introduction;
    }
    
    @Column(name = "jxzc")
    public String getJxzc() {
        return jxzc;
    }
    public void setJxzc(String jxzc) {
        this.jxzc = jxzc;
    }
    
    @Column(name = "lczc")
    public String getLczc() {
        return lczc;
    }
    public void setLczc(String lczc) {
        this.lczc = lczc;
    }
    
    @Column(name = "xlzc")
    public String getXlzc() {
        return xlzc;
    }
    public void setXlzc(String xlzc) {
        this.xlzc = xlzc;
    }
    
    @Column(name = "xzzc")
    public String getXzzc() {
        return xzzc;
    }
    public void setXzzc(String xzzc) {
        this.xzzc = xzzc;
    }
    
    @Column(name = "status")
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
}

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

@@ -1,11 +1,10 @@
package com.yihu.jw.wlyy.doctor;// default package
package com.yihu.jw.wlyy.hospital;// default package
import com.yihu.jw.IdEntityWithOperation;
import java.sql.Timestamp;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
@@ -13,7 +12,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_org")
public class BaseOrg extends IdEntityWithOperation implements java.io.Serializable {
public class BaseOrgDO extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
@@ -43,12 +42,12 @@ public class BaseOrg extends IdEntityWithOperation implements java.io.Serializab
	// Constructors
	/** default constructor */
	public BaseOrg() {
	public BaseOrgDO() {
	}
	/** full constructor */
	public BaseOrg(String id, String province, String provinceName,
	public BaseOrgDO(String id, String province, String provinceName,
			String city, String cityName, String town, String townName,
			String name, String alias, String spell, String type,
			String address, String traffic, String photo, String saasId,

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

@@ -1,11 +1,9 @@
package com.yihu.jw.wlyy.doctor;// default package
package com.yihu.jw.wlyy.hospital;// default package
import com.yihu.jw.IdEntityWithOperation;
import java.sql.Timestamp;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
@@ -13,7 +11,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_org_dept")
public class BaseOrgDept extends IdEntityWithOperation implements java.io.Serializable {
public class BaseOrgDeptDO extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
	private String orgId;
@@ -31,7 +29,7 @@ public class BaseOrgDept extends IdEntityWithOperation implements java.io.Serial
	// Constructors
	/** default constructor */
	public BaseOrgDept() {
	public BaseOrgDeptDO() {
	}
	@Column(name = "org_id", nullable = false, length = 100)

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

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

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

@@ -1,275 +0,0 @@
package com.yihu.jw.wlyy.patient;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
import java.sql.Date;
/**
 * Created by Administrator on 2017/6/6 0006.
 */
@Entity
@Table(name = "base_patient")
public class BasePatient extends IdEntityWithOperation implements Serializable {
    private static final long serialVersionUID = -5371957917251091855L;
    private String accountId;//关联wlyy_login_account账号id
    private String idcard;//身份证
    private String name;//姓名
    private Date birthday;//生日
    private String sex;//性别
    private String mobile;//手机
    private String phone;//联系电话
    private String ssc;//社保卡
    private String photo;//头像http地址
    private String province;//省编码
    private String provinceName;//省名称
    private String city;//市编码
    private String cityName;//市名称
    private String town;//区县编码
    private String townName;//区县名称
    private String street;//街道
    private String streetName;//街道名称
    private String address;//详细地址
    private Integer status;//用户状态：1正常，0禁用，-1恶意注册，2审核中
    private String saasId;//saas配置id
    private String email;//邮箱
    private String nation;//籍贯
    private String spell;//名称拼音首字母
    @Column(name = "account_id")
    public String getAccountId() {
        return accountId;
    }
    public void setAccountId(String accountId) {
        this.accountId = accountId;
    }
    
    @Column(name = "idcard")
    public String getIdcard() {
        return idcard;
    }
    public void setIdcard(String idcard) {
        this.idcard = idcard;
    }
    
    @Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    
    @Column(name = "birthday")
    public Date getBirthday() {
        return birthday;
    }
    public void setBirthday(Date birthday) {
        this.birthday = birthday;
    }
    
    @Column(name = "sex")
    public String getSex() {
        return sex;
    }
    public void setSex(String sex) {
        this.sex = sex;
    }
    
    @Column(name = "mobile")
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    
    @Column(name = "phone")
    public String getPhone() {
        return phone;
    }
    public void setPhone(String phone) {
        this.phone = phone;
    }
    
    @Column(name = "ssc")
    public String getSsc() {
        return ssc;
    }
    public void setSsc(String ssc) {
        this.ssc = ssc;
    }
    
    @Column(name = "photo")
    public String getPhoto() {
        return photo;
    }
    public void setPhoto(String photo) {
        this.photo = photo;
    }
    
    @Column(name = "province")
    public String getProvince() {
        return province;
    }
    public void setProvince(String province) {
        this.province = province;
    }
    
    @Column(name = "province_name")
    public String getProvinceName() {
        return provinceName;
    }
    public void setProvinceName(String provinceName) {
        this.provinceName = provinceName;
    }
    
    @Column(name = "city")
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
    
    @Column(name = "city_name")
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
    
    @Column(name = "town")
    public String getTown() {
        return town;
    }
    public void setTown(String town) {
        this.town = town;
    }
    
    @Column(name = "town_name")
    public String getTownName() {
        return townName;
    }
    public void setTownName(String townName) {
        this.townName = townName;
    }
    
    @Column(name = "street")
    public String getStreet() {
        return street;
    }
    public void setStreet(String street) {
        this.street = street;
    }
    
    @Column(name = "street_name")
    public String getStreetName() {
        return streetName;
    }
    public void setStreetName(String streetName) {
        this.streetName = streetName;
    }
    
    @Column(name = "address")
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
    
    @Column(name = "status")
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    
    @Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    
    @Column(name = "email")
    public String getEmail() {
        return email;
    }
    public void setEmail(String email) {
        this.email = email;
    }
    
    @Column(name = "nation")
    public String getNation() {
        return nation;
    }
    public void setNation(String nation) {
        this.nation = nation;
    }
    
    @Column(name = "spell")
    public String getSpell() {
        return spell;
    }
    public void setSpell(String spell) {
        this.spell = spell;
    }
}

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

@@ -13,7 +13,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_patient_extend")
public class BasePatientExtend extends IdEntityWithOperation implements java.io.Serializable {
public class BasePatientExtendDO extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
@@ -31,11 +31,11 @@ public class BasePatientExtend extends IdEntityWithOperation implements java.io.
	// Constructors
	/** default constructor */
	public BasePatientExtend() {
	public BasePatientExtendDO() {
	}
	/** minimal constructor */
	public BasePatientExtend(String id, Date entryDate,
	public BasePatientExtendDO(String id, Date entryDate,
			Date workStateTime, Date createTime, Date updateTime) {
		this.id = id;
		this.entryDate = entryDate;
@@ -43,7 +43,7 @@ public class BasePatientExtend extends IdEntityWithOperation implements java.io.
	}
	/** full constructor */
	public BasePatientExtend(String id, String patientId, Date entryDate,
	public BasePatientExtendDO(String id, String patientId, Date entryDate,
			String workState, Date workStateTime, String jobNumber,
			String companyId, String companyName, String companyEmail,
			String remark, String createUser, String createUserName,

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

@@ -13,7 +13,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_patient_wechat")
public class BasePatientWechat extends IdEntity implements java.io.Serializable {
public class BasePatientWechatDO extends IdEntity implements java.io.Serializable {
    // Fields
@@ -30,13 +30,13 @@ public class BasePatientWechat extends IdEntity implements java.io.Serializable
    /**
     * default constructor
     */
    public BasePatientWechat() {
    public BasePatientWechatDO() {
    }
    /**
     * minimal constructor
     */
    public BasePatientWechat(String id, Date createTime) {
    public BasePatientWechatDO(String id, Date createTime) {
        this.id = id;
        this.createTime = createTime;
    }
@@ -44,7 +44,7 @@ public class BasePatientWechat extends IdEntity implements java.io.Serializable
    /**
     * full constructor
     */
    public BasePatientWechat(String id, String saasId, String wechatId,
    public BasePatientWechatDO(String id, String saasId, String wechatId,
                             String patientId, String openid, String unionid,
                             Date createTime) {
        this.id = id;

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

@@ -15,7 +15,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_advertisement")
public class WlyyAdvertisement extends IdEntityWithOperation implements Serializable {
public class WlyyAdvertisementDO extends IdEntityWithOperation implements Serializable {
    private static final long serialVersionUID = 1497635003375865515L;
    private String saasId;//0,为默认广告

common/common-request-mapping/readme.MD

@@ -1 +1,4 @@
common-request-mapping路径
**
common-request-mapping路径
网关调用微服务的路径统一放在这项目 每个模块都必须是 /svr-{模块名称}/xxx  开头  避免和网关对外的路径冲突
**

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -6,7 +6,7 @@ package com.yihu.jw.rm.base;
 */
public class BaseRequestMapping {
    public static final String api_common = "/bases";
    public static final String api_base_common = "/svr-bases";
    //功能模块常量
    public static class Function{

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseSmsRequestMapping.java

@@ -6,7 +6,7 @@ package com.yihu.jw.rm.base;
 */
public class BaseSmsRequestMapping {
    public static final String api_common="sms";
    public static final String api_common=BaseRequestMapping.api_base_common+"/sms";
    //短信常量
    public static class Sms{
        public static final String message_success_create="sms create success";

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseVersionRequestMapping.java

@@ -5,7 +5,11 @@ package com.yihu.jw.rm.base;
 */
public class BaseVersionRequestMapping {
    public static final String api_common = "/version";
    public static final String api_common = BaseRequestMapping.api_base_common+"/version";
    /**
     * wlyy app版本
     */
    public static class WlyyVersion {
        public static final String api_create = "/wlyyVersion";
        public static final String api_update = "/wlyyVersion";
@@ -30,6 +34,9 @@ public class BaseVersionRequestMapping {
    }
    /**
     * 用户版本 用户灰度发布
     */
    public class UserVersion {
        public static final String api_create = "/userVersion";
        public static final String api_update = "/userVersion";

common/common-request-mapping/src/main/java/com/yihu/jw/rm/wx/WechatRequestMapping.java

@@ -1,11 +1,11 @@
package com.yihu.jw.rm.wx;
package com.yihu.jw.rm.base;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public class WechatRequestMapping {
    public static final String api_common="/wechat";
    public static final String api_common=BaseRequestMapping.api_base_common+"/wechat";
    //微信token模块常量

common/common-request-mapping/src/main/java/com/yihu/jw/rm/wlyy/WlyyRequestMapping.java

@@ -5,7 +5,7 @@ package com.yihu.jw.rm.wlyy;
 */
public class WlyyRequestMapping {
    public static final String api_common = "wlyy";
    public static final String api_wlyy_common = "svr-wlyy";
    //协议模块常量
    public static class Agreement {
@@ -115,11 +115,11 @@ public class WlyyRequestMapping {
    广告相关操作
     */
    public static class Advertisement {
        public static final String api_common = "advertisement";
        public static final String api_create = "create";
        public static final String api_delete = "delete";
        public static final String api_create = "advertisement";
        public static final String api_delete = "advertisement";
        public static final String api_getById = "getById";
        public static final String api_update = "update";
        public static final String api_update = "advertisement";
        public static final String api_queryPage = "queryPage";
        public static final String api_getList = "getList";
        public static final String api_getListByPatientId = "getListByPatientId";

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/base/MFunction.java

@@ -5,9 +5,8 @@ import java.util.*;
/**
 * Created by chenweida on 2017/5/19.
 */
public class MFunction {
    private Long id;
    private String code;//业务code
public class FunctionVO {
    private String id;
    private String name; //功能名称
    private String saasId; // saasid
    private String parentCode; //父功能code
@@ -20,25 +19,17 @@ public class MFunction {
    private String updateUserName;
    private Date updateTime;
    private String remark; //备注
    private List<MFunction> children = new ArrayList<>();
    private List<FunctionVO> children = new ArrayList<>();
    private String text;
    public Long getId() {
    public String getId() {
        return id;
    }
    public void setId(Long id) {
    public void setId(String id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }
@@ -127,11 +118,11 @@ public class MFunction {
        this.remark = remark;
    }
    public List<MFunction> getChildren() {
    public List<FunctionVO> getChildren() {
        return children;
    }
    public void setChildren(List<MFunction> children) {
    public void setChildren(List<FunctionVO> children) {
        this.children = children;
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/base/MModule.java

@@ -7,9 +7,8 @@ import java.util.List;
/**
 * Created by chenweida on 2017/5/19.
 */
public class MModule {
    private Long id;
    private String code; //业务code
public class ModuleVO{
    private String id;
    private String name; //模块名称
    private String saasId; //关联 Saas code
    private String parentCode;//父id
@@ -22,24 +21,16 @@ public class MModule {
    private Date updateTime;
    private String remark;
    private String state ;   //closed:表示有子节点   open:表示没有子节点
    private List<MModule> children = new ArrayList<>();
    private List<ModuleVO> children = new ArrayList<>();
    public Long getId() {
    public String getId() {
        return id;
    }
    public void setId(Long id) {
    public void setId(String id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }
@@ -136,11 +127,11 @@ public class MModule {
        this.state = state;
    }
    public List<MModule> getChildren() {
    public List<ModuleVO> getChildren() {
        return children;
    }
    public void setChildren(List<MModule> children) {
    public void setChildren(List<ModuleVO> children) {
        this.children = children;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/base/MSaas.java

@@ -5,9 +5,8 @@ import java.util.Date;
/**
 * Created by chenweida on 2017/5/19.
 */
public class MSaas {
    private Long id;
    private String code;//业务code、
public class SaasVO {
    private String id;
    private String name;//名称
    private Integer status;//状态 -1 已删除 0待审核 1审核通过 2 审核不通过
    private String createUser; //创建人code
@@ -18,22 +17,14 @@ public class MSaas {
    private Date modifyTime;//修改时间
    private String remark;//备注
    public Long getId() {
    public String getId() {
        return id;
    }
    public void setId(Long id) {
    public void setId(String id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/sms/MSmsGateway.java

@@ -3,9 +3,8 @@ package com.yihu.jw.restmodel.base.sms;
/**
 * Created by chenweida on 2017/5/22.
 */
public class MSmsGateway {
    private Long id;
    private String code; //业务code
public class SmsGatewayVO {
    private String id;
    private String name;//名称
    private String saasId; //关联 base_saas code
    private String orgCode; //机构code
@@ -14,12 +13,12 @@ public class MSmsGateway {
    private String password;	//短信接口的密码
    private String url;	//短信接口的url
    public String getCode() {
        return code;
    public String getId() {
        return id;
    }
    public void setCode(String code) {
        this.code = code;
    public void setId(String id) {
        this.id = id;
    }
    public String getSaasId() {
@@ -70,13 +69,6 @@ public class MSmsGateway {
        this.url = url;
    }
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public String getName() {
        return name;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/sms/MSms.java

@@ -5,9 +5,8 @@ import java.util.Date;
/**
 * Created by chenweida on 2017/5/22.
 */
public class MSms {
    private Long id;
public class SmsVO {
    private String id;
    private String saasId;	//saasid 关联base_saas code
    private String mobile;	//电话号码
    private String ip;	//发送短信的ip地址
@@ -18,11 +17,11 @@ public class MSms {
    private Integer status;	//短信状态 状态，0未发送，1已发送
    private Date czrq; //操作时间
    public Long getId() {
    public String getId() {
        return id;
    }
    public void setId(Long id) {
    public void setId(String id) {
        this.id = id;
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/version/MBaseServerUrlVersion.java

@@ -5,8 +5,8 @@ import java.util.Date;
/**
 * Created by chenweida on 2017/6/16.
 */
public class MBaseServerUrlVersion {
    private String code;
public class BaseServerUrlVersionVO {
    private String id;
    private String saasId;
    private String functionCode;//关联功能表 base_function code
    private String functionName;//功能名字
@@ -23,12 +23,12 @@ public class MBaseServerUrlVersion {
    private Integer status;//1: 正常 0：不可用  -1删除
    private String remark;
    public String getCode() {
        return code;
    public String getId() {
        return id;
    }
    public void setCode(String code) {
        this.code = code;
    public void setId(String id) {
        this.id = id;
    }
    public String getSaasId() {

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/version/MBaseServerVersionLog.java

@@ -5,9 +5,9 @@ import java.util.Date;
/**
 * Created by chenweida on 2017/6/16.
 */
public class MBaseServerVersionLog {
public class BaseServerVersionLogVO {
    private Long id;
    private String id;
    private String saasId; //关联saas code
    private String userCodes;//此次更新的用户 多个逗号分割
    private String name;//此次更新的版本名称
@@ -21,14 +21,12 @@ public class MBaseServerVersionLog {
        return saasId;
    }
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
    public void setId(String id) {
        this.id = id;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/version/MBaseServerVersion.java

@@ -7,8 +7,8 @@ import java.util.List;
/**
 * Created by chenweida on 2017/6/16.
 */
public class MBaseServerVersion {
    private String code; //业务code
public class BaseServerVersionVO {
    private String id;
    private String saasId;//关联base_saas code
    private String userCode;//用户表code 医生
    private String name; //版本名称
@@ -22,18 +22,18 @@ public class MBaseServerVersion {
    private Integer status;////-1 删除 0 禁用 可用
    private String remark;
    private List<MBaseServerUrlVersion> children = new ArrayList<>();
    private List<BaseServerVersionVO> children = new ArrayList<>();
    //children长度为0时    state  “open”表示是子节点，“closed”表示为父节点；
    // children长度>0时,  state   “open,closed”表示是节点的打开关闭
    private String state;
    public String getCode() {
        return code;
    public String getId() {
        return id;
    }
    public void setCode(String code) {
        this.code = code;
    public void setId(String id) {
        this.id = id;
    }
    public String getSaasId() {
@@ -132,11 +132,11 @@ public class MBaseServerVersion {
        this.remark = remark;
    }
    public List<MBaseServerUrlVersion> getChildren() {
    public List<BaseServerVersionVO> getChildren() {
        return children;
    }
    public void setChildren(List<MBaseServerUrlVersion> children) {
    public void setChildren(List<BaseServerVersionVO> children) {
        this.children = children;
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/version/MWlyyVersion.java

@@ -5,8 +5,8 @@ import java.util.Date;
/**
 * Created by chenweida on 2017/6/16.
 */
public class MWlyyVersion {
    private Long id;
public class WlyyVersionVO {
    private String id;
    private String saasId; //saas code
    private String code;
    private String name;
@@ -23,11 +23,11 @@ public class MWlyyVersion {
    private String updateUserName;
    private Integer status;////-1 删除 0 禁用 可用
    public Long getId() {
    public String getId() {
        return id;
    }
    public void setId(Long id) {
    public void setId(String id) {
        this.id = id;
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/wx/MWxGraphicMessage.java

@@ -5,9 +5,8 @@ import java.util.Date;
/**
 * Created by Administrator on 2017/5/21 0021.
 */
public class MWxGraphicMessage {
    private Long id;
    private String code;//业务code
public class WxGraphicMessageVO {
    private String id;
    private String saasId;
    private String title;//标题
    private String description;//描述
@@ -22,22 +21,14 @@ public class MWxGraphicMessage {
    private String remark;//备注
    private Integer status;  //状态 -1删除 0 冻结 1可用
    public Long getId() {
    public String getId() {
        return id;
    }
    public void setId(Long id) {
    public void setId(String id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getTitle() {
        return title;
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/wx/MWxMenu.java

@@ -7,10 +7,9 @@ import java.util.List;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public class MWxMenu {
    private Long id;//主键id
public class WxMenuVO {
    private String id;//主键id
    private String code;//业务code
    private String wechatCode;//关联的微信code 关联表 Wx_Wechat
    private String wechatName;//关联的微信名 关联表 Wx_Wechat
    private String supMenucode;//父菜单id 如果是一级菜单 此字段为空
@@ -30,33 +29,25 @@ public class MWxMenu {
    private String createUserName;//创建人
    private String remark;//备注
    private Integer status; //状态 -1删除 0 冻结 1可用
    private List<MWxMenu> children = new ArrayList<>();
    private List<WxMenuVO> children = new ArrayList<>();
    private String state;
    public List<MWxMenu> getChildren() {
    public List<WxMenuVO> getChildren() {
        return children;
    }
    public void setChildren(List<MWxMenu> children) {
    public void setChildren(List<WxMenuVO> children) {
        this.children = children;
    }
    public Long getId() {
    public String getId() {
        return id;
    }
    public void setId(Long id) {
    public void setId(String id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getWechatCode() {
        return wechatCode;
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/wx/MWxTemplate.java

@@ -8,9 +8,8 @@ import java.util.Map;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public class MWxTemplate {
    private Long id;
    private String code;//模板code
public class WxTemplateVO {
    private String id;
    private String title;//模板标题
    private String name;//用于模板列表渲染
    private String wechatCode;//关联的微信code 关联表 Wx_Wechat
@@ -28,6 +27,14 @@ public class MWxTemplate {
    private String state;
    private Integer status;  //状态 -1删除 0 冻结 1可用
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getRemark() {
        return remark;
    }
@@ -44,21 +51,6 @@ public class MWxTemplate {
        this.status = status;
    }
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getTitle() {
        return title;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/wx/MWxWechat.java

@@ -8,10 +8,9 @@ import java.util.Map;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public class MWxWechat {
public class WxWechatVO {
    private Long id;
    private String code;//业务code
    private String id;
    private String saasId;//'saas配置id'
    private String name;//名称
    private String token;//token
@@ -32,23 +31,14 @@ public class MWxWechat {
    private List<Map<String,Object>> children = new ArrayList<>();
    private String state;
    public Long getId() {
    public String getId() {
        return id;
    }
    public void setId(Long id) {
    public void setId(String id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getSaasId() {
        return saasId;
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/manage/system/ManageUserVO.java

@@ -6,8 +6,7 @@ import java.util.Date;
 * Created by chenweida on 2017/6/9.
 */
public class ManageUserVO {
    private Integer id;
    private String code;
    private String id;
    private String name;
    private String password;//密码  密码是 密码+salt MD5加密
    private String salt;//盐值
@@ -22,22 +21,14 @@ public class ManageUserVO {
    private String updateUserName;
    private String remark;
    public Integer getId() {
    public String getId() {
        return id;
    }
    public void setId(Integer id) {
    public void setId(String id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }

svr-lib-parent-pom/pom.xml

@@ -21,15 +21,10 @@
    <!--deploy 的时候发布到这个服务器-->
    <distributionManagement>
        <repository>
            <id>releases</id>
            <name>Releases</name>
            <url>http://172.19.103.43:8081/nexus/content/repositories/releases/</url>
            <id>test</id>
            <name>testRespository</name>
            <url>http://172.19.103.43:8081/nexus/content/repositories/test/</url>
        </repository>
        <snapshotRepository>
            <id>snapshots</id>
            <name>Snapshots</name>
            <url>http://172.19.103.43:8081/nexus/content/repositories/snapshots/</url>
        </snapshotRepository>
    </distributionManagement>
    <modules>
@@ -41,7 +36,8 @@
        <!--业务微服务-->
        <module>../svr/svr-base</module><!--基础微服务-->
        <module>../svr/svr-wlyy</module><!--i健康微服务-->
        <module>../svr/svr-manage</module><!--基卫后台管理系统-->
        <!--<module>../svr/svr-manage</module>&lt;!&ndash;后台管理系统&ndash;&gt;-->
        <module>../svr/svr-iot</module><!--物联网平台-->
        <!--网关-->
        <module>../web-gateway</module><!--web网关-->
@@ -240,6 +236,11 @@
            <!--springCloud end-->
            <!--springBoot start-->
            <dependency>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-starter-test</artifactId>
                <version>${version.springBoot}</version>
            </dependency>
            <dependency>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot</artifactId>

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

@@ -3,6 +3,7 @@ package com.yihu.jw;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
@@ -17,6 +18,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
        entityManagerFactoryRef="baseEntityManagerFactory",
        transactionManagerRef = "baseTransactionManager"
)
@ComponentScan(basePackages={"com"})
public class SvrBaseApplication {
    public static void main(String[] args) {

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

@@ -1,10 +1,10 @@
package com.yihu.jw.business.base.controller;
import com.yihu.jw.base.base.Function;
import com.yihu.jw.base.base.FunctionDO;
import com.yihu.jw.business.base.service.FunctionService;
import com.yihu.jw.business.base.service.ModuleFunService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.base.MFunction;
import com.yihu.jw.restmodel.base.base.FunctionVO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.base.BaseRequestMapping;
@@ -25,7 +25,7 @@ import java.util.List;
 * Created by chenweida on 2017/5/19.
 */
@RestController
@RequestMapping(BaseRequestMapping.api_common)
@RequestMapping(BaseRequestMapping.api_base_common)
@Api(value = "功能模块", description = "功能模块接口管理")
public class FunctionController extends EnvelopRestController {
    @Autowired
@@ -39,7 +39,7 @@ public class FunctionController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            Function function = toEntity(jsonData, Function.class);
            FunctionDO function = toEntity(jsonData, FunctionDO.class);
            return Envelop.getSuccess(BaseRequestMapping.Function.message_success_create, functionService.createFunction(function));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -52,7 +52,7 @@ public class FunctionController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            Function function = toEntity(jsonData, Function.class);
            FunctionDO function = toEntity(jsonData, FunctionDO.class);
            return Envelop.getSuccess(BaseRequestMapping.Function.message_success_update, functionService.updateFunction(function));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -112,10 +112,10 @@ public class FunctionController extends EnvelopRestController {
        }
        //得到list数据
        List<Function> list = functionService.search(fields, filters, sorts, page, size);
        List<FunctionDO> list = functionService.search(fields, filters, sorts, page, size);
        if(list!=null){
            for(Function func:list){//循环遍历,设置是否有子节点
                List<Function> children = functionService.getChildren(func.getId());
            for(FunctionDO func:list){//循环遍历,设置是否有子节点
                List<FunctionDO> children = functionService.getChildren(func.getId());
                func.setChildren(children);
            }
        }
@@ -125,7 +125,7 @@ public class FunctionController extends EnvelopRestController {
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<MFunction> mFunctions = convertToModels(list, new ArrayList<>(list.size()), MFunction.class, fields);
        List<FunctionVO> mFunctions = convertToModels(list, new ArrayList<>(list.size()), FunctionVO.class, fields);
        return Envelop.getSuccessListWithPage(BaseRequestMapping.Function.message_success_find_functions,mFunctions, page, size,count);
    }
@@ -141,17 +141,17 @@ public class FunctionController extends EnvelopRestController {
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+name,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<Function> list = functionService.search(fields,filters,sorts);
        List<FunctionDO> list = functionService.search(fields,filters,sorts);
        List<Object> functions = new ArrayList<>();
        if(list!=null){
            for(Function func:list){
            for(FunctionDO func:list){
                String code = func.getId();
                func = functionService.getAllChildren(code);
                functions.add(func);
            }
        }
        //封装返回格式
        List<MFunction> mFunctions = convertToModels(functions, new ArrayList<>(functions.size()), MFunction.class, fields);
        List<FunctionVO> mFunctions = convertToModels(functions, new ArrayList<>(functions.size()), FunctionVO.class, fields);
        return Envelop.getSuccessList(BaseRequestMapping.Function.message_success_find_functions,mFunctions);
    }
@@ -185,7 +185,7 @@ public class FunctionController extends EnvelopRestController {
    @GetMapping(value =BaseRequestMapping.Function.api_getChildren )
    @ApiOperation(value="查找子节点")
    public Envelop getChildren(@PathVariable String code){
        List<Function> children = functionService.getChildren(code);
        List<FunctionDO> children = functionService.getChildren(code);
        return Envelop.getSuccess("查询成功",children);
    }
}

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.Module;
import com.yihu.jw.base.base.ModuleDO;
import com.yihu.jw.business.base.service.ModuleService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.base.MModule;
@@ -24,7 +24,7 @@ import java.util.List;
 * Created by chenweida on 2017/5/19.
 */
@RestController
@RequestMapping(BaseRequestMapping.api_common)
@RequestMapping(BaseRequestMapping.api_base_common)
@Api(value = "模块模块", description = "模块接口管理")
public class ModuleController extends EnvelopRestController {
    @Autowired
@@ -36,7 +36,7 @@ public class ModuleController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            Module module = toEntity(jsonData, Module.class);
            ModuleDO module = toEntity(jsonData, ModuleDO.class);
            return Envelop.getSuccess(BaseRequestMapping.Module.message_success_create, moduleService.createModule(module));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -49,7 +49,7 @@ public class ModuleController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            Module module = toEntity(jsonData, Module.class);
            ModuleDO module = toEntity(jsonData, ModuleDO.class);
            return Envelop.getSuccess(BaseRequestMapping.Module.message_success_update, moduleService.updateModule(module));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -109,11 +109,11 @@ public class ModuleController extends EnvelopRestController {
        }
        //得到list数据
        List<Module> list = moduleService.search(fields, filters, sorts, page, size);
        List<ModuleDO> list = moduleService.search(fields, filters, sorts, page, size);
        if(list!=null){
            for(Module module:list){//循环遍历,设置是否有子节点
                List<Module> children = moduleService.getChildren(module.getId());
            for(ModuleDO module:list){//循环遍历,设置是否有子节点
                List<ModuleDO> children = moduleService.getChildren(module.getId());
                //children长度为0时    state  “open”表示是子节点，“closed”表示为父节点；
                // children长度>0时,  state   “open,closed”表示是节点的打开关闭
                if (children.size()>0){
@@ -145,7 +145,7 @@ public class ModuleController extends EnvelopRestController {
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+name,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<Module> list = moduleService.search(fields,filters,sorts);
        List<ModuleDO> list = moduleService.search(fields,filters,sorts);
        //封装返回格式
        List<MModule> mModules = convertToModels(list, new ArrayList<>(list.size()), MModule.class, fields);
        return Envelop.getSuccessList(BaseRequestMapping.Module.message_success_find_Modules,mModules);
@@ -155,7 +155,7 @@ public class ModuleController extends EnvelopRestController {
    @GetMapping(value =BaseRequestMapping.Module.api_getChildren )
    @ApiOperation(value="查找子节点")
    public Envelop getChildren(@PathVariable String code){
        List<Module> children = moduleService.getChildren(code);
        List<ModuleDO> children = moduleService.getChildren(code);
        return Envelop.getSuccess("查询成功",children);
    }

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

@@ -16,7 +16,7 @@ import java.util.List;
 * Created by chenweida on 2017/5/19.
 */
@RestController
@RequestMapping(BaseRequestMapping.api_common)
@RequestMapping(BaseRequestMapping.api_base_common)
@Api(value = "模块功能模块", description = "模块功能模块")
public class ModuleFunController extends EnvelopRestController {
    @Autowired

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.Saas;
import com.yihu.jw.base.base.SaasDO;
import com.yihu.jw.business.base.service.SaasService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.base.MSaas;
@@ -23,7 +23,7 @@ import java.util.List;
 * Created by chenweida on 2017/5/19.
 */
@RestController
@RequestMapping(BaseRequestMapping.api_common)
@RequestMapping(BaseRequestMapping.api_base_common)
@Api(value = "Saas配置模块", description = "Saas配置模块接口管理")
public class SaasController extends EnvelopRestController {
    @Autowired
@@ -35,7 +35,7 @@ public class SaasController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            Saas saas = toEntity(jsonData, Saas.class);
            SaasDO saas = toEntity(jsonData, SaasDO.class);
            return Envelop.getSuccess(BaseRequestMapping.Saas.message_success_create, saasService.createSaas(saas));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -48,7 +48,7 @@ public class SaasController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            Saas saas = toEntity(jsonData, Saas.class);
            SaasDO saas = toEntity(jsonData, SaasDO.class);
            return Envelop.getSuccess(BaseRequestMapping.Saas.message_success_update, saasService.updateSaas(saas));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -99,7 +99,7 @@ public class SaasController extends EnvelopRestController {
            HttpServletRequest request,
            HttpServletResponse response) throws Exception {
        //得到list数据
        List<Saas> list = saasService.search(fields, filters, sorts, page, size);
        List<SaasDO> list = saasService.search(fields, filters, sorts, page, size);
        //获取总数
        long count = saasService.getCount(filters);
        //封装头信息
@@ -121,7 +121,7 @@ public class SaasController extends EnvelopRestController {
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+name,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<Saas> list = saasService.search(fields, filters, sorts);
        List<SaasDO> list = saasService.search(fields, filters, sorts);
        //封装返回格式
        List<MSaas> mSaass = convertToModels(list, new ArrayList<>(list.size()), MSaas.class, fields);
        return Envelop.getSuccessList(BaseRequestMapping.Saas.message_success_find_saass, mSaass);

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.Function;
import com.yihu.jw.base.base.FunctionDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -10,20 +10,20 @@ import java.util.List;
/**
 * Created by chenweida on 2017/5/19.
 */
public interface FunctionDao extends PagingAndSortingRepository<Function, String>, JpaSpecificationExecutor<Function> {
public interface FunctionDao extends PagingAndSortingRepository<FunctionDO, String>, JpaSpecificationExecutor<FunctionDO> {
    @Query("from Function f where f.name=?1 and f.status=1")
    Function findByName(String name);
    @Query("from FunctionDO f where f.name=?1 and f.status=1")
    FunctionDO findByName(String name);
    @Query("from Function f where f.id=?1 and f.status=1")
    Function findById(String id);
    @Query("from FunctionDO f where f.id=?1 and f.status=1")
    FunctionDO findById(String id);
    @Query("from Function f where f.name=?1 and f.status=1 and f.id!=?2")
    Function findByNameExcludeId(String name,String id);
    @Query("from FunctionDO f where f.name=?1 and f.status=1 and f.id!=?2")
    FunctionDO findByNameExcludeId(String name,String id);
    @Query("from Function f where f.parentId=?1 and f.status=1")
    List<Function> getChildren(String parentId);
    @Query("from FunctionDO f where f.parentCode=?1 and f.status=1")
    List<FunctionDO> getChildren(String parentCode);
    @Query("from Function f where f.status=1")
    List<Function> findAll();
    @Query("from FunctionDO f where f.status=1")
    List<FunctionDO> findAll();
}

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.Module;
import com.yihu.jw.base.base.ModuleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -10,19 +10,19 @@ import java.util.List;
/**
 * Created by chenweida on 2017/5/19.
 */
public interface ModuleDao extends PagingAndSortingRepository<Module, String>, JpaSpecificationExecutor<Module> {
    @Query("from Module f where f.name=?1 and f.status=1")
    Module findByName(String name);
public interface ModuleDao extends PagingAndSortingRepository<ModuleDO, String>, JpaSpecificationExecutor<ModuleDO> {
    @Query("from ModuleDO f where f.name=?1 and f.status=1")
    ModuleDO findByName(String name);
    @Query("from Module f where f.id=?1 and f.status=1")
    Module findById(String id);
    @Query("from ModuleDO f where f.id=?1 and f.status=1")
    ModuleDO findById(String id);
    @Query("from Module f where f.name=?1 and f.status=1 and f.id != ?2")
    Module findByNameExcludeId(String name, String code);
    @Query("from ModuleDO f where f.name=?1 and f.status=1 and f.id != ?2")
    ModuleDO findByNameExcludeId(String name, String code);
    @Query("from Module f where f.parentId=?1 and f.status=1")
    List<Module> getChildren(String code);
    @Query("from ModuleDO f where f.parentId=?1 and f.status=1")
    List<ModuleDO> getChildren(String code);
    @Query("from Module f where f.status=1")
    List<Module> findAll();
    @Query("from ModuleDO f where f.status=1")
    List<ModuleDO> findAll();
}

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.ModuleFunction;
import com.yihu.jw.base.base.ModuleFunctionDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
@@ -12,18 +12,18 @@ import java.util.List;
/**
 * Created by chenweida on 2017/5/22.
 */
public interface ModuleFunctionDao extends PagingAndSortingRepository<ModuleFunction, String>, JpaSpecificationExecutor<ModuleFunction> {
public interface ModuleFunctionDao extends PagingAndSortingRepository<ModuleFunctionDO, String>, JpaSpecificationExecutor<ModuleFunctionDO> {
    @Transactional
    @Modifying
    @Query("delete from ModuleFunction es where es.moduleId = ?1")
    @Query("delete from ModuleFunctionDO es where es.moduleId = ?1")
    int deleteByModuleId(String moduleId);
    @Query("from ModuleFunction mf where mf.moduleId = ?1")
    List<ModuleFunction> findByModuleId(String id);
    @Query("from ModuleFunctionDO mf where mf.moduleId = ?1")
    List<ModuleFunctionDO> findByModuleId(String id);
    @Transactional
    @Modifying
    @Query("delete from ModuleFunction es where es.functionId = ?1 and es.moduleId = ?2")
    @Query("delete from ModuleFunctionDO es where es.functionId = ?1 and es.moduleId = ?2")
    void delete(String delCode, String moduleCode);
}

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.Saas;
import com.yihu.jw.base.base.SaasDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -8,13 +8,13 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/5/19.
 */
public interface SaasDao extends PagingAndSortingRepository<Saas, String>, JpaSpecificationExecutor<Saas> {
    @Query("from Saas f where f.name=?1 and f.status=1")
    Saas findByName(String name);
public interface SaasDao extends PagingAndSortingRepository<SaasDO, String>, JpaSpecificationExecutor<SaasDO> {
    @Query("from SaasDO f where f.name=?1 and f.status=1")
    SaasDO findByName(String name);
    @Query("from Saas f where f.name=?1 and f.status=1 and f.id != ?2")
    Saas findByNameExcludeId(String name, String id);
    @Query("from SaasDO f where f.name=?1 and f.status=1 and f.id != ?2")
    SaasDO findByNameExcludeId(String name, String id);
    @Query("from Saas f where f.id=?1 and f.status=1")
    Saas findById(String id);
    @Query("from SaasDO f where f.id=?1 and f.status=1")
    SaasDO findById(String id);
}

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.base.dao;
import com.yihu.jw.base.base.SaasModule;
import com.yihu.jw.base.base.SaasModuleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
@@ -9,8 +9,8 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/5/22.
 */
public interface SaasModuleDao extends PagingAndSortingRepository<SaasModule, String>, JpaSpecificationExecutor<SaasModule> {
public interface SaasModuleDao extends PagingAndSortingRepository<SaasModuleDO, String>, JpaSpecificationExecutor<SaasModuleDO> {
    @Modifying
    @Query("delete from SaasModule es where es.saasId = ?1")
    @Query("delete from SaasModuleDO es where es.saasId = ?1")
    int deleteBySaasCode(String saasCode);
}

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

@@ -1,13 +1,13 @@
package com.yihu.jw.business.base.service;
import com.yihu.jw.base.base.ModuleFunction;
import com.yihu.jw.base.base.ModuleFunctionDO;
import com.yihu.jw.business.base.dao.FunctionDao;
import com.yihu.jw.business.base.dao.ModuleFunctionDao;
import com.yihu.jw.base.base.Function;
import com.yihu.jw.base.base.FunctionDO;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.base.MFunction;
import com.yihu.jw.restmodel.base.base.FunctionVO;
import com.yihu.jw.rm.base.BaseRequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -24,7 +24,7 @@ import java.util.Map;
 * Created by chenweida on 2017/5/19.
 */
@Service
public class FunctionService extends BaseJpaService<Function, FunctionDao> {
public class FunctionService extends BaseJpaService<FunctionDO, FunctionDao> {
    @Autowired
    private FunctionDao functionDao;
    @Autowired
@@ -35,14 +35,14 @@ public class FunctionService extends BaseJpaService<Function, FunctionDao> {
    private JdbcTemplate jdbcTemplate;
    @Transactional
    public Function createFunction(Function function) throws ApiException {
    public FunctionDO createFunction(FunctionDO function) throws ApiException {
        if (StringUtils.isEmpty(function.getId())) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(function.getName())) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        Function functionTmp = functionDao.findByName(function.getName());
        FunctionDO functionTmp = functionDao.findByName(function.getName());
        if (functionTmp != null) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
@@ -50,22 +50,22 @@ public class FunctionService extends BaseJpaService<Function, FunctionDao> {
    }
    @Transactional
    public Function updateFunction(Function function) {
    public FunctionDO updateFunction(FunctionDO function) {
        if (StringUtils.isEmpty(function.getName())) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(function.getId())) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        Function functionTmp = functionDao.findByNameExcludeId(function.getName(), function.getId());
        FunctionDO functionTmp = functionDao.findByNameExcludeId(function.getName(), function.getId());
        if (functionTmp != null) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return functionDao.save(function);
    }
    public Function findById(String id) {
        Function function = functionDao.findById(id);
    public FunctionDO findById(String id) {
        FunctionDO function = functionDao.findById(id);
        if (function == null) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_id_no_exist, ExceptionCode.common_error_params_code);
        }
@@ -74,7 +74,7 @@ public class FunctionService extends BaseJpaService<Function, FunctionDao> {
    @Transactional
    public void deleteFunction(String id) {
        Function function = functionDao.findById(id);
        FunctionDO function = functionDao.findById(id);
        if (function == null) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_id_no_exist, ExceptionCode.common_error_params_code);
        }
@@ -87,9 +87,9 @@ public class FunctionService extends BaseJpaService<Function, FunctionDao> {
        moduleFunctionDao.deleteByModuleId(moduleId);
        //分配新的功能
        String [] functionCodeArr=functionIds.split(",");
        List<ModuleFunction> saasModuleList=new ArrayList<>();
        List<ModuleFunctionDO> saasModuleList=new ArrayList<>();
        for(String functionId:functionCodeArr){
            ModuleFunction saasModule=new ModuleFunction();
            ModuleFunctionDO saasModule=new ModuleFunctionDO();
            saasModule.setModuleId(moduleId);
            saasModule.setFunctionId(functionId);
            saasModuleList.add(saasModule);
@@ -97,9 +97,9 @@ public class FunctionService extends BaseJpaService<Function, FunctionDao> {
        moduleFunctionDao.save(saasModuleList);
    }
    public List<MFunction> getModuleFunctions(String saasId) {
    public List<FunctionVO> getModuleFunctions(String saasId) {
        String sql=" select m.code,m.parent_code,m.name from base_function f,base_module_function mf where f.code=mf.function_id and f.status=1 and mf.module_id=?";
        return jdbcTemplate.queryForList(sql,MFunction.class,saasId);
        return jdbcTemplate.queryForList(sql,FunctionVO.class,saasId);
    }
    /**
@@ -107,16 +107,16 @@ public class FunctionService extends BaseJpaService<Function, FunctionDao> {
     * @param code
     * @return
     */
    public List<Function> getChildren(String code){
        List<Function> childrens = functionDao.getChildren(code);
        for(Function children:childrens){
            List<Function> children1 = functionDao.getChildren(children.getId());//判断子节点是否有孙节点
    public List<FunctionDO> getChildren(String code){
        List<FunctionDO> childrens = functionDao.getChildren(code);
        for(FunctionDO children:childrens){
            List<FunctionDO> children1 = functionDao.getChildren(children.getId());//判断子节点是否有孙节点
            children.setChildren(children1);
        }
        return childrens;
    }
    public List<Function> findAll(){
    public List<FunctionDO> findAll(){
        return functionDao.findAll();
    }
@@ -125,10 +125,10 @@ public class FunctionService extends BaseJpaService<Function, FunctionDao> {
     * @return
     */
    public Map<String,String> getName(){
        List<Function> functions = findAll();
        List<FunctionDO> functions = findAll();
        Map<String, String> map = new HashMap<>();
        if(null!=functions){
            for(Function function: functions){
            for(FunctionDO function: functions){
                map.put(function.getId(),function.getName());
            }
        }
@@ -140,10 +140,10 @@ public class FunctionService extends BaseJpaService<Function, FunctionDao> {
     * @param id
     * @return
     */
    public Function getAllChildren(String id){
        Function function = functionDao.findById(id);
        List<Function> childrens = functionDao.getChildren(id);
        for(Function children:childrens){
    public FunctionDO getAllChildren(String id){
        FunctionDO function = functionDao.findById(id);
        List<FunctionDO> childrens = functionDao.getChildren(id);
        for(FunctionDO children:childrens){
            getAllChildren(children.getId());
        }
        function.setChildren(childrens);

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.base.service;
import com.yihu.jw.base.base.ModuleFunction;
import com.yihu.jw.base.base.ModuleFunctionDO;
import com.yihu.jw.business.base.dao.ModuleFunctionDao;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
@@ -18,7 +18,7 @@ import java.util.List;
 * Created by chenweida on 2017/5/19.
 */
@Service
public class ModuleFunService extends BaseJpaService<ModuleFunction, ModuleFunctionDao> {
public class ModuleFunService extends BaseJpaService<ModuleFunctionDO, ModuleFunctionDao> {
    @Autowired
    private ModuleFunctionDao moduleFunctionDao;
@@ -29,9 +29,9 @@ public class ModuleFunService extends BaseJpaService<ModuleFunction, ModuleFunct
     * @return
     */
    public List<String> getExistFun(String id) {
        List<ModuleFunction> moduleFuns = moduleFunctionDao.findByModuleId(id);
        List<ModuleFunctionDO> moduleFuns = moduleFunctionDao.findByModuleId(id);
        List<String> list = new ArrayList<>();
        for(ModuleFunction moduleFun:moduleFuns){
        for(ModuleFunctionDO moduleFun:moduleFuns){
            list.add(moduleFun.getFunctionId());
        }
        return list;
@@ -69,7 +69,7 @@ public class ModuleFunService extends BaseJpaService<ModuleFunction, ModuleFunct
            moduleFunctionDao.delete(delCode, moduleCode);
        }
        for(String addCode:newFunCodes){
            ModuleFunction moduleFunction = new ModuleFunction();
            ModuleFunctionDO moduleFunction = new ModuleFunctionDO();
            moduleFunction.setFunctionId(addCode);
            moduleFunction.setModuleId(moduleCode);
            moduleFunctionDao.save(moduleFunction);

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

@@ -1,7 +1,7 @@
package com.yihu.jw.business.base.service;
import com.yihu.jw.base.base.Module;
import com.yihu.jw.base.base.SaasModule;
import com.yihu.jw.base.base.ModuleDO;
import com.yihu.jw.base.base.SaasModuleDO;
import com.yihu.jw.business.base.dao.ModuleDao;
import com.yihu.jw.business.base.dao.SaasModuleDao;
import com.yihu.jw.exception.ApiException;
@@ -24,7 +24,7 @@ import java.util.Map;
 * Created by chenweida on 2017/5/19.
 */
@Service
public class ModuleService extends BaseJpaService<Module, ModuleDao> {
public class ModuleService extends BaseJpaService<ModuleDO, ModuleDao> {
    @Autowired
    private ModuleDao moduleDao;
    @Autowired
@@ -34,7 +34,7 @@ public class ModuleService extends BaseJpaService<Module, ModuleDao> {
    @Transactional
    public Module createModule(Module module) throws ApiException {
    public ModuleDO createModule(ModuleDO module) throws ApiException {
        if (StringUtils.isEmpty(module.getId())) {
            throw new ApiException(BaseRequestMapping.Module.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
@@ -44,7 +44,7 @@ public class ModuleService extends BaseJpaService<Module, ModuleDao> {
        if (StringUtils.isEmpty(module.getSaasId())) {
            throw new ApiException(BaseRequestMapping.Module.message_fail_saasid_is_null, ExceptionCode.common_error_params_code);
        }
        Module moduleTmp = moduleDao.findByName(module.getName());
        ModuleDO moduleTmp = moduleDao.findByName(module.getName());
        if (moduleTmp != null) {
            throw new ApiException(BaseRequestMapping.Module.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
@@ -52,22 +52,22 @@ public class ModuleService extends BaseJpaService<Module, ModuleDao> {
    }
    @Transactional
    public Module updateModule(Module module) {
    public ModuleDO updateModule(ModuleDO module) {
        if (StringUtils.isEmpty(module.getName())) {
            throw new ApiException(BaseRequestMapping.Module.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(module.getId())) {
            throw new ApiException(BaseRequestMapping.Module.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        Module moduleTmp = moduleDao.findByNameExcludeId(module.getName(), module.getId());
        ModuleDO moduleTmp = moduleDao.findByNameExcludeId(module.getName(), module.getId());
        if (moduleTmp != null) {
            throw new ApiException(BaseRequestMapping.Module.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return moduleDao.save(module);
    }
    public Module findById(String Id) {
        Module module = moduleDao.findById(Id);
    public ModuleDO findById(String Id) {
        ModuleDO module = moduleDao.findById(Id);
        if (module == null) {
            throw new ApiException(BaseRequestMapping.Module.message_fail_id_no_exist, ExceptionCode.common_error_params_code);
        }
@@ -76,7 +76,7 @@ public class ModuleService extends BaseJpaService<Module, ModuleDao> {
    @Transactional
    public void deleteModule(String Id) {
        Module module = moduleDao.findById(Id);
        ModuleDO module = moduleDao.findById(Id);
        if (module == null) {
            throw new ApiException(BaseRequestMapping.Module.message_fail_id_no_exist, ExceptionCode.common_error_params_code);
        }
@@ -89,9 +89,9 @@ public class ModuleService extends BaseJpaService<Module, ModuleDao> {
        saasModuleDao.deleteBySaasCode(saasCode);
        //分配新的模块
        String [] moduleCodeArr=moduleCodes.split(",");
        List<SaasModule> saasModuleList=new ArrayList<>();
        List<SaasModuleDO> saasModuleList=new ArrayList<>();
        for(String moduleCode:moduleCodeArr){
            SaasModule saasModule=new SaasModule();
            SaasModuleDO saasModule=new SaasModuleDO();
            saasModule.setModuleId(moduleCode);
            saasModule.setSaasId(saasCode);
            saasModuleList.add(saasModule);
@@ -104,10 +104,10 @@ public class ModuleService extends BaseJpaService<Module, ModuleDao> {
       return jdbcTemplate.queryForList(sql,MModule.class,saasCode);
    }
    public List<Module> getChildren(String code){
        List<Module> childrens = moduleDao.getChildren(code);
        for(Module children:childrens){
            List<Module> children1 = moduleDao.getChildren(children.getId());//判断子节点是否有孙节点
    public List<ModuleDO> getChildren(String code){
        List<ModuleDO> childrens = moduleDao.getChildren(code);
        for(ModuleDO children:childrens){
            List<ModuleDO> children1 = moduleDao.getChildren(children.getId());//判断子节点是否有孙节点
            //没有children    state
            //“open”表示是子节点，“closed”表示为父节点；
            if (children1.size()>0){
@@ -119,7 +119,7 @@ public class ModuleService extends BaseJpaService<Module, ModuleDao> {
        return childrens;
    }
    public List<Module> findAll(){
    public List<ModuleDO> findAll(){
        return moduleDao.findAll();
    }
@@ -128,10 +128,10 @@ public class ModuleService extends BaseJpaService<Module, ModuleDao> {
     * @return
     */
    public Map<String,String> getName(){
        List<Module> modules = findAll();
        List<ModuleDO> modules = findAll();
        Map<String, String> map = new HashMap<>();
        if(null!=modules){
            for(Module module: modules){
            for(ModuleDO module: modules){
                map.put(module.getId(),module.getName());
            }
        }

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.base.service;
import com.yihu.jw.base.base.Saas;
import com.yihu.jw.base.base.SaasDO;
import com.yihu.jw.business.base.dao.SaasDao;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
@@ -15,19 +15,19 @@ import org.springframework.util.StringUtils;
 * Created by chenweida on 2017/5/19.
 */
@Service
public class SaasService extends BaseJpaService<Saas, SaasDao> {
public class SaasService extends BaseJpaService<SaasDO, SaasDao> {
    @Autowired
    private SaasDao saasDao;
    @Transactional
    public Saas createSaas(Saas saas) throws ApiException {
    public SaasDO createSaas(SaasDO saas) throws ApiException {
        if (StringUtils.isEmpty(saas.getId())) {
            throw new ApiException(BaseRequestMapping.Saas.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(saas.getName())) {
            throw new ApiException(BaseRequestMapping.Saas.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        Saas saasTmp = saasDao.findByName(saas.getName());
        SaasDO saasTmp = saasDao.findByName(saas.getName());
        if (saasTmp != null) {
            throw new ApiException(BaseRequestMapping.Saas.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
@@ -35,22 +35,22 @@ public class SaasService extends BaseJpaService<Saas, SaasDao> {
    }
    @Transactional
    public Saas updateSaas(Saas saas) {
    public SaasDO updateSaas(SaasDO saas) {
        if (StringUtils.isEmpty(saas.getName())) {
            throw new ApiException(BaseRequestMapping.Saas.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(saas.getId())) {
            throw new ApiException(BaseRequestMapping.Saas.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        Saas saasTmp = saasDao.findByNameExcludeId(saas.getName(), saas.getId());
        SaasDO saasTmp = saasDao.findByNameExcludeId(saas.getName(), saas.getId());
        if (saasTmp != null) {
            throw new ApiException(BaseRequestMapping.Saas.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return saasDao.save(saas);
    }
    public Saas findById(String id) {
        Saas saas = saasDao.findById(id);
    public SaasDO findById(String id) {
        SaasDO saas = saasDao.findById(id);
        if (saas == null) {
            throw new ApiException(BaseRequestMapping.Saas.message_fail_id_no_exist, ExceptionCode.common_error_params_code);
        }
@@ -59,14 +59,14 @@ public class SaasService extends BaseJpaService<Saas, SaasDao> {
    @Transactional
    public void deleteSaas(String id) {
        Saas saas = saasDao.findById(id);
        SaasDO saas = saasDao.findById(id);
        if (saas == null) {
            throw new ApiException(BaseRequestMapping.Saas.message_fail_id_no_exist, ExceptionCode.common_error_params_code);
        }
        saas.setStatus(-1);
    }
    public Saas findByName(String cityName) {
    public SaasDO findByName(String cityName) {
        return saasDao.findByName(cityName);
    }
}

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

@@ -1,11 +1,11 @@
package com.yihu.jw.business.login.dao;
import com.yihu.jw.base.login.BaseLoginAccount;
import com.yihu.jw.base.login.BaseLoginAccountDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/6/20.
 */
public interface BaseLoginAccountDao extends PagingAndSortingRepository<BaseLoginAccount, String>, JpaSpecificationExecutor<BaseLoginAccount> {
public interface BaseLoginAccountDao extends PagingAndSortingRepository<BaseLoginAccountDO, String>, JpaSpecificationExecutor<BaseLoginAccountDO> {
}

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

@@ -1,11 +1,11 @@
package com.yihu.jw.business.login.dao;
import com.yihu.jw.base.login.BaseLoginLog;
import com.yihu.jw.base.login.BaseLoginLogDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/6/20.
 */
public interface BaseLoginLogDao extends PagingAndSortingRepository<BaseLoginLog, String>, JpaSpecificationExecutor<BaseLoginLog> {
public interface BaseLoginLogDao extends PagingAndSortingRepository<BaseLoginLogDO, String>, JpaSpecificationExecutor<BaseLoginLogDO> {
}

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.sms.controller;
import com.yihu.jw.base.sms.BaseSms;
import com.yihu.jw.base.sms.BaseSmsDO;
import com.yihu.jw.business.sms.service.SmsService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.sms.MSms;
@@ -35,7 +35,7 @@ public class SmsController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseSms sms = toEntity(jsonData, BaseSms.class);
            BaseSmsDO sms = toEntity(jsonData, BaseSmsDO.class);
            return Envelop.getSuccess(BaseSmsRequestMapping.Sms.message_success_create, smsService.createSms(sms));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -48,7 +48,7 @@ public class SmsController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseSms sms = toEntity(jsonData, BaseSms.class);
            BaseSmsDO sms = toEntity(jsonData, BaseSmsDO.class);
            return Envelop.getSuccess(BaseSmsRequestMapping.Sms.message_success_update, smsService.updateSms(sms));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -73,7 +73,7 @@ public class SmsController extends EnvelopRestController {
            HttpServletRequest request,
            HttpServletResponse response) throws Exception {
        //得到list数据
        List<BaseSms> list = smsService.search(fields, filters, sorts, page, size);
        List<BaseSmsDO> list = smsService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=smsService.getCount(filters);
        //封装头信息
@@ -95,7 +95,7 @@ public class SmsController extends EnvelopRestController {
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+name,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<BaseSms> list = smsService.search(fields,filters,sorts);
        List<BaseSmsDO> list = smsService.search(fields,filters,sorts);
        //封装返回格式
        List<MSms> mSmss = convertToModels(list, new ArrayList<>(list.size()), MSms.class, fields);
        return Envelop.getSuccessList(BaseSmsRequestMapping.Sms.message_success_find_smss,mSmss);

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.sms.controller;
import com.yihu.jw.base.sms.BaseSmsGateway;
import com.yihu.jw.base.sms.BaseSmsGatewayDO;
import com.yihu.jw.business.sms.service.SmsGatewayService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.sms.MSmsGateway;
@@ -35,7 +35,7 @@ public class SmsGatewayController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseSmsGateway smsGateway = toEntity(jsonData, BaseSmsGateway.class);
            BaseSmsGatewayDO smsGateway = toEntity(jsonData, BaseSmsGatewayDO.class);
            return Envelop.getSuccess(BaseSmsRequestMapping.SmsGateway.message_success_create, smsGatewayService.createSmsGateway(smsGateway));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -48,7 +48,7 @@ public class SmsGatewayController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseSmsGateway smsGateway = toEntity(jsonData, BaseSmsGateway.class);
            BaseSmsGatewayDO smsGateway = toEntity(jsonData, BaseSmsGatewayDO.class);
            return Envelop.getSuccess(BaseSmsRequestMapping.SmsGateway.message_success_update, smsGatewayService.updateSmsGateway(smsGateway));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -98,7 +98,7 @@ public class SmsGatewayController extends EnvelopRestController {
            HttpServletRequest request,
            HttpServletResponse response) throws Exception {
        //得到list数据
        List<BaseSmsGateway> list = smsGatewayService.search(fields, filters, sorts, page, size);
        List<BaseSmsGatewayDO> list = smsGatewayService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=smsGatewayService.getCount(filters);
        //封装头信息
@@ -120,7 +120,7 @@ public class SmsGatewayController extends EnvelopRestController {
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+name,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<BaseSmsGateway> list = smsGatewayService.search(fields,filters,sorts);
        List<BaseSmsGatewayDO> list = smsGatewayService.search(fields,filters,sorts);
        //封装返回格式
        List<MSmsGateway> mSmsGateways = convertToModels(list, new ArrayList<>(list.size()), MSmsGateway.class, fields);
        return Envelop.getSuccessList(BaseSmsRequestMapping.SmsGateway.message_success_find_SmsGateways,mSmsGateways);

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

@@ -1,21 +1,9 @@
package com.yihu.jw.business.sms.dao;
import com.fasterxml.jackson.databind.deser.Deserializers;
import com.yihu.jw.base.sms.BaseSms;
import com.yihu.jw.base.sms.BaseSmsDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface SmsDao extends PagingAndSortingRepository<BaseSms, String>, JpaSpecificationExecutor<BaseSms> {
    @Query("from Function f where f.name=?1 and f.status=1")
    BaseSms findByName(String name);
    @Query("from Function f where f.name=?1 and f.status=1 and f.code != ?2")
    BaseSms findByNameExcludeCode(String name, String code);
    @Query("from Function f where f.code=?1 and f.status=1")
    BaseSms findByCode(String code);
public interface SmsDao extends PagingAndSortingRepository<BaseSmsDO, String>, JpaSpecificationExecutor<BaseSmsDO> {
}

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.sms.dao;
import com.yihu.jw.base.sms.BaseSmsGateway;
import com.yihu.jw.base.sms.BaseSmsGatewayDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -8,13 +8,13 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/5/22.
 */
public interface SmsGatewayDao extends PagingAndSortingRepository<BaseSmsGateway, String>, JpaSpecificationExecutor<BaseSmsGateway> {
    @Query("from BaseSmsGateway f where f.name=?1 and f.status=1")
    BaseSmsGateway findByName(String name);
public interface SmsGatewayDao extends PagingAndSortingRepository<BaseSmsGatewayDO, String>, JpaSpecificationExecutor<BaseSmsGatewayDO> {
    @Query("from BaseSmsGatewayDO f where f.name=?1 and f.status=1")
    BaseSmsGatewayDO findByName(String name);
    @Query("from BaseSmsGateway f where f.name=?1 and f.status=1 and f.code != ?2")
    BaseSmsGateway findByNameExcludeCode(String name, String code);
    @Query("from BaseSmsGatewayDO f where f.name=?1 and f.status=1 and f.id != ?2")
    BaseSmsGatewayDO findByNameExcludeCode(String name, String code);
    @Query("from BaseSmsGateway f where f.id=?1 and f.status=1")
    BaseSmsGateway findById(String id);
    @Query("from BaseSmsGatewayDO f where f.id=?1 and f.status=1")
    BaseSmsGatewayDO findById(String id);
}

svr/svr-base/src/main/java/com/yihu/jw/business/sms/service/SmsGatewayService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.business.sms.service;
import com.yihu.jw.base.sms.BaseSmsGateway;
import com.yihu.jw.base.sms.BaseSmsGatewayDO;
import com.yihu.jw.business.sms.dao.SmsGatewayDao;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
@@ -15,19 +15,19 @@ import org.springframework.util.StringUtils;
 * Created by chenweida on 2017/5/22.
 */
@Service
public class SmsGatewayService extends BaseJpaService<BaseSmsGateway, SmsGatewayDao> {
public class SmsGatewayService extends BaseJpaService<BaseSmsGatewayDO, SmsGatewayDao> {
    @Autowired
    private SmsGatewayDao smsGatewayDao;
    @Transactional
    public BaseSmsGateway createSmsGateway(BaseSmsGateway smsGateway) throws ApiException {
    public BaseSmsGatewayDO createSmsGateway(BaseSmsGatewayDO smsGateway) throws ApiException {
        if (StringUtils.isEmpty(smsGateway.getId())) {
            throw new ApiException(BaseSmsRequestMapping.SmsGateway.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(smsGateway.getName())) {
            throw new ApiException(BaseSmsRequestMapping.SmsGateway.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        BaseSmsGateway smsGatewayTmp = smsGatewayDao.findByName(smsGateway.getName());
        BaseSmsGatewayDO smsGatewayTmp = smsGatewayDao.findByName(smsGateway.getName());
        if (smsGatewayTmp != null) {
            throw new ApiException(BaseSmsRequestMapping.SmsGateway.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
@@ -35,22 +35,22 @@ public class SmsGatewayService extends BaseJpaService<BaseSmsGateway, SmsGateway
    }
    @Transactional
    public BaseSmsGateway updateSmsGateway(BaseSmsGateway smsGateway) {
    public BaseSmsGatewayDO updateSmsGateway(BaseSmsGatewayDO smsGateway) {
        if (StringUtils.isEmpty(smsGateway.getName())) {
            throw new ApiException(BaseSmsRequestMapping.SmsGateway.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        if (StringUtils.isEmpty(smsGateway.getId())) {
            throw new ApiException(BaseSmsRequestMapping.SmsGateway.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        BaseSmsGateway smsGatewayTmp = smsGatewayDao.findByNameExcludeCode(smsGateway.getName(), smsGateway.getId());
        BaseSmsGatewayDO smsGatewayTmp = smsGatewayDao.findByNameExcludeCode(smsGateway.getName(), smsGateway.getId());
        if (smsGatewayTmp != null) {
            throw new ApiException(BaseSmsRequestMapping.SmsGateway.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return smsGatewayDao.save(smsGateway);
    }
    public BaseSmsGateway findById(String id) {
        BaseSmsGateway smsGateway = smsGatewayDao.findById(id);
    public BaseSmsGatewayDO findById(String id) {
        BaseSmsGatewayDO smsGateway = smsGatewayDao.findById(id);
        if (smsGateway == null) {
            throw new ApiException(BaseSmsRequestMapping.SmsGateway.message_fail_id_no_exist, ExceptionCode.common_error_params_code);
        }
@@ -59,7 +59,7 @@ public class SmsGatewayService extends BaseJpaService<BaseSmsGateway, SmsGateway
    @Transactional
    public void deleteSmsGateway(String id) {
        BaseSmsGateway smsGateway = smsGatewayDao.findById(id);
        BaseSmsGatewayDO smsGateway = smsGatewayDao.findById(id);
        if (smsGateway == null) {
            throw new ApiException(BaseSmsRequestMapping.SmsGateway.message_fail_id_no_exist, ExceptionCode.common_error_params_code);
        }

svr/svr-base/src/main/java/com/yihu/jw/business/sms/service/SmsService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.business.sms.service;
import com.yihu.jw.base.sms.BaseSms;
import com.yihu.jw.base.sms.BaseSmsDO;
import com.yihu.jw.business.sms.dao.SmsDao;
import com.yihu.jw.exception.ApiException;
import com.yihu.base.mysql.query.BaseJpaService;
@@ -12,17 +12,17 @@ import org.springframework.transaction.annotation.Transactional;
 * Created by chenweida on 2017/5/22.
 */
@Service
public class SmsService  extends BaseJpaService<BaseSms, SmsDao> {
public class SmsService  extends BaseJpaService<BaseSmsDO, SmsDao> {
    @Autowired
    private SmsDao smsDao;
    @Transactional
    public BaseSms createSms(BaseSms sms) throws ApiException {
    public BaseSmsDO createSms(BaseSmsDO sms) throws ApiException {
        return smsDao.save(sms);
    }
    @Transactional
    public BaseSms updateSms(BaseSms sms) {
    public BaseSmsDO updateSms(BaseSmsDO sms) {
        return smsDao.save(sms);
    }

svr/svr-base/src/main/java/com/yihu/jw/business/user/contorller/EmployeeController.java

@@ -1,6 +1,8 @@
package com.yihu.jw.business.user.contorller;
import com.yihu.jw.business.user.service.EmployeeService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -11,4 +13,8 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/employee")
@Api(description = "医生，行政人员等非患者用户")
public class EmployeeController {
    @Autowired
    private EmployeeService employeeService;
}

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

@@ -0,0 +1,11 @@
package com.yihu.jw.business.user.dao;
import com.yihu.jw.base.user.BaseEmployDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/11/28.
 */
public interface EmployeeDao extends PagingAndSortingRepository<BaseEmployDO, String>, JpaSpecificationExecutor<BaseEmployDO> {
}

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

@@ -1,14 +1,10 @@
package com.yihu.jw.business.version.controller;
import com.yihu.jw.base.sms.BaseSms;
import com.yihu.jw.base.sms.BaseSmsGateway;
import com.yihu.jw.base.version.BaseUserVersion;
import com.yihu.jw.business.version.service.UserVersionService;
import com.yihu.jw.base.version.BaseUserVersionDO;
import com.yihu.jw.business.version.service.BaseUserVersionService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.sms.MSmsGateway;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.base.BaseSmsRequestMapping;
import com.yihu.jw.rm.base.BaseVersionRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -31,7 +27,7 @@ import java.util.List;
@Api(description = "灰度发布,用户版本信息")
public class UserVersionController extends EnvelopRestController {
    @Autowired
    private UserVersionService userVersionService;
    private BaseUserVersionService baseEmployeeVersionService;
    @PostMapping(value = BaseVersionRequestMapping.UserVersion.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@@ -40,8 +36,8 @@ public class UserVersionController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseUserVersion baseUserVersion = toEntity(jsonData, BaseUserVersion.class);
            return Envelop.getSuccess(BaseVersionRequestMapping.UserVersion.message_success_create, userVersionService.createUserVersion(baseUserVersion));
            BaseUserVersionDO baseUserVersion = toEntity(jsonData, BaseUserVersionDO.class);
            return Envelop.getSuccess(BaseVersionRequestMapping.UserVersion.message_success_create, baseEmployeeVersionService.createUserVersion(baseUserVersion));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -53,7 +49,7 @@ public class UserVersionController extends EnvelopRestController {
            @ApiParam(name = "ids", value = "ids")
            @RequestParam(value = "ids", required = true) String ids) {
        try {
            userVersionService.deleteUserVersion(ids);
            baseEmployeeVersionService.deleteUserVersion(ids);
            return Envelop.getSuccess(BaseVersionRequestMapping.UserVersion.message_success_delete);
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -66,7 +62,7 @@ public class UserVersionController extends EnvelopRestController {
            @ApiParam(name = "userId", value = "userId")
            @PathParam(value = "userId") String userId) {
        try {
            return Envelop.getSuccess(BaseVersionRequestMapping.UserVersion.message_success_find, userVersionService.getUserVersionByUserId(userId));
            return Envelop.getSuccess(BaseVersionRequestMapping.UserVersion.message_success_find, baseEmployeeVersionService.getUserVersionByUserId(userId));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -77,7 +73,7 @@ public class UserVersionController extends EnvelopRestController {
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) String id) {
        try {
            return Envelop.getSuccess(BaseVersionRequestMapping.UserVersion.message_success_find, userVersionService.getUserVersion(id));
            return Envelop.getSuccess(BaseVersionRequestMapping.UserVersion.message_success_find, baseEmployeeVersionService.getUserVersion(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -99,13 +95,13 @@ public class UserVersionController extends EnvelopRestController {
            HttpServletRequest request,
            HttpServletResponse response) throws Exception {
        //得到list数据
        List<BaseUserVersion> list = userVersionService.search(fields, filters, sorts, page, size);
        List<BaseUserVersionDO> list = baseEmployeeVersionService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=userVersionService.getCount(filters);
        long count=baseEmployeeVersionService.getCount(filters);
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<BaseUserVersion> baseUserVersions = convertToModels(list, new ArrayList<>(list.size()), BaseUserVersion.class, fields);
        List<BaseUserVersionDO> baseUserVersions = convertToModels(list, new ArrayList<>(list.size()), BaseUserVersionDO.class, fields);
        return Envelop.getSuccessListWithPage(BaseVersionRequestMapping.UserVersion.message_success_find,baseUserVersions, page, size,count);
    }
@@ -121,9 +117,9 @@ public class UserVersionController extends EnvelopRestController {
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+name,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<BaseUserVersion> list = userVersionService.search(fields,filters,sorts);
        List<BaseUserVersionDO> list = baseEmployeeVersionService.search(fields,filters,sorts);
        //封装返回格式
        List<BaseUserVersion> baseUserVersions = convertToModels(list, new ArrayList<>(list.size()), BaseUserVersion.class, fields);
        List<BaseUserVersionDO> baseUserVersions = convertToModels(list, new ArrayList<>(list.size()), BaseUserVersionDO.class, fields);
        return Envelop.getSuccessList(BaseVersionRequestMapping.UserVersion.message_success_find,baseUserVersions);
    }
}

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

@@ -0,0 +1,14 @@
package com.yihu.jw.business.version.dao;
import com.yihu.jw.base.version.BaseUserVersionDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/11/13.
 */
public interface BaseUserVersionDao extends PagingAndSortingRepository<BaseUserVersionDO, String>, JpaSpecificationExecutor<BaseUserVersionDO> {
    @Query("from BaseUserVersionDO where userId=?1")
    BaseUserVersionDO getUserVersionByUserId(String userId);
}

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

@@ -1,14 +0,0 @@
package com.yihu.jw.business.version.dao;
import com.yihu.jw.base.version.BaseUserVersion;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/11/13.
 */
public interface UserVersionDao extends PagingAndSortingRepository<BaseUserVersion, String>, JpaSpecificationExecutor<BaseUserVersion> {
    @Query("from BaseUserVersion where userId=?1")
    BaseUserVersion getUserVersionByUserId(String userId);
}

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

@@ -0,0 +1,41 @@
package com.yihu.jw.business.version.service;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.base.version.BaseUserVersionDO;
import com.yihu.jw.business.sms.dao.SmsGatewayDao;
import com.yihu.jw.business.version.dao.BaseUserVersionDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
/**
 * Created by chenweida on 2017/11/10.
 */
@Service
public class BaseUserVersionService extends BaseJpaService<BaseUserVersionDO, BaseUserVersionDao> {
    @Autowired
    private BaseUserVersionDao baseUserVersionDao;
    @Transactional
    public BaseUserVersionDO createUserVersion(BaseUserVersionDO baseUserVersion) {
        return baseUserVersionDao.save(baseUserVersion);
    }
    @Transactional
    public void deleteUserVersion(String ids) {
        String[] idStr = ids.split(",");
        for (String id : idStr) {
            baseUserVersionDao.delete(id);
        }
    }
    public BaseUserVersionDO getUserVersionByUserId(String userId) {
        return baseUserVersionDao.getUserVersionByUserId(userId);
    }
    public BaseUserVersionDO getUserVersion(String id) {
        return baseUserVersionDao.findOne(id);
    }
}

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

@@ -1,42 +0,0 @@
package com.yihu.jw.business.version.service;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.base.sms.BaseSmsGateway;
import com.yihu.jw.base.version.BaseUserVersion;
import com.yihu.jw.business.sms.dao.SmsGatewayDao;
import com.yihu.jw.business.version.dao.UserVersionDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
/**
 * Created by chenweida on 2017/11/10.
 */
@Service
public class UserVersionService extends BaseJpaService<BaseUserVersion, UserVersionDao> {
    @Autowired
    private UserVersionDao userVersionDao;
    @Transactional
    public BaseUserVersion createUserVersion(BaseUserVersion baseUserVersion) {
        return userVersionDao.save(baseUserVersion);
    }
    @Transactional
    public void deleteUserVersion(String ids) {
        String[] idStr = ids.split(",");
        for (String id : idStr) {
            userVersionDao.delete(id);
        }
    }
    public BaseUserVersion getUserVersionByUserId(String userId) {
      return  userVersionDao.getUserVersionByUserId(userId);
    }
    public BaseUserVersion getUserVersion(String id) {
        return  userVersionDao.findOne(id);
    }
}

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

@@ -1,12 +1,12 @@
package com.yihu.jw.business.wx.controller;
import com.yihu.jw.base.wx.WxWechat;
import com.yihu.jw.base.wx.WxWechatDO;
import com.yihu.jw.business.wx.service.WechatService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.base.wx.MWxWechat;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -36,7 +36,7 @@ public class WechatConfigController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WxWechat wechat = toEntity(jsonData, WxWechat.class);
            WxWechatDO wechat = toEntity(jsonData, WxWechatDO.class);
            return Envelop.getSuccess(WechatRequestMapping.WxConfig.message_success_create, wechatService.createWechat(wechat));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -49,7 +49,7 @@ public class WechatConfigController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WxWechat wechat = toEntity(jsonData, WxWechat.class);
            WxWechatDO wechat = toEntity(jsonData, WxWechatDO.class);
            return Envelop.getSuccess(WechatRequestMapping.WxConfig.message_success_update, wechatService.updateWxchat(wechat));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -107,7 +107,7 @@ public class WechatConfigController extends EnvelopRestController {
            sorts = "-updateTime";
        }
        //得到list数据
        List<WxWechat> list = wechatService.search(fields, filters, sorts, page, size);
        List<WxWechatDO> list = wechatService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=wechatService.getCount(filters);
        //封装头信息
@@ -129,7 +129,7 @@ public class WechatConfigController extends EnvelopRestController {
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+name,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<WxWechat> list = wechatService.search(fields,filters,sorts);
        List<WxWechatDO> list = wechatService.search(fields,filters,sorts);
        //封装返回格式
        List<MWxWechat> mWxWechats = convertToModels(list, new ArrayList<>(list.size()), MWxWechat.class, fields);
        return Envelop.getSuccessList(WechatRequestMapping.WxConfig.message_success_find_functions,mWxWechats);

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

@@ -1,11 +1,11 @@
package com.yihu.jw.business.wx.controller;
import com.yihu.jw.base.wx.WxAccessToken;
import com.yihu.jw.base.wx.WxAccessTokenDO;
import com.yihu.jw.business.wx.service.WxAccessTokenService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -38,7 +38,7 @@ public class WxAccessTokenController extends EnvelopRestController {
            @ApiParam(name = "wechatId", value = "wechatId")
            @RequestParam(value = "wechatId") String wechatId) {
        try {
            WxAccessToken wxAccessToken = wxAccessTokenService.getWxAccessTokenById(wechatId);
            WxAccessTokenDO wxAccessToken = wxAccessTokenService.getWxAccessTokenById(wechatId);
            return Envelop.getSuccess(WechatRequestMapping.WxAccessToken.message_success_get, wxAccessToken);
        }catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());

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

@@ -1,12 +1,12 @@
package com.yihu.jw.business.wx.controller;
import com.yihu.jw.base.wx.WxGraphicMessage;
import com.yihu.jw.base.wx.WxGraphicMessageDO;
import com.yihu.jw.business.wx.service.WxGraphicMessageService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.base.wx.MWxGraphicMessage;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -36,7 +36,7 @@ public class WxGraphicMessageController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WxGraphicMessage WxGraphicMessage = toEntity(jsonData, WxGraphicMessage.class);
            WxGraphicMessageDO WxGraphicMessage = toEntity(jsonData, WxGraphicMessageDO.class);
            return Envelop.getSuccess(WechatRequestMapping.WxGraphicMessage.message_success_create, wxGraphicMessageService.createWxGraphicMessage(WxGraphicMessage));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -50,7 +50,7 @@ public class WxGraphicMessageController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WxGraphicMessage WxGraphicMessage = toEntity(jsonData, WxGraphicMessage.class);
            WxGraphicMessageDO WxGraphicMessage = toEntity(jsonData, WxGraphicMessageDO.class);
            return Envelop.getSuccess(WechatRequestMapping.WxGraphicMessage.message_success_update, wxGraphicMessageService.updateWxGraphicMessage(WxGraphicMessage));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -108,7 +108,7 @@ public class WxGraphicMessageController extends EnvelopRestController {
            sorts = "-updateTime";
        }
        //得到list数据
        List<WxGraphicMessage> list = wxGraphicMessageService.search(fields, filters, sorts, page, size);
        List<WxGraphicMessageDO> list = wxGraphicMessageService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=wxGraphicMessageService.getCount(filters);
        //封装头信息
@@ -130,7 +130,7 @@ public class WxGraphicMessageController extends EnvelopRestController {
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+title,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<WxGraphicMessage> list = wxGraphicMessageService.search(fields,filters,sorts);
        List<WxGraphicMessageDO> list = wxGraphicMessageService.search(fields,filters,sorts);
        //封装返回格式
        List<MWxGraphicMessage> mWxGraphicMessages = convertToModels(list, new ArrayList<>(list.size()), MWxGraphicMessage.class, fields);
        return Envelop.getSuccessList(WechatRequestMapping.WxGraphicMessage.message_success_find_functions,mWxGraphicMessages);

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

@@ -1,7 +1,7 @@
package com.yihu.jw.business.wx.controller;
import com.yihu.jw.base.wx.WxMenu;
import com.yihu.jw.base.wx.WxWechat;
import com.yihu.jw.base.wx.WxMenuDO;
import com.yihu.jw.base.wx.WxWechatDO;
import com.yihu.jw.business.wx.WechatResponse;
import com.yihu.jw.business.wx.service.WechatService;
import com.yihu.jw.business.wx.service.WxMenuService;
@@ -10,7 +10,7 @@ import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.base.wx.MWxMenu;
import com.yihu.jw.restmodel.base.wx.MWxWechat;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -46,7 +46,7 @@ public class WxMenuController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WxMenu wxMenu = toEntity(jsonData, WxMenu.class);
            WxMenuDO wxMenu = toEntity(jsonData, WxMenuDO.class);
            return Envelop.getSuccess(WechatRequestMapping.WxMenu.message_success_create, wxMenuService.createWxMenu(wxMenu));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -59,7 +59,7 @@ public class WxMenuController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WxMenu wxMenu = toEntity(jsonData, WxMenu.class);
            WxMenuDO wxMenu = toEntity(jsonData, WxMenuDO.class);
            return Envelop.getSuccess(WechatRequestMapping.WxMenu.message_success_update, wxMenuService.updateWxMenu(wxMenu));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -118,9 +118,9 @@ public class WxMenuController extends EnvelopRestController {
        }
        //得到微信列表数据
        List<WxWechat> wechats = wechatService.search(fields, filters, sorts, page, size);
        for(WxWechat wechat:wechats){
            List<WxMenu> parentMenus = wxMenuService.findParentMenuByWechatCode(wechat.getId());
        List<WxWechatDO> wechats = wechatService.search(fields, filters, sorts, page, size);
        for(WxWechatDO wechat:wechats){
            List<WxMenuDO> parentMenus = wxMenuService.findParentMenuByWechatCode(wechat.getId());
            if (parentMenus.size()>0){
                wechat.setState("closed");
            }else{
@@ -152,9 +152,9 @@ public class WxMenuController extends EnvelopRestController {
            filters = "supMenucode=0;";
        }
        //得到list数据
        List<WxMenu> list = wxMenuService.search(fields,filters,sorts);
        for(WxMenu wxMenu:list){
            List<WxMenu> childMenus = wxMenuService.findChildMenus(wxMenu.getId());
        List<WxMenuDO> list = wxMenuService.search(fields,filters,sorts);
        for(WxMenuDO wxMenu:list){
            List<WxMenuDO> childMenus = wxMenuService.findChildMenus(wxMenu.getId());
            wxMenu.setChildren(childMenus);
        }
        //封装返回格式
@@ -199,9 +199,9 @@ public class WxMenuController extends EnvelopRestController {
            @PathVariable(value = "wechatId", required = true) String wechatId
    ) {
        try {
            List<WxMenu> parentMenus = wxMenuService.findParentMenuByWechatCode(wechatId);
            for(WxMenu parentMenu:parentMenus){
                List<WxMenu> childMenus = wxMenuService.findChildMenus(parentMenu.getId());
            List<WxMenuDO> parentMenus = wxMenuService.findParentMenuByWechatCode(wechatId);
            for(WxMenuDO parentMenu:parentMenus){
                List<WxMenuDO> childMenus = wxMenuService.findChildMenus(parentMenu.getId());
                if (childMenus.size()>0){
                    parentMenu.setState("closed");
                }else{

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

@@ -2,8 +2,8 @@ package com.yihu.jw.business.wx.controller;
import com.yihu.jw.business.wx.WechatResponse;
import com.yihu.jw.base.wx.Miniprogram;
import com.yihu.jw.base.wx.WxTemplate;
import com.yihu.jw.base.wx.WxWechat;
import com.yihu.jw.base.wx.WxTemplateDO;
import com.yihu.jw.base.wx.WxWechatDO;
import com.yihu.jw.business.wx.service.WechatService;
import com.yihu.jw.business.wx.service.WxTemplateService;
import com.yihu.jw.exception.ApiException;
@@ -11,7 +11,7 @@ import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.base.wx.MWxTemplate;
import com.yihu.jw.restmodel.base.wx.MWxWechat;
import com.yihu.jw.rm.wx.WechatRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -45,7 +45,7 @@ public class WxTemplateController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "微信模版json字符串")
            @RequestBody String jsonData) {
        try {
            WxTemplate WxTemplate = toEntity(jsonData, WxTemplate.class);
            WxTemplateDO WxTemplate = toEntity(jsonData, WxTemplateDO.class);
            return Envelop.getSuccess(WechatRequestMapping.WxTemplate.message_success_create, wxTemplateService.createWxTemplate(WxTemplate));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -58,7 +58,7 @@ public class WxTemplateController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WxTemplate WxTemplate = toEntity(jsonData, WxTemplate.class);
            WxTemplateDO WxTemplate = toEntity(jsonData, WxTemplateDO.class);
            return Envelop.getSuccess(WechatRequestMapping.WxTemplate.message_success_update, wxTemplateService.updateWxTemplate(WxTemplate));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -116,9 +116,9 @@ public class WxTemplateController extends EnvelopRestController {
        }
        //得到微信列表数据
        List<WxWechat> wechats = wechatService.search(fields, filters, sorts, page, size);
        for(WxWechat wechat:wechats){
            List<WxTemplate> wxTemplates = wxTemplateService.findByWxId(wechat.getId());
        List<WxWechatDO> wechats = wechatService.search(fields, filters, sorts, page, size);
        for(WxWechatDO wechat:wechats){
            List<WxTemplateDO> wxTemplates = wxTemplateService.findByWxId(wechat.getId());
            if (wxTemplates.size()>0){
                wechat.setState("closed");
            }else{
@@ -146,7 +146,7 @@ public class WxTemplateController extends EnvelopRestController {
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+title,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<WxTemplate> list = wxTemplateService.search(fields,filters,sorts);
        List<WxTemplateDO> list = wxTemplateService.search(fields,filters,sorts);
        //封装返回格式
        List<MWxTemplate> mMWxTemplates = convertToModels(list, new ArrayList<>(list.size()), MWxTemplate.class, fields);
        return Envelop.getSuccessList(WechatRequestMapping.WxTemplate.message_success_find_functions,mMWxTemplates);

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.wx.dao;
import com.yihu.jw.base.wx.WxWechat;
import com.yihu.jw.base.wx.WxWechatDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -10,18 +10,18 @@ import java.util.List;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public interface WechatDao extends PagingAndSortingRepository<WxWechat, String>, JpaSpecificationExecutor<WxWechat> {
public interface WechatDao extends PagingAndSortingRepository<WxWechatDO, String>, JpaSpecificationExecutor<WxWechatDO> {
    @Query("from WxWechat w where w.appId = ?1 and w.status!=-1")
    WxWechat findByAppId(String appId);
    @Query("from WxWechatDO w where w.appId = ?1 and w.status!=-1")
    WxWechatDO findByAppId(String appId);
    @Query("from WxWechat w where w.appId = ?1 and w.id!= ?2 and w.status!=-1")
    WxWechat findByAppIdExcludeId(String appId, String id);
    @Query("from WxWechatDO w where w.appId = ?1 and w.id!= ?2 and w.status!=-1")
    WxWechatDO findByAppIdExcludeId(String appId, String id);
    @Query("from WxWechat w where w.id = ?1 and w.status!=-1")
    WxWechat findById(String id);
    @Query("from WxWechatDO w where w.id = ?1 and w.status!=-1")
    WxWechatDO findById(String id);
    @Query("from WxWechat w where w.status!=-1")
    List<WxWechat> findAll();
    @Query("from WxWechatDO w where w.status!=-1")
    List<WxWechatDO> findAll();
}

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.wx.dao;
import com.yihu.jw.base.wx.WxAccessToken;
import com.yihu.jw.base.wx.WxAccessTokenDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -10,8 +10,8 @@ import java.util.List;
/**
 * Created by Administrator on 2017/5/18 0018.
 */
public interface WxAccessTokenDao extends PagingAndSortingRepository<WxAccessToken, String>, JpaSpecificationExecutor<WxAccessToken> {
public interface WxAccessTokenDao extends PagingAndSortingRepository<WxAccessTokenDO, String>, JpaSpecificationExecutor<WxAccessTokenDO> {
    @Query("from WxAccessToken w where w.wechatId =?1 order by w.addTimestamp desc")
    List<WxAccessToken> getWxAccessTokenById(String wechatId);
    @Query("from WxAccessTokenDO w where w.wechatId =?1 order by w.addTimestamp desc")
    List<WxAccessTokenDO> getWxAccessTokenById(String wechatId);
}

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.wx.dao;
import com.yihu.jw.base.wx.WxGraphicMessage;
import com.yihu.jw.base.wx.WxGraphicMessageDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -8,12 +8,8 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public interface WxGraphicMessageDao extends PagingAndSortingRepository<WxGraphicMessage, String>, JpaSpecificationExecutor<WxGraphicMessage> {
public interface WxGraphicMessageDao extends PagingAndSortingRepository<WxGraphicMessageDO, String>, JpaSpecificationExecutor<WxGraphicMessageDO> {
    @Query("from WxWechat w where w.appId = ?1 and w.status!=-1")
    WxGraphicMessage findByAppId(String appId);
    @Query("from WxGraphicMessage w where w.id =?1 and w.status!=-1")
    WxGraphicMessage findById(String id);
    @Query("from WxGraphicMessageDO w where w.id =?1 and w.status!=-1")
    WxGraphicMessageDO findById(String id);
}

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.wx.dao;
import com.yihu.jw.base.wx.WxMenu;
import com.yihu.jw.base.wx.WxMenuDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -10,38 +10,38 @@ import java.util.List;
/**
 * Created by Administrator on 2017/5/19 0019.
 */
public interface WxMenuDao  extends PagingAndSortingRepository<WxMenu, String>, JpaSpecificationExecutor<WxMenu> {
public interface WxMenuDao  extends PagingAndSortingRepository<WxMenuDO, String>, JpaSpecificationExecutor<WxMenuDO> {
    @Query("from WxMenu m where m.id = ?1 and m.status = 1")
    WxMenu findById(String id);
    @Query("from WxMenuDO m where m.id = ?1 and m.status = 1")
    WxMenuDO findById(String id);
    @Query("from WxMenu m where m.wechatId =?1 and m.status = 1 order  by m.supMenuid ,m.sort")
    List<WxMenu> findByWechatId(String wechatId);
    @Query("from WxMenuDO m where m.wechatId =?1 and m.status = 1 order  by m.supMenuid ,m.sort")
    List<WxMenuDO> findByWechatId(String wechatId);
    @Query("from WxMenu m where m.wechatId = ?1 and  m.supMenuid= ?2 and m.status =1 order by m.sort")
    List<WxMenu> findChildMenus(String wechatId, String supMenuid);
    @Query("from WxMenuDO m where m.wechatId = ?1 and  m.supMenuid= ?2 and m.status =1 order by m.sort")
    List<WxMenuDO> findChildMenus(String wechatId, String supMenuid);
    @Query("from WxMenu m where  m.supMenuid= ?1 and m.status =1 order by m.sort")
    List<WxMenu> findChildMenus( String supMenuid);
    @Query("from WxMenuDO m where  m.supMenuid= ?1 and m.status =1 order by m.sort")
    List<WxMenuDO> findChildMenus( String supMenuid);
    /**
     * 根据wechatId判断父菜单的sort是否重复
     * @param wechatId
     * @param sort
     */
    @Query("from WxMenu m where m.wechatId = ?1 and m.status =1 and m.sort =?2 and m.supMenuid ='0' and m.id != ?3")
    WxMenu findByWechatIdExcludeSortFromParent(String wechatId, Integer sort,String id);
    @Query("from WxMenuDO m where m.wechatId = ?1 and m.status =1 and m.sort =?2 and m.supMenuid ='0' and m.id != ?3")
    WxMenuDO findByWechatIdExcludeSortFromParent(String wechatId, Integer sort,String id);
    /**
     * 根据wechatId,supMenucode判断子菜单的sort是否重复
     * @param wechatId
     * @param sort
     */
    @Query("from WxMenu m where m.wechatId = ?1 and m.status =1 and m.sort =?2 and m.supMenuid =?3 and m.id != ?4")
    WxMenu findByWechatIdExcludeSortFromChild(String wechatId, Integer sort,String supMenuid,String id);
    @Query("from WxMenuDO m where m.wechatId = ?1 and m.status =1 and m.sort =?2 and m.supMenuid =?3 and m.id != ?4")
    WxMenuDO findByWechatIdExcludeSortFromChild(String wechatId, Integer sort,String supMenuid,String id);
    @Query("from WxMenu m where m.wechatId =?1 and m.status = 1 and  m.supMenuid = '0' order by m.supMenuid ,m.sort")
    List<WxMenu> findParentMenuByWechatId(String wechatId);
    @Query("from WxMenuDO m where m.wechatId =?1 and m.status = 1 and  m.supMenuid = '0' order by m.supMenuid ,m.sort")
    List<WxMenuDO> findParentMenuByWechatId(String wechatId);
}