代码修改

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

@@ -1,24 +1,26 @@
package com.yihu.jw.entity.ehr.quota;
import java.util.Date;
import javax.persistence.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IdEntity;
import static javax.persistence.GenerationType.IDENTITY;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
/**
 * TjDataSource entity. @author MyEclipse Persistence Tools
 * Created by Administrator on 2017/6/8.
 */
@Entity
@Table(name = "tj_data_source")
public class TjDataSource implements java.io.Serializable {
@Access(value = AccessType.PROPERTY)
public class TjDataSource extends IdEntity {
    public static String type_es ="1";
    public static String type_solr ="2";
    public static String type_mysql ="3";
    // Fields
    private Integer id;
    private String code;
    private String type;// 1:mysql数据库 2:redis 3 接口
    private String type;
    private String name;
    private Date createTime;
    private String createUser;
@@ -26,148 +28,107 @@ public class TjDataSource implements java.io.Serializable {
    private Date updateTime;
    private String updateUser;
    private String updateUserName;
    private String status;//1: 正常 0：不可用  -1删除
    private Integer status;
    private String remark;
    // Constructors
    /** default constructor */
    public TjDataSource() {
    }
    /** minimal constructor */
    public TjDataSource(Date createTime, Date updateTime) {
        this.createTime = createTime;
        this.updateTime = updateTime;
    }
    /** full constructor */
    public TjDataSource(String code, String type, String name,
                        Date createTime, String createUser, String createUserName,
                        Date updateTime, String updateUser, String updateUserName,
                        String status, String remark) {
        this.code = code;
        this.type = type;
        this.name = name;
        this.createTime = createTime;
        this.createUser = createUser;
        this.createUserName = createUserName;
        this.updateTime = updateTime;
        this.updateUser = updateUser;
        this.updateUserName = updateUserName;
        this.status = status;
        this.remark = remark;
    }
    // Property accessors
    @Id
    @GeneratedValue(strategy = IDENTITY)
    @Column(name = "id", unique = true, nullable = false)
    public Integer getId() {
        return this.id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    @Column(name = "code", length = 100)
    @Column(name = "code", nullable = true)
    public String getCode() {
        return this.code;
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name = "type", length = 2)
    @Column(name = "type", nullable = true)
    public String getType() {
        return this.type;
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    @Column(name = "name", length = 200)
    @Column(name = "name", nullable = true)
    public String getName() {
        return this.name;
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Temporal(TemporalType.TIMESTAMP)
    @Column(name = "create_time", nullable = false, length = 0)
    @Column(name = "create_time", nullable = false)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateTime() {
        return this.createTime;
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @Column(name = "create_user", length = 100)
    @Column(name = "create_user", nullable = true)
    public String getCreateUser() {
        return this.createUser;
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    @Column(name = "create_user_name", length = 50)
    @Column(name = "create_user_name", nullable = true)
    public String getCreateUserName() {
        return this.createUserName;
        return createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
    @Temporal(TemporalType.TIMESTAMP)
    @Column(name = "update_time", nullable = false, length = 0)
    @Column(name = "update_time", nullable = false)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getUpdateTime() {
        return this.updateTime;
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    @Column(name = "update_user", length = 100)
    @Column(name = "update_user", nullable = true)
    public String getUpdateUser() {
        return this.updateUser;
        return updateUser;
    }
    public void setUpdateUser(String updateUser) {
        this.updateUser = updateUser;
    }
    @Column(name = "update_user_name", length = 50)
    @Column(name = "update_user_name", nullable = true)
    public String getUpdateUserName() {
        return this.updateUserName;
        return updateUserName;
    }
    public void setUpdateUserName(String updateUserName) {
        this.updateUserName = updateUserName;
    }
    @Column(name = "status", length = 1)
    public String getStatus() {
        return this.status;
    @Column(name = "status", nullable = true)
    public Integer getStatus() {
        return status;
    }
    public void setStatus(String status) {
    public void setStatus(Integer status) {
        this.status = status;
    }
    @Column(name = "remark", length = 1500)
    @Column(name = "remark", nullable = true)
    public String getRemark() {
        return this.remark;
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
}
}

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

@@ -1,216 +1,213 @@
package com.yihu.jw.entity.ehr.quota;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
import static javax.persistence.GenerationType.IDENTITY;
import java.util.List;
/**
 * TjQuota entity. @author MyEclipse Persistence Tools
 * Created by Administrator on 2017/6/9.
 */
@Entity
@Table(name = "tj_quota")
public class TjQuota implements java.io.Serializable {
    // Fields
@Table(name = "tj_quota", schema = "", catalog = "healtharchive")
public class TjQuota extends IdEntity {
    private Integer id;
    private String code;
    private String name;
    private String cron;//quartz时间表达式
    private String cron;
    private String execType;
    private String jobClazz; //类class
    private String dataLevel;//1 全量  2增量
    private Date execTime;
    private String jobClazz;
    private Date createTime;
    private String createUser;
    private String createUserName;
    private Date updateTime;
    private String updateUser;
    private String updateUserName;
    private String status;//1: 正常 0：不可用  -1删除
    private Integer status;
    private Integer dataLevel;
    private String remark;
    private Integer quotaType;
    private String metadataCode;
    private String isInitExec; // 是否初始执行过，0：否，1：是。
    private String resultGetType; // 指标结果获取方式 1：直接库中获取，2：二次统计获取。
    //周期指标执行状态：0未开启，1执行中
    private String jobStatus;
    // Constructors
    /** default constructor */
    public TjQuota() {
    }
    private TjQuotaDataSource tjQuotaDataSourceModel;
    private TjQuotaDataSave tjQuotaDataSaveModel;
    /** minimal constructor */
    public TjQuota(Date createTime, Date updateTime) {
        this.createTime = createTime;
        this.updateTime = updateTime;
    private List<TjQuota> children;
    @Column(name = "code")
    public String getCode() {
        return code;
    }
    /** full constructor */
    public TjQuota(String code, String name, String jobClazz,
                   Date createTime, String createUser, String createUserName,
                   Date updateTime, String updateUser, String updateUserName,
                   String status, String remark,String dataLevel ,String cron ,String execType, String jobStatus) {
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
        this.jobClazz = jobClazz;
        this.createTime = createTime;
        this.createUser = createUser;
        this.createUserName = createUserName;
        this.updateTime = updateTime;
        this.updateUser = updateUser;
        this.updateUserName = updateUserName;
        this.status = status;
        this.jobStatus = jobStatus;
        this.remark = remark;
        this.dataLevel = dataLevel;
        this.cron = cron;
        this.execType = execType;
    }
    // Property accessors
    @Id
    @GeneratedValue(strategy = IDENTITY)
    @Column(name = "id", unique = true, nullable = false)
    public Integer getId() {
        return this.id;
    @Column(name = "cron")
    public String getCron() {
        return cron;
    }
    public void setId(Integer id) {
        this.id = id;
    public void setCron(String cron) {
        this.cron = cron;
    }
    @Column(name = "code", length = 100)
    public String getCode() {
        return this.code;
    @Column(name = "exec_type")
    public String getExecType() {
        return execType;
    }
    public void setCode(String code) {
        this.code = code;
    public void setExecType(String execType) {
        this.execType = execType;
    }
    @Column(name = "name", length = 200)
    public String getName() {
        return this.name;
    @Column(name = "exec_time", nullable = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getExecTime() {
        return execTime;
    }
    public void setName(String name) {
        this.name = name;
    public void setExecTime(Date execTime) {
        this.execTime = execTime;
    }
    @Column(name = "job_clazz", length = 500)
    @Column(name = "job_clazz")
    public String getJobClazz() {
        return this.jobClazz;
        return jobClazz;
    }
    public void setJobClazz(String jobClazz) {
        this.jobClazz = jobClazz;
    }
    @Temporal(TemporalType.TIMESTAMP)
    @Column(name = "create_time", nullable = false, length = 0)
    @Column(name = "create_time", nullable = false)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getCreateTime() {
        return this.createTime;
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @Column(name = "create_user", length = 100)
    @Column(name = "create_user")
    public String getCreateUser() {
        return this.createUser;
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    @Column(name = "create_user_name", length = 50)
    @Column(name = "create_user_name")
    public String getCreateUserName() {
        return this.createUserName;
        return createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
    @Temporal(TemporalType.TIMESTAMP)
    @Column(name = "update_time", nullable = false, length = 0)
    @Column(name = "update_time", nullable = false)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getUpdateTime() {
        return this.updateTime;
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    @Column(name = "update_user", length = 100)
    @Column(name = "update_user")
    public String getUpdateUser() {
        return this.updateUser;
        return updateUser;
    }
    public void setUpdateUser(String updateUser) {
        this.updateUser = updateUser;
    }
    @Column(name = "update_user_name", length = 50)
    @Column(name = "update_user_name")
    public String getUpdateUserName() {
        return this.updateUserName;
        return updateUserName;
    }
    public void setUpdateUserName(String updateUserName) {
        this.updateUserName = updateUserName;
    }
    @Column(name = "status", length = 1)
    public String getStatus() {
        return this.status;
    @Column(name = "status")
    public Integer getStatus() {
        return status;
    }
    public void setStatus(String status) {
    public void setStatus(Integer status) {
        this.status = status;
    }
    @Column(name = "remark", length = 1500)
    public String getRemark() {
        return this.remark;
    @Column(name = "data_level")
    public Integer getDataLevel() {
        return dataLevel;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    public void setDataLevel(Integer dataLevel) {
        this.dataLevel = dataLevel;
    }
    @Column(name = "cron", length = 100)
    public String getCron() {
        return cron;
    @Column(name = "quota_type")
    public Integer getQuotaType() {
        return quotaType;
    }
    public void setCron(String cron) {
        this.cron = cron;
    public void setQuotaType(Integer quotaType) {
        this.quotaType = quotaType;
    }
    @Column(name = "data_level", length = 2)
    public String getDataLevel() {
        return dataLevel;
    @Column(name = "remark")
    public String getRemark() {
        return remark;
    }
    public void setDataLevel(String dataLevel) {
        this.dataLevel = dataLevel;
    public void setRemark(String remark) {
        this.remark = remark;
    }
    @Column(name = "exec_type", length = 1)
    public String getExecType() {
        return execType;
    @Column(name = "metadata_code")
    public String getMetadataCode() {
        return metadataCode;
    }
    public void setExecType(String execType) {
        this.execType = execType;
    public void setMetadataCode(String metadataCode) {
        this.metadataCode = metadataCode;
    }
    @Column(name = "is_init_exec", nullable = false)
    public String getIsInitExec() {
        return isInitExec;
    }
    @Column(name = "result_get_type", length = 2)
    public void setIsInitExec(String isInitExec) {
        this.isInitExec = isInitExec;
    }
    @Column(name = "result_get_type")
    public String getResultGetType() {
        return resultGetType;
    }
@@ -218,6 +215,15 @@ public class TjQuota implements java.io.Serializable {
    public void setResultGetType(String resultGetType) {
        this.resultGetType = resultGetType;
    }
    @Transient
    public List<TjQuota> getChildren() {
        return children;
    }
    public void setChildren(List<TjQuota> children) {
        this.children = children;
    }
    @Column(name = "job_status", length = 1)
    public String getJobStatus() {
        return jobStatus;
@@ -226,4 +232,22 @@ public class TjQuota implements java.io.Serializable {
    public void setJobStatus(String jobStatus) {
        this.jobStatus = jobStatus;
    }
}
    @Transient
    public TjQuotaDataSource getTjQuotaDataSourceModel() {
        return tjQuotaDataSourceModel;
    }
    public void setTjQuotaDataSourceModel(TjQuotaDataSource tjQuotaDataSourceModel) {
        this.tjQuotaDataSourceModel = tjQuotaDataSourceModel;
    }
    @Transient
    public TjQuotaDataSave getTjQuotaDataSaveModel() {
        return tjQuotaDataSaveModel;
    }
    public void setTjQuotaDataSaveModel(TjQuotaDataSave tjQuotaDataSaveModel) {
        this.tjQuotaDataSaveModel = tjQuotaDataSaveModel;
    }
}

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

@@ -1,77 +1,59 @@
package com.yihu.jw.entity.ehr.quota;
import javax.persistence.*;
import com.yihu.jw.entity.IdEntity;
import static javax.persistence.GenerationType.IDENTITY;
import javax.persistence.*;
import java.io.Serializable;
/**
 * TjQuotaDataSource entity. @author MyEclipse Persistence Tools
 * Created by Administrator on 2017/6/9.
 */
@Entity
@Table(name = "tj_quota_data_source")
public class TjQuotaDataSource implements java.io.Serializable {
    // Fields
@Table(name = "tj_quota_data_source", schema = "", catalog = "healtharchive")
public class TjQuotaDataSource extends IdEntity {
    private Integer id;
    private String quotaCode;
    private String sourceCode;
    private String configJson;
    private String name;
    private String code;
    // Constructors
    /** default constructor */
    public TjQuotaDataSource() {
    }
    /** full constructor */
    public TjQuotaDataSource(String quotaCode, String sourceCode,
                             String configJson) {
        this.quotaCode = quotaCode;
        this.sourceCode = sourceCode;
        this.configJson = configJson;
    }
    // Property accessors
    @Id
    @GeneratedValue(strategy = IDENTITY)
    @Column(name = "id", unique = true, nullable = false)
    public Integer getId() {
        return this.id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    @Column(name = "quota_code", length = 100)
    @Column(name = "quota_code")
    public String getQuotaCode() {
        return this.quotaCode;
        return quotaCode;
    }
    public void setQuotaCode(String quotaCode) {
        this.quotaCode = quotaCode;
    }
    @Column(name = "source_code", length = 100)
    @Column(name = "source_code")
    public String getSourceCode() {
        return this.sourceCode;
        return sourceCode;
    }
    public void setSourceCode(String sourceCode) {
        this.sourceCode = sourceCode;
    }
    @Column(name = "config_json", length = 2000)
    @Column(name = "config_json")
    public String getConfigJson() {
        return this.configJson;
        return configJson;
    }
    public void setConfigJson(String configJson) {
        this.configJson = configJson;
    }
    @Transient
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Transient
    public String getCode() {
        return code;
@@ -80,4 +62,4 @@ public class TjQuotaDataSource implements java.io.Serializable {
    public void setCode(String code) {
        this.code = code;
    }
}
}

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

@@ -1,62 +1,50 @@
package com.yihu.jw.entity.ehr.quota;
import javax.persistence.*;
import com.yihu.jw.entity.IdEntity;
import static javax.persistence.GenerationType.IDENTITY;
import javax.persistence.*;
import java.io.Serializable;
/**
 * TjQuotaDimensionMain entity. @author MyEclipse Persistence Tools
 * 统计主纬度关联表
 *
 * @author janseny
 * @version 1.0
 * @updated 2017年6月8日
 */
@Entity
@Table(name = "tj_quota_dimension_main")
public class TjQuotaDimensionMain implements java.io.Serializable {
@Access(value = AccessType.PROPERTY)
public class TjQuotaDimensionMain extends IdEntity {
    // Fields
    private String quotaCode;  //关联 tj_quota code
    private String mainCode; //关联 jt_dimension_main
    private String dictSql;//
    private String keyVal;//
    private Integer id;
    private String quotaCode;
    private String mainCode;
    private String dictSql;
    private String keyVal;
    private String name;
    private String type;
    // Constructors
    /** default constructor */
    public TjQuotaDimensionMain() {
    }
    // Property accessors
    @Id
    @GeneratedValue(strategy = IDENTITY)
    @Column(name = "id", unique = true, nullable = false)
    public Integer getId() {
        return this.id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    @Column(name = "quota_code", length = 100)
    @Column(name = "quota_code",  nullable = true)
    public String getQuotaCode() {
        return this.quotaCode;
        return quotaCode;
    }
    public void setQuotaCode(String quotaCode) {
        this.quotaCode = quotaCode;
    }
    @Column(name = "main_code", length = 100)
    @Column(name = "main_code",  nullable = true)
    public String getMainCode() {
        return this.mainCode;
        return mainCode;
    }
    public void setMainCode(String mainCode) {
        this.mainCode = mainCode;
    }
    @Column(name = "dict_sql",  nullable = true)
    public String getDictSql() {
        return dictSql;
    }
@@ -65,7 +53,7 @@ public class TjQuotaDimensionMain implements java.io.Serializable {
        this.dictSql = dictSql;
    }
    @Column(name = "key_val", length = 100)
    @Column(name = "key_val",  nullable = true)
    public String getKeyVal() {
        return keyVal;
    }
@@ -74,6 +62,15 @@ public class TjQuotaDimensionMain implements java.io.Serializable {
        this.keyVal = keyVal;
    }
    @Transient
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Transient
    public String getType() {
        return type;

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

@@ -1,41 +1,34 @@
package com.yihu.jw.entity.ehr.quota;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
import static javax.persistence.GenerationType.IDENTITY;
/**
 * Created by chenweida on 2017/6/2.
 * 统计指标日志
 *
 * @author janseny
 * @version 1.0
 * @updated 2017年6月9日
 */
@Entity
@Table(name = "tj_quota_log")
public class TjQuotaLog {
    private Integer id;
    private String saasId;
    private String quotaCode;
    private Date startTime;
    private Date endTime;
    private String content;
    /**
     * 1成功 0失败，2执行中
     */
    private String status;
    @Id
    @GeneratedValue(strategy = IDENTITY)
    @Column(name = "id", unique = true, nullable = false)
    public Integer getId() {
        return id;
    }
@Access(value = AccessType.PROPERTY)
public class TjQuotaLog extends IdEntity {
    public void setId(Integer id) {
        this.id = id;
    }
    private String quotaCode;  //
    private String saasId; //
    private Integer status;//1成功 0失败
    private String content;//内容
    private Date startTime;//任务开始执行时间
    private Date endTime;//任务结束执行时间
    private String statusName;
    @Column(name = "quota_code",  nullable = true)
    public String getQuotaCode() {
        return quotaCode;
    }
@@ -44,24 +37,25 @@ public class TjQuotaLog {
        this.quotaCode = quotaCode;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getStartTime() {
        return startTime;
    @Column(name = "saas_id",  nullable = true)
    public String getSaasId() {
        return saasId;
    }
    public void setStartTime(Date startTime) {
        this.startTime = startTime;
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getEndTime() {
        return endTime;
    @Column(name = "status",  nullable = true)
    public Integer getStatus() {
        return status;
    }
    public void setEndTime(Date endTime) {
        this.endTime = endTime;
    public void setStatus(Integer status) {
        this.status = status;
    }
    @Column(name = "content",  nullable = true)
    public String getContent() {
        return content;
    }
@@ -70,19 +64,32 @@ public class TjQuotaLog {
        this.content = content;
    }
    public String getStatus() {
        return status;
    @Column(name = "start_time",  nullable = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getStartTime() {
        return startTime;
    }
    public void setStatus(String status) {
        this.status = status;
    public void setStartTime(Date startTime) {
        this.startTime = startTime;
    }
    public String getSaasId() {
        return saasId;
    @Column(name = "end_time",  nullable = true)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    public Date getEndTime() {
        return endTime;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    public void setEndTime(Date endTime) {
        this.endTime = endTime;
    }
    @Transient
    public String getStatusName() {
        return statusName;
    }
    public void setStatusName(String statusName) {
        this.statusName = statusName;
    }
}