代码修改

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/quota/TjDataSave.java

@@ -26,6 +26,10 @@ public class TjDataSave implements Serializable {
    private Integer status;
    private String remark;
    public static String type_es ="1";
    public static String type_solr="2";
    public static String type_mysql ="3";
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", unique = true, nullable = false)

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/quota/TjQuotaDataSave.java

@@ -14,6 +14,8 @@ public class TjQuotaDataSave implements Serializable{
    private String saveCode;
    private String configJson;
    private String type;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", unique = true, nullable = false)
@@ -51,4 +53,13 @@ public class TjQuotaDataSave implements Serializable{
    public void setConfigJson(String configJson) {
        this.configJson = configJson;
    }
    @Transient
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/quota/TjQuotaGovProvision.java

@@ -0,0 +1,119 @@
package com.yihu.jw.entity.ehr.quota;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
 * Created by wxw on 2018/3/6.
 */
@Entity
@Table(name = "tj_quota_gov_provision")
public class TjQuotaGovProvision implements Serializable {
    private long id;
    private long population;
    private String gender;
    private String year;
    private String district;
    private long administrativeDivision;
    private Date createDate;
    private String creator;
    private Date modifyDate;
    private String modifier;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
    @Column(name = "id", unique = true, nullable = false)
    public long getId() {
        return id;
    }
    public void setId(long id) {
        this.id = id;
    }
    @Column(name = "population")
    public long getPopulation() {
        return population;
    }
    public void setPopulation(long population) {
        this.population = population;
    }
    @Column(name = "gender")
    public String getGender() {
        return gender;
    }
    public void setGender(String gender) {
        this.gender = gender;
    }
    @Column(name = "year")
    public String getYear() {
        return year;
    }
    public void setYear(String year) {
        this.year = year;
    }
    @Column(name = "district")
    public String getDistrict() {
        return district;
    }
    public void setDistrict(String district) {
        this.district = district;
    }
    @Column(name = "administrative_division")
    public long getAdministrativeDivision() {
        return administrativeDivision;
    }
    public void setAdministrativeDivision(long administrativeDivision) {
        this.administrativeDivision = administrativeDivision;
    }
    @Column(name = "create_date", nullable = false)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateDate() {
        return createDate;
    }
    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    }
    @Column(name = "creator")
    public String getCreator() {
        return creator;
    }
    public void setCreator(String creator) {
        this.creator = creator;
    }
    @Column(name = "modify_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getModifyDate() {
        return modifyDate;
    }
    public void setModifyDate(Date modifyDate) {
        this.modifyDate = modifyDate;
    }
    @Column(name = "modifier")
    public String getModifier() {
        return modifier;
    }
    public void setModifier(String modifier) {
        this.modifier = modifier;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsAdapterDictionary.java

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.ehr.resource;
import javax.persistence.*;
import java.io.Serializable;
/**
 * @author linaz
@@ -9,7 +10,7 @@ import javax.persistence.*;
@Entity
@Table(name="rs_adapter_dictionary")
@Access(value = AccessType.PROPERTY)
public class RsAdapterDictionary {
public class RsAdapterDictionary implements Serializable {
    private String id;
    private String schemeId;

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsAdapterMetadata.java

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.ehr.resource;
import javax.persistence.*;
import java.io.Serializable;
/**
 * 适配数据元
@@ -9,7 +10,7 @@ import javax.persistence.*;
 */
@Entity
@Table(name="rs_adapter_metadata")
public class RsAdapterMetadata {
public class RsAdapterMetadata implements Serializable {
    private String id;
    private String schemeId;
    private String metadataId;

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsAdapterScheme.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.ehr.resource;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
 * 资源适配方案实体
@@ -11,7 +12,7 @@ import javax.persistence.*;
 */
@Entity
@Table(name="rs_adapter_scheme")
public class RsAdapterScheme {
public class RsAdapterScheme implements Serializable {
    private String id;
    private String type;

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsAppResource.java

@@ -3,13 +3,14 @@ package com.yihu.jw.entity.ehr.resource;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
 * Created by lyr on 2016/4/26.
 */
@Entity
@Table(name="rs_app_resource")
public class RsAppResource {
public class RsAppResource implements Serializable {
    private String id;
    private String appId;
    private String resourceId;

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsAppResourceMetadata.java

@@ -3,13 +3,14 @@ package com.yihu.jw.entity.ehr.resource;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
 * Created by lyr on 2016/4/26.
 */
@Entity
@Table(name="rs_app_resource_metadata")
public class RsAppResourceMetadata {
public class RsAppResourceMetadata implements Serializable {
    private String id;
    private String appId;
    private String appResourceId;

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsDictionary.java

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.ehr.resource;
import javax.persistence.*;
import java.io.Serializable;
/**
 * 资源字典
@@ -9,7 +10,7 @@ import javax.persistence.*;
 */
@Entity
@Table(name="rs_dictionary")
public class RsDictionary {
public class RsDictionary implements Serializable {
    private int id;
    private String code;
    private String name;

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsDictionaryEntry.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.ehr.resource;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
 * 资源字典项
@@ -11,7 +12,7 @@ import javax.persistence.*;
 */
@Entity
@Table(name = "rs_dictionary_entry")
public class RsDictionaryEntry {
public class RsDictionaryEntry implements Serializable {
    private int id;
    private int dictId;
    private String dictCode;

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsDimension.java

@@ -3,13 +3,14 @@ package com.yihu.jw.entity.ehr.resource;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
 * Created by lyr on 2016/4/25.
 */
@Entity
@Table(name="rs_dimension")
public class RsDimension {
public class RsDimension implements Serializable {
    private String id;
    private String code;
    private String name;

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsDimensionCategory.java

@@ -3,13 +3,14 @@ package com.yihu.jw.entity.ehr.resource;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
 * Created by lyr on 2016/4/25.
 */
@Entity
@Table(name="rs_dimension_category")
public class RsDimensionCategory {
public class RsDimensionCategory implements Serializable {
    private String id;
    private String name;

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsInterface.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.ehr.resource;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
 * 资源接口
@@ -11,7 +12,7 @@ import javax.persistence.*;
 */
@Entity
@Table(name="rs_interface")
public class RsInterface {
public class RsInterface implements Serializable {
    private String id;
    private String name;
    private String resourceInterface;

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsMetadata.java

@@ -3,13 +3,14 @@ package com.yihu.jw.entity.ehr.resource;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
 * Created by lyr on 2016/5/16.
 */
@Entity
@Table(name="rs_metadata")
public class RsMetadata {
public class RsMetadata implements Serializable {
    private String id;
    private String domain;

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsOrgResource.java

@@ -3,13 +3,14 @@ package com.yihu.jw.entity.ehr.resource;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
 * Created by zdm on 2017/6/15
 */
@Entity
@Table(name="rs_organization_resource")
public class RsOrgResource {
public class RsOrgResource implements Serializable {
    private String id;
    private String organizationId;
    private String resourceId;

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsOrgResourceMetadata.java

@@ -3,13 +3,14 @@ package com.yihu.jw.entity.ehr.resource;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
 * Created by zdm on 2017/6/15
 */
@Entity
@Table(name="rs_organization_resource_metadata")
public class RsOrgResourceMetadata {
public class RsOrgResourceMetadata implements Serializable {
    private String id;
    private String organizationId;
    private String organizationResourceId;

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsReport.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.ehr.resource;
import org.hibernate.annotations.Formula;
import javax.persistence.*;
import java.io.Serializable;
/**
 * 资源报表 entity
@@ -12,7 +13,7 @@ import javax.persistence.*;
 */
@Entity
@Table(name = "rs_report")
public class RsReport {
public class RsReport implements Serializable {
    private Integer id; // 主键
    private String code; // 报表编码

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsReportCategory.java

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.ehr.resource;
import javax.persistence.*;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -12,7 +13,7 @@ import java.util.List;
 */
@Entity
@Table(name = "rs_report_category")
public class RsReportCategory {
public class RsReportCategory implements Serializable {
    private Integer id; // 主键
    private Integer pid; // 父级ID

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsReportMonitorType.java

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.ehr.resource;
import javax.persistence.*;
import java.io.Serializable;
/**
 * 资源报表监测类型 entity
@@ -10,7 +11,7 @@ import javax.persistence.*;
 */
@Entity
@Table(name = "rs_report_monitor_type")
public class RsReportMonitorType {
public class RsReportMonitorType implements Serializable {
    private Integer id; // 主键
    private String name; // 名称

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsReportUsers.java

@@ -3,13 +3,14 @@ package com.yihu.jw.entity.ehr.resource;
import org.hibernate.annotations.Formula;
import javax.persistence.*;
import java.io.Serializable;
/**
 * Created by wxw on 2018/7/31.
 */
@Entity
@Table(name = "rs_report_users")
public class RsReportUsers {
public class RsReportUsers implements Serializable {
    private Integer id; // 主键
    private String reportCode;  // 报表编码

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsReportView.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.ehr.resource;
import org.hibernate.annotations.Formula;
import javax.persistence.*;
import java.io.Serializable;
/**
 * 资源报表视图配置 entity
@@ -12,7 +13,7 @@ import javax.persistence.*;
 */
@Entity
@Table(name = "rs_report_view")
public class RsReportView {
public class RsReportView implements Serializable {
    private Integer id; // 主键
    private Integer reportId; // 资源报表ID

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsResourceCategory.java

@@ -1,9 +1,11 @@
package com.yihu.jw.entity.ehr.resource;
import com.yihu.jw.entity.AssignedIdentityEntity;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
 * Created by lyr on 2016/5/4.
@@ -11,24 +13,13 @@ import javax.persistence.*;
 */
@Entity
@Table(name="rs_resource_category")
public class RsResourceCategory {
public class RsResourceCategory extends AssignedIdentityEntity {
    private String id;
    private String name;
    private String pid;
    private String code;
    private String description;
    @Id
    @GeneratedValue(generator="Generator")
    @GenericGenerator(name="Generator",strategy = "assigned")
    @Column(name="id",nullable = false,unique = true)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(name="name",nullable = false)
    public String getName() {

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsResourceDefaultParam.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.ehr.resource;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
 * 资源字典
@@ -11,7 +12,7 @@ import javax.persistence.*;
 */
@Entity
@Table(name="rs_resource_default_params")
public class RsResourceDefaultParam {
public class RsResourceDefaultParam implements Serializable {
    private String id;
    private String resourcesId;

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsResourceMetadata.java

@@ -3,13 +3,14 @@ package com.yihu.jw.entity.ehr.resource;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
 * Created by lyr on 2016/4/25.
 */
@Entity
@Table(name="rs_resource_metadata")
public class RsResourceMetadata {
public class RsResourceMetadata implements Serializable {
    private String id;
    private String resourcesId;
    private String metadataId;

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsResourceQuota.java

@@ -1,14 +1,16 @@
package com.yihu.jw.entity.ehr.resource;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
 * Created by Administrator on 2017/8/10.
 */
@Entity
@Table(name="rs_resource_quota")
public class RsResourceQuota {
public class RsResourceQuota implements Serializable {
    private int id;
    private String resourceId;
    private String quotaTypeName;
@@ -18,6 +20,7 @@ public class RsResourceQuota {
    private Integer pid;
    private List<RsResourceQuota> children;
    private List<Map<String, Object>> mapList;
    @Id
    @GeneratedValue(strategy = GenerationType.AUTO)
@@ -92,4 +95,13 @@ public class RsResourceQuota {
    public void setChildren(List<RsResourceQuota> children) {
        this.children = children;
    }
    @Transient
    public List<Map<String, Object>> getMapList() {
        return mapList;
    }
    public void setMapList(List<Map<String, Object>> mapList) {
        this.mapList = mapList;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsRolesResource.java

@@ -3,13 +3,14 @@ package com.yihu.jw.entity.ehr.resource;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
 * Created by zdm on 2017/6/15
 */
@Entity
@Table(name="rs_roles_resource")
public class RsRolesResource {
public class RsRolesResource implements Serializable {
    private String id;
    private String rolesId;
    private String resourceId;

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsRolesResourceMetadata.java

@@ -3,13 +3,14 @@ package com.yihu.jw.entity.ehr.resource;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
 * Created by zdm on 2017/6/15
 */
@Entity
@Table(name="rs_roles_resource_metadata")
public class RsRolesResourceMetadata {
public class RsRolesResourceMetadata implements Serializable {
    private String id;
    private String rolesId;
    private String rolesResourceId;

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsSystemDictionary.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.ehr.resource;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
 * 资源系统字典
@@ -11,7 +12,7 @@ import javax.persistence.*;
 */
@Entity
@Table(name="rs_system_dictionary")
public class RsSystemDictionary {
public class RsSystemDictionary implements Serializable {
    private String id;
    private String code;
    private String name;

common/common-entity/src/main/java/com/yihu/jw/entity/ehr/resource/RsSystemDictionaryEntry.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.ehr.resource;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
/**
 * 资源系统字典项
@@ -11,7 +12,7 @@ import javax.persistence.*;
 */
@Entity
@Table(name="rs_system_dictionary_entry")
public class RsSystemDictionaryEntry {
public class RsSystemDictionaryEntry implements Serializable {
    private String id;
    private String dictCode;
    private String code;

common/common-request-mapping/src/main/java/com/yihu/jw/rm/svrBasic/AgAdminConstants.java

@@ -1,11 +0,0 @@
package com.yihu.jw.rm.svrBasic;
/**
 * Created by AndyCai on 2016/2/22.
 */
public class AgAdminConstants {
    public static final String ResourceCount = "X-Total-Count";
    public static final String DefaultPassword="12345678";
    public static final String DateTimeFormat="yyyy-MM-dd HH:mm:ss";
    public static final String DateFormat="yyyy-MM-dd";
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/svrBasic/Channel.java

@@ -1,10 +0,0 @@
package com.yihu.jw.rm.svrBasic;
/**
 * @author Sand
 * @version 1.0
 * @created 2016.03.31 16:41
 */
public class Channel {
    public static final String PackageResolve = "channel_pack_resolve";
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/svrBasic/ErrorCode.java

@@ -1,116 +0,0 @@
package com.yihu.jw.rm.svrBasic;
/**
 *
 * @author Sand
 * @version 1.0
 * @created 2015.08.10 17:49
 */
public enum ErrorCode {
    // new version code
    // --------------------- standard ---------------------
    CONTINUE(100, "Continue"),
    SWITCHING_PROTOCOLS(101, "Switching Protocols"),
    PROCESSING(102, "Processing"),
    CHECKPOINT(103, "Checkpoint"),
    OK(200, "OK"),
    CREATED(201, "Created"),
    ACCEPTED(202, "Accepted"),
    NON_AUTHORITATIVE_INFORMATION(203, "Non-Authoritative Information"),
    NO_CONTENT(204, "No Content"),
    RESET_CONTENT(205, "Reset Content"),
    PARTIAL_CONTENT(206, "Partial Content"),
    MULTI_STATUS(207, "Multi-Status"),
    ALREADY_REPORTED(208, "Already Reported"),
    IM_USED(226, "IM Used"),
    MULTIPLE_CHOICES(300, "Multiple Choices"),
    MOVED_PERMANENTLY(301, "Moved Permanently"),
    FOUND(302, "Found"),
    /** @deprecated */
    @Deprecated
    MOVED_TEMPORARILY(302, "Moved Temporarily"),
    SEE_OTHER(303, "See Other"),
    NOT_MODIFIED(304, "Not Modified"),
    /** @deprecated */
    @Deprecated
    USE_PROXY(305, "Use Proxy"),
    TEMPORARY_REDIRECT(307, "Temporary Redirect"),
    PERMANENT_REDIRECT(308, "Permanent Redirect"),
    BAD_REQUEST(400, "Bad Request"),
    UNAUTHORIZED(401, "Unauthorized"),
    PAYMENT_REQUIRED(402, "Payment Required"),
    FORBIDDEN(403, "Forbidden"),
    NOT_FOUND(404, "Not Found"),
    METHOD_NOT_ALLOWED(405, "Method Not Allowed"),
    NOT_ACCEPTABLE(406, "Not Acceptable"),
    PROXY_AUTHENTICATION_REQUIRED(407, "Proxy Authentication Required"),
    REQUEST_TIMEOUT(408, "Request Timeout"),
    CONFLICT(409, "Conflict"),
    GONE(410, "Gone"),
    LENGTH_REQUIRED(411, "Length Required"),
    PRECONDITION_FAILED(412, "Precondition Failed"),
    PAYLOAD_TOO_LARGE(413, "Payload Too Large"),
    /** @deprecated */
    @Deprecated
    REQUEST_ENTITY_TOO_LARGE(413, "Request Entity Too Large"),
    URI_TOO_LONG(414, "URI Too Long"),
    /** @deprecated */
    @Deprecated
    REQUEST_URI_TOO_LONG(414, "Request-URI Too Long"),
    UNSUPPORTED_MEDIA_TYPE(415, "Unsupported Media Type"),
    REQUESTED_RANGE_NOT_SATISFIABLE(416, "Requested range not satisfiable"),
    EXPECTATION_FAILED(417, "Expectation Failed"),
    I_AM_A_TEAPOT(418, "I'm a teapot"),
    /** @deprecated */
    @Deprecated
    INSUFFICIENT_SPACE_ON_RESOURCE(419, "Insufficient Space On Resource"),
    /** @deprecated */
    @Deprecated
    METHOD_FAILURE(420, "Method Failure"),
    /** @deprecated */
    @Deprecated
    DESTINATION_LOCKED(421, "Destination Locked"),
    UNPROCESSABLE_ENTITY(422, "Unprocessable Entity"),
    LOCKED(423, "Locked"),
    FAILED_DEPENDENCY(424, "Failed Dependency"),
    UPGRADE_REQUIRED(426, "Upgrade Required"),
    PRECONDITION_REQUIRED(428, "Precondition Required"),
    TOO_MANY_REQUESTS(429, "Too Many Requests"),
    REQUEST_HEADER_FIELDS_TOO_LARGE(431, "Request Header Fields Too Large"),
    UNAVAILABLE_FOR_LEGAL_REASONS(451, "Unavailable For Legal Reasons"),
    INTERNAL_SERVER_ERROR(500, "Internal Server Error"),
    NOT_IMPLEMENTED(501, "Not Implemented"),
    BAD_GATEWAY(502, "Bad Gateway"),
    SERVICE_UNAVAILABLE(503, "Service Unavailable"),
    GATEWAY_TIMEOUT(504, "Gateway Timeout"),
    HTTP_VERSION_NOT_SUPPORTED(505, "HTTP Version not supported"),
    VARIANT_ALSO_NEGOTIATES(506, "Variant Also Negotiates"),
    INSUFFICIENT_STORAGE(507, "Insufficient Storage"),
    LOOP_DETECTED(508, "Loop Detected"),
    BANDWIDTH_LIMIT_EXCEEDED(509, "Bandwidth Limit Exceeded"),
    NOT_EXTENDED(510, "Not Extended"),
    NETWORK_AUTHENTICATION_REQUIRED(511, "Network Authentication Required"),
    // --------------------- ehr ---------------------
    REQUEST_NOT_COMPLETED(-1, "Request Not Completed"), //默认错误码，请求未完成
    MISSING_USER_AGENT(-2, "Missing User Agent"),
    RATE_LIMIT_EXCEEDING(-3, "Rate Limit Exceeding"),
    OBJECT_NOT_FOUND(-4, "Object Not Found");
    private final int value;
    private final String reasonPhrase;
    ErrorCode (int value, String reasonPhrase) {
        this.value = value;
        this.reasonPhrase = reasonPhrase;
    }
    public int value() {
        return this.value;
    }
    public String getReasonPhrase() {
        return this.reasonPhrase;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/svrBasic/HBConstants.java

@@ -1,11 +0,0 @@
package com.yihu.jw.rm.svrBasic;
public class HBConstants {
	final static public String T_HFILES = "H_Files";
	final static public String T_HeathArchive = "H_HeathArchive";
	 /*通用列族 */
    public static final String FamilyBasic = "basic";
    public static final String FamilyExtension = "extension";
    /* 数据集表特有列族 */
    public static final String FamilyMetaData = "meta_data";
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/svrBasic/HttpHeader.java

@@ -1,14 +0,0 @@
package com.yihu.jw.rm.svrBasic;
/**
 * Created by Sand Wen on 2016.2.27.
 */
public class HttpHeader {
    public static final String RATE_LIMIT_LIMIT = "X-RateLimit-Limit";
    public static final String RATE_LIMIT_REMAINING = "X-RateLimit-Remaining";
    public static final String RATE_LIMIT_RESET = "X-RateLimit-Reset";
    public static final String TOTAL_COUNT = "X-Total-Count";
    public static final String AUTHORIZATION = "Authorization";
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/svrBasic/LisEntry.java

@@ -1,26 +0,0 @@
package com.yihu.jw.rm.svrBasic;
/**
 * 检验名称枚举列表（用于赛诺菲接口）
 *
 * @author linaz
 * @created 2016.06.28 14:23
 */
public class LisEntry {
//    PRO,    尿蛋白质
//    CREA,   肌酐
//    GLU,    葡萄糖
//    TCHO,   总胆固醇
//    HDL-C,  高密脂蛋白胆固醇
//    TG,     甘油三酯
//    K,      钾
//    HbAc1,  糖化血红蛋白
//    GLU(2h),葡萄糖2h
//    cTnI,   肌钙蛋白Ⅰ
//    PRO,    尿蛋白质
//    UTP;    24小时尿蛋白
    public static final String[] ENTRY_NAME = {"PRO", "CREA", "GLU", "TCHO", "HDL-C", "TG", "K", "HbAc1", "GLU(2h)", "cTnI", "PRO", "UTP"};
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/svrBasic/MicroServices.java

@@ -1,65 +0,0 @@
package com.yihu.jw.rm.svrBasic;
/**
 * 全局微服务名称枚举。用于Feign及Thrift客户端。
 *
 * @author Sand
 * @version 1.0
 * @created 2016.01.11 8:54
 */
public class MicroServices {
    public static final String Configuration = "svr-configuration";
    //以下几个微服务聚合svr-basic
    public static final String Basic = "svr-basic";
    public static final String Application = "svr-basic";
    public static final String Geography = "svr-basic";
    public static final String Patient = "svr-basic";
    public static final String Portal = "svr-basic";
    public static final String Security = "svr-basic";
    public static final String User = "svr-basic";
    public static final String Family = "svr-basic";
    public static final String FileResource = "svr-basic";
    public static final String Dictionary = "svr-basic";
    public static final String EsbDictionary = "hos-admin";
    public static final String Organization = "svr-basic";
    //以下几个微服务聚合svr-standard
    public static final String Adaption = "svr-standard";
    public static final String Standard = "hos-admin";
    public static final String StandardSource = "svr-standard";
    public static final String SpecialDict = "hos-admin";
    public static final String Resource = "svr-resource";
    public static final String ESB = "svr-esb";
    public static final String HealthProfile = "svr-health-profile";
    public static final String PackageResolve = "svr-pack-resolve";
    public static final String Package = "svr-pack-mgr";
    public static final String Authentication = "svr-authentication";
    public static final String Redis = "svr-redis";
    public static final String StdRedis = "hos-admin";
    public static final String Quota = "svr-quota";
    public static final String Dfs = "svr-dfs";
    public static final String Cipher = "svr-cipher";
    public static final String ArchiveSecurity = "svr-archive-security";
    public static final String Statistics = "svr-protal-statistics";
    public static final String Discovery = "svr-discovery";
    public static final String LogCollection = "svr-logCollection";
    public static final String Analyzer = "svr-pack-analyzer";
    public static final String FzGateway = "ag-admin";
    public static final String AgZuul = "ag-zuul";
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/svrBasic/PageArg.java

@@ -1,14 +0,0 @@
package com.yihu.jw.rm.svrBasic;
/**
 * @author Sand
 * @version 1.0
 * @created 2016.02.14 17:47
 */
public class PageArg {
    public static final Integer DefaultPage = 1;
    public static final Integer DefaultSize = 30;
    public static final String DefaultPageS = "1";
    public static final String DefaultSizeS = "30";
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/svrBasic/SessionAttributeKeys.java

@@ -1,12 +0,0 @@
package com.yihu.jw.rm.svrBasic;
/**
 * Spring MVC 的Web会话常用会话属性常量。
 *
 * @author Sand
 * @version 1.0
 * @created 2015.11.07 16:29
 */
public class SessionAttributeKeys {
    public final static String CurrentUser = "current_user";
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/svrBasic/SystemDictId.java

@@ -1,50 +0,0 @@
package com.yihu.jw.rm.svrBasic;
/**
 * 通用字典ID。
 *
 * @author Sand
 * @version 1.0
 * @created 2015.07.29 14:38
 */
public class SystemDictId {
/*    public final static long Nation = 1;                         // 民族字典
    public final static long Gender = 2;                         // 性别字典
    public final static long Country = 3;                       // 国家字典
    public final static long MartialStatus = 4;                 // 婚姻状态字典
    public final static long FamilyMemberRelation = 5;          // 家庭关系
    public final static long ResidenceType = 6;                // 户口类型
    public final static long OrganizationType = 7;             // 组织机构类型
    public final static long OrganizationSettledWay = 8;       // 机构接入平台方式
    public final static long CardStatus = 9;                          // 卡状态
    public final static long CardType = 10;                      // 卡类型
    public final static long RSAKeyType = 11;                       // 公私钥类型
    public final static long UserType = 12;                      // 用户类型
    public final static long UserRole = 13;                      // 用户角色*/
    public final static long AppStatus = 1;                                 // app状态
    public final static long AppCatalog = 2;                             // app类型
    public final static long Gender = 3;                                    // 用户性别
    public final static long MartialStatus = 4;                       // 婚姻状况
    public final static long Nation = 5;                                    // 民族
    public final static long ResidenceType = 6;                  // 户口类型
    public final static long OrgType = 7;                               // 机构类型
    public final static long SettledWay = 8;                        // 结算方式
    public final static long CardStatus = 9;                          // 卡状态
    public final static long CardType = 10;                         // 卡类型
    public final static long RequestState = 11;                       // 请求状态
    public final static long KeyType = 12;                              // 用户区分
    public final static long MedicalRole = 13;                      // 医疗角色
    public final static long UserRole = 14;                         // 用户角色
    public final static long UserType = 15;                         // 用户类别
    public final static long FamilyMemberRelation = 16;                      // 家庭成员关系
    public final static long tags = 17;                                     // 标签
    public final static long yesNo = 18;                                 // 是否
    public final static long hosTableList = 19;                    // 集成开放平台数据收集表
    public final static long loginAddress = 20;                    // 登入地址API Id
    public final static String AddressAPI = "baidu_APIStore_API";       //登入地址API
    public final static String Apikey = "baidu_apikey";                                 //登入地址apikey
    public final static int RsReportStatus = 92; // 资源报表状态
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/svrBasic/UrlScope.java

@@ -1,33 +0,0 @@
package com.yihu.jw.rm.svrBasic;
/**
 * @author linaz
 * @created 2016.06.03 15:57
 */
public enum UrlScope {
    Public(0),              // fastdfs
    Private(1);             // http
    private int url;
    UrlScope(int url) {    //    必须是private的，否则编译错误
        this.url = url;
    }
    public static UrlScope valueOf(int url) {
        switch (url) {
            case 0:
                return Public;
            case 1:
                return Private;
            default:
                return null;
        }
    }
    public int value() {
        return this.url;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/ehr/quota/EsConfig.java

@@ -0,0 +1,326 @@
package com.yihu.jw.restmodel.ehr.quota;
/**
 * Created by chenweida on 2017/6/2.
 */
public class EsConfig {
    private String host;//地址
    private Integer port;//端口
    private String index;// 索引 es相当与数据库
    private String type;// 类型 es 相当于表
    private String clusterName;//es clusterName
    private String table;// 数据库表
    private String fullQuery;  //全量查询
    private String filter;  // where条件
    private String timekey;//根据sql去查询的key 时间控制字段
    private String aggregation;// 聚合方式，默认count：计数；sum：求和；list：查询；distinct：去重查询；
    private String aggregationKey;//聚合字段
    private String especialType; //特殊类型  orgHealthCategory：卫生机构类型
    private String superiorBaseQuotaCode;  // 上级基础指标code
    private String dateComparisonType;      //时间对比类型  lastYear 去年 lastMonth 上个月 lastWeek 上个星期 lastDay 昨天
    // solr去重查询
    private String distinctGroupField; // 分组去重字段
    private String distinctGroupSort; // 去重组内排序，如：“event_date asc”。
    private Boolean distinctGroupNullIsolate; // 去重组内，空值记录是保存第一条，还是每条记录单独保存，true：拆分保存，false：保存第一条，默认合并保存。
    //除法运算
    private String molecular;  // 统计除法的分子  指标code
    private String molecularFilter;  // 除法的分子过滤条件
    private String denominator;// 统计除法的分母  指标code
    private String denominatorFilter;// 除法的分母过滤条件
    private String percentOperation;//运算方式  1 乘法  2 除法
    private String percentOperationValue;//运算对应的值
    private String divisionType; //除法运算类型 1 分子分母各维度对应相除 默认 2 分子按维度 /分母按年份获取总数 如：技术人员每千人口 = 技术人员数/对应区县总人口数*1000
    //加法运算
    private String addOperation;//加法运算方式  1 加法 默认 2 减法
    private String addFirstQuotaCode;//加法第一个指标
    private String addFirstFilter;//加法第一个指标过滤条件
    private String addSecondQuotaCode;//加法第二个指标
    private String addSecondFilter;//加法第二个指标过滤条件
    private String growthFlag;  // 增幅标志  1 year  2 month 3 quarter
    private String incrementFlag;   // 环比  1 上月  2 本月
    //已停止使用
    private String thousandFlag; //每千，每万 1000,10000
    private String thousandDmolecular; //每千，每万 统计分子
    private String thousandDenominator; //每千，每万 统计分母
    public String getSuperiorBaseQuotaCode() {
        return superiorBaseQuotaCode;
    }
    public void setSuperiorBaseQuotaCode(String superiorBaseQuotaCode) {
        this.superiorBaseQuotaCode = superiorBaseQuotaCode;
    }
    public String getHost() {
        return host;
    }
    public void setHost(String host) {
        this.host = host;
    }
    public String getIndex() {
        return index;
    }
    public void setIndex(String index) {
        this.index = index;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    public String getTimekey() {
        return timekey;
    }
    public void setTimekey(String timekey) {
        this.timekey = timekey;
    }
    public Integer getPort() {
        return port;
    }
    public void setPort(Integer port) {
        this.port = port;
    }
    public String getClusterName() {
        return clusterName;
    }
    public void setClusterName(String clusterName) {
        this.clusterName = clusterName;
    }
    public String getTable() {
        return table;
    }
    public void setTable(String table) {
        this.table = table;
    }
    public String getMolecular() {
        return molecular;
    }
    public void setMolecular(String molecular) {
        this.molecular = molecular;
    }
    public String getDenominator() {
        return denominator;
    }
    public void setDenominator(String denominator) {
        this.denominator = denominator;
    }
    public String getFilter() {
        return filter;
    }
    public void setFilter(String filter) {
        this.filter = filter;
    }
    public String getAggregation() {
        return aggregation;
    }
    public void setAggregation(String aggregation) {
        this.aggregation = aggregation;
    }
    public String getAggregationKey() {
        return aggregationKey;
    }
    public void setAggregationKey(String aggregationKey) {
        this.aggregationKey = aggregationKey;
    }
    public String getThousandFlag() {
        return thousandFlag;
    }
    public void setThousandFlag(String thousandFlag) {
        this.thousandFlag = thousandFlag;
    }
    public String getThousandDmolecular() {
        return thousandDmolecular;
    }
    public void setThousandDmolecular(String thousandDmolecular) {
        this.thousandDmolecular = thousandDmolecular;
    }
    public String getThousandDenominator() {
        return thousandDenominator;
    }
    public void setThousandDenominator(String thousandDenominator) {
        this.thousandDenominator = thousandDenominator;
    }
    public String getEspecialType() {
        return especialType;
    }
    public void setEspecialType(String especialType) {
        this.especialType = especialType;
    }
    public String getPercentOperation() {
        return percentOperation;
    }
    public void setPercentOperation(String percentOperation) {
        this.percentOperation = percentOperation;
    }
    public String getPercentOperationValue() {
        return percentOperationValue;
    }
    public void setPercentOperationValue(String percentOperationValue) {
        this.percentOperationValue = percentOperationValue;
    }
    public String getMolecularFilter() {
        return molecularFilter;
    }
    public void setMolecularFilter(String molecularFilter) {
        this.molecularFilter = molecularFilter;
    }
    public String getDenominatorFilter() {
        return denominatorFilter;
    }
    public void setDenominatorFilter(String denominatorFilter) {
        this.denominatorFilter = denominatorFilter;
    }
    public String getFullQuery() {
        return fullQuery;
    }
    public void setFullQuery(String fullQuery) {
        this.fullQuery = fullQuery;
    }
    public String getAddOperation() {
        return addOperation;
    }
    public void setAddOperation(String addOperation) {
        this.addOperation = addOperation;
    }
    public String getAddFirstQuotaCode() {
        return addFirstQuotaCode;
    }
    public void setAddFirstQuotaCode(String addFirstQuotaCode) {
        this.addFirstQuotaCode = addFirstQuotaCode;
    }
    public String getAddFirstFilter() {
        return addFirstFilter;
    }
    public void setAddFirstFilter(String addFirstFilter) {
        this.addFirstFilter = addFirstFilter;
    }
    public String getAddSecondQuotaCode() {
        return addSecondQuotaCode;
    }
    public void setAddSecondQuotaCode(String addSecondQuotaCode) {
        this.addSecondQuotaCode = addSecondQuotaCode;
    }
    public String getAddSecondFilter() {
        return addSecondFilter;
    }
    public void setAddSecondFilter(String addSecondFilter) {
        this.addSecondFilter = addSecondFilter;
    }
    public String getGrowthFlag() {
        return growthFlag;
    }
    public void setGrowthFlag(String growthFlag) {
        this.growthFlag = growthFlag;
    }
    public String getIncrementFlag() {
        return incrementFlag;
    }
    public void setIncrementFlag(String incrementFlag) {
        this.incrementFlag = incrementFlag;
    }
    public String getDivisionType() {
        return divisionType;
    }
    public void setDivisionType(String divisionType) {
        this.divisionType = divisionType;
    }
    public String getDateComparisonType() {
        return dateComparisonType;
    }
    public void setDateComparisonType(String dateComparisonType) {
        this.dateComparisonType = dateComparisonType;
    }
    public String getDistinctGroupField() {
        return distinctGroupField;
    }
    public void setDistinctGroupField(String distinctGroupField) {
        this.distinctGroupField = distinctGroupField;
    }
    public String getDistinctGroupSort() {
        return distinctGroupSort;
    }
    public void setDistinctGroupSort(String distinctGroupSort) {
        this.distinctGroupSort = distinctGroupSort;
    }
    public Boolean getDistinctGroupNullIsolate() {
        return distinctGroupNullIsolate;
    }
    public void setDistinctGroupNullIsolate(Boolean distinctGroupNullIsolate) {
        this.distinctGroupNullIsolate = distinctGroupNullIsolate;
    }
}

common/common-util/src/main/java/com/yihu/jw/util/date/DateUtil.java

@@ -6,6 +6,7 @@ import org.springframework.util.StringUtils;
import java.math.BigDecimal;
import java.sql.Time;
import java.sql.Timestamp;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.*;
import java.time.format.DateTimeFormatter;
@@ -25,6 +26,26 @@ import java.util.concurrent.TimeUnit;
 */
public class DateUtil {
    public static final String DEFAULT_DATE_YEAR_FORMAT = "yyyy";
    public static final String DEFAULT_DATE_MONTH_FORMAT = "MM";
    public static final String PRINT_DATE_YM_FORMAT = "MMM., yyyy";
    public static final String PRINT_DATE_YMD_FORMAT = "MMM. d, yyyy";
    public static final String DEFAULT_YEARS = "0.0";
    public static final String DEFAULT_DATE_YMD_FORMAT = "yyyy-MM-dd";
    public static final String DEFAULT_DATE_YM_FORMAT = "yyyyMM";
    public static final String DEFAULT_DATE_MD_FORMAT = "MMdd";
    public static final String DEFAULT_CHAR_DATE_YMD_FORMAT = "yyyyMMdd";
    public static final String DEFAULT_TIMESTAMP_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
    public static final String DEFAULT_SIMPLEDATE_FORMAT = "yyyy-MM-dd HH:mm:ss SSS";
    public static final String DEFAULT_YMDHMSDATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
    public static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
    public static final String DEFAULT_NOW_STRING_FORMAT = "yyyyMMddHHmmssSSS";
    public static final String DATE_MDY_FORMAT = "MMddyyyy";
    public static final String DATE_MY_FORMAT = "MMyyyy";
    public static final String utcDateTimePattern = "yyyy-MM-dd'T'HH:mm:ss'Z'";
    public static final String utcDateTimePatternTZ = " yyyy-MM-dd'T'HH:mm:ssZZZ";
    public static final String DATE_WORLD_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
    public static final String HH_MM = "HH:mm";
    public static final String HH_MM_SS = "HH:mm:ss";
    public static final String YY = "yy";
@@ -100,6 +121,36 @@ public class DateUtil {
        return Date.from(instant);
    }
    public static String getYearFromYMD(Date ymd) {
        return getYearFromYMD(toString(ymd));
    }
    public static String getYearFromYMD(String ymd) {
        return ymd != null && ymd.length() == "yyyy-MM-dd".length() ? ymd.substring(0, 4) : null;
    }
    public static String utcToDate(String utcTime, String format) {
        SimpleDateFormat utcSdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
        SimpleDateFormat newSdf = new SimpleDateFormat(format);
        String date = null;
        try {
            if (!org.apache.commons.lang3.StringUtils.isEmpty(utcTime)) {
                date = newSdf.format(utcSdf.parse(utcTime));
            }
        } catch (ParseException var6) {
            var6.printStackTrace();
        }
        return date;
    }
    public static String utcToDate(Date date) {
        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
        String utcDate = sdf1.format(date);
        return utcDate;
    }
    /**
     * 字符串转时间格式
     */