专科医生

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

@@ -1,7 +1,7 @@
package com.yihu.jw.entity.base.function;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.IntegerIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -13,7 +13,7 @@ import javax.persistence.Transient;
 */
@Entity
@Table(name = "base_function")
public class FunctionDO extends UuidIdentityEntityWithOperator {
public class FunctionDO extends IntegerIdentityEntityWithOperator {
    //功能名称
    private String name;

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

@@ -1,7 +1,8 @@
package com.yihu.jw.entity.base.message;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -9,11 +10,12 @@ import javax.persistence.Table;
 * Created by progr1mmer on 2018/8/14.
 */@Entity
@Table(name = "base_message")
public class Message extends UuidIdentityEntity {
public class MessageDo extends IntegerIdentityEntity {
    private String topic; //消息主题
    private String template; //消息模板
    @Column(name = "topic", nullable = false)
    public String getTopic() {
        return topic;
    }
@@ -22,6 +24,7 @@ public class Message extends UuidIdentityEntity {
        this.topic = topic;
    }
    @Column(name = "template", nullable = false)
    public String getTemplate() {
        return template;
    }

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

@@ -1,7 +1,8 @@
package com.yihu.jw.entity.base.message;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -10,21 +11,23 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_message_subscriber")
public class MessageSubscriberDO extends UuidIdentityEntity {
public class MessageSubscriberDO extends IntegerIdentityEntity {
    private String messageId; //消息ID
    private Integer messageId; //消息ID
    private String saasId; //saas id
    private String url; //推送地址
    private String remark; //备注
    public String getMessageId() {
    @Column(name = "message_id")
    public Integer getMessageId() {
        return messageId;
    }
    public void setMessageId(String messageId) {
    public void setMessageId(Integer messageId) {
        this.messageId = messageId;
    }
    @Column(name = "saas_id", length = 50)
    public String getSaasId() {
        return saasId;
    }
@@ -33,6 +36,7 @@ public class MessageSubscriberDO extends UuidIdentityEntity {
        this.saasId = saasId;
    }
    @Column(name = "url")
    public String getUrl() {
        return url;
    }
@@ -41,6 +45,7 @@ public class MessageSubscriberDO extends UuidIdentityEntity {
        this.url = url;
    }
    @Column(name = "remark")
    public String getRemark() {
        return remark;
    }

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

@@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.module;// default package
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.IntegerIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -14,7 +14,7 @@ import java.util.List;
 */
@Entity
@Table(name = "base_module")
public class ModuleDO extends UuidIdentityEntityWithOperator {
public class ModuleDO extends IntegerIdentityEntityWithOperator {
    public enum Status {
		disable,

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

@@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.module;// default package
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.*;
@@ -9,28 +9,29 @@ import javax.persistence.*;
 */
@Entity
@Table(name = "base_module_function")
public class ModuleFunctionDO extends UuidIdentityEntity {
public class ModuleFunctionDO extends IntegerIdentityEntity {
	//关联 base_function   ic
	private String functionId;
	//关联 base_module   id
	private String moduleId;
	private Integer moduleId;
	//关联 base_function   ic
	private Integer functionId;
	@Column(name = "function_id", length = 100)
	public String getFunctionId() {
		return this.functionId;
	@Column(name = "module_id")
	public Integer getModuleId() {
		return this.moduleId;
	}
	public void setFunctionId(String functionId) {
		this.functionId = functionId;
	public void setModuleId(Integer moduleId) {
		this.moduleId = moduleId;
	}
	@Column(name = "module_id", length = 100)
	public String getModuleId() {
		return this.moduleId;
	@Column(name = "function_id")
	public Integer getFunctionId() {
		return this.functionId;
	}
	public void setModuleId(String moduleId) {
		this.moduleId = moduleId;
	public void setFunctionId(Integer functionId) {
		this.functionId = functionId;
	}
}

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

@@ -0,0 +1,139 @@
package com.yihu.jw.entity.base.oauth2;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
/**
 * Entity - Oauth2
 * Created by progr1mmer on 2018/1/23.
 */
@Entity
@Table(name = "oauth_client_details")
@Access(value = AccessType.PROPERTY)
public class OauthClientDetailsDO {
    private String clientId;
    private String saasId;
    private String resourceIds;
    private String clientSecret;
    private String scope;
    private String authorizedGrantTypes;
    private String webServerRedirectUri;
    private String authorities;
    private Integer accessTokenValidity;
    private Integer refreshTokenValidity;
    private String additionalInformation;
    private String autoApprove;
    @Id
    @GeneratedValue(generator = "Generator")
    @GenericGenerator(name = "Generator", strategy = "assigned")
    @Column(name = "client_id", nullable = false)
    public String getClientId() {
        return clientId;
    }
    public void setClientId(String clientId) {
        this.clientId = clientId;
    }
    @Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    @Column(name = "resource_ids")
    public String getResourceIds() {
        return resourceIds;
    }
    public void setResourceIds(String resourceIds) {
        this.resourceIds = resourceIds;
    }
    @Column(name = "client_secret")
    public String getClientSecret() {
        return clientSecret;
    }
    public void setClientSecret(String clientSecret) {
        this.clientSecret = clientSecret;
    }
    @Column(name = "scope")
    public String getScope() {
        return scope;
    }
    public void setScope(String scope) {
        this.scope = scope;
    }
    @Column(name = "authorized_grant_types")
    public String getAuthorizedGrantTypes() {
        return authorizedGrantTypes;
    }
    public void setAuthorizedGrantTypes(String authorizedGrantTypes) {
        this.authorizedGrantTypes = authorizedGrantTypes;
    }
    @Column(name = "web_server_redirect_uri")
    public String getWebServerRedirectUri() {
        return webServerRedirectUri;
    }
    public void setWebServerRedirectUri(String webServerRedirectUri) {
        this.webServerRedirectUri = webServerRedirectUri;
    }
    @Column(name = "authorities")
    public String getAuthorities() {
        return authorities;
    }
    public void setAuthorities(String authorities) {
        this.authorities = authorities;
    }
    @Column(name = "access_token_validity")
    public Integer getAccessTokenValidity() {
        return accessTokenValidity;
    }
    public void setAccessTokenValidity(Integer accessTokenValidity) {
        this.accessTokenValidity = accessTokenValidity;
    }
    @Column(name = "refresh_token_validity")
    public Integer getRefreshTokenValidity() {
        return refreshTokenValidity;
    }
    public void setRefreshTokenValidity(Integer refreshTokenValidity) {
        this.refreshTokenValidity = refreshTokenValidity;
    }
    @Column(name = "additional_information")
    public String getAdditionalInformation() {
        return additionalInformation;
    }
    public void setAdditionalInformation(String additionalInformation) {
        this.additionalInformation = additionalInformation;
    }
    @Column(name = "autoapprove")
    public String getAutoApprove() {
        return autoApprove;
    }
    public void setAutoApprove(String autoApprove) {
        this.autoApprove = autoApprove;
    }
}

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

@@ -10,7 +10,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_organization")
public class Organization extends UuidIdentityEntity {
public class OrganizationDO extends UuidIdentityEntity {
    private String name; //名称
    private String code; //编码

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

@@ -1,18 +1,29 @@
package com.yihu.jw.entity.base.role;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.IntegerIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.sql.Timestamp;
/**
 * BaseRole entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_role")
public class RoleDO extends UuidIdentityEntityWithOperator {
public class RoleDO extends IntegerIdentityEntityWithOperator {
	/**
	 * 角色类型
	 */
	public enum Type {
		//系统 - user对应的角色类型
		system,
		//医生
		doctor,
		//患者
		patient
	}
	//saas id
	private String saasId;
@@ -22,20 +33,8 @@ public class RoleDO extends UuidIdentityEntityWithOperator {
	private String code;
	//备注
	private String remark;
	// Constructors
	/** default constructor */
	public RoleDO() {
	}
	/** minimal constructor */
	public RoleDO(String id, Timestamp createTime, Timestamp updateTime) {
		this.id = id;
		this.createTime = createTime;
		this.updateTime = updateTime;
	}
	// Property accessors
	//角色类型
	private Type type;
	@Column(name = "saas_id", length = 50)
	public String getSaasId() {
@@ -73,4 +72,12 @@ public class RoleDO extends UuidIdentityEntityWithOperator {
		this.remark = remark;
	}
	@Column(name = "type")
	public Type getType() {
		return type;
	}
	public void setType(Type type) {
		this.type = type;
	}
}

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

@@ -1,5 +1,6 @@
package com.yihu.jw.entity.base.role;
import com.yihu.jw.entity.IntegerIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
@@ -11,36 +12,36 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_role_module_function")
public class RoleModuleFunctionDO extends UuidIdentityEntity {
public class RoleModuleFunctionDO extends IntegerIdentityEntity {
    private String roleId; //角色ID
    private String moduleId; //模块ID
    private String functionId; //功能ID
    private Integer roleId; //角色ID
    private Integer moduleId; //模块ID
    private Integer functionId; //功能ID
    @Column(name = "role_id", length = 50)
    public String getRoleId() {
    @Column(name = "role_id", nullable = false)
    public Integer getRoleId() {
        return roleId;
    }
    public void setRoleId(String roleId) {
    public void setRoleId(Integer roleId) {
        this.roleId = roleId;
    }
    @Column(name = "module_id", length = 50)
    public String getModuleId() {
    @Column(name = "module_id", nullable = false)
    public Integer getModuleId() {
        return moduleId;
    }
    public void setModuleId(String moduleId) {
    public void setModuleId(Integer moduleId) {
        this.moduleId = moduleId;
    }
    @Column(name = "function_id", length = 50)
    public String getFunctionId() {
    @Column(name = "function_id", nullable = false)
    public Integer getFunctionId() {
        return functionId;
    }
    public void setFunctionId(String functionId) {
    public void setFunctionId(Integer functionId) {
        this.functionId = functionId;
    }
}

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

@@ -16,9 +16,13 @@ import javax.persistence.Table;
public class SaasDO extends UuidIdentityEntityWithOperator {
    public enum Status {
    	//待审核
        auditWait,
		//审核通过
        auditPassed,
		//审核不通过
        auditNotPassed,
		//已删除
		delete
    }
@@ -33,11 +37,14 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
    private String orgCode; //机构编码
	private String name; //系统名称
	private Status status; //状态 0 已删除 1待审核 2审核通过 3审核不通过
	private Status status; //状态  0待审核 1审核通过 2审核不通过 3已删除
	private String remark; //备注
	private String logo; //远程fastDFS文件地址
    private Integer theme; //主题ID
    private Type type; //类型
	private String manager; //管理员 - 关联user表id字段
	private String email; //管理员邮箱
	private String phone; //管理员手机号码
	@Column(name = "org_code", nullable = false)
	public String getOrgCode() {
@@ -66,7 +73,7 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
        this.status = status;
    }
    @Column(name = "remark", length = 1000)
    @Column(name = "remark")
	public String getRemark() {
		return this.remark;
	}
@@ -101,4 +108,32 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
	public void setType(Type type) {
		this.type = type;
	}
	@Column(name = "manager", length = 50)
	public String getManager() {
		return manager;
	}
	public void setManager(String manager) {
		this.manager = manager;
	}
	@Column(name = "email")
	public String getEmail() {
		return email;
	}
	public void setEmail(String email) {
		this.email = email;
	}
	@Column(name = "phone")
	public String getPhone() {
		return phone;
	}
	public void setPhone(String phone) {
		this.phone = phone;
	}
}

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

@@ -1,7 +1,8 @@
package com.yihu.jw.entity.base.saas;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -10,11 +11,12 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_saas_default_module")
public class SaasDefaultModuleDO extends UuidIdentityEntity {
public class SaasDefaultModuleDO extends IntegerIdentityEntity {
    private SaasDO.Type type;
    private Integer moduleId;
    @Column(name = "type", nullable = false)
    public SaasDO.Type getType() {
        return type;
    }
@@ -23,6 +25,7 @@ public class SaasDefaultModuleDO extends UuidIdentityEntity {
        this.type = type;
    }
    @Column(name = "module_id", nullable = false)
    public Integer getModuleId() {
        return moduleId;
    }

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

@@ -1,7 +1,7 @@
package com.yihu.jw.entity.base.saas;// default package
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.*;
@@ -10,10 +10,10 @@ import javax.persistence.*;
 */
@Entity
@Table(name = "base_saas_module")
public class SaasModuleDO extends UuidIdentityEntity {
public class SaasModuleDO extends IntegerIdentityEntity {
	private String saasId; //关联WlyySaas code
	private String moduleId; //关联 WlyyModule code
	private Integer moduleId; //关联 WlyyModule code
	// Constructors
@@ -26,12 +26,12 @@ public class SaasModuleDO extends UuidIdentityEntity {
		this.saasId = saasId;
	}
	@Column(name = "module_id", length = 50)
	public String getModuleId() {
	@Column(name = "module_id", nullable = false)
	public Integer getModuleId() {
		return this.moduleId;
	}
	public void setModuleId(String moduleId) {
	public void setModuleId(Integer moduleId) {
		this.moduleId = moduleId;
	}
}

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

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

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

@@ -0,0 +1,170 @@
package com.yihu.jw.entity.base.user;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by progr1mmer on 2018/8/20.
 */
@Entity
@Table(name = "base_user")
public class UserDO extends UuidIdentityEntityWithOperator {
    /**
     * 性别
     */
    public enum Gender {
        //男
        male,
        //女
        female
    }
    //用户名
    private String username;
    //密码
    private String password;
    //密码散列值
    private String salt;
    //姓名
    private String name;
    //性别
    private Gender gender;
    //身份证号码
    private String idcard;
    //手机号码
    private String phone;
    //邮箱
    private String email;
    //是否可用
    private Boolean isEnabled;
    //是否锁定
    private Boolean isLocked;
    //锁定时间
    private Date lockedDate;
    //最后登陆时间
    private Date loginDate;
    //登陆失败次数
    private Integer loginFailureCount;
    @Column(name = "username", nullable = false)
    public String getUsername() {
        return username;
    }
    public void setUsername(String username) {
        this.username = username;
    }
    @Column(name = "password", nullable = false)
    public String getPassword() {
        return password;
    }
    public void setPassword(String password) {
        this.password = password;
    }
    @Column(name = "salt", nullable = false)
    public String getSalt() {
        return salt;
    }
    public void setSalt(String salt) {
        this.salt = salt;
    }
    @Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "gender")
    public Gender getGender() {
        return gender;
    }
    public void setGender(Gender gender) {
        this.gender = gender;
    }
    @Column(name = "idcard")
    public String getIdcard() {
        return idcard;
    }
    public void setIdcard(String idcard) {
        this.idcard = idcard;
    }
    @Column(name = "phone", length = 200)
    public String getPhone() {
        return phone;
    }
    public void setPhone(String phone) {
        this.phone = phone;
    }
    @Column(name = "email", length = 200)
    public String getEmail() {
        return email;
    }
    public void setEmail(String email) {
        this.email = email;
    }
    @Column(name = "is_enabled", nullable = false)
    public Boolean getEnabled() {
        return isEnabled;
    }
    public void setEnabled(Boolean enabled) {
        isEnabled = enabled;
    }
    @Column(name = "is_locked", nullable = false)
    public Boolean getLocked() {
        return isLocked;
    }
    public void setLocked(Boolean locked) {
        isLocked = locked;
    }
    @Column(name = "locked_date")
    public Date getLockedDate() {
        return lockedDate;
    }
    public void setLockedDate(Date lockedDate) {
        this.lockedDate = lockedDate;
    }
    @Column(name = "login_date")
    public Date getLoginDate() {
        return loginDate;
    }
    public void setLoginDate(Date loginDate) {
        this.loginDate = loginDate;
    }
    @Column(name = "login_failure_count")
    public Integer getLoginFailureCount() {
        return loginFailureCount;
    }
    public void setLoginFailureCount(Integer loginFailureCount) {
        this.loginFailureCount = loginFailureCount;
    }
}

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

@@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.user;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -10,13 +10,13 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "base_employ_hide_module_function")
public class EmployHideModuleFunctionDO extends UuidIdentityEntity {
public class UserHideModuleFunctionDO extends IntegerIdentityEntity {
    //用户ID
    private String employId;
    //模块ID
    private String moduleId;
    private Integer moduleId;
    //功能ID（该字段为空则直接隐藏上级模块）
    private String functionId;
    private Integer functionId;
}

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

@@ -0,0 +1,39 @@
package com.yihu.jw.entity.base.user;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * BaseEmployRole entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "base_user_role")
public class UserRoleDO extends IntegerIdentityEntity {
	// Fields
	private String userId;
	private Integer roleId;
	@Column(name = "user_id", length = 50)
	public String getUserId() {
		return userId;
	}
	public void setUserId(String userId) {
		this.userId = userId;
	}
	@Column(name = "role_id")
	public Integer getRoleId() {
		return this.roleId;
	}
	public void setRoleId(Integer roleId) {
		this.roleId = roleId;
	}
}

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

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.agreement;
package com.yihu.jw.entity.wlyy.agreement;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.agreement;
package com.yihu.jw.entity.wlyy.agreement;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.agreement;
package com.yihu.jw.entity.wlyy.agreement;
import com.yihu.jw.entity.UuidIdentityEntity;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.agreement;
package com.yihu.jw.entity.wlyy.agreement;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.hospital;// default package
package com.yihu.jw.entity.wlyy.hospital;// default package
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.hospital;// default package
package com.yihu.jw.entity.wlyy.hospital;// default package
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.hospital;
package com.yihu.jw.entity.wlyy.hospital;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.patient;// default package
package com.yihu.jw.entity.wlyy.patient;// default package
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.patient;// default package
package com.yihu.jw.entity.wlyy.patient;// default package
import com.yihu.jw.entity.UuidIdentityEntity;

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

@@ -1,4 +1,4 @@
package com.yihu.jw.wlyy.patient;
package com.yihu.jw.entity.wlyy.patient;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;

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

@@ -29,7 +29,7 @@ public class BaseRequestMapping {
    }
    /**
     * SAAS
     * SAAS模块
     */
    public static class SaasModule extends Basic {
        public static final String PREFIX  = "/saas_module";
@@ -79,6 +79,21 @@ public class BaseRequestMapping {
        public static final String PREFIX  = "/system_dict_entry";
    }
    /**
     * 用户
     */
    public static class User extends Basic {
        public static final String PREFIX  = "/user";
        public static final String CHECK_USERNAME = "/check_username";
    }
    /**
     * 用户
     */
    public static class UserRole extends Basic {
        public static final String PREFIX  = "/user_role";
    }
    /**
     * 角色
     */

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/web/endpoint/EnvelopRestEndpoint.java

@@ -1,8 +1,8 @@
package com.yihu.jw.restmodel.web.endpoint;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
@@ -20,76 +20,74 @@ import java.lang.reflect.Method;
import java.util.*;
/**
 * REST风格控控制器基类。此控制器用于对API进行校验，并处理平台根层级的业务，如API参数校验，错误及返回码设定等。
 * <p>
 * 根层级的校验，如果是正确的，直接返回HTTP代码200，若出错，则会将HTTP返回代码设置为1X或2X，并在HTTP响应体中包含响应的信息。
 * REST风格控控制器基类。
 * 基于Envelop的返回结果封装
 * HTTP响应体格式为JSON。
 * + 成功：会根据各业务逻辑自行决定要返回的数据，各业务模块的返回结构不同。
 * + 失败：{"code":"错误代码", "message":"错误原因"}
 * + 成功：根据各业务逻辑自行决定要返回的数据，各业务模块的返回结构不尽相同。
 * + 失败：{"status":错误码, "message":"错误原因"}
 *
 * @author zhiyong
 * @author Sand
 * @author Progr1mmer
 */
public abstract class EnvelopRestEndpoint {
    @Autowired
    protected ObjectMapper objectMapper;
    protected Envelop success(String desc) {
        return success(desc, 200);
    protected Envelop success(String message) {
        return success(message, 200);
    }
    protected Envelop success(String desc, int code) {
    protected Envelop success(String message, int status) {
        Envelop envelop = new Envelop();
        envelop.setMessage(desc);
        envelop.setStatus(code);
        envelop.setMessage(message);
        envelop.setStatus(status);
        return envelop;
    }
    protected <J> ObjEnvelop<J> success(J data){
        return success(data, "success");
    protected <J> ObjEnvelop<J> success(J obj){
        return success("success", obj);
    }
    protected <J> ObjEnvelop<J> success(J data, String desc){
        return success(data, desc, 200);
    protected <J> ObjEnvelop<J> success(String message, J obj){
        return success(message, 200, obj);
    }
    protected <J> ObjEnvelop<J> success(J data, String desc, int code){
    protected <J> ObjEnvelop<J> success(String message, int status, J obj){
        ObjEnvelop<J> objEnvelop = new ObjEnvelop<>();
        objEnvelop.setMessage(desc);
        objEnvelop.setStatus(code);
        objEnvelop.setObj(data);
        objEnvelop.setMessage(message);
        objEnvelop.setStatus(status);
        objEnvelop.setObj(obj);
        return objEnvelop;
    }
    protected <T> ListEnvelop<T> success(List<T> contents){
        return success(contents, "success");
        return success("success", contents);
    }
    protected <T> ListEnvelop<T> success(List<T> contents, String desc){
        return success(contents, desc, 200);
    protected <T> ListEnvelop<T> success(String message, List<T> contents){
        return success(message, 200, contents);
    }
    protected <T> ListEnvelop<T> success(List<T> contents, String desc, int code){
    protected <T> ListEnvelop<T> success(String message, int status, List<T> contents){
        ListEnvelop<T> listEnvelop = new ListEnvelop<>();
        listEnvelop.setMessage(desc);
        listEnvelop.setStatus(code);
        listEnvelop.setMessage(message);
        listEnvelop.setStatus(status);
        listEnvelop.setDetailModelList(contents);
        return listEnvelop;
    }
    protected <T> PageEnvelop<T> success(List<T> contents, int totalCount, int currPage, int pageSize) {
        return success(contents, "success", totalCount, currPage, pageSize);
        return success("success", contents, totalCount, currPage, pageSize);
    }
    protected <T> PageEnvelop<T> success(List<T> contents, String desc, int totalCount, int currPage, int pageSize) {
        return success(contents, desc, 200, totalCount, currPage, pageSize);
    protected <T> PageEnvelop<T> success(String message, List<T> contents, int totalCount, int currPage, int pageSize) {
        return success(message, 200, contents, totalCount, currPage, pageSize);
    }
    protected <T> PageEnvelop<T> success(List<T> contents, String desc, int code, int totalCount, int currPage, int pageSize) {
    protected <T> PageEnvelop<T> success(String message, int status,  List<T> contents, int totalCount, int currPage, int pageSize) {
        PageEnvelop<T> pageEnvelop = new PageEnvelop();
        pageEnvelop.setMessage(desc);
        pageEnvelop.setStatus(code);
        pageEnvelop.setMessage(message);
        pageEnvelop.setStatus(status);
        pageEnvelop.setCurrPage(currPage);
        pageEnvelop.setPageSize(pageSize);
        pageEnvelop.setTotalCount(totalCount);
@@ -98,38 +96,35 @@ public abstract class EnvelopRestEndpoint {
    }
    protected <T, J> MixEnvelop<T, J> success(List<T> contents, J obj) {
        return success(contents, obj, "success");
        return success("success", contents, obj);
    }
    protected <T, J> MixEnvelop<T, J> success(List<T> contents, J obj, String desc) {
        return success(contents, obj, desc, 200);
    protected <T, J> MixEnvelop<T, J> success(String message, List<T> contents, J obj) {
        return success(message, 200, contents, obj);
    }
    protected <T, J> MixEnvelop<T, J> success(List<T> contents, J data, String desc, int code) {
        return success(contents, data, desc, code, contents.size(), 1, contents.size());
    protected <T, J> MixEnvelop<T, J> success(String message, int status, List<T> contents, J obj) {
        return success(message, status, contents, obj, contents.size(), 1, contents.size());
    }
    protected <T, J> MixEnvelop<T, J> success(List<T> contents, J data, String desc, int code, int totalCount, int currPage, int pageSize) {
    protected <T, J> MixEnvelop<T, J> success(String message, int status, List<T> contents, J obj, int totalCount, int currPage, int pageSize) {
        MixEnvelop<T, J> mixEnvelop = new MixEnvelop();
        mixEnvelop.setMessage(desc);
        mixEnvelop.setStatus(code);
        mixEnvelop.setMessage(message);
        mixEnvelop.setStatus(status);
        mixEnvelop.setCurrPage(currPage);
        mixEnvelop.setPageSize(pageSize);
        mixEnvelop.setTotalCount(totalCount);
        mixEnvelop.setDetailModelList(contents);
        mixEnvelop.setObj(data);
        mixEnvelop.setObj(obj);
        return mixEnvelop;
    }
    protected Envelop failed(String desc) {
        return failed(desc, 500);
    protected Envelop failed(String message) {
        return failed(message, -10000);
    }
    protected Envelop failed(String desc, int code) {
        Envelop envelop = new Envelop();
        envelop.setMessage(desc);
        envelop.setStatus(code);
        return envelop;
    protected Envelop failed(String message, int status) {
        return success(message, status);
    }
    protected <T> T toEntity(String json, Class<T> target) throws IOException {
@@ -188,13 +183,13 @@ public abstract class EnvelopRestEndpoint {
    protected String randomString(int length) {
        String str = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
        StringBuffer buffer = new StringBuffer();
        StringBuilder builder = new StringBuilder();
        Random random = new Random();
        for (int i = 0; i < length; i++) {
            int pos = random.nextInt(str.length());
            buffer.append(str.charAt(pos));
            builder.append(str.charAt(pos));
        }
        return buffer.toString();
        return builder.toString();
    }
    /**

common/common-web/src/main/java/com/yihu/jw/web/handler/GlobalExceptionHandler.java

@@ -24,9 +24,6 @@ import java.io.IOException;
@ControllerAdvice
public class GlobalExceptionHandler {
    @Value("${spring.application.name}")
    private String appName;
    private static final Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class);
    @ExceptionHandler

common/common-web/src/main/resources/logback-spring.xml

@@ -6,7 +6,7 @@
    <springProperty scope="context" name="appName" source="spring.application.name" />
	<property name="log_home" value="/wlyy-logs/${appName}" />
    <property name="max_history" value="30"/>
    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
@@ -29,6 +29,7 @@
    <appender name="ApiInfoFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <fileNamePattern>${log_home}/api/info/%d{yyyy-MM-dd}.log</fileNamePattern>
            <maxHistory>${max_history}</maxHistory>
        </rollingPolicy>
        <encoder>
            <pattern>${FILE_LOG_PATTERN}</pattern>
@@ -44,6 +45,7 @@
    <appender name="ApiWarnFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <fileNamePattern>${log_home}/api/warn/%d{yyyy-MM-dd}.log</fileNamePattern>
            <maxHistory>${max_history}</maxHistory>
        </rollingPolicy>
        <encoder>
            <pattern>${FILE_LOG_PATTERN}</pattern>
@@ -59,6 +61,7 @@
    <appender name="ApiErrorFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <fileNamePattern>${log_home}/api/error/%d{yyyy-MM-dd}.log</fileNamePattern>
            <maxHistory>${max_history}</maxHistory>
        </rollingPolicy>
        <encoder>
            <pattern>${FILE_LOG_PATTERN}</pattern>
@@ -70,21 +73,13 @@
            <onMismatch>DENY</onMismatch>
        </filter>
    </appender>
    <logger name="com.yihu.jw.web.handler.GlobalExceptionHandler" level="WARN" additivity="false">
        <appender-ref ref="console" />
        <appender-ref ref="ApiInfoFile" />
        <appender-ref ref="ApiWarnFile" />
        <appender-ref ref="ApiErrorFile" />
    </logger>
    <!-- Api Log End -->
    <!-- 如果微服务纳入全局异常处理，请勿修改以上代码，有新的日志处理请在以下追加！！！ -->
    <!-- Business Log Start -->
    <appender name="BusinessInfoFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <fileNamePattern>${log_home}/business/info/%d{yyyy-MM-dd}.log</fileNamePattern>
            <maxHistory>${max_history}</maxHistory>
        </rollingPolicy>
        <encoder>
            <pattern>${FILE_LOG_PATTERN}</pattern>
@@ -100,6 +95,7 @@
    <appender name="BusinessWarnFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <fileNamePattern>${log_home}/business/warn/%d{yyyy-MM-dd}.log</fileNamePattern>
            <maxHistory>${max_history}</maxHistory>
        </rollingPolicy>
        <encoder>
            <pattern>${FILE_LOG_PATTERN}</pattern>
@@ -115,6 +111,7 @@
    <appender name="BusinessErrorFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <fileNamePattern>${log_home}/business/error/%d{yyyy-MM-dd}.log</fileNamePattern>
            <maxHistory>${max_history}</maxHistory>
        </rollingPolicy>
        <encoder>
            <pattern>${FILE_LOG_PATTERN}</pattern>
@@ -128,11 +125,28 @@
    </appender>
    <!-- Business Log End -->
	<root level="INFO">
    <!-- 如果微服务纳入全局异常处理，请勿修改以上代码，有新的日志处理请在以下追加！！！ -->
    <!-- Other Log Start -->
    <!-- Other Log End -->
    <!-- 针对接口调用出错日志（单独记录） -->
    <logger name="com.yihu.jw.web.handler.GlobalExceptionHandler" level="WARN" additivity="false">
        <appender-ref ref="console" />
        <appender-ref ref="ApiInfoFile" />
        <appender-ref ref="ApiWarnFile" />
        <appender-ref ref="ApiErrorFile" />
    </logger>
    <!-- 业务日志 -->
    <logger name="com.yihu.jw">
        <appender-ref ref="BusinessInfoFile" />
        <appender-ref ref="BusinessWarnFile" />
        <appender-ref ref="BusinessErrorFile" />
    </logger>
    <!-- 基础日志 -->
	<root level="INFO">
        <appender-ref ref="console" />
	</root>
</configuration>

gateway/basic-gateway/pom.xml

@@ -10,7 +10,7 @@
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>basic-gateway</artifactId>
    <artifactId>ag-basic</artifactId>
    <version>${parent.version}</version>
    <packaging>war</packaging>
@@ -52,7 +52,6 @@
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-config</artifactId>
            <scope>${dependency.scope}</scope>
        </dependency>
        <!-- 安全认证中心-->
@@ -70,17 +69,21 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
            <scope>${dependency.scope}</scope>
        </dependency>
        <dependency>
            <groupId>redis.clients</groupId>
            <artifactId>jedis</artifactId>
        </dependency>
        <!-- Redis  -->
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-web</artifactId>
        </dependency>
    </dependencies>
    <build>
        <finalName>basic-gateway</finalName>
        <finalName>ag-basic</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

gateway/basic-gateway/src/main/java/com/yihu/BasicGateway.java

@@ -13,15 +13,15 @@ import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
@EnableEurekaClient
@EnableZuulProxy
@SpringBootApplication
public class BasicGateway extends SpringBootServletInitializer {
public class AgBasicServer extends SpringBootServletInitializer {
    public static void main(String [] args) {
        SpringApplication.run(BasicGateway.class, args);
        SpringApplication.run(AgBasicServer.class, args);
    }
    @Override
    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
        return application.sources(BasicGateway.class);
        return application.sources(AgBasicServer.class);
    }
}

gateway/basic-gateway/src/main/java/com/yihu/gateway/config/WebSecurityConfig.java

@@ -1,4 +1,4 @@
package com.yihu.gateway.config;
package com.yihu.jw.gateway.config;
import org.springframework.boot.autoconfigure.security.SecurityProperties;
import org.springframework.context.annotation.Configuration;

gateway/basic-gateway/src/main/java/com/yihu/gateway/filter/BasicZuulFilter.java

@@ -1,9 +1,9 @@
//package com.yihu.gateway.filter;
//package com.yihu.jw.gateway.filter;
//
//import com.fasterxml.jackson.databind.ObjectMapper;
//import com.netflix.zuul.ZuulFilter;
//import com.netflix.zuul.context.RequestContext;
//import com.yihu.ehr.util.rest.Envelop;
//import com.yihu.jw.restmodel.web.Envelop;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
//import org.springframework.beans.factory.annotation.Autowired;
@@ -114,10 +114,10 @@
//    private Object forbidden(RequestContext requestContext, int status, String errorMsg) {
//        requestContext.setSendZuulResponse(false);
//        Envelop envelop = new Envelop();
//        envelop.setErrorCode(status);
//        envelop.setErrorMsg(errorMsg);
//        envelop.setMessage(errorMsg);
//        envelop.setStatus(status);
//        try {
//            requestContext.setResponseStatusCode(status);
//            //requestContext.setResponseStatusCode(status);
//            requestContext.getResponse().getWriter().write(objectMapper.writeValueAsString(envelop));
//        } catch (IOException e) {
//            requestContext.setResponseStatusCode(HttpStatus.INTERNAL_SERVER_ERROR.value());

gateway/basic-gateway/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name: basic-gateway
    name: ag-basic
  cloud:
    config:
      failFast: true

readme.MD

@@ -1,11 +1,9 @@
项目结构
     common    公共的一些配置
        common-swagger   swagger工程
        涉及主要技术 swagger
     svr    业务微服务  
     common     公共依赖包
     svr     业务微服务  
        svr-base 基础微服务
        svr-quota 统计微服务
    server
     server
         svr-configuration    配置服务 
            涉及主要技术 git(存储配置文件) 
         svr-discovery    发现服务 

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

@@ -7,6 +7,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/5/19.
 */
public interface FunctionDao extends PagingAndSortingRepository<FunctionDO, String>, JpaSpecificationExecutor<FunctionDO> {
public interface FunctionDao extends PagingAndSortingRepository<FunctionDO, Integer>, JpaSpecificationExecutor<FunctionDO> {
}

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

@@ -0,0 +1,11 @@
package com.yihu.jw.base.dao;
import com.yihu.jw.entity.base.message.MessageDo;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by progr1mmer on 2018/8/20.
 */
public interface MessageDao extends PagingAndSortingRepository<MessageDo, Integer>, JpaSpecificationExecutor<MessageDo> {
}

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

@@ -0,0 +1,11 @@
package com.yihu.jw.base.dao;
import com.yihu.jw.entity.base.message.MessageSubscriberDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by progr1mmer on 2018/8/20.
 */
public interface MessageSubscriberDao extends PagingAndSortingRepository<MessageSubscriberDO, Integer>, JpaSpecificationExecutor<MessageSubscriberDO> {
}

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

@@ -7,6 +7,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/5/19.
 */
public interface ModuleDao extends PagingAndSortingRepository<ModuleDO, String>, JpaSpecificationExecutor<ModuleDO> {
public interface ModuleDao extends PagingAndSortingRepository<ModuleDO, Integer>, JpaSpecificationExecutor<ModuleDO> {
}

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

@@ -7,6 +7,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/5/19.
 */
public interface ModuleFunctionDao extends PagingAndSortingRepository<ModuleFunctionDO, String>, JpaSpecificationExecutor<ModuleFunctionDO> {
public interface ModuleFunctionDao extends PagingAndSortingRepository<ModuleFunctionDO, Integer>, JpaSpecificationExecutor<ModuleFunctionDO> {
}

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

@@ -0,0 +1,11 @@
package com.yihu.jw.base.dao;
import com.yihu.jw.entity.base.oauth2.OauthClientDetailsDO;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * Created by progr1mmer on 2018/1/23.
 */
public interface OauthClientDetailsDao extends JpaRepository<OauthClientDetailsDO, String> {
}

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

@@ -7,6 +7,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by progr1mmer on 2018/8/17.
 */
public interface RoleDao extends PagingAndSortingRepository<RoleDO, String>, JpaSpecificationExecutor<RoleDO> {
public interface RoleDao extends PagingAndSortingRepository<RoleDO, Integer>, JpaSpecificationExecutor<RoleDO> {
}

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

@@ -7,6 +7,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by progr1mmer on 2018/8/17.
 */
public interface RoleModuleFunctionDao extends PagingAndSortingRepository<RoleModuleFunctionDO, String>, JpaSpecificationExecutor<RoleModuleFunctionDO> {
public interface RoleModuleFunctionDao extends PagingAndSortingRepository<RoleModuleFunctionDO, Integer>, JpaSpecificationExecutor<RoleModuleFunctionDO> {
}

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

@@ -7,6 +7,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by progr1mmer on 2018/8/17.
 */
public interface SaasModuleDao extends PagingAndSortingRepository<SaasModuleDO, String>, JpaSpecificationExecutor<SaasModuleDO> {
public interface SaasModuleDao extends PagingAndSortingRepository<SaasModuleDO, Integer>, JpaSpecificationExecutor<SaasModuleDO> {
}

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

@@ -0,0 +1,11 @@
package com.yihu.jw.base.dao;
import com.yihu.jw.entity.base.user.UserDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by progr1mmer on 2018/8/20.
 */
public interface UserDao extends PagingAndSortingRepository<UserDO, String>, JpaSpecificationExecutor<UserDO> {
}

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

@@ -0,0 +1,11 @@
package com.yihu.jw.base.dao;
import com.yihu.jw.entity.base.user.UserRoleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by progr1mmer on 2018/8/20.
 */
public interface UserRoleDao extends PagingAndSortingRepository<UserRoleDO, Integer>, JpaSpecificationExecutor<UserRoleDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasEndpoint.java

@@ -1,18 +1,21 @@
package com.yihu.jw.base.endpoint.saas;
import com.yihu.jw.base.service.UserService;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.base.service.SaasService;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.utils.security.MD5;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -27,15 +30,27 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private SaasService saasService;
    @Autowired
    private UserService userService;
    @PostMapping(value = BaseRequestMapping.Saas.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<SaasDO> create (
            @ApiParam(name = "json", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        SaasDO saasDO = toEntity(jsonData, SaasDO.class);
        saasDO = saasService.save(saasDO);
        return success(saasDO);
    public Envelop create (
            @ApiParam(name = "saas", value = "Json数据", required = true)
            @RequestParam(value = "saas") SaasDO saasDO,
            @ApiParam(name = "user", value = "Json数据", required = true)
            @RequestParam(value = "user") UserDO userDO) throws Exception {
        if (userService.search("username=" + userDO.getUsername()).size() > 0) {
            return failed("管理员用户名已存在");
        }
        userDO.setEnabled(true);
        userDO.setLocked(false);
        if (StringUtils.isEmpty(userDO.getPassword())) {
            String password = MD5.md5Hex(userDO.getIdcard().substring(0, 5));
            userDO.setPassword(password);
        }
        saasService.save(saasDO, userDO);
        return success("创建成功");
    }
    @PostMapping(value = BaseRequestMapping.Saas.DELETE)

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserEndpoint.java

@@ -0,0 +1,106 @@
package com.yihu.jw.base.endpoint.user;
import com.yihu.jw.base.service.UserService;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * Created by progr1mmer on 2018/8/16.
 */
@RestController
@RequestMapping(value = BaseRequestMapping.User.PREFIX)
@Api(value = "用户管理", description = "用户管理服务接口", tags = {"wlyy基础服务 - 用户管理服务接口"})
public class UserEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private UserService userService;
    @PostMapping(value = BaseRequestMapping.User.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<UserDO> create (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        UserDO userDO = toEntity(jsonData, UserDO.class);
        userDO = userService.save(userDO);
        return success(userDO);
    }
    @PostMapping(value = BaseRequestMapping.User.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        userService.delete(ids);
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.User.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public Envelop update (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        UserDO userDO = toEntity(jsonData, UserDO.class);
        if (null == userDO.getId()) {
            return failed("ID不能为空");
        }
        userDO = userService.save(userDO);
        return success(userDO);
    }
    @GetMapping(value = BaseRequestMapping.User.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<UserDO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        List<UserDO> userDOS = userService.search(fields, filters, sorts, page, size);
        int count = (int)userService.getCount(filters);
        return success(userDOS, count, page, size);
    }
    @GetMapping(value = BaseRequestMapping.User.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<UserDO> list (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        List<UserDO> userDOS = userService.search(fields, filters, sorts);
        return success(userDOS);
    }
    @GetMapping(value = BaseRequestMapping.User.CHECK_USERNAME)
    @ApiOperation(value = "检查用户名是否可用(message=1代表可用，message=0代表不可用)")
    public Envelop checkName (
            @ApiParam(name = "username", value = "用户名", required = true)
            @RequestParam(value = "username", required = false) String username) throws Exception {
        if (userService.search("username=" + username).size() == 0) {
            return success("1");
        } else {
            return success("0");
        }
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/user/UserRoleEndpoint.java

@@ -0,0 +1,94 @@
package com.yihu.jw.base.endpoint.user;
import com.yihu.jw.base.service.UserRoleService;
import com.yihu.jw.entity.base.user.UserRoleDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * Created by progr1mmer on 2018/8/16.
 */
@RestController
@RequestMapping(value = BaseRequestMapping.UserRole.PREFIX)
@Api(value = "用户角色管理", description = "用户角色管理服务接口", tags = {"wlyy基础服务 - 用户角色管理服务接口"})
public class UserRoleEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private UserRoleService userRoleService;
    @PostMapping(value = BaseRequestMapping.UserRole.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<UserRoleDO> create (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        UserRoleDO userRoleDO = toEntity(jsonData, UserRoleDO.class);
        userRoleDO = userRoleService.save(userRoleDO);
        return success(userRoleDO);
    }
    @PostMapping(value = BaseRequestMapping.UserRole.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        userRoleService.delete(ids);
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.UserRole.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public Envelop update (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        UserRoleDO userRoleDO = toEntity(jsonData, UserRoleDO.class);
        if (null == userRoleDO.getId()) {
            return failed("ID不能为空");
        }
        userRoleDO = userRoleService.save(userRoleDO);
        return success(userRoleDO);
    }
    @GetMapping(value = BaseRequestMapping.UserRole.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<UserRoleDO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        List<UserRoleDO> userRoleDOS = userRoleService.search(fields, filters, sorts, page, size);
        int count = (int)userRoleService.getCount(filters);
        return success(userRoleDOS, count, page, size);
    }
    @GetMapping(value = BaseRequestMapping.UserRole.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<UserRoleDO> list (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        List<UserRoleDO> userRoleDOS = userRoleService.search(fields, filters, sorts);
        return success(userRoleDOS);
    }
}

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

@@ -0,0 +1,13 @@
package com.yihu.jw.base.service;
import com.yihu.jw.base.dao.MessageDao;
import com.yihu.jw.entity.base.message.MessageDo;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * Created by progr1mmer on 2018/8/20.
 */
@Service
public class MessageService extends BaseJpaService<MessageDo, MessageDao> {
}

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

@@ -0,0 +1,13 @@
package com.yihu.jw.base.service;
import com.yihu.jw.base.dao.MessageSubscriberDao;
import com.yihu.jw.entity.base.message.MessageSubscriberDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * Created by progr1mmer on 2018/8/20.
 */
@Service
public class MessageSubscriberService extends BaseJpaService<MessageSubscriberDO, MessageSubscriberDao> {
}

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

@@ -1,7 +1,9 @@
package com.yihu.jw.base.service;
import com.yihu.jw.base.dao.UserDao;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.base.dao.SaasDao;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -15,6 +17,14 @@ public class SaasService extends BaseJpaService<SaasDO, SaasDao> {
    @Autowired
    private SaasDao saasDao;
    @Autowired
    private UserDao userDao;
    public SaasDO save(SaasDO saas, UserDO user) {
        user = userDao.save(user);
        saas.setManager(user.getId());
        return super.save(saas);
    }
    @Transactional
    public void delete(String ids) {

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

@@ -0,0 +1,13 @@
package com.yihu.jw.base.service;
import com.yihu.jw.base.dao.UserRoleDao;
import com.yihu.jw.entity.base.user.UserRoleDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * Created by progr1mmer on 2018/8/20.
 */
@Service
public class UserRoleService extends BaseJpaService<UserRoleDO, UserRoleDao> {
}

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

@@ -0,0 +1,13 @@
package com.yihu.jw.base.service;
import com.yihu.jw.base.dao.UserDao;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * Created by progr1mmer on 2018/8/20.
 */
@Service
public class UserService extends BaseJpaService<UserDO, UserDao> {
}

svr/svr-base/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name: svr-base
    name: svr-base-lyx
  cloud:
    config:
      failFast: true

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/dao/rehabilitation/RehabilitationDetailDao.java

@@ -0,0 +1,17 @@
package com.yihu.jw.dao.rehabilitation;
import com.yihu.jw.entity.specialist.rehabilitation.RehabilitationDetailDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Date;
/**
 * Created by 刘文彬 on 2018/8/20.
 */
public interface RehabilitationDetailDao extends PagingAndSortingRepository<RehabilitationDetailDO, Long>,JpaSpecificationExecutor<RehabilitationDetailDO> {
    @Query(" select count(1) from RehabilitationDetailDO where status =?1 and programId=?2 and executeTime>=?3 and executeTime<=?4 ")
    Integer todayBacklogCount(Integer status,String programId,Date executeStartTime,Date executeEndTime);
}

svr/svr-wlyy/pom.xml

@@ -109,5 +109,11 @@
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-commons</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
        </dependency>
    </dependencies>
</project>

svr/svr-wlyy/src/main/java/com/yihu/jw/config/SwaggerConfig.java

@@ -1,50 +1,50 @@
package com.yihu.jw.config;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import static com.google.common.base.Predicates.or;
import static springfox.documentation.builders.PathSelectors.regex;
@Configuration
@EnableSwagger2
@ComponentScan("com.yihu.jw.**")
public class SwaggerConfig {
    public static final String Wlyy_API = "Wlyy";
    @Bean
    public Docket wlyyAPI() {
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(Wlyy_API)
                .useDefaultResponseMessages(false)
                .forCodeGeneration(false)
                .pathMapping("/")
                .select()
                .paths(or(
                        regex("/" + WlyyRequestMapping.api_wlyy_common + "/.*")
                ))
                .build()
                .apiInfo(wlyyApiInfo());
    }
    private ApiInfo wlyyApiInfo() {
        ApiInfo wlyyInfo = new ApiInfo("基卫2.0API",
                "基卫2.0API，提供基础卫生相关服务。",
                "1.0",
                "No terms of service",
                "wenfujian@jkzl.com",
                "The Apache License, Version 2.0",
                "http://www.apache.org/licenses/LICENSE-2.0.html"
        );
        return wlyyInfo;
    }
}
//package com.yihu.jw.config;
//
//import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.ComponentScan;
//import org.springframework.context.annotation.Configuration;
//import springfox.documentation.service.ApiInfo;
//import springfox.documentation.spi.DocumentationType;
//import springfox.documentation.spring.web.plugins.Docket;
//import springfox.documentation.swagger2.annotations.EnableSwagger2;
//
//import static com.google.common.base.Predicates.or;
//import static springfox.documentation.builders.PathSelectors.regex;
//
//@Configuration
//@EnableSwagger2
//@ComponentScan("com.yihu.jw.**")
//public class SwaggerConfig {
//    public static final String Wlyy_API = "Wlyy";
//
//    @Bean
//    public Docket wlyyAPI() {
//        return new Docket(DocumentationType.SWAGGER_2)
//                .groupName(Wlyy_API)
//                .useDefaultResponseMessages(false)
//                .forCodeGeneration(false)
//                .pathMapping("/")
//                .select()
//                .paths(or(
//                        regex("/" + WlyyRequestMapping.api_wlyy_common + "/.*")
//                ))
//                .build()
//                .apiInfo(wlyyApiInfo());
//    }
//
//    private ApiInfo wlyyApiInfo() {
//        ApiInfo wlyyInfo = new ApiInfo("基卫2.0API",
//                "基卫2.0API，提供基础卫生相关服务。",
//                "1.0",
//                "No terms of service",
//                "wenfujian@jkzl.com",
//                "The Apache License, Version 2.0",
//                "http://www.apache.org/licenses/LICENSE-2.0.html"
//        );
//
//        return wlyyInfo;
//    }
//
//
//}

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

@@ -2,9 +2,11 @@ package com.yihu.jw.wlyy.controller.agreement;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.EnvelopRestController;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.agreement.WlyyAgreementDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementDO;
import com.yihu.jw.wlyy.service.agreement.WlyyAgreementService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,13 +17,14 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping(WlyyRequestMapping.api_wlyy_common)
@Api(value = "协议相关操作", description = "协议相关操作")
public class WlyyAgreementController extends EnvelopRestController {
public class WlyyAgreementController extends EnvelopRestEndpoint {
    @Autowired
    private WlyyAgreementService wlyyAgreementService;
@@ -30,10 +33,10 @@ public class WlyyAgreementController extends EnvelopRestController {
    @ApiOperation(value = "创建协议", notes = "创建协议")
    public Envelop create(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
            @RequestBody String jsonData) throws IOException {
        try {
            WlyyAgreementDO wlyyAgreement = toEntity(jsonData, WlyyAgreementDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.Agreement.message_success_create, wlyyAgreementService.create(wlyyAgreement));
            return success(WlyyRequestMapping.Agreement.message_success_create, wlyyAgreementService.create(wlyyAgreement));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -43,12 +46,12 @@ public class WlyyAgreementController extends EnvelopRestController {
    @ApiOperation(value = "修改协议", notes = "修改协议")
    public Envelop update(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
            @RequestBody String jsonData) throws IOException {
        try {
            WlyyAgreementDO wlyyAgreement = toEntity(jsonData, WlyyAgreementDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.Agreement.message_success_update, wlyyAgreementService.update(wlyyAgreement));
            return success(WlyyRequestMapping.Agreement.message_success_update, wlyyAgreementService.update(wlyyAgreement));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
            return failed(e.getMessage(), e.getErrorCode());
        }
    }
@@ -70,10 +73,9 @@ public class WlyyAgreementController extends EnvelopRestController {
    @ApiOperation(value = "根据code查找协议", notes = "根据code查找协议")
    public Envelop findByCode(
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) String id
    ) {
            @RequestParam(value = "id", required = true) String id) {
        try {
            return Envelop.getSuccess(WlyyRequestMapping.Agreement.message_success_find, wlyyAgreementService.findById(id));
            return success(WlyyRequestMapping.Agreement.message_success_find, wlyyAgreementService.findById(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -81,7 +83,7 @@ public class WlyyAgreementController extends EnvelopRestController {
    @RequestMapping(value = WlyyRequestMapping.Agreement.api_queryPage, method = RequestMethod.GET)
    @ApiOperation(value = "分页获取协议")
    public Envelop queryPage(
    public PageEnvelop<WlyyAgreementDO> queryPage(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,code,parentCode,saasId,name,price,posterPic,remark,type,status")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
@@ -103,13 +105,13 @@ public class WlyyAgreementController extends EnvelopRestController {
        //封装返回格式
        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);
        return success(WlyyRequestMapping.Agreement.message_success_find_functions, wlyyAgreement, page, size, (int)count);
    }
    @GetMapping(value = WlyyRequestMapping.Agreement.api_getList)
    @ApiOperation(value = "获取协议列表(不分页)")
    public Envelop getList(
    public ListEnvelop<WlyyAgreementDO> getList(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,code,parentCode,saasId,name,price,posterPic,remark,type,status")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
@@ -120,7 +122,7 @@ public class WlyyAgreementController extends EnvelopRestController {
        List<WlyyAgreementDO> list = wlyyAgreementService.search(fields,filters,sorts);
        //封装返回格式
        List<WlyyAgreementDO> wlyyAgreement = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreementDO.class, fields);
        return Envelop.getSuccessList(WlyyRequestMapping.Agreement.message_success_find_functions,wlyyAgreement);
        return success(WlyyRequestMapping.Agreement.message_success_find_functions,wlyyAgreement);
    }
}

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

@@ -2,9 +2,11 @@ package com.yihu.jw.wlyy.controller.agreement;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.EnvelopRestController;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpiDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementKpiDO;
import com.yihu.jw.wlyy.service.agreement.WlyyAgreementKpiService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,13 +17,14 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping(WlyyRequestMapping.api_wlyy_common)
@Api(value = "套餐指标相关操作", description = "套餐指标相关操作")
public class WlyyAgreementKpiController extends EnvelopRestController {
public class WlyyAgreementKpiController extends EnvelopRestEndpoint {
    @Autowired
    private WlyyAgreementKpiService wlyyAgreementKpiService;
@@ -30,12 +33,12 @@ public class WlyyAgreementKpiController extends EnvelopRestController {
    @ApiOperation(value = "创建套餐指标", notes = "创建套餐指标")
    public Envelop create(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
            @RequestBody String jsonData) throws IOException {
        try {
            WlyyAgreementKpiDO wlyyAgreementKpi = toEntity(jsonData, WlyyAgreementKpiDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.AgreementKpi.message_success_create, wlyyAgreementKpiService.create(wlyyAgreementKpi));
            return success(WlyyRequestMapping.AgreementKpi.message_success_create, wlyyAgreementKpiService.create(wlyyAgreementKpi));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
            return failed(e.getMessage(), e.getErrorCode());
        }
    }
@@ -43,12 +46,12 @@ public class WlyyAgreementKpiController extends EnvelopRestController {
    @ApiOperation(value = "修改套餐指标", notes = "修改套餐指标")
    public Envelop update(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
            @RequestBody String jsonData) throws IOException {
        try {
            WlyyAgreementKpiDO wlyyAgreementKpi = toEntity(jsonData, WlyyAgreementKpiDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.AgreementKpi.message_success_update, wlyyAgreementKpiService.update(wlyyAgreementKpi));
            return MixEnvelop.getSuccess(WlyyRequestMapping.AgreementKpi.message_success_update, wlyyAgreementKpiService.update(wlyyAgreementKpi));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
@@ -68,14 +71,14 @@ public class WlyyAgreementKpiController extends EnvelopRestController {
    @GetMapping(value = WlyyRequestMapping.AgreementKpi.api_getById)
    @ApiOperation(value = "根据id查找套餐指标", notes = "根据id查找套餐指标")
    public Envelop findByCode(
    public MixEnvelop findByCode(
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) String id
    ) {
        try {
            return Envelop.getSuccess(WlyyRequestMapping.AgreementKpi.message_success_find, wlyyAgreementKpiService.findById(id));
            return MixEnvelop.getSuccess(WlyyRequestMapping.AgreementKpi.message_success_find, wlyyAgreementKpiService.findById(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
            return MixEnvelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
@@ -97,19 +100,19 @@ public class WlyyAgreementKpiController extends EnvelopRestController {
        //得到list数据
        List<WlyyAgreementKpiDO> list = wlyyAgreementKpiService.search(fields, filters, sorts, page, size);
        //获取总数
        long count=wlyyAgreementKpiService.getCount(filters);
        long count= wlyyAgreementKpiService.getCount(filters);
        //封装头信息
        pagedResponse(request, response, count, page, size);
        //封装返回格式
        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);
        return MixEnvelop.getSuccessListWithPage(WlyyRequestMapping.AgreementKpi.message_success_find_functions,wlyyAgreementKpi, page, size,count);
    }
    @GetMapping(value = WlyyRequestMapping.AgreementKpi.api_getList)
    @ApiOperation(value = "获取套餐指标列表(不分页)")
    public Envelop getList(
    public ListEnvelop<WlyyAgreementKpiDO> getList(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "id,code,agreementCode,kpiName,type,kpiTimes,status,del,kpiContent,keyword")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
@@ -120,7 +123,7 @@ public class WlyyAgreementKpiController extends EnvelopRestController {
        List<WlyyAgreementKpiDO> list = wlyyAgreementKpiService.search(fields,filters,sorts);
        //封装返回格式
        List<WlyyAgreementKpiDO> wlyyAgreementKpi = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreementKpiDO.class, fields);
        return Envelop.getSuccessList(WlyyRequestMapping.AgreementKpi.message_success_find_functions,wlyyAgreementKpi);
        return success(WlyyRequestMapping.AgreementKpi.message_success_find_functions, wlyyAgreementKpi);
    }
}

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

@@ -2,9 +2,10 @@ package com.yihu.jw.wlyy.controller.agreement;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.EnvelopRestController;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpiLogDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementKpiLogDO;
import com.yihu.jw.wlyy.service.agreement.WlyyAgreementKpiLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,13 +16,14 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping(WlyyRequestMapping.api_wlyy_common)
@Api(value = "套餐指标执行日志相关操作", description = "套餐指标执行日志相关操作")
public class WlyyAgreementKpiLogController extends EnvelopRestController {
public class WlyyAgreementKpiLogController extends EnvelopRestEndpoint {
    @Autowired
    private WlyyAgreementKpiLogService wlyyAgreementKpiLogService;
@@ -30,10 +32,10 @@ public class WlyyAgreementKpiLogController extends EnvelopRestController {
    @ApiOperation(value = "创建套餐指标日志", notes = "创建套餐指标日志")
    public Envelop create(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
            @RequestBody String jsonData) throws IOException {
        try {
            WlyyAgreementKpiLogDO wlyyAgreementKpiLog = toEntity(jsonData, WlyyAgreementKpiLogDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.AgreementKpiLog.message_success_create, wlyyAgreementKpiLogService.create(wlyyAgreementKpiLog));
            return success(WlyyRequestMapping.AgreementKpiLog.message_success_create, wlyyAgreementKpiLogService.create(wlyyAgreementKpiLog));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -46,7 +48,7 @@ public class WlyyAgreementKpiLogController extends EnvelopRestController {
            @RequestParam(value = "id", required = true) String id
    ) {
        try {
            return Envelop.getSuccess(WlyyRequestMapping.AgreementKpiLog.message_success_find, wlyyAgreementKpiLogService.findById(id));
            return success(WlyyRequestMapping.AgreementKpiLog.message_success_find, wlyyAgreementKpiLogService.findById(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -76,7 +78,7 @@ public class WlyyAgreementKpiLogController extends EnvelopRestController {
        //封装返回格式
        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);
        return PageEnvelop.getSuccessListWithPage(WlyyRequestMapping.AgreementKpiLog.message_success_find_functions,wlyyAgreementKpiLog, page, size,count);
    }
@@ -93,7 +95,7 @@ public class WlyyAgreementKpiLogController extends EnvelopRestController {
        List<WlyyAgreementKpiLogDO> list = wlyyAgreementKpiLogService.search(fields,filters,sorts);
        //封装返回格式
        List<WlyyAgreementKpiLogDO> wlyyAgreementKpiLog = convertToModels(list, new ArrayList<>(list.size()), WlyyAgreementKpiLogDO.class, fields);
        return Envelop.getSuccessList(WlyyRequestMapping.AgreementKpiLog.message_success_find_functions,wlyyAgreementKpiLog);
        return success(WlyyRequestMapping.AgreementKpiLog.message_success_find_functions, wlyyAgreementKpiLog);
    }
}

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

@@ -2,9 +2,9 @@ package com.yihu.jw.wlyy.controller.agreement;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.EnvelopRestController;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.agreement.WlyySignFamilyDO;
import com.yihu.jw.entity.wlyy.agreement.WlyySignFamilyDO;
import com.yihu.jw.wlyy.service.agreement.WlyySignFamilyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,14 +15,13 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping(WlyyRequestMapping.api_wlyy_common)
@Api(value = "签约相关操作", description = "签约相关操作")
public class WlyySignFamilyController extends EnvelopRestController {
public class WlyySignFamilyController extends EnvelopRestEndpoint {
    @Autowired
    private WlyySignFamilyService wlyySignFamilyService;
@@ -31,10 +30,10 @@ public class WlyySignFamilyController extends EnvelopRestController {
    @ApiOperation(value = "创建签约", notes = "创建签约")
    public Envelop create(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) throws ParseException {
            @RequestBody String jsonData) throws Exception {
        try {
            WlyySignFamilyDO wlyySignFamily = toEntity(jsonData, WlyySignFamilyDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.SignFamily.message_success_create, wlyySignFamilyService.create(wlyySignFamily));
            return success(WlyyRequestMapping.SignFamily.message_success_create, wlyySignFamilyService.create(wlyySignFamily));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -44,10 +43,10 @@ public class WlyySignFamilyController extends EnvelopRestController {
    @ApiOperation(value = "修改签约", notes = "修改签约")
    public Envelop update(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) throws ParseException {
            @RequestBody String jsonData) throws Exception {
        try {
            WlyySignFamilyDO wlyySignFamily = toEntity(jsonData, WlyySignFamilyDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.SignFamily.message_success_update, wlyySignFamilyService.update(wlyySignFamily));
            return success(WlyyRequestMapping.SignFamily.message_success_update, wlyySignFamilyService.update(wlyySignFamily));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -60,7 +59,7 @@ public class WlyySignFamilyController extends EnvelopRestController {
            @RequestParam(value = "id", required = true) String id
    ) {
        try {
            return Envelop.getSuccess(WlyyRequestMapping.SignFamily.message_success_find, wlyySignFamilyService.findById(id));
            return success(WlyyRequestMapping.SignFamily.message_success_find, wlyySignFamilyService.findById(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -90,7 +89,7 @@ public class WlyySignFamilyController extends EnvelopRestController {
        //封装返回格式
        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);
        return success(WlyyRequestMapping.SignFamily.message_success_find_functions,wlyySignFamily, page, size, (int)count);
    }
@@ -107,7 +106,7 @@ public class WlyySignFamilyController extends EnvelopRestController {
        List<WlyySignFamilyDO> list = wlyySignFamilyService.search(fields,filters,sorts);
        //封装返回格式
        List<WlyySignFamilyDO> wlyySignFamily = convertToModels(list, new ArrayList<>(list.size()), WlyySignFamilyDO.class, fields);
        return Envelop.getSuccessList(WlyyRequestMapping.SignFamily.message_success_find_functions,wlyySignFamily);
        return success(WlyyRequestMapping.SignFamily.message_success_find_functions, wlyySignFamily);
    }
}

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

@@ -2,9 +2,9 @@ package com.yihu.jw.wlyy.controller.patient;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.EnvelopRestController;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;
import com.yihu.jw.wlyy.patient.WlyyAdvertisementDO;
import com.yihu.jw.entity.wlyy.patient.WlyyAdvertisementDO;
import com.yihu.jw.wlyy.service.patient.AdvertisementService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -25,7 +26,7 @@ import java.util.List;
@RestController
@RequestMapping(value = WlyyRequestMapping.api_wlyy_common)
@Api(value = "广告相关操作", description = "广告相关操作")
public class AdvertisementControlelr extends EnvelopRestController {
public class AdvertisementControlelr extends EnvelopRestEndpoint {
    @Autowired
    private AdvertisementService advertisementService;
@@ -34,10 +35,10 @@ public class AdvertisementControlelr extends EnvelopRestController {
    @ApiOperation(value = "创建广告", notes = "创建广告")
    public Envelop create(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
            @RequestBody String jsonData) throws IOException {
        try {
            WlyyAdvertisementDO advertisement = toEntity(jsonData, WlyyAdvertisementDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.Advertisement.message_success_create, advertisementService.create(advertisement));
            return success(WlyyRequestMapping.Advertisement.message_success_create, advertisementService.create(advertisement));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -47,10 +48,10 @@ public class AdvertisementControlelr extends EnvelopRestController {
    @ApiOperation(value = "修改广告", notes = "修改广告")
    public Envelop update(
            @ApiParam(name = "json_data", value = "", defaultValue = "")
            @RequestBody String jsonData) {
            @RequestBody String jsonData) throws IOException {
        try {
            WlyyAdvertisementDO advertisement = toEntity(jsonData, WlyyAdvertisementDO.class);
            return Envelop.getSuccess(WlyyRequestMapping.Advertisement.message_success_update, advertisementService.update(advertisement));
            return success(WlyyRequestMapping.Advertisement.message_success_update, advertisementService.update(advertisement));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -76,7 +77,7 @@ public class AdvertisementControlelr extends EnvelopRestController {
            @RequestParam(value = "id", required = true) String id
    ) {
        try {
            return Envelop.getSuccess(WlyyRequestMapping.Advertisement.message_success_find, advertisementService.findById(id));
            return success(WlyyRequestMapping.Advertisement.message_success_find, advertisementService.findById(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -106,7 +107,7 @@ public class AdvertisementControlelr extends EnvelopRestController {
        //封装返回格式
        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);
        return success(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisement, page, size, (int)count);
    }
@@ -123,7 +124,7 @@ public class AdvertisementControlelr extends EnvelopRestController {
        List<WlyyAdvertisementDO> list = advertisementService.search(fields, filters, sorts);
        //封装返回格式
        List<WlyyAdvertisementDO> advertisement = convertToModels(list, new ArrayList<>(list.size()), WlyyAdvertisementDO.class, fields);
        return Envelop.getSuccessList(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisement);
        return success(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisement);
    }
    @GetMapping(value = WlyyRequestMapping.Advertisement.api_getListByPatientId)
@@ -134,14 +135,14 @@ public class AdvertisementControlelr extends EnvelopRestController {
            HttpServletRequest request
    ) {
        List<WlyyAdvertisementDO> advertisements = advertisementService.getListByPatientId(patientId, request);
        return Envelop.getSuccessList(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisements);
        return success(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisements);
    }
    @GetMapping(value = WlyyRequestMapping.Advertisement.api_getListByHttp)
    @ApiOperation(value = "根据患者code地区(通过http判断)获取广告")
    public Envelop getListByHttp(HttpServletRequest request) {
        List<WlyyAdvertisementDO> advertisements = advertisementService.getByHttp(request);
        return Envelop.getSuccess(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisements);
        return success(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisements);
    }
    /**
@@ -154,7 +155,7 @@ public class AdvertisementControlelr extends EnvelopRestController {
    @ApiOperation(value = "根据患者ip地址(供网关调用)")
    public Envelop getListByIp(@RequestParam(value = "ipAddress") String ipAddress) {
        List<WlyyAdvertisementDO> advertisements = advertisementService.getListByIp(ipAddress);
        return Envelop.getSuccess(WlyyRequestMapping.Advertisement.message_success_find_functions, advertisements);
        return success(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.SaasDO;
import com.yihu.jw.entity.base.saas.SaasDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

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.WlyyAgreementDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

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.WlyyAgreementKpiDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementKpiDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

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.WlyyAgreementKpiLogDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementKpiLogDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

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.WlyySignFamilyDO;
import com.yihu.jw.entity.wlyy.agreement.WlyySignFamilyDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

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.hospital.BaseOrgHospitalDO;
import com.yihu.jw.entity.wlyy.hospital.BaseOrgHospitalDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

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.WlyyAdvertisementDO;
import com.yihu.jw.entity.wlyy.patient.WlyyAdvertisementDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

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

@@ -1,8 +1,8 @@
package com.yihu.jw.wlyy.service;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.base.base.SaasDO;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.wlyy.dao.BaseSaasDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

@@ -2,10 +2,10 @@ package com.yihu.jw.wlyy.service.agreement;
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.WlyyAgreementKpiLogDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementKpiLogDO;
import com.yihu.jw.wlyy.dao.agreement.WlyyAgreementKpiLogDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

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

@@ -2,11 +2,11 @@ package com.yihu.jw.wlyy.service.agreement;
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.WlyyAgreementDO;
import com.yihu.jw.wlyy.agreement.WlyyAgreementKpiDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementKpiDO;
import com.yihu.jw.wlyy.dao.agreement.WlyyAgreementKpiDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

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

@@ -2,10 +2,10 @@ package com.yihu.jw.wlyy.service.agreement;
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.WlyyAgreementDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementDO;
import com.yihu.jw.wlyy.dao.agreement.WlyyAgreementDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

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

@@ -2,12 +2,12 @@ package com.yihu.jw.wlyy.service.agreement;
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.util.IDCard;
import com.yihu.jw.wlyy.agreement.WlyyAgreementDO;
import com.yihu.jw.wlyy.agreement.WlyySignFamilyDO;
import com.yihu.jw.entity.wlyy.agreement.WlyyAgreementDO;
import com.yihu.jw.entity.wlyy.agreement.WlyySignFamilyDO;
import com.yihu.jw.wlyy.dao.agreement.WlyySignFamilyDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

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

@@ -1,8 +1,8 @@
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.hospital.BaseOrgHospitalDO;
import com.yihu.jw.entity.wlyy.hospital.BaseOrgHospitalDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

@@ -1,18 +1,17 @@
package com.yihu.jw.wlyy.service.patient;
import com.yihu.jw.base.base.SaasDO;
import com.yihu.jw.entity.base.saas.SaasDO;
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.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.WlyySignFamilyDO;
import com.yihu.jw.entity.wlyy.agreement.WlyySignFamilyDO;
import com.yihu.jw.wlyy.dao.patient.AdvertisementDao;
import com.yihu.jw.wlyy.patient.WlyyAdvertisementDO;
import com.yihu.jw.entity.wlyy.patient.WlyyAdvertisementDO;
import com.yihu.jw.wlyy.service.BaseSaasService;
import com.yihu.jw.wlyy.service.agreement.WlyySignFamilyService;
import com.yihu.mysql.query.BaseJpaService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

wlyy-parent-pom/pom.xml

@@ -60,7 +60,7 @@
        <!-- 暂时保留 -->
        <!-- 网关服务 -->
        <module>../gateway/basic-gateway</module> <!-- web网关 -->
        <module>../gateway/ag-basic</module> <!-- web网关 -->
        <!--业务微服务-->
        <module>../svr/svr-base</module><!-- 基础微服务 -->