代码修改

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

@@ -1,6 +1,7 @@
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;
@@ -12,8 +13,8 @@ import java.util.Date;
 */
@Entity
@Table(name = "tj_data_save", schema = "", catalog = "healtharchive")
public class TjDataSave implements Serializable {
    private Long id;
public class TjDataSave extends IdEntity {
    private String code;
    private String type;
    private String name;
@@ -30,17 +31,6 @@ public class TjDataSave implements Serializable {
    public static String type_solr="2";
    public static String type_mysql ="3";
    @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 = "code", nullable = true)
    public String getCode() {
        return code;

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

@@ -1,6 +1,7 @@
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;
@@ -12,8 +13,8 @@ import java.util.Date;
@Entity
@Table(name = "tj_data_source")
@Access(value = AccessType.PROPERTY)
public class TjDataSource implements Serializable {
    private Long id;
public class TjDataSource extends IdEntity {
    private String code;
    private String type;
    private String name;
@@ -26,17 +27,6 @@ public class TjDataSource implements Serializable {
    private Integer status;
    private String remark;
    @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 = "code", nullable = true)
    public String getCode() {
        return code;

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

@@ -1,6 +1,7 @@
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;
@@ -16,10 +17,9 @@ import java.util.Date;
@Entity
@Table(name = "tj_dimension_main")
@Access(value = AccessType.PROPERTY)
public class TjDimensionMain implements Serializable{
public class TjDimensionMain extends IdEntity {
    private long id;
    private String code;  //业务代码
    private String name; //主维度名称
    private String type;//主维度 :1 行政区划
@@ -32,16 +32,6 @@ public class TjDimensionMain implements Serializable{
    private String updateUser;//修改人
    private String updateUserName;//修改人名
    @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 = "code",  nullable = true)
    public String getCode() {
        return code;

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

@@ -1,6 +1,7 @@
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;
@@ -16,10 +17,8 @@ import java.util.Date;
@Entity
@Table(name = "tj_dimension_slave")
@Access(value = AccessType.PROPERTY)
public class TjDimensionSlave implements Serializable{
public class TjDimensionSlave extends IdEntity {
    private long id;
    private String code;  //业务代码
    private String name; //从维度名称
    private String type;//类型:1 性别 2 年龄
@@ -33,15 +32,6 @@ public class TjDimensionSlave implements Serializable{
    private String updateUserName;//修改人名
    private Boolean checked;
    @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 = "code",  nullable = true)
    public String getCode() {

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

@@ -1,6 +1,7 @@
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;
@@ -12,8 +13,8 @@ import java.util.List;
 */
@Entity
@Table(name = "tj_quota", schema = "", catalog = "healtharchive")
public class TjQuota implements Serializable {
    private Long id;
public class TjQuota extends IdEntity {
    private String code;
    private String name;
    private String cron;
@@ -36,22 +37,11 @@ public class TjQuota implements Serializable {
    //周期指标执行状态：0未开启，1执行中
    private String jobStatus;
    private TjQuotaDataSource tjQuotaDataSource;
    private TjQuotaDataSave tjQuotaDataSave;
    private TjQuotaDataSource tjQuotaDataSourceModel;
    private TjQuotaDataSave tjQuotaDataSaveModel;
    private List<TjQuota> children;
    @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 = "code")
    public String getCode() {
        return code;
@@ -244,20 +234,20 @@ public class TjQuota implements Serializable {
    }
    @Transient
    public TjQuotaDataSource getTjQuotaDataSource() {
        return tjQuotaDataSource;
    public TjQuotaDataSource getTjQuotaDataSourceModel() {
        return tjQuotaDataSourceModel;
    }
    public void setTjQuotaDataSource(TjQuotaDataSource tjQuotaDataSource) {
        this.tjQuotaDataSource = tjQuotaDataSource;
    public void setTjQuotaDataSourceModel(TjQuotaDataSource tjQuotaDataSourceModel) {
        this.tjQuotaDataSourceModel = tjQuotaDataSourceModel;
    }
    @Transient
    public TjQuotaDataSave getTjQuotaDataSave() {
        return tjQuotaDataSave;
    public TjQuotaDataSave getTjQuotaDataSaveModel() {
        return tjQuotaDataSaveModel;
    }
    public void setTjQuotaDataSave(TjQuotaDataSave tjQuotaDataSave) {
        this.tjQuotaDataSave = tjQuotaDataSave;
    public void setTjQuotaDataSaveModel(TjQuotaDataSave tjQuotaDataSaveModel) {
        this.tjQuotaDataSaveModel = tjQuotaDataSaveModel;
    }
}

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

@@ -1,5 +1,7 @@
package com.yihu.jw.entity.ehr.quota;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.*;
import java.io.Serializable;
@@ -8,8 +10,7 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "tj_quota_data_save", schema = "", catalog = "healtharchive")
public class TjQuotaDataSave implements Serializable{
    private Long id;
public class TjQuotaDataSave extends IdEntity {
    private String quotaCode;
    private String saveCode;
    private String configJson;
@@ -17,17 +18,6 @@ public class TjQuotaDataSave implements Serializable{
    private String type;
    private String name;
    @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 = "quota_code")
    public String getQuotaCode() {
        return quotaCode;

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

@@ -1,5 +1,7 @@
package com.yihu.jw.entity.ehr.quota;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.*;
import java.io.Serializable;
@@ -8,24 +10,13 @@ import java.io.Serializable;
 */
@Entity
@Table(name = "tj_quota_data_source", schema = "", catalog = "healtharchive")
public class TjQuotaDataSource implements Serializable{
    private Long id;
public class TjQuotaDataSource extends IdEntity {
    private String quotaCode;
    private String sourceCode;
    private String configJson;
    private String name;
    @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 = "quota_code")
    public String getQuotaCode() {
        return quotaCode;

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

@@ -1,6 +1,8 @@
package com.yihu.jw.entity.ehr.quota;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.*;
import java.io.Serializable;
@@ -14,25 +16,13 @@ import java.io.Serializable;
@Entity
@Table(name = "tj_quota_dimension_main")
@Access(value = AccessType.PROPERTY)
public class TjQuotaDimensionMain implements Serializable{
public class TjQuotaDimensionMain extends IdEntity {
    private Long id;
    private String quotaCode;  //关联 tj_quota code
    private String mainCode; //关联 jt_dimension_main
    private String dictSql;//
    private String keyVal;//
    @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 = "quota_code",  nullable = true)
    public String getQuotaCode() {
        return quotaCode;

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

@@ -1,5 +1,7 @@
package com.yihu.jw.entity.ehr.quota;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.*;
import java.io.Serializable;
@@ -13,10 +15,8 @@ import java.io.Serializable;
@Entity
@Table(name = "tj_quota_dimension_slave")
@Access(value = AccessType.PROPERTY)
public class TjQuotaDimensionSlave implements Serializable{
public class TjQuotaDimensionSlave extends IdEntity {
    private Long id;
    private String quotaCode;  //关联 tj_quota code
    private String slaveCode; //关联 jt_dimension_slave
    private String dictSql;//
@@ -26,16 +26,6 @@ public class TjQuotaDimensionSlave implements Serializable{
    private String name;
    @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 = "quota_code",  nullable = true)
    public String getQuotaCode() {
        return quotaCode;

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

@@ -1,6 +1,7 @@
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;
@@ -11,8 +12,8 @@ import java.util.Date;
 */
@Entity
@Table(name = "tj_quota_gov_provision")
public class TjQuotaGovProvision implements Serializable {
    private long id;
public class TjQuotaGovProvision extends IdEntity {
    private long population;
    private String gender;
    private String year;
@@ -23,17 +24,6 @@ public class TjQuotaGovProvision implements Serializable {
    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;

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

@@ -1,6 +1,7 @@
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;
@@ -16,10 +17,8 @@ import java.util.Date;
@Entity
@Table(name = "tj_quota_log")
@Access(value = AccessType.PROPERTY)
public class TjQuotaLog implements Serializable{
public class TjQuotaLog extends IdEntity {
    private long id;
    private String quotaCode;  //
    private String saasId; //
    private Integer status;//1成功 0失败
@@ -27,15 +26,6 @@ public class TjQuotaLog implements Serializable{
    private Date startTime;//任务开始执行时间
    private Date endTime;//任务结束执行时间
    @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 = "quota_code",  nullable = true)
    public String getQuotaCode() {

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

@@ -1,6 +1,7 @@
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;
@@ -12,25 +13,14 @@ import java.util.Date;
 */
@Entity
@Table(name = "tj_quota_warn", schema = "", catalog = "healtharchive")
public class TjQuotaWarn implements Serializable {
    private Long id;
public class TjQuotaWarn extends IdEntity {
    private String quotaCode;
    private String value;
    private String userId;
    private Date createTime;
    private Date updateTime;
    @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 = "quota_code", nullable = true)
    public String getQuotaCode() {
        return quotaCode;