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

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/version/BaseUserVersion.java

@@ -18,7 +18,7 @@ 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
@@ -28,7 +28,7 @@ public class BaseUserVersion  extends IdEntity implements java.io.Serializable {
	// Constructors
	/** default constructor */
	public BaseUserVersion() {
	public BaseUserVersionDO() {
	}

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

@@ -15,7 +15,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "base_doctors")
public class BaseDoctors extends IdEntityWithOperation {
public class BaseDoctorsDO extends IdEntityWithOperation {
    private static final long serialVersionUID = 3138130150854187709L;

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

@@ -13,7 +13,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 +43,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

@@ -13,7 +13,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 +31,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

@@ -14,7 +14,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

@@ -14,7 +14,7 @@ import java.sql.Date;
 */
@Entity
@Table(name = "base_patient")
public class BasePatient extends IdEntityWithOperation implements Serializable {
public class BasePatientDO extends IdEntityWithOperation implements Serializable {
    private static final long serialVersionUID = -5371957917251091855L;
    private String accountId;//关联wlyy_login_account账号id

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,为默认广告

svr-lib-parent-pom/pom.xml

@@ -36,7 +36,7 @@
        <!--业务微服务-->
        <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><!--物联网平台-->
        <!--网关-->

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

@@ -1,6 +1,6 @@
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;
@@ -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);
            }
        }
@@ -141,10 +141,10 @@ 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);
@@ -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;
@@ -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/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;
@@ -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.parentCode=?1 and f.status=1")
    List<Function> getChildren(String parentCode);
    @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,9 +1,9 @@
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;
@@ -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);
@@ -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,9 +1,9 @@
package com.yihu.jw.business.sms.dao;
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.repository.PagingAndSortingRepository;
public interface SmsDao extends PagingAndSortingRepository<BaseSms, String>, JpaSpecificationExecutor<BaseSms> {
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.id != ?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/version/controller/UserVersionController.java

@@ -1,8 +1,6 @@
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.base.version.BaseUserVersionDO;
import com.yihu.jw.business.version.service.UserVersionService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.base.sms.MSmsGateway;
@@ -40,7 +38,7 @@ public class UserVersionController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            BaseUserVersion baseUserVersion = toEntity(jsonData, BaseUserVersion.class);
            BaseUserVersionDO baseUserVersion = toEntity(jsonData, BaseUserVersionDO.class);
            return Envelop.getSuccess(BaseVersionRequestMapping.UserVersion.message_success_create, userVersionService.createUserVersion(baseUserVersion));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -99,13 +97,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 = userVersionService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=userVersionService.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 +119,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 = userVersionService.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/UserVersionDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.business.version.dao;
import com.yihu.jw.base.version.BaseUserVersion;
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;
@@ -8,7 +8,7 @@ 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);
public interface UserVersionDao 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/service/UserVersionService.java

@@ -1,8 +1,7 @@
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.base.version.BaseUserVersionDO;
import com.yihu.jw.business.sms.dao.SmsGatewayDao;
import com.yihu.jw.business.version.dao.UserVersionDao;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,12 +14,12 @@ import java.util.Arrays;
 * Created by chenweida on 2017/11/10.
 */
@Service
public class UserVersionService extends BaseJpaService<BaseUserVersion, UserVersionDao> {
public class UserVersionService extends BaseJpaService<BaseUserVersionDO, UserVersionDao> {
    @Autowired
    private UserVersionDao userVersionDao;
    @Transactional
    public BaseUserVersion createUserVersion(BaseUserVersion baseUserVersion) {
    public BaseUserVersionDO createUserVersion(BaseUserVersionDO baseUserVersion) {
        return userVersionDao.save(baseUserVersion);
    }
@@ -32,11 +31,11 @@ public class UserVersionService extends BaseJpaService<BaseUserVersion, UserVers
        }
    }
    public BaseUserVersion getUserVersionByUserId(String userId) {
    public BaseUserVersionDO getUserVersionByUserId(String userId) {
      return  userVersionDao.getUserVersionByUserId(userId);
    }
    public BaseUserVersion getUserVersion(String id) {
    public BaseUserVersionDO getUserVersion(String id) {
        return  userVersionDao.findOne(id);
    }
}

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

@@ -1,6 +1,6 @@
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;
@@ -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,6 +1,6 @@
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;
@@ -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,6 +1,6 @@
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;
@@ -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;
@@ -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;
@@ -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);
}

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.wx.dao;
import com.yihu.jw.base.wx.WxTemplate;
import com.yihu.jw.base.wx.WxTemplateDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -10,12 +10,12 @@ import java.util.List;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public interface WxTemplateDao extends PagingAndSortingRepository<WxTemplate, String>, JpaSpecificationExecutor<WxTemplate> {
public interface WxTemplateDao extends PagingAndSortingRepository<WxTemplateDO, String>, JpaSpecificationExecutor<WxTemplateDO> {
    @Query("from WxTemplate w where w.id = ?1 and w.status =1")
    WxTemplate findById(String id);
    @Query("from WxTemplateDO w where w.id = ?1 and w.status =1")
    WxTemplateDO findById(String id);
    @Query("from WxTemplate w where w.wechatId = ?1 and w.status =1")
    List<WxTemplate> findByWxId(String wechatId);
    @Query("from WxTemplateDO w where w.wechatId = ?1 and w.status =1")
    List<WxTemplateDO> findByWxId(String wechatId);
}

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.wx.service;
import com.yihu.jw.base.wx.WxWechat;
import com.yihu.jw.base.wx.WxWechatDO;
import com.yihu.jw.business.wx.dao.WechatDao;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
@@ -17,13 +17,13 @@ import java.util.*;
 * Created by Administrator on 2017/5/20 0020.
 */
@Service
public class WechatService extends BaseJpaService<WxWechat, WechatDao> {
public class WechatService extends BaseJpaService<WxWechatDO, WechatDao> {
    @Autowired
    private WechatDao wechatDao;
    @Transient
    public WxWechat createWechat(WxWechat wechat) {
    public WxWechatDO createWechat(WxWechatDO wechat) {
        String code = UUID.randomUUID().toString().replaceAll("-", "");
        wechat.setId(code);
        if (StringUtils.isEmpty(wechat.getSaasId())) {
@@ -38,7 +38,7 @@ public class WechatService extends BaseJpaService<WxWechat, WechatDao> {
        if (StringUtils.isEmpty(wechat.getName())) {
            throw new ApiException(WechatRequestMapping.WxConfig.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        WxWechat wechatTem = wechatDao.findByAppId(wechat.getAppId());
        WxWechatDO wechatTem = wechatDao.findByAppId(wechat.getAppId());
        if (wechatTem != null) {
            throw new ApiException(WechatRequestMapping.WxConfig.message_fail_appId_exist, ExceptionCode.common_error_params_code);
        }
@@ -46,7 +46,7 @@ public class WechatService extends BaseJpaService<WxWechat, WechatDao> {
    }
    @Transient
    public WxWechat updateWxchat(WxWechat wechat) {
    public WxWechatDO updateWxchat(WxWechatDO wechat) {
        if (StringUtils.isEmpty(wechat.getSaasId())) {
            throw new ApiException(WechatRequestMapping.WxConfig.message_fail_saasId_is_null, ExceptionCode.common_error_params_code);
        }
@@ -59,11 +59,11 @@ public class WechatService extends BaseJpaService<WxWechat, WechatDao> {
        if (StringUtils.isEmpty(wechat.getName())) {
            throw new ApiException(WechatRequestMapping.WxConfig.message_fail_name_is_null, ExceptionCode.common_error_params_code);
        }
        WxWechat wechat1 = findById(wechat.getId());
        WxWechatDO wechat1 = findById(wechat.getId());
        if (wechat1 == null) {
            throw new ApiException(WechatRequestMapping.WxConfig.message_fail_wxWechat_is_no_exist, ExceptionCode.common_error_params_code);
        }
        WxWechat wechatTem = wechatDao.findByAppIdExcludeId(wechat.getAppId(), wechat.getId());
        WxWechatDO wechatTem = wechatDao.findByAppIdExcludeId(wechat.getAppId(), wechat.getId());
        if (wechatTem != null) {
            throw new ApiException(WechatRequestMapping.WxConfig.message_fail_appId_exist, ExceptionCode.common_error_params_code);
        }
@@ -71,7 +71,7 @@ public class WechatService extends BaseJpaService<WxWechat, WechatDao> {
    }
    public WxWechat findById(String id) {
    public WxWechatDO findById(String id) {
        return wechatDao.findById(id);
    }
@@ -80,7 +80,7 @@ public class WechatService extends BaseJpaService<WxWechat, WechatDao> {
        if (!StringUtils.isEmpty(ids)) {
            String[] codeArray = ids.split(",");
            for (String code : codeArray) {
                WxWechat wxWechat = wechatDao.findById(code);
                WxWechatDO wxWechat = wechatDao.findById(code);
                if (wxWechat == null) {
                    throw new ApiException(WechatRequestMapping.WxConfig.message_fail_id_no_exist, ExceptionCode.common_error_params_code);
                }
@@ -92,7 +92,7 @@ public class WechatService extends BaseJpaService<WxWechat, WechatDao> {
        }
    }
    public List<WxWechat> findAll() {
    public List<WxWechatDO> findAll() {
        return wechatDao.findAll();
    }
@@ -102,10 +102,10 @@ public class WechatService extends BaseJpaService<WxWechat, WechatDao> {
     * @return
     */
    public Map<String, String> getAllWechatConfig() {
        List<WxWechat> wechats = findAll();
        List<WxWechatDO> wechats = findAll();
        Map<String, String> map = new HashMap<>();
        if (null != wechats) {
            for (WxWechat wx : wechats) {
            for (WxWechatDO wx : wechats) {
                map.put(wx.getId(), wx.getName());
            }
        }

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

@@ -1,7 +1,7 @@
package com.yihu.jw.business.wx.service;
import com.yihu.jw.base.wx.WxAccessToken;
import com.yihu.jw.base.wx.WxWechat;
import com.yihu.jw.base.wx.WxAccessTokenDO;
import com.yihu.jw.base.wx.WxWechatDO;
import com.yihu.jw.business.wx.dao.WechatDao;
import com.yihu.jw.business.wx.dao.WxAccessTokenDao;
import com.yihu.jw.exception.ApiException;
@@ -24,7 +24,7 @@ import java.util.UUID;
 * Created by Administrator on 2017/5/18 0018.
 */
@Service
public class WxAccessTokenService extends BaseJpaService<WxAccessToken, WxAccessTokenDao> {
public class WxAccessTokenService extends BaseJpaService<WxAccessTokenDO, WxAccessTokenDao> {
    private Logger logger= LoggerFactory.getLogger(WxAccessTokenService.class);
@@ -40,16 +40,16 @@ public class WxAccessTokenService extends BaseJpaService<WxAccessToken, WxAccess
     * @param wechatId
     * @return
     */
    public WxAccessToken getWxAccessTokenById(String wechatId) {
    public WxAccessTokenDO getWxAccessTokenById(String wechatId) {
        try {
            //根据wechatCode查找出appid和appSecret
            WxWechat wxWechat = wechatDao.findById(wechatId);
            WxWechatDO wxWechat = wechatDao.findById(wechatId);
            if(wxWechat==null){
                throw new ApiException(WechatRequestMapping.WxConfig.message_fail_wxWechat_is_no_exist, ExceptionCode.common_error_params_code);
            }
            List<WxAccessToken> wxAccessTokens =  wxAccessTokenDao.getWxAccessTokenById(wechatId);
            List<WxAccessTokenDO> wxAccessTokens =  wxAccessTokenDao.getWxAccessTokenById(wechatId);
            if(wxAccessTokens!=null&&wxAccessTokens.size()>0){
                for (WxAccessToken accessToken : wxAccessTokens) {
                for (WxAccessTokenDO accessToken : wxAccessTokens) {
                    if ((System.currentTimeMillis() - accessToken.getAddTimestamp()) < (accessToken.getExpiresIn() * 1000)) {
                        return accessToken;
                    } else {
@@ -76,7 +76,7 @@ public class WxAccessTokenService extends BaseJpaService<WxAccessToken, WxAccess
            if (json.has("access_token")) {
                String token = json.get("access_token").toString();
                String expires_in = json.get("expires_in").toString();
                WxAccessToken newaccessToken = new WxAccessToken();
                WxAccessTokenDO newaccessToken = new WxAccessTokenDO();
                newaccessToken.setAccessToken(token);
                newaccessToken.setExpiresIn(Long.parseLong(expires_in));
                newaccessToken.setAddTimestamp(System.currentTimeMillis());

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

@@ -1,6 +1,6 @@
package com.yihu.jw.business.wx.service;
import com.yihu.jw.base.wx.WxGraphicMessage;
import com.yihu.jw.base.wx.WxGraphicMessageDO;
import com.yihu.jw.business.wx.dao.WxGraphicMessageDao;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
@@ -19,13 +19,13 @@ import java.util.*;
 * Created by Administrator on 2017/5/20 0020.
 */
@Service
public class WxGraphicMessageService extends BaseJpaService<WxGraphicMessage, WxGraphicMessageDao> {
public class WxGraphicMessageService extends BaseJpaService<WxGraphicMessageDO, WxGraphicMessageDao> {
    @Autowired
    private WxGraphicMessageDao wxGraphicMessageDao;
    @Transient
    public WxGraphicMessage createWxGraphicMessage(WxGraphicMessage wxGraphicMessage) {
    public WxGraphicMessageDO createWxGraphicMessage(WxGraphicMessageDO wxGraphicMessage) {
        String code = UUID.randomUUID().toString().replaceAll("-", "");
        wxGraphicMessage.setId(code);
        if (StringUtils.isEmpty(wxGraphicMessage.getStatus())) {
@@ -34,7 +34,7 @@ public class WxGraphicMessageService extends BaseJpaService<WxGraphicMessage, Wx
        if (StringUtils.isEmpty(wxGraphicMessage.getTitle())) {
            throw new ApiException(WechatRequestMapping.WxGraphicMessage.message_fail_title_is_null, ExceptionCode.common_error_params_code);
        }
        WxGraphicMessage wxGraphicMessageTem = wxGraphicMessageDao.findById(wxGraphicMessage.getId());
        WxGraphicMessageDO wxGraphicMessageTem = wxGraphicMessageDao.findById(wxGraphicMessage.getId());
        if (wxGraphicMessageTem != null) {
            throw new ApiException(WechatRequestMapping.WxGraphicMessage.message_fail_id_exist, ExceptionCode.common_error_params_code);
        }
@@ -42,7 +42,7 @@ public class WxGraphicMessageService extends BaseJpaService<WxGraphicMessage, Wx
    }
    @Transient
    public WxGraphicMessage updateWxGraphicMessage(WxGraphicMessage wxGraphicMessage) {
    public WxGraphicMessageDO updateWxGraphicMessage(WxGraphicMessageDO wxGraphicMessage) {
        if (StringUtils.isEmpty(wxGraphicMessage.getId())) {
            throw new ApiException(WechatRequestMapping.WxGraphicMessage.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
@@ -51,14 +51,14 @@ public class WxGraphicMessageService extends BaseJpaService<WxGraphicMessage, Wx
        }
        //根据id查找
        WxGraphicMessage wxGraphicMessage1 = findById(wxGraphicMessage.getId());
        WxGraphicMessageDO wxGraphicMessage1 = findById(wxGraphicMessage.getId());
        if(wxGraphicMessage1==null){
            throw new ApiException(WechatRequestMapping.WxGraphicMessage.message_fail_wxGraphicMessage_is_no_exist, ExceptionCode.common_error_params_code);
        }
        return wxGraphicMessageDao.save(wxGraphicMessage);
    }
    public WxGraphicMessage findById(String id) {
    public WxGraphicMessageDO findById(String id) {
      return wxGraphicMessageDao.findById(id);
    }
@@ -67,7 +67,7 @@ public class WxGraphicMessageService extends BaseJpaService<WxGraphicMessage, Wx
        if(!StringUtils.isEmpty(codes)){
            String[] codeArray = codes.split(",");
            for(String code:codeArray){
                WxGraphicMessage wxGraphicMessage = findById(code);
                WxGraphicMessageDO wxGraphicMessage = findById(code);
                wxGraphicMessage.setStatus(-1);
                wxGraphicMessage.setUpdateUser(userCode);
                wxGraphicMessage.setUpdateUserName(userName);
@@ -126,7 +126,7 @@ public class WxGraphicMessageService extends BaseJpaService<WxGraphicMessage, Wx
            if(codes!=null){
                String[] codeArray = codes.split(",");
                for(String code: codeArray){
                    WxGraphicMessage graphicMessage = findById(code);
                    WxGraphicMessageDO graphicMessage = findById(code);
                    Map<String,String> article = new HashMap<>();
                    article.put("Url",graphicMessage.getUrl());
                    article.put("Title", graphicMessage.getTitle());
@@ -157,7 +157,7 @@ public class WxGraphicMessageService extends BaseJpaService<WxGraphicMessage, Wx
            if(ids!=null){
                String[] codeArray = ids.split(",");
                for(String id: codeArray){
                    WxGraphicMessage graphicMessage = findById(id);
                    WxGraphicMessageDO graphicMessage = findById(id);
                    Map<String,String> article = new HashMap<>();
                    article.put("Url",graphicMessage.getUrl());
                    article.put("Title", graphicMessage.getTitle());

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

@@ -1,8 +1,8 @@
package com.yihu.jw.business.wx.service;
import com.yihu.jw.base.wx.WxAccessToken;
import com.yihu.jw.base.wx.WxMenu;
import com.yihu.jw.base.wx.WxWechat;
import com.yihu.jw.base.wx.WxAccessTokenDO;
import com.yihu.jw.base.wx.WxMenuDO;
import com.yihu.jw.base.wx.WxWechatDO;
import com.yihu.jw.business.wx.dao.WxMenuDao;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
@@ -26,7 +26,7 @@ import java.util.UUID;
 * Created by Administrator on 2017/5/19 0019.
 */
@Service
public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
public class WxMenuService extends BaseJpaService<WxMenuDO, WxMenuDao> {
    private Logger logger= LoggerFactory.getLogger(WxMenuService.class);
@@ -44,7 +44,7 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
     * @param wxMenu
     * @return
     */
    public WxMenu createWxMenu(WxMenu wxMenu) {
    public WxMenuDO createWxMenu(WxMenuDO wxMenu) {
        String code = UUID.randomUUID().toString().replaceAll("-", "");
        wxMenu.setId(code);
        if(canSaveOrUpata(wxMenu)){
@@ -54,12 +54,12 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
    }
    @Transient
    public WxMenu updateWxMenu(WxMenu wxMenu) {
    public WxMenuDO updateWxMenu(WxMenuDO wxMenu) {
        if (StringUtils.isEmpty(wxMenu.getId())) {
            throw new ApiException(WechatRequestMapping.WxMenu.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        if(canSaveOrUpata(wxMenu)){
            WxMenu wxMenu1 = findById(wxMenu.getId());
            WxMenuDO wxMenu1 = findById(wxMenu.getId());
            if(wxMenu1==null){
                throw new ApiException(WechatRequestMapping.WxMenu.message_fail_WxMenu_is_no_exist, ExceptionCode.common_error_params_code);
            }
@@ -74,15 +74,15 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
            String[] codeArray = ids.split(",");
            Date date = new Date();
            for (String code : codeArray) {
                WxMenu wxMenu = wxMenuDao.findById(code);
                WxMenuDO wxMenu = wxMenuDao.findById(code);
                if (wxMenu == null) {
                    continue;
                }
                String supMenucode = wxMenu.getSupMenuid();
                if (StringUtils.isEmpty(supMenucode)) {//如果是空,则为父菜单
                    List<WxMenu> childMenus = findChildMenus(wxMenu.getWechatId(), wxMenu.getId());
                    List<WxMenuDO> childMenus = findChildMenus(wxMenu.getWechatId(), wxMenu.getId());
                    if (childMenus != null) {
                        for (WxMenu wxmenu : childMenus) {
                        for (WxMenuDO wxmenu : childMenus) {
                            wxmenu.setStatus(-1);
                            wxmenu.setUpdateUser(userId);
                            wxmenu.setUpdateUserName(userName);
@@ -103,15 +103,15 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
        if(!StringUtils.isEmpty(codes)) {
            String[] codeArray = codes.split(",");
            for (String code : codeArray) {
                WxMenu wxMenu = wxMenuDao.findById(code);
                WxMenuDO wxMenu = wxMenuDao.findById(code);
                if (wxMenu == null) {
                    continue;
                }
                String supMenucode = wxMenu.getSupMenuid();
                if (StringUtils.isEmpty(supMenucode)) {//如果是空,则为父菜单
                    List<WxMenu> childMenus = findChildMenus(wxMenu.getWechatId(), wxMenu.getId());
                    List<WxMenuDO> childMenus = findChildMenus(wxMenu.getWechatId(), wxMenu.getId());
                    if (childMenus != null) {
                        for (WxMenu wxmenu : childMenus) {
                        for (WxMenuDO wxmenu : childMenus) {
                            wxmenu.setStatus(-1);
                            wxmenu.setUpdateUser(userCode);
                            wxMenuDao.save(wxmenu);
@@ -125,7 +125,7 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
        }
    }
    public WxMenu findById(String id) {
    public WxMenuDO findById(String id) {
        return wxMenuDao.findById(id);
    }
    /**
@@ -133,8 +133,8 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
     * @param wechatCode
     * @return
     */
    public List<WxMenu> findParentMenuByWechatCode(String wechatCode){
        List<WxMenu> parentMenus = wxMenuDao.findParentMenuByWechatId(wechatCode);
    public List<WxMenuDO> findParentMenuByWechatCode(String wechatCode){
        List<WxMenuDO> parentMenus = wxMenuDao.findParentMenuByWechatId(wechatCode);
        return parentMenus;
    }
@@ -144,18 +144,18 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
     * @return JSONObject
     */
    public JSONObject createWechatMenu(String wechatId) {
        WxWechat wechat = wechatService.findById(wechatId);
        WxWechatDO wechat = wechatService.findById(wechatId);
        if(wechat==null){
            throw new ApiException(WechatRequestMapping.WxConfig.message_fail_wxWechat_is_no_exist, ExceptionCode.common_error_params_code);
        }
        //首先根据wechatCode获取菜单,然后封装成json字符串
        List<WxMenu> menus = wxMenuDao.findByWechatId(wechatId);
        List<WxMenuDO> menus = wxMenuDao.findByWechatId(wechatId);
        if(menus==null){
            throw new ApiException(WechatRequestMapping.WxMenu.message_fail_WxMenu_is_no_exist, ExceptionCode.common_error_params_code);
        }
        String menuJsonString = getMenuToString(menus, wechatId);
        logger.info("-----------------微信菜单json字符串:"+ menuJsonString+"--------------------");
        WxAccessToken wxAccessTokenByCode = wxAccessTokenService.getWxAccessTokenById(wechatId);
        WxAccessTokenDO wxAccessTokenByCode = wxAccessTokenService.getWxAccessTokenById(wechatId);
        String token = wxAccessTokenByCode.getAccessToken();
        // 请求微信接口创建菜单
        String url = " https://api.weixin.qq.com/cgi-bin/menu/create?access_token=" + token;
@@ -165,19 +165,19 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
        return result;
    }
    private String getMenuToString(List<WxMenu> menus,String wechatCode){
    private String getMenuToString(List<WxMenuDO> menus,String wechatCode){
        String menuJsonStr = "";
        List<WxMenu> parentMenus = new ArrayList<WxMenu>();//存储父菜单
        List<WxMenuDO> parentMenus = new ArrayList<WxMenuDO>();//存储父菜单
        if(menus!=null){
            menuJsonStr = "{\"button\":[{";
            for(WxMenu wxMenu:menus){
            for(WxMenuDO wxMenu:menus){
                if(StringUtils.isEmpty(wxMenu.getSupMenuid())){//说明是父菜单
                    parentMenus.add(wxMenu);
                }
            }
        }
        int j = 0;
        for(WxMenu menu:parentMenus){//遍历父菜单
        for(WxMenuDO menu:parentMenus){//遍历父菜单
            if(j==0){
                j++;
            }else{
@@ -185,11 +185,11 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
            }
            menuJsonStr = getString(menuJsonStr, menu);
            //查找是否有子菜单
            List<WxMenu> childMenus = findChildMenus(wechatCode, menu.getId());
            List<WxMenuDO> childMenus = findChildMenus(wechatCode, menu.getId());
            if(childMenus!=null){
                int i =0;
                menuJsonStr += ",\"sub_button\":[{";
                for(WxMenu childMenu:childMenus){
                for(WxMenuDO childMenu:childMenus){
                    if(i==0){
                        i++;
                    }else{
@@ -205,7 +205,7 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
        return menuJsonStr;
    }
    private String getString(String menuJsonStr, WxMenu menu) {
    private String getString(String menuJsonStr, WxMenuDO menu) {
        menuJsonStr += "\"name\":\""+ menu.getName()+"\"";
        if(!StringUtils.isEmpty(menu.getType())){
            menuJsonStr += ",\"type\":\"" + menu.getType()+"\"";
@@ -234,19 +234,19 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
     * @param sup_menucode
     * @return
     */
    public List<WxMenu> findChildMenus(String wechatCode,String sup_menucode ){
    public List<WxMenuDO> findChildMenus(String wechatCode,String sup_menucode ){
        return wxMenuDao.findChildMenus(wechatCode,sup_menucode);
    }
    public List<WxMenu> findChildMenus(String parentCode ){
    public List<WxMenuDO> findChildMenus(String parentCode ){
        return wxMenuDao.findChildMenus(parentCode);
    }
    private boolean canSaveOrUpata(WxMenu wxMenu){
    private boolean canSaveOrUpata(WxMenuDO wxMenu){
        String wechatCode = wxMenu.getWechatId();
        String supMenucode = wxMenu.getSupMenuid();
        if(StringUtils.isEmpty(wechatCode)){
            WxMenu parentMenuCode = findById(supMenucode);
            WxMenuDO parentMenuCode = findById(supMenucode);
            wechatCode = parentMenuCode.getWechatId();
            wxMenu.setWechatId(wechatCode);
        }
@@ -261,20 +261,20 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
            throw new ApiException(WechatRequestMapping.WxMenu.message_fail_sort_is_null, ExceptionCode.common_error_params_code);
        }
        //根据wechatCode查找是否存在微信配置
        WxWechat wxWechat = wechatService.findById(wechatCode);
        WxWechatDO wxWechat = wechatService.findById(wechatCode);
        if(wxWechat==null){
            throw new ApiException(WechatRequestMapping.WxConfig.message_fail_wxWechat_is_no_exist, ExceptionCode.common_error_params_code);
        }
        if (!"0".equals(supMenucode)) {//不为0,说明是子菜单,判断父菜单是否存在
            //说明是子菜单
            //判断父菜单是否存在
            WxMenu parentMenuCode = findById(supMenucode);
            WxMenuDO parentMenuCode = findById(supMenucode);
            if(parentMenuCode==null){
                throw new ApiException(WechatRequestMapping.WxMenu.message_fail_supMenuId_is_no_exist, ExceptionCode.common_error_params_code);
            }
            //查询已经存在的子菜单条数
            List<WxMenu> childMenus = findChildMenus(wechatCode, supMenucode);
            List<WxMenuDO> childMenus = findChildMenus(wechatCode, supMenucode);
            if(childMenus.size()==5){
                throw new ApiException(WechatRequestMapping.WxMenu.message_fail_childMenu_is_to_much, ExceptionCode.common_error_params_code);
            }
@@ -286,7 +286,7 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
            }
        }else{
            //查找父菜单
            List<WxMenu> parentMenus = findParentMenuByWechatCode(wechatCode);
            List<WxMenuDO> parentMenus = findParentMenuByWechatCode(wechatCode);
            if(parentMenus!=null){
                if(parentMenus.size()==3){
                    throw new ApiException(WechatRequestMapping.WxMenu.message_fail_parentMenu_is_to_much, ExceptionCode.common_error_params_code);
@@ -341,7 +341,7 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
                throw new ApiException(WechatRequestMapping.WxMenu.message_fail_mediaId_is_null, ExceptionCode.common_error_params_code);
            }
        }
        WxMenu wxMenuTemp = null;
        WxMenuDO wxMenuTemp = null;
        if(StringUtils.isEmpty(wxMenu.getSupMenuid())){//如果是空,则为父菜单
            //判断sort是否重复
            wxMenuTemp = wxMenuDao.findByWechatIdExcludeSortFromParent(wxMenu.getWechatId(), wxMenu.getSort(),wxMenu.getId());

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

@@ -22,7 +22,7 @@ import java.util.*;
 * Created by Administrator on 2017/5/19 0019.
 */
@Service
public class WxTemplateService extends BaseJpaService<WxTemplate, WxTemplateDao> {
public class WxTemplateService extends BaseJpaService<WxTemplateDO, WxTemplateDao> {
    private Logger logger= LoggerFactory.getLogger(WxTemplateService.class);
@@ -35,7 +35,7 @@ public class WxTemplateService extends BaseJpaService<WxTemplate, WxTemplateDao>
    @Autowired
    private WechatService wechatService;
    public WxTemplate createWxTemplate(WxTemplate wxTemplate) {
    public WxTemplateDO createWxTemplate(WxTemplateDO wxTemplate) {
        if (StringUtils.isEmpty(wxTemplate.getTemplateId())) {
            throw new ApiException(WechatRequestMapping.WxTemplate.message_fail_templateid_is_null, ExceptionCode.common_error_params_code);
        }
@@ -49,7 +49,7 @@ public class WxTemplateService extends BaseJpaService<WxTemplate, WxTemplateDao>
        return wxTemplateDao.save(wxTemplate);
    }
    public WxTemplate updateWxTemplate(WxTemplate wxTemplate) {
    public WxTemplateDO updateWxTemplate(WxTemplateDO wxTemplate) {
        if (StringUtils.isEmpty(wxTemplate.getTemplateId())) {
            throw new ApiException(WechatRequestMapping.WxTemplate.message_fail_templateid_is_null, ExceptionCode.common_error_params_code);
        }
@@ -61,7 +61,7 @@ public class WxTemplateService extends BaseJpaService<WxTemplate, WxTemplateDao>
        if (StringUtils.isEmpty(id)) {
            throw new ApiException(WechatRequestMapping.WxConfig.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        WxTemplate wxTemplate1 = findById(id);
        WxTemplateDO wxTemplate1 = findById(id);
        if(wxTemplate1==null){
            throw new ApiException(WechatRequestMapping.WxTemplate.message_fail_template_is_no_exist, ExceptionCode.common_error_params_code);
        }
@@ -77,7 +77,7 @@ public class WxTemplateService extends BaseJpaService<WxTemplate, WxTemplateDao>
        if(!StringUtils.isEmpty(codes)) {
            String[] codeArray = codes.split(",");
            for (String code : codeArray) {
                WxTemplate wxTemplate = wxTemplateDao.findById(code);
                WxTemplateDO wxTemplate = wxTemplateDao.findById(code);
                if (wxTemplate == null) {
                    throw new ApiException(WechatRequestMapping.WxTemplate.message_fail_id_no_exist, ExceptionCode.common_error_params_code);
                }
@@ -90,15 +90,15 @@ public class WxTemplateService extends BaseJpaService<WxTemplate, WxTemplateDao>
    }
    public WxTemplate findById(String id) {
        WxTemplate wxTemplate = wxTemplateDao.findById(id);
    public WxTemplateDO findById(String id) {
        WxTemplateDO wxTemplate = wxTemplateDao.findById(id);
        return wxTemplate;
    }
    public JSONObject sendTemplateMessage(String openid, String templateId, String url, String data,Miniprogram miniprogram) {
        try {
            //首先根据wechatTemplate获取微信模版
            WxTemplate wxTemplate = findById(templateId);
            WxTemplateDO wxTemplate = findById(templateId);
            if(wxTemplate==null){
                throw new ApiException(WechatRequestMapping.WxTemplate.message_fail_template_is_no_exist, ExceptionCode.common_error_params_code);
            }
@@ -114,17 +114,17 @@ public class WxTemplateService extends BaseJpaService<WxTemplate, WxTemplateDao>
            ObjectMapper mapper = new ObjectMapper();
            ////将data转为对象
            Map<String, WechatTemplateData> dataMap = mapper.readValue(data, new TypeReference<LinkedHashMap<String, WechatTemplateData>>() {});
            Map<String, WechatTemplateData> newDataMap = new LinkedHashMap<String, WechatTemplateData>();
            Map<String, WechatTemplateDataDO> dataMap = mapper.readValue(data, new TypeReference<LinkedHashMap<String, WechatTemplateDataDO>>() {});
            Map<String, WechatTemplateDataDO> newDataMap = new LinkedHashMap<String, WechatTemplateDataDO>();
            int j = 0;
            for (Map.Entry<String, WechatTemplateData> entry : dataMap.entrySet()) {//(keyword1,WechatTemplateData)
            for (Map.Entry<String, WechatTemplateDataDO> entry : dataMap.entrySet()) {//(keyword1,WechatTemplateData)
                String key = entry.getKey();//keyword1   转为result
                newDataMap.put(contentList.get(j),entry.getValue());
                j++;
            }
            //将数据封装在WechatTemplate对象中
            WechatTemplate wechatTemplate = new WechatTemplate();
            WechatTemplateDO wechatTemplate = new WechatTemplateDO();
            wechatTemplate.setTouser(openid);
            wechatTemplate.setUrl(url);
            wechatTemplate.setTemplate_id(wxTemplate.getTemplateId());
@@ -136,7 +136,7 @@ public class WxTemplateService extends BaseJpaService<WxTemplate, WxTemplateDao>
            String params = mapper.writeValueAsString(wechatTemplate);
            logger.info("----------------------模版消息json字符串:"+params+"------------------");
            WxAccessToken wxAccessTokenByCode = wxAccessTokenService.getWxAccessTokenById(wechatCode);
            WxAccessTokenDO wxAccessTokenByCode = wxAccessTokenService.getWxAccessTokenById(wechatCode);
            String token = wxAccessTokenByCode.getAccessToken();
            String token_url = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + token;
            String result = HttpUtil.sendPost(token_url, params);
@@ -151,7 +151,7 @@ public class WxTemplateService extends BaseJpaService<WxTemplate, WxTemplateDao>
        }
    }
    public List<WxTemplate> findByWxId(String code) {
    public List<WxTemplateDO> findByWxId(String code) {
        return wxTemplateDao.findByWxId(code);
    }
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/agreement/WlyyAgreementController.java

@@ -4,7 +4,7 @@ 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.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.agreement.WlyyAgreement;
import com.yihu.jw.wlyy.agreement.WlyyAgreementDO;
import com.yihu.jw.wlyy.service.agreement.WlyyAgreementService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -32,7 +32,7 @@ public class WlyyAgreementController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WlyyAgreement wlyyAgreement = toEntity(jsonData, WlyyAgreement.class);
            WlyyAgreementDO wlyyAgreement = toEntity(jsonData, WlyyAgreementDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.Agreement.message_success_create, wlyyAgreementService.create(wlyyAgreement));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -45,7 +45,7 @@ public class WlyyAgreementController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WlyyAgreement wlyyAgreement = toEntity(jsonData, WlyyAgreement.class);
            WlyyAgreementDO wlyyAgreement = toEntity(jsonData, WlyyAgreementDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.Agreement.message_success_update, wlyyAgreementService.update(wlyyAgreement));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -95,13 +95,13 @@ public class WlyyAgreementController extends EnvelopRestController {
            HttpServletRequest request,
            HttpServletResponse response) throws Exception {
        //得到list数据
        List<WlyyAgreement> list = wlyyAgreementService.search(fields, filters, sorts, page, size);
        List<WlyyAgreementDO> list = wlyyAgreementService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=wlyyAgreementService.getCount(filters);
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<WlyyAgreement> wlyyAgreement = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreement.class, fields);
        List<WlyyAgreementDO> wlyyAgreement = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreementDO.class, fields);
        return Envelop.getSuccessListWithPage(WlyyRequestMapping.Agreement.message_success_find_functions,wlyyAgreement, page, size,count);
    }
@@ -117,9 +117,9 @@ public class WlyyAgreementController extends EnvelopRestController {
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+name,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<WlyyAgreement> list = wlyyAgreementService.search(fields,filters,sorts);
        List<WlyyAgreementDO> list = wlyyAgreementService.search(fields,filters,sorts);
        //封装返回格式
        List<WlyyAgreement> wlyyAgreement = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreement.class, fields);
        List<WlyyAgreementDO> wlyyAgreement = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreementDO.class, fields);
        return Envelop.getSuccessList(WlyyRequestMapping.Agreement.message_success_find_functions,wlyyAgreement);
    }

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/agreement/WlyyAgreementKpiController.java

@@ -4,7 +4,7 @@ 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.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpi;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpiDO;
import com.yihu.jw.wlyy.service.agreement.WlyyAgreementKpiService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -32,7 +32,7 @@ public class WlyyAgreementKpiController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WlyyAgreementKpi wlyyAgreementKpi = toEntity(jsonData, WlyyAgreementKpi.class);
            WlyyAgreementKpiDO wlyyAgreementKpi = toEntity(jsonData, WlyyAgreementKpiDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.AgreementKpi.message_success_create, wlyyAgreementKpiService.create(wlyyAgreementKpi));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -45,7 +45,7 @@ public class WlyyAgreementKpiController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WlyyAgreementKpi wlyyAgreementKpi = toEntity(jsonData, WlyyAgreementKpi.class);
            WlyyAgreementKpiDO wlyyAgreementKpi = toEntity(jsonData, WlyyAgreementKpiDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.AgreementKpi.message_success_update, wlyyAgreementKpiService.update(wlyyAgreementKpi));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -95,13 +95,13 @@ public class WlyyAgreementKpiController extends EnvelopRestController {
            HttpServletRequest request,
            HttpServletResponse response) throws Exception {
        //得到list数据
        List<WlyyAgreementKpi> list = wlyyAgreementKpiService.search(fields, filters, sorts, page, size);
        List<WlyyAgreementKpiDO> list = wlyyAgreementKpiService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=wlyyAgreementKpiService.getCount(filters);
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<WlyyAgreementKpi> wlyyAgreementKpi = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreementKpi.class, fields);
        List<WlyyAgreementKpiDO> wlyyAgreementKpi = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreementKpiDO.class, fields);
        return Envelop.getSuccessListWithPage(WlyyRequestMapping.AgreementKpi.message_success_find_functions,wlyyAgreementKpi, page, size,count);
    }
@@ -117,9 +117,9 @@ public class WlyyAgreementKpiController extends EnvelopRestController {
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+kpiName,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<WlyyAgreementKpi> list = wlyyAgreementKpiService.search(fields,filters,sorts);
        List<WlyyAgreementKpiDO> list = wlyyAgreementKpiService.search(fields,filters,sorts);
        //封装返回格式
        List<WlyyAgreementKpi> wlyyAgreementKpi = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreementKpi.class, fields);
        List<WlyyAgreementKpiDO> wlyyAgreementKpi = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreementKpiDO.class, fields);
        return Envelop.getSuccessList(WlyyRequestMapping.AgreementKpi.message_success_find_functions,wlyyAgreementKpi);
    }

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/agreement/WlyyAgreementKpiLogController.java

@@ -4,7 +4,7 @@ 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.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpiLog;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpiLogDO;
import com.yihu.jw.wlyy.service.agreement.WlyyAgreementKpiLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -32,7 +32,7 @@ public class WlyyAgreementKpiLogController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WlyyAgreementKpiLog wlyyAgreementKpiLog = toEntity(jsonData, WlyyAgreementKpiLog.class);
            WlyyAgreementKpiLogDO wlyyAgreementKpiLog = toEntity(jsonData, WlyyAgreementKpiLogDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.AgreementKpiLog.message_success_create, wlyyAgreementKpiLogService.create(wlyyAgreementKpiLog));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -68,13 +68,13 @@ public class WlyyAgreementKpiLogController extends EnvelopRestController {
            HttpServletRequest request,
            HttpServletResponse response) throws Exception {
        //得到list数据
        List<WlyyAgreementKpiLog> list = wlyyAgreementKpiLogService.search(fields, filters, sorts, page, size);
        List<WlyyAgreementKpiLogDO> list = wlyyAgreementKpiLogService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=wlyyAgreementKpiLogService.getCount(filters);
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<WlyyAgreementKpiLog> wlyyAgreementKpiLog = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreementKpiLog.class, fields);
        List<WlyyAgreementKpiLogDO> wlyyAgreementKpiLog = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreementKpiLogDO.class, fields);
        return Envelop.getSuccessListWithPage(WlyyRequestMapping.AgreementKpiLog.message_success_find_functions,wlyyAgreementKpiLog, page, size,count);
    }
@@ -90,9 +90,9 @@ public class WlyyAgreementKpiLogController extends EnvelopRestController {
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+kpiName,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<WlyyAgreementKpiLog> list = wlyyAgreementKpiLogService.search(fields,filters,sorts);
        List<WlyyAgreementKpiLogDO> list = wlyyAgreementKpiLogService.search(fields,filters,sorts);
        //封装返回格式
        List<WlyyAgreementKpiLog> wlyyAgreementKpiLog = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreementKpiLog.class, fields);
        List<WlyyAgreementKpiLogDO> wlyyAgreementKpiLog = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreementKpiLogDO.class, fields);
        return Envelop.getSuccessList(WlyyRequestMapping.AgreementKpiLog.message_success_find_functions,wlyyAgreementKpiLog);
    }

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/agreement/WlyySignFamilyController.java

@@ -4,7 +4,7 @@ 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.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.agreement.WlyySignFamily;
import com.yihu.jw.wlyy.agreement.WlyySignFamilyDO;
import com.yihu.jw.wlyy.service.agreement.WlyySignFamilyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -33,7 +33,7 @@ public class WlyySignFamilyController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) throws ParseException {
        try {
            WlyySignFamily wlyySignFamily = toEntity(jsonData, WlyySignFamily.class);
            WlyySignFamilyDO wlyySignFamily = toEntity(jsonData, WlyySignFamilyDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.SignFamily.message_success_create, wlyySignFamilyService.create(wlyySignFamily));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -46,7 +46,7 @@ public class WlyySignFamilyController extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) throws ParseException {
        try {
            WlyySignFamily wlyySignFamily = toEntity(jsonData, WlyySignFamily.class);
            WlyySignFamilyDO wlyySignFamily = toEntity(jsonData, WlyySignFamilyDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.SignFamily.message_success_update, wlyySignFamilyService.update(wlyySignFamily));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -82,13 +82,13 @@ public class WlyySignFamilyController extends EnvelopRestController {
            HttpServletRequest request,
            HttpServletResponse response) throws Exception {
        //得到list数据
        List<WlyySignFamily> list = wlyySignFamilyService.search(fields, filters, sorts, page, size);
        List<WlyySignFamilyDO> list = wlyySignFamilyService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=wlyySignFamilyService.getCount(filters);
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<WlyySignFamily> wlyySignFamily = convertToModels(list, new ArrayList<>(list.size()), WlyySignFamily.class, fields);
        List<WlyySignFamilyDO> wlyySignFamily = convertToModels(list, new ArrayList<>(list.size()), WlyySignFamilyDO.class, fields);
        return Envelop.getSuccessListWithPage(WlyyRequestMapping.SignFamily.message_success_find_functions,wlyySignFamily, page, size,count);
    }
@@ -104,9 +104,9 @@ public class WlyySignFamilyController extends EnvelopRestController {
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+name")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<WlyySignFamily> list = wlyySignFamilyService.search(fields,filters,sorts);
        List<WlyySignFamilyDO> list = wlyySignFamilyService.search(fields,filters,sorts);
        //封装返回格式
        List<WlyySignFamily> wlyySignFamily = convertToModels(list, new ArrayList<>(list.size()), WlyySignFamily.class, fields);
        List<WlyySignFamilyDO> wlyySignFamily = convertToModels(list, new ArrayList<>(list.size()), WlyySignFamilyDO.class, fields);
        return Envelop.getSuccessList(WlyyRequestMapping.SignFamily.message_success_find_functions,wlyySignFamily);
    }

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/controller/patient/AdvertisementControlelr.java

@@ -4,7 +4,7 @@ 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.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.patient.WlyyAdvertisement;
import com.yihu.jw.wlyy.patient.WlyyAdvertisementDO;
import com.yihu.jw.wlyy.service.patient.AdvertisementService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -36,7 +36,7 @@ public class AdvertisementControlelr extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WlyyAdvertisement advertisement = toEntity(jsonData, WlyyAdvertisement.class);
            WlyyAdvertisementDO advertisement = toEntity(jsonData, WlyyAdvertisementDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.Advertisement.message_success_create, advertisementService.create(advertisement));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -49,7 +49,7 @@ public class AdvertisementControlelr extends EnvelopRestController {
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
        try {
            WlyyAdvertisement advertisement = toEntity(jsonData, WlyyAdvertisement.class);
            WlyyAdvertisementDO advertisement = toEntity(jsonData, WlyyAdvertisementDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.Advertisement.message_success_update, advertisementService.update(advertisement));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -98,13 +98,13 @@ public class AdvertisementControlelr extends EnvelopRestController {
            HttpServletRequest request,
            HttpServletResponse response) throws Exception {
        //得到list数据
        List<WlyyAdvertisement> list = advertisementService.search(fields, filters, sorts, page, size);
        List<WlyyAdvertisementDO> list = advertisementService.search(fields, filters, sorts, page, size);
        //获取总数
        long count = advertisementService.getCount(filters);
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        List<WlyyAdvertisement> advertisement = convertToModels(list, new ArrayList<>(list.size()), WlyyAdvertisement.class, fields);
        List<WlyyAdvertisementDO> advertisement = convertToModels(list, new ArrayList<>(list.size()), WlyyAdvertisementDO.class, fields);
        return Envelop.getSuccessListWithPage(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisement, page, size, count);
    }
@@ -120,9 +120,9 @@ public class AdvertisementControlelr extends EnvelopRestController {
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档", defaultValue = "+name,+createTime")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        //得到list数据
        List<WlyyAdvertisement> list = advertisementService.search(fields, filters, sorts);
        List<WlyyAdvertisementDO> list = advertisementService.search(fields, filters, sorts);
        //封装返回格式
        List<WlyyAdvertisement> advertisement = convertToModels(list, new ArrayList<>(list.size()), WlyyAdvertisement.class, fields);
        List<WlyyAdvertisementDO> advertisement = convertToModels(list, new ArrayList<>(list.size()), WlyyAdvertisementDO.class, fields);
        return Envelop.getSuccessList(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisement);
    }
@@ -133,14 +133,14 @@ public class AdvertisementControlelr extends EnvelopRestController {
            @RequestParam(value = "patientId") String patientId,
            HttpServletRequest request
    ) {
        List<WlyyAdvertisement> advertisements = advertisementService.getListByPatientId(patientId, request);
        List<WlyyAdvertisementDO> advertisements = advertisementService.getListByPatientId(patientId, request);
        return Envelop.getSuccessList(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisements);
    }
    @GetMapping(value = WlyyRequestMapping.Advertisement.api_getListByHttp)
    @ApiOperation(value = "根据患者code地区(通过http判断)获取广告")
    public Envelop getListByHttp(HttpServletRequest request) {
        List<WlyyAdvertisement> advertisements = advertisementService.getByHttp(request);
        List<WlyyAdvertisementDO> advertisements = advertisementService.getByHttp(request);
        return Envelop.getSuccess(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisements);
    }
@@ -153,7 +153,7 @@ public class AdvertisementControlelr extends EnvelopRestController {
    @GetMapping(value = WlyyRequestMapping.Advertisement.api_getListByIp)
    @ApiOperation(value = "根据患者ip地址(供网关调用)")
    public Envelop getListByIp(@RequestParam(value = "ipAddress") String ipAddress) {
        List<WlyyAdvertisement> advertisements = advertisementService.getListByIp(ipAddress);
        List<WlyyAdvertisementDO> advertisements = advertisementService.getListByIp(ipAddress);
        return Envelop.getSuccess(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisements);
    }

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/BaseSaasDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.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,10 +8,10 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/5/19.
 */
public interface BaseSaasDao extends PagingAndSortingRepository<Saas, String>, JpaSpecificationExecutor<Saas> {
    @Query("from Saas f where f.name=?1 and f.status=1")
    Saas findByName(String name);
public interface BaseSaasDao 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.code=?1 and f.status=1")
    Saas findByCode(String code);
    @Query("from SaasDO f where f.code=?1 and f.status=1")
    SaasDO findByCode(String code);
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/agreement/WlyyAgreementDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.dao.agreement;
import com.yihu.jw.wlyy.agreement.WlyyAgreement;
import com.yihu.jw.wlyy.agreement.WlyyAgreementDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -8,10 +8,10 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Administrator on 2017/6/1 0001.
 */
public interface WlyyAgreementDao extends PagingAndSortingRepository<WlyyAgreement, String>, JpaSpecificationExecutor<WlyyAgreement> {
public interface WlyyAgreementDao extends PagingAndSortingRepository<WlyyAgreementDO, String>, JpaSpecificationExecutor<WlyyAgreementDO> {
    @Query("from WlyyAgreement w where w.id=?1 and w.status !=-1")
    WlyyAgreement findById(String id);
    @Query("from WlyyAgreementDO w where w.id=?1 and w.status !=-1")
    WlyyAgreementDO findById(String id);
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/agreement/WlyyAgreementKpiDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.dao.agreement;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpi;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpiDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -8,10 +8,10 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Administrator on 2017/6/1 0001.
 */
public interface WlyyAgreementKpiDao extends PagingAndSortingRepository<WlyyAgreementKpi, String>, JpaSpecificationExecutor<WlyyAgreementKpi> {
public interface WlyyAgreementKpiDao extends PagingAndSortingRepository<WlyyAgreementKpiDO, String>, JpaSpecificationExecutor<WlyyAgreementKpiDO> {
    @Query("from WlyyAgreementKpi w where w.id=?1 and w.status !=-1")
    WlyyAgreementKpi findById(String id);
    @Query("from WlyyAgreementKpiDO w where w.id=?1 and w.status !=-1")
    WlyyAgreementKpiDO findById(String id);
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/agreement/WlyyAgreementKpiLogDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.dao.agreement;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpiLog;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpiLogDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -8,8 +8,8 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Administrator on 2017/6/1 0001.
 */
public interface WlyyAgreementKpiLogDao  extends PagingAndSortingRepository<WlyyAgreementKpiLog, String>, JpaSpecificationExecutor<WlyyAgreementKpiLog> {
public interface WlyyAgreementKpiLogDao  extends PagingAndSortingRepository<WlyyAgreementKpiLogDO, String>, JpaSpecificationExecutor<WlyyAgreementKpiLogDO> {
    @Query("from WlyyAgreementKpiLog w where w.id =?1")
    WlyyAgreementKpiLog findById(String code);
    @Query("from WlyyAgreementKpiLogDO w where w.id =?1")
    WlyyAgreementKpiLogDO findById(String code);
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/agreement/WlyySignFamilyDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.dao.agreement;
import com.yihu.jw.wlyy.agreement.WlyySignFamily;
import com.yihu.jw.wlyy.agreement.WlyySignFamilyDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -10,11 +10,11 @@ import java.util.List;
/**
 * Created by Administrator on 2017/6/2 0002.
 */
public interface WlyySignFamilyDao  extends PagingAndSortingRepository<WlyySignFamily, String>, JpaSpecificationExecutor<WlyySignFamily> {
public interface WlyySignFamilyDao  extends PagingAndSortingRepository<WlyySignFamilyDO, String>, JpaSpecificationExecutor<WlyySignFamilyDO> {
    @Query("from WlyySignFamily w where w.id = ?1")
    WlyySignFamily findById(String id);
    @Query("from WlyySignFamilyDO w where w.id = ?1")
    WlyySignFamilyDO findById(String id);
    @Query("from WlyySignFamily w where w.patient = ?1 and w.status = ?2")
    List<WlyySignFamily> findByPatientId(String patientId, Integer status);
    @Query("from WlyySignFamilyDO w where w.patient = ?1 and w.status = ?2")
    List<WlyySignFamilyDO> findByPatientId(String patientId, Integer status);
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/doctor/DoctorDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.dao.doctor;
import com.yihu.jw.wlyy.doctor.BaseDoctors;
import com.yihu.jw.wlyy.doctor.BaseDoctorsDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -8,8 +8,8 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Administrator on 2017/6/7 0007.
 */
public interface DoctorDao extends PagingAndSortingRepository<BaseDoctors, String>, JpaSpecificationExecutor<BaseDoctors> {
public interface DoctorDao extends PagingAndSortingRepository<BaseDoctorsDO, String>, JpaSpecificationExecutor<BaseDoctorsDO> {
    @Query("from BaseDoctors d where d.id = ?1 and d.status !=-1")
    BaseDoctors findById(String code);
    @Query("from BaseDoctorsDO d where d.id = ?1 and d.status !=-1")
    BaseDoctorsDO findById(String code);
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/doctor/HospitalDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.dao.doctor;
import com.yihu.jw.wlyy.doctor.BaseOrgHospital;
import com.yihu.jw.wlyy.doctor.BaseOrgHospitalDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -8,8 +8,8 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Administrator on 2017/6/7 0007.
 */
public interface HospitalDao extends PagingAndSortingRepository<BaseOrgHospital, String>, JpaSpecificationExecutor<BaseOrgHospital> {
public interface HospitalDao extends PagingAndSortingRepository<BaseOrgHospitalDO, String>, JpaSpecificationExecutor<BaseOrgHospitalDO> {
    @Query("from BaseOrgHospital w where w.code = ?1")
    BaseOrgHospital findByCode(String code);
    @Query("from BaseOrgHospitalDO w where w.code = ?1")
    BaseOrgHospitalDO findByCode(String code);
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/patient/AdvertisementDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.dao.patient;
import com.yihu.jw.wlyy.patient.WlyyAdvertisement;
import com.yihu.jw.wlyy.patient.WlyyAdvertisementDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -10,17 +10,17 @@ import java.util.List;
/**
 * Created by Administrator on 2017/6/6 0006.
 */
public interface AdvertisementDao extends PagingAndSortingRepository<WlyyAdvertisement, String>, JpaSpecificationExecutor<WlyyAdvertisement> {
public interface AdvertisementDao extends PagingAndSortingRepository<WlyyAdvertisementDO, String>, JpaSpecificationExecutor<WlyyAdvertisementDO> {
    @Query("from WlyyAdvertisement w where w.id=?1 and w.status !=-1")
    WlyyAdvertisement findById(String id);
    @Query("from WlyyAdvertisementDO w where w.id=?1 and w.status !=-1")
    WlyyAdvertisementDO findById(String id);
    //根据saasCode查询广告
    @Query("from WlyyAdvertisement w where w.saasId=?1 and w.status !=-1 order by w.sort")
    List<WlyyAdvertisement> getListBySaasId(String saasCode);
    @Query("from WlyyAdvertisementDO w where w.saasId=?1 and w.status !=-1 order by w.sort")
    List<WlyyAdvertisementDO> getListBySaasId(String saasCode);
    //查询默认广告
    @Query("from WlyyAdvertisement w where w.saasId ='0' and w.status !=-1 order by w.sort")
    List<WlyyAdvertisement> getDefaultList();
    @Query("from WlyyAdvertisementDO w where w.saasId ='0' and w.status !=-1 order by w.sort")
    List<WlyyAdvertisementDO> getDefaultList();
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/patient/BasePatientDao.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.dao.patient;
import com.yihu.jw.wlyy.patient.BasePatient;
import com.yihu.jw.wlyy.patient.BasePatientDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -8,12 +8,12 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Administrator on 2017/6/6 0006.
 */
public interface BasePatientDao extends PagingAndSortingRepository<BasePatient, String>, JpaSpecificationExecutor<BasePatient> {
public interface BasePatientDao extends PagingAndSortingRepository<BasePatientDO, String>, JpaSpecificationExecutor<BasePatientDO> {
    @Query("from BasePatient w where w.code =?1")
    BasePatient findByCode(String code);
    @Query("from BasePatientDO w where w.code =?1")
    BasePatientDO findByCode(String code);
    @Query("from BasePatient w where w.id=?1 ")
    BasePatient findById(Long id);
    @Query("from BasePatientDO w where w.id=?1 ")
    BasePatientDO findById(Long id);
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/BaseSaasService.java

@@ -1,7 +1,7 @@
package com.yihu.jw.wlyy.service;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.base.base.Saas;
import com.yihu.jw.base.base.SaasDO;
import com.yihu.jw.wlyy.dao.BaseSaasDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -10,15 +10,15 @@ import org.springframework.stereotype.Service;
 * Created by chenweida on 2017/5/19.
 */
@Service
public class BaseSaasService extends BaseJpaService<Saas, BaseSaasDao> {
public class BaseSaasService extends BaseJpaService<SaasDO, BaseSaasDao> {
    @Autowired
    private BaseSaasDao saasDao;
    public Saas findByCode(String code) {
    public SaasDO findByCode(String code) {
        return saasDao.findByCode(code);
    }
    public Saas findByName(String cityName) {
    public SaasDO findByName(String cityName) {
        return saasDao.findByName(cityName);
    }
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyyAgreementKpiLogService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpiLog;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpiLogDO;
import com.yihu.jw.wlyy.dao.agreement.WlyyAgreementKpiLogDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -17,7 +17,7 @@ import java.util.Date;
 * Created by Administrator on 2017/6/1 0001.
 */
@Service
public class WlyyAgreementKpiLogService extends BaseJpaService<WlyyAgreementKpiLog, WlyyAgreementKpiLogDao> {
public class WlyyAgreementKpiLogService extends BaseJpaService<WlyyAgreementKpiLogDO, WlyyAgreementKpiLogDao> {
    @Autowired
    private WlyyAgreementKpiLogDao wlyyAgreementKpiLogDao;
@@ -26,7 +26,7 @@ public class WlyyAgreementKpiLogService extends BaseJpaService<WlyyAgreementKpiL
    //private SaasService saasService;
    @Transient
    public WlyyAgreementKpiLog create(WlyyAgreementKpiLog wlyyAgreementKpiLog) {
    public WlyyAgreementKpiLogDO create(WlyyAgreementKpiLogDO wlyyAgreementKpiLog) {
        String saasId = wlyyAgreementKpiLog.getSaasId();
        if (StringUtils.isEmpty(saasId)) {
            throw new ApiException(WlyyRequestMapping.Agreement.message_fail_saasId_is_null, ExceptionCode.common_error_params_code);
@@ -57,7 +57,7 @@ public class WlyyAgreementKpiLogService extends BaseJpaService<WlyyAgreementKpiL
    }
    public WlyyAgreementKpiLog findById(String id) {
    public WlyyAgreementKpiLogDO findById(String id) {
        return wlyyAgreementKpiLogDao.findById(id);
    }
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyyAgreementKpiService.java

@@ -4,8 +4,8 @@ import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.agreement.WlyyAgreement;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpi;
import com.yihu.jw.wlyy.agreement.WlyyAgreementDO;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpiDO;
import com.yihu.jw.wlyy.dao.agreement.WlyyAgreementKpiDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -18,7 +18,7 @@ import java.util.Date;
 * Created by Administrator on 2017/6/1 0001.
 */
@Service
public class WlyyAgreementKpiService extends BaseJpaService<WlyyAgreementKpi, WlyyAgreementKpiDao> {
public class WlyyAgreementKpiService extends BaseJpaService<WlyyAgreementKpiDO, WlyyAgreementKpiDao> {
    @Autowired
    private WlyyAgreementKpiDao wlyyAgreementKpiDao;
@@ -30,7 +30,7 @@ public class WlyyAgreementKpiService extends BaseJpaService<WlyyAgreementKpi, Wl
    //private SaasService saasService;
    @Transient
    public WlyyAgreementKpi create(WlyyAgreementKpi wlyyAgreementKpi) {
    public WlyyAgreementKpiDO create(WlyyAgreementKpiDO wlyyAgreementKpi) {
        String saasId = wlyyAgreementKpi.getSaasId();
        if (StringUtils.isEmpty(saasId)) {
            throw new ApiException(WlyyRequestMapping.Agreement.message_fail_saasId_is_null, ExceptionCode.common_error_params_code);
@@ -44,7 +44,7 @@ public class WlyyAgreementKpiService extends BaseJpaService<WlyyAgreementKpi, Wl
        if (StringUtils.isEmpty(agreementCode)) {
            throw new ApiException(WlyyRequestMapping.AgreementKpi.message_fail_agreementId_is_null, ExceptionCode.common_error_params_code);
        }
        WlyyAgreement agreement = wlyyAgreementService.findById(agreementCode);
        WlyyAgreementDO agreement = wlyyAgreementService.findById(agreementCode);
        if(agreement == null){
            throw new ApiException(WlyyRequestMapping.AgreementKpi.message_fail_agreement_is_null, ExceptionCode.common_error_params_code);
        }
@@ -64,7 +64,7 @@ public class WlyyAgreementKpiService extends BaseJpaService<WlyyAgreementKpi, Wl
    }
    @Transient
    public WlyyAgreementKpi update(WlyyAgreementKpi wlyyAgreementKpi) {
    public WlyyAgreementKpiDO update(WlyyAgreementKpiDO wlyyAgreementKpi) {
        String saasId = wlyyAgreementKpi.getSaasId();
        if (StringUtils.isEmpty(saasId)) {
            throw new ApiException(WlyyRequestMapping.Agreement.message_fail_saasId_is_null, ExceptionCode.common_error_params_code);
@@ -78,7 +78,7 @@ public class WlyyAgreementKpiService extends BaseJpaService<WlyyAgreementKpi, Wl
        if (StringUtils.isEmpty(agreementCode)) {
            throw new ApiException(WlyyRequestMapping.AgreementKpi.message_fail_agreementId_is_null, ExceptionCode.common_error_params_code);
        }
        WlyyAgreement agreement = wlyyAgreementService.findById(agreementCode);
        WlyyAgreementDO agreement = wlyyAgreementService.findById(agreementCode);
        if(agreement == null){
            throw new ApiException(WlyyRequestMapping.AgreementKpi.message_fail_agreement_is_null, ExceptionCode.common_error_params_code);
        }
@@ -95,7 +95,7 @@ public class WlyyAgreementKpiService extends BaseJpaService<WlyyAgreementKpi, Wl
        if (StringUtils.isEmpty(id)) {
            throw new ApiException(WlyyRequestMapping.Agreement.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        WlyyAgreementKpi wlyyAgreementKpi1 = wlyyAgreementKpiDao.findById(id);
        WlyyAgreementKpiDO wlyyAgreementKpi1 = wlyyAgreementKpiDao.findById(id);
        if(wlyyAgreementKpi1==null){
            throw new ApiException(WlyyRequestMapping.Agreement.message_fail_wlyyAgreement_is_no_exist, ExceptionCode.common_error_params_code);
        }
@@ -106,13 +106,13 @@ public class WlyyAgreementKpiService extends BaseJpaService<WlyyAgreementKpi, Wl
        return wlyyAgreementKpiDao.save(wlyyAgreementKpi);
    }
    public WlyyAgreementKpi findById(String id) {
    public WlyyAgreementKpiDO findById(String id) {
        return wlyyAgreementKpiDao.findById(id);
    }
    @Transient
    public void delete(String id) {
        WlyyAgreementKpi wlyyAgreementKpi = findById(id);
        WlyyAgreementKpiDO wlyyAgreementKpi = findById(id);
        if(wlyyAgreementKpi==null){
            throw new ApiException(WlyyRequestMapping.AgreementKpi.message_fail_wlyyAgreementKpi_is_no_exist, ExceptionCode.common_error_params_code);
        }

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyyAgreementService.java

@@ -4,7 +4,7 @@ import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.agreement.WlyyAgreement;
import com.yihu.jw.wlyy.agreement.WlyyAgreementDO;
import com.yihu.jw.wlyy.dao.agreement.WlyyAgreementDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -17,7 +17,7 @@ import java.util.Date;
 * Created by Administrator on 2017/6/1 0001.
 */
@Service
public class WlyyAgreementService extends BaseJpaService<WlyyAgreement, WlyyAgreementDao> {
public class WlyyAgreementService extends BaseJpaService<WlyyAgreementDO, WlyyAgreementDao> {
    @Autowired
    private WlyyAgreementDao wlyyAgreementDao;
@@ -26,7 +26,7 @@ public class WlyyAgreementService extends BaseJpaService<WlyyAgreement, WlyyAgre
    //private SaasService saasService;
    @Transient
    public WlyyAgreement create(WlyyAgreement wlyyAgreement) {
    public WlyyAgreementDO create(WlyyAgreementDO wlyyAgreement) {
        String saasId = wlyyAgreement.getSaasId();
        if (StringUtils.isEmpty(saasId)) {
            throw new ApiException(WlyyRequestMapping.Agreement.message_fail_saasId_is_null, ExceptionCode.common_error_params_code);
@@ -52,7 +52,7 @@ public class WlyyAgreementService extends BaseJpaService<WlyyAgreement, WlyyAgre
    }
    @Transient
    public WlyyAgreement update(WlyyAgreement wlyyAgreement) {
    public WlyyAgreementDO update(WlyyAgreementDO wlyyAgreement) {
        String saasId = wlyyAgreement.getSaasId();
        if (StringUtils.isEmpty(saasId)) {
            throw new ApiException(WlyyRequestMapping.Agreement.message_fail_saasId_is_null, ExceptionCode.common_error_params_code);
@@ -74,7 +74,7 @@ public class WlyyAgreementService extends BaseJpaService<WlyyAgreement, WlyyAgre
        if (StringUtils.isEmpty(id)) {
            throw new ApiException(WlyyRequestMapping.Agreement.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        WlyyAgreement wlyyAgreement1 = wlyyAgreementDao.findById(id);
        WlyyAgreementDO wlyyAgreement1 = wlyyAgreementDao.findById(id);
        if(wlyyAgreement1==null){
            throw new ApiException(WlyyRequestMapping.Agreement.message_fail_wlyyAgreement_is_no_exist, ExceptionCode.common_error_params_code);
        }
@@ -86,14 +86,14 @@ public class WlyyAgreementService extends BaseJpaService<WlyyAgreement, WlyyAgre
        return wlyyAgreementDao.save(wlyyAgreement);
    }
    public WlyyAgreement findById(String id) {
        WlyyAgreement wlyyAgreement = wlyyAgreementDao.findById(id);
    public WlyyAgreementDO findById(String id) {
        WlyyAgreementDO wlyyAgreement = wlyyAgreementDao.findById(id);
        return wlyyAgreement;
    }
    @Transient
    public void delete(String id) {
        WlyyAgreement wlyyAgreement = findById(id);
        WlyyAgreementDO wlyyAgreement = findById(id);
        if(wlyyAgreement==null){
            throw new ApiException(WlyyRequestMapping.Agreement.message_fail_wlyyAgreement_is_no_exist, ExceptionCode.common_error_params_code);
        }

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/agreement/WlyySignFamilyService.java

@@ -5,8 +5,8 @@ import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.util.IDCard;
import com.yihu.jw.wlyy.agreement.WlyyAgreement;
import com.yihu.jw.wlyy.agreement.WlyySignFamily;
import com.yihu.jw.wlyy.agreement.WlyyAgreementDO;
import com.yihu.jw.wlyy.agreement.WlyySignFamilyDO;
import com.yihu.jw.wlyy.dao.agreement.WlyySignFamilyDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -20,7 +20,7 @@ import java.util.List;
 * Created by Administrator on 2017/6/2 0002.
 */
@Service
public class WlyySignFamilyService extends BaseJpaService<WlyySignFamily, WlyySignFamilyDao> {
public class WlyySignFamilyService extends BaseJpaService<WlyySignFamilyDO, WlyySignFamilyDao> {
    @Autowired
    private WlyySignFamilyDao wlyySignFamilyDao;
@@ -32,7 +32,7 @@ public class WlyySignFamilyService extends BaseJpaService<WlyySignFamily, WlyySi
    //private SaasService saasService;
    @Transient
    public WlyySignFamily create(WlyySignFamily wlyySignFamily) throws ParseException {
    public WlyySignFamilyDO create(WlyySignFamilyDO wlyySignFamily) throws ParseException {
        boolean b = canSaveOrUpdate(wlyySignFamily);
        if(b){
            return wlyySignFamilyDao.save(wlyySignFamily);
@@ -41,7 +41,7 @@ public class WlyySignFamilyService extends BaseJpaService<WlyySignFamily, WlyySi
    }
    @Transient
    public WlyySignFamily update(WlyySignFamily wlyySignFamily) throws ParseException {
    public WlyySignFamilyDO update(WlyySignFamilyDO wlyySignFamily) throws ParseException {
        boolean b = canSaveOrUpdate(wlyySignFamily);
        if(b){
            return wlyySignFamilyDao.save(wlyySignFamily);
@@ -49,11 +49,11 @@ public class WlyySignFamilyService extends BaseJpaService<WlyySignFamily, WlyySi
        return null;
    }
    public WlyySignFamily findById(String id) {
    public WlyySignFamilyDO findById(String id) {
        return wlyySignFamilyDao.findById(id);
    }
    private boolean canSaveOrUpdate(WlyySignFamily wlyySignFamily) throws ParseException {
    private boolean canSaveOrUpdate(WlyySignFamilyDO wlyySignFamily) throws ParseException {
        String saasId = wlyySignFamily.getSaasId();
        if (StringUtils.isEmpty(saasId)) {
            throw new ApiException(WlyyRequestMapping.Agreement.message_fail_saasId_is_null, ExceptionCode.common_error_params_code);
@@ -99,7 +99,7 @@ public class WlyySignFamilyService extends BaseJpaService<WlyySignFamily, WlyySi
            throw new ApiException(WlyyRequestMapping.SignFamily.message_fail_agreementId_is_null, ExceptionCode.common_error_params_code);
        }
        //根据agreementCode查找协议是否存在
        WlyyAgreement agreement = wlyyAgreementService.findById(agreementCode);
        WlyyAgreementDO agreement = wlyyAgreementService.findById(agreementCode);
        if(agreement==null){
            throw new ApiException(WlyyRequestMapping.Agreement.message_fail_wlyyAgreement_is_no_exist, ExceptionCode.common_error_params_code);
        }
@@ -112,7 +112,7 @@ public class WlyySignFamilyService extends BaseJpaService<WlyySignFamily, WlyySi
     * @param status
     * @return
     */
    public List<WlyySignFamily> findByPatientCode(String patientCode,Integer status) {
    public List<WlyySignFamilyDO> findByPatientCode(String patientCode,Integer status) {
        return wlyySignFamilyDao.findByPatientId(patientCode,status);
    }
}

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/doctor/DoctorService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.wlyy.service.doctor;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.wlyy.dao.doctor.DoctorDao;
import com.yihu.jw.wlyy.doctor.BaseDoctors;
import com.yihu.jw.wlyy.doctor.BaseDoctorsDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -10,12 +10,12 @@ import org.springframework.stereotype.Service;
 * Created by Administrator on 2017/6/7 0007.
 */
@Service
public class DoctorService extends BaseJpaService<BaseDoctors, DoctorDao> {
public class DoctorService extends BaseJpaService<BaseDoctorsDO, DoctorDao> {
    @Autowired
    private DoctorDao doctorDao;
    public BaseDoctors findById(String code){
    public BaseDoctorsDO findById(String code){
        return doctorDao.findById(code);
    }

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/doctor/HospitalService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.wlyy.service.doctor;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.wlyy.dao.doctor.HospitalDao;
import com.yihu.jw.wlyy.doctor.BaseOrgHospital;
import com.yihu.jw.wlyy.doctor.BaseOrgHospitalDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -10,12 +10,12 @@ import org.springframework.stereotype.Service;
 * Created by Administrator on 2017/6/7 0007.
 */
@Service
public class HospitalService extends BaseJpaService<BaseOrgHospital, HospitalDao> {
public class HospitalService extends BaseJpaService<BaseOrgHospitalDO, HospitalDao> {
    @Autowired
    private HospitalDao hospitalDao;
    public BaseOrgHospital findByCode(String code){
    public BaseOrgHospitalDO findByCode(String code){
        return hospitalDao.findByCode(code);
    }

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/patient/AdvertisementService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.wlyy.service.patient;
import com.yihu.jw.base.base.Saas;
import com.yihu.jw.base.base.SaasDO;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.exception.code.ExceptionCode;
import com.yihu.base.mysql.query.BaseJpaService;
@@ -8,9 +8,9 @@ import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.util.AddressUtils;
import com.yihu.jw.util.CusAccessObjectUtil;
import com.yihu.jw.wlyy.agreement.WlyySignFamily;
import com.yihu.jw.wlyy.agreement.WlyySignFamilyDO;
import com.yihu.jw.wlyy.dao.patient.AdvertisementDao;
import com.yihu.jw.wlyy.patient.WlyyAdvertisement;
import com.yihu.jw.wlyy.patient.WlyyAdvertisementDO;
import com.yihu.jw.wlyy.service.BaseSaasService;
import com.yihu.jw.wlyy.service.agreement.WlyySignFamilyService;
import org.slf4j.Logger;
@@ -29,7 +29,7 @@ import java.util.List;
 * Created by Administrator on 2017/6/6 0006.
 */
@Service
public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, AdvertisementDao> {
public class AdvertisementService extends BaseJpaService<WlyyAdvertisementDO, AdvertisementDao> {
    private Logger logger= LoggerFactory.getLogger(AdvertisementService.class);
@@ -46,7 +46,7 @@ public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, Adve
    private BaseSaasService saasService;
    @Transient
     public WlyyAdvertisement create(WlyyAdvertisement advertisement) {
     public WlyyAdvertisementDO create(WlyyAdvertisementDO advertisement) {
        if (StringUtils.isEmpty(advertisement.getSaasId())) {
            throw new ApiException(WlyyRequestMapping.Advertisement.message_fail_saasid_is_null, ExceptionCode.common_error_params_code);
        }
@@ -67,7 +67,7 @@ public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, Adve
    }
    @Transient
    public WlyyAdvertisement update(WlyyAdvertisement advertisement) {
    public WlyyAdvertisementDO update(WlyyAdvertisementDO advertisement) {
        if (StringUtils.isEmpty(advertisement.getSaasId())) {
            throw new ApiException(WlyyRequestMapping.Advertisement.message_fail_saasid_is_null, ExceptionCode.common_error_params_code);
        }
@@ -85,7 +85,7 @@ public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, Adve
            throw new ApiException(WlyyRequestMapping.Advertisement.message_fail_picture_is_null, ExceptionCode.common_error_params_code);
        }
        //根据id获取修改前的记录
        WlyyAdvertisement advertisement1 = findById(id);
        WlyyAdvertisementDO advertisement1 = findById(id);
        if(null == advertisement1){
            throw new ApiException(WlyyRequestMapping.Advertisement.message_fail_wlyyAdvertisement_is_not_exist, ExceptionCode.common_error_params_code);
        }
@@ -96,13 +96,13 @@ public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, Adve
        return advertisementDao.save(advertisement);
    }
    public WlyyAdvertisement findById(String id) {
    public WlyyAdvertisementDO findById(String id) {
        return advertisementDao.findById(id);
    }
    @Transient
    public void delete(String id) {
        WlyyAdvertisement advertisement = findById(id);
        WlyyAdvertisementDO advertisement = findById(id);
        if(advertisement==null){
            throw new ApiException(WlyyRequestMapping.Advertisement.message_fail_wlyyAdvertisement_is_not_exist, ExceptionCode.common_error_params_code);
        }
@@ -116,12 +116,12 @@ public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, Adve
     * @param request
     * @return
     */
    public List<WlyyAdvertisement> getListByPatientId(String patientCode, HttpServletRequest request) {
        List<WlyyAdvertisement> advertisements = null;
    public List<WlyyAdvertisementDO> getListByPatientId(String patientCode, HttpServletRequest request) {
        List<WlyyAdvertisementDO> advertisements = null;
        //查找已签约的,根据签约的saasId查找地区,获得广告
        List<WlyySignFamily> signs =  signFamilyService.findByPatientCode(patientCode,1);
        List<WlyySignFamilyDO> signs =  signFamilyService.findByPatientCode(patientCode,1);
        if(signs!=null){
            for(WlyySignFamily sign:signs){
            for(WlyySignFamilyDO sign:signs){
                String saasCode = sign.getSaasId();
                if(!StringUtils.isEmpty(sign.getSaasId())){
                    advertisements = getListBySaasId(saasCode);
@@ -141,7 +141,7 @@ public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, Adve
     * @param saasCode
     * @return
     */
    public List<WlyyAdvertisement> getListBySaasId(String saasCode){
    public List<WlyyAdvertisementDO> getListBySaasId(String saasCode){
        return advertisementDao.getListBySaasId(saasCode);
    }
@@ -149,7 +149,7 @@ public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, Adve
     * 查找默认广告
     * @return
     */
    private List<WlyyAdvertisement> getDefaultList(){
    private List<WlyyAdvertisementDO> getDefaultList(){
        return advertisementDao.getDefaultList();
    }
@@ -158,7 +158,7 @@ public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, Adve
     * @param request
     * @return
     */
    public  List<WlyyAdvertisement> getByHttp(HttpServletRequest request){
    public  List<WlyyAdvertisementDO> getByHttp(HttpServletRequest request){
        String ipAddress = CusAccessObjectUtil.getIpAddress(request);
        logger.info("-------------请求的ip地址为:"+ipAddress+"--------------");
        AddressUtils addressUtils = new AddressUtils();
@@ -170,7 +170,7 @@ public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, Adve
                return  getDefaultList();
            }else{
                String cityName = addresses[3];
                Saas saas = saasService.findByName(cityName);//成都市
                SaasDO saas = saasService.findByName(cityName);//成都市
                if(saas ==null){
                    cityName = cityName.substring(0,cityName.length()-1);//成都
                    saas = saasService.findByName(cityName);
@@ -194,7 +194,7 @@ public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, Adve
     * @param ipaddress
     * @return
     */
    public  List<WlyyAdvertisement> getListByIp(String ipaddress){
    public  List<WlyyAdvertisementDO> getListByIp(String ipaddress){
        try {
            logger.info("-------------请求的ip地址为:"+ipaddress+"--------------");
            AddressUtils addressUtils = new AddressUtils();
@@ -205,7 +205,7 @@ public class AdvertisementService extends BaseJpaService<WlyyAdvertisement, Adve
                return  getDefaultList();
            }else{
                String cityName = addresses[3];
                Saas saas = saasService.findByName(cityName);//成都市
                SaasDO saas = saasService.findByName(cityName);//成都市
                if(saas ==null){
                    cityName = cityName.substring(0,cityName.length()-1);//成都
                    saas = saasService.findByName(cityName);

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/service/patient/PatientService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.wlyy.service.patient;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.wlyy.dao.patient.BasePatientDao;
import com.yihu.jw.wlyy.patient.BasePatient;
import com.yihu.jw.wlyy.patient.BasePatientDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -10,13 +10,13 @@ import org.springframework.stereotype.Service;
 * Created by Administrator on 2017/6/6 0006.
 */
@Service
public class PatientService extends BaseJpaService<BasePatient, BasePatientDao> {
public class PatientService extends BaseJpaService<BasePatientDO, BasePatientDao> {
    @Autowired
    private BasePatientDao basePatientDao;
    public BasePatient findByCode(String code){
    public BasePatientDO findByCode(String code){
        return basePatientDao.findByCode(code);
    }
}