some modle variables has changed.
This commit is contained in:
insanity
parent
bc2d33f5f5
commit
b9be479aa5
|
|
@ -15,7 +15,7 @@ import java.util.Date;
|
|||
@Table(name = "INFRA", schema = "public", catalog = "postgres")
|
||||
public class Infra {
|
||||
private long id;
|
||||
private MetaInfraType type;
|
||||
private MetaInfraType infraType;
|
||||
private long childId;
|
||||
private Date createDate;
|
||||
private Probe probe;
|
||||
|
|
@ -23,7 +23,7 @@ public class Infra {
|
|||
|
||||
/*
|
||||
private long id;
|
||||
private MetaInfraType type;
|
||||
private MetaInfraType infraType;
|
||||
private long childId;
|
||||
private Date createDate;
|
||||
private Probe probeId;
|
||||
|
|
@ -43,11 +43,11 @@ public class Infra {
|
|||
@ManyToOne
|
||||
@JoinColumn(name = "TYPE_ID", nullable = false)
|
||||
public MetaInfraType getType() {
|
||||
return type;
|
||||
return infraType;
|
||||
}
|
||||
|
||||
public void setType(MetaInfraType type) {
|
||||
this.type = type;
|
||||
public void setType(MetaInfraType infraType) {
|
||||
this.infraType = infraType;
|
||||
}
|
||||
|
||||
@Basic
|
||||
|
|
@ -95,30 +95,30 @@ public class Infra {
|
|||
Infra infra = new Infra();
|
||||
infra.setChildId(id);
|
||||
|
||||
MetaInfraType type = new MetaInfraType();
|
||||
MetaInfraType infraType = new MetaInfraType();
|
||||
if(c == InfraMachine.class) {
|
||||
type.setId(1);
|
||||
infraType.setId(1);
|
||||
}
|
||||
else if(c == InfraHost.class) {
|
||||
type.setId(2);
|
||||
infraType.setId(2);
|
||||
}
|
||||
else if(c == InfraOS.class) {
|
||||
type.setId(3);
|
||||
infraType.setId(3);
|
||||
}
|
||||
else if(c == InfraOSApplication.class) {
|
||||
type.setId(4);
|
||||
infraType.setId(4);
|
||||
}
|
||||
else if(c == InfraOSDaemon.class) {
|
||||
type.setId(5);
|
||||
infraType.setId(5);
|
||||
}
|
||||
else if(c == InfraOSPort.class) {
|
||||
type.setId(6);
|
||||
infraType.setId(6);
|
||||
}
|
||||
else if(c == InfraService.class) {
|
||||
type.setId(7);
|
||||
infraType.setId(7);
|
||||
}
|
||||
|
||||
infra.setType(type);
|
||||
infra.setType(infraType);
|
||||
|
||||
return infra;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ import java.util.Date;
|
|||
@Table(name = "META_CRAWLER_INPUT_ITEM", schema = "public", catalog = "postgres")
|
||||
public class MetaCrawlerInputItem {
|
||||
private int id;
|
||||
private MetaInputType metaInputType;
|
||||
private MetaCrawler metaCrawler;
|
||||
private MetaInputType inputType;
|
||||
private MetaCrawler crawler;
|
||||
private String description;
|
||||
private String name;
|
||||
private Date createDate;
|
||||
|
|
@ -34,21 +34,21 @@ public class MetaCrawlerInputItem {
|
|||
@ManyToOne
|
||||
@JoinColumn(name = "TYPE_ID", nullable = false)
|
||||
public MetaInputType getMetaInputType() {
|
||||
return metaInputType;
|
||||
return inputType;
|
||||
}
|
||||
|
||||
public void setMetaInputType(MetaInputType metaInputType) {
|
||||
this.metaInputType = metaInputType;
|
||||
public void setMetaInputType(MetaInputType inputType) {
|
||||
this.inputType = inputType;
|
||||
}
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "CRAWLER_ID", nullable = false)
|
||||
public MetaCrawler getMetaCrawler() {
|
||||
return metaCrawler;
|
||||
return crawler;
|
||||
}
|
||||
|
||||
public void setMetaCrawler(MetaCrawler metaCrawler) {
|
||||
this.metaCrawler = metaCrawler;
|
||||
public void setMetaCrawler(MetaCrawler crawler) {
|
||||
this.crawler = crawler;
|
||||
}
|
||||
|
||||
@Column(name = "DESCRIPTION", nullable = true, length = 50)
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ public class MetaInfraVendor {
|
|||
private int id;
|
||||
private String name;
|
||||
private Date createDate;
|
||||
private MetaInfraType metaInfraType;
|
||||
private MetaInfraType infraType;
|
||||
|
||||
@Id
|
||||
public int getId() {
|
||||
|
|
@ -47,11 +47,11 @@ public class MetaInfraVendor {
|
|||
@ManyToOne
|
||||
@JoinColumn(name = "TYPE_ID", nullable=false)
|
||||
public MetaInfraType getMetaInfraType() {
|
||||
return metaInfraType;
|
||||
return infraType;
|
||||
}
|
||||
|
||||
public void setMetaInfraType(MetaInfraType metaInfraType) {
|
||||
this.metaInfraType = metaInfraType;
|
||||
public void setMetaInfraType(MetaInfraType infraType) {
|
||||
this.infraType = infraType;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import java.util.Date;
|
|||
@Table(name = "META_SENSOR_ITEM", schema = "public", catalog = "postgres")
|
||||
public class MetaSensorItem {
|
||||
private int id;
|
||||
private MetaSensorItemType metaSensorItemType;
|
||||
private MetaSensorItemType itemType;
|
||||
private String key;
|
||||
private String name;
|
||||
private Date createDate;
|
||||
|
|
@ -38,11 +38,11 @@ public class MetaSensorItem {
|
|||
@ManyToOne
|
||||
@JoinColumn(name = "TYPE_ID", nullable = false)
|
||||
public MetaSensorItemType getMetaSensorItemType() {
|
||||
return metaSensorItemType;
|
||||
return itemType;
|
||||
}
|
||||
|
||||
public void setMetaSensorItemType(MetaSensorItemType metaSensorItemType) {
|
||||
this.metaSensorItemType = metaSensorItemType;
|
||||
public void setMetaSensorItemType(MetaSensorItemType itemType) {
|
||||
this.itemType = itemType;
|
||||
}
|
||||
|
||||
@Column(name = "KEY", nullable = true, length = 50)
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ import java.util.Date;
|
|||
@Table(name = "META_VENDOR_CRAWLER", schema = "public", catalog = "postgres")
|
||||
public class MetaVendorCrawler {
|
||||
private int id;
|
||||
private MetaCrawler metaCrawler;
|
||||
private MetaInfraVendor metaInfraVendor;
|
||||
private MetaCrawler crawler;
|
||||
private MetaInfraVendor infraVendor;
|
||||
private Date createDate;
|
||||
|
||||
@Id
|
||||
|
|
@ -26,21 +26,21 @@ public class MetaVendorCrawler {
|
|||
@ManyToOne
|
||||
@JoinColumn(name = "CRAWLER_ID", nullable = false)
|
||||
public MetaCrawler getMetaCrawler() {
|
||||
return metaCrawler;
|
||||
return crawler;
|
||||
}
|
||||
|
||||
public void setMetaCrawler(MetaCrawler metaCrawler) {
|
||||
this.metaCrawler = metaCrawler;
|
||||
public void setMetaCrawler(MetaCrawler crawler) {
|
||||
this.crawler = crawler;
|
||||
}
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "VENDOR_ID", nullable = false)
|
||||
public MetaInfraVendor getMetaInfraVendor() {
|
||||
return metaInfraVendor;
|
||||
return infraVendor;
|
||||
}
|
||||
|
||||
public void setMetaInfraVendor(MetaInfraVendor metaInfraVendor) {
|
||||
this.metaInfraVendor = metaInfraVendor;
|
||||
public void setMetaInfraVendor(MetaInfraVendor infraVendor) {
|
||||
this.infraVendor = infraVendor;
|
||||
}
|
||||
|
||||
// @Basic
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ public class MetaVendorCrawlerSensorItem {
|
|||
private String interval;
|
||||
private String warnCondition;
|
||||
private Date createDate;
|
||||
private MetaSensorItem metaSensorItem;
|
||||
private MetaInfraVendor metaInfraVendor;
|
||||
private MetaSensorItem sensorItem;
|
||||
private MetaInfraVendor infraVendor;
|
||||
private short crawlerId;
|
||||
|
||||
@Id
|
||||
|
|
@ -81,21 +81,21 @@ public class MetaVendorCrawlerSensorItem {
|
|||
@ManyToOne
|
||||
@JoinColumn(name = "ITEM_ID", nullable = false)
|
||||
public MetaSensorItem getMetaSensorItem() {
|
||||
return metaSensorItem;
|
||||
return sensorItem;
|
||||
}
|
||||
|
||||
public void setMetaSensorItem(MetaSensorItem metaSensorItem) {
|
||||
this.metaSensorItem = metaSensorItem;
|
||||
public void setMetaSensorItem(MetaSensorItem sensorItem) {
|
||||
this.sensorItem = sensorItem;
|
||||
}
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "VENDOR_ID", nullable = false)
|
||||
public MetaInfraVendor getMetaInfraVendor() {
|
||||
return metaInfraVendor;
|
||||
return infraVendor;
|
||||
}
|
||||
|
||||
public void setMetaInfraVendor(MetaInfraVendor metaInfraVendor) {
|
||||
this.metaInfraVendor = metaInfraVendor;
|
||||
public void setMetaInfraVendor(MetaInfraVendor infraVendor) {
|
||||
this.infraVendor = infraVendor;
|
||||
}
|
||||
|
||||
@Basic
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ createdDate Date
|
|||
restartedDated Date
|
||||
authorizedDate Date
|
||||
authorizedMember Member
|
||||
infraHost InfraHost // infraHost > infraOS > infraMachine -> Probe
|
||||
host InfraHost // host > infraOS > infraMachine -> Probe
|
||||
probeKey String
|
||||
encryptionKey String
|
||||
status (Meta)
|
||||
|
|
@ -50,7 +50,7 @@ status (Meta)
|
|||
private String cidr;
|
||||
private Date authorizeDate;
|
||||
private Member authorizeMember;
|
||||
private InfraHost infraHost;
|
||||
private InfraHost host;
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy= GenerationType.IDENTITY)
|
||||
|
|
@ -181,10 +181,10 @@ status (Meta)
|
|||
@ManyToOne
|
||||
@JoinColumn(name = "HOST_ID", nullable = false)
|
||||
public InfraHost getInfraHost() {
|
||||
return infraHost;
|
||||
return host;
|
||||
}
|
||||
|
||||
public void setInfraHost(InfraHost infraHost) {
|
||||
this.infraHost = infraHost;
|
||||
public void setInfraHost(InfraHost host) {
|
||||
this.host = host;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ import java.util.Date;
|
|||
@Table(name = "PROBE_TASK", schema = "public", catalog = "postgres")
|
||||
public class ProbeTask {
|
||||
private long id;
|
||||
private MetaProbeTaskType metaProbeTaskType;
|
||||
private MetaProbeTaskType taskType;
|
||||
private Probe probe;
|
||||
private String data;
|
||||
private Date createDate;
|
||||
|
|
@ -35,11 +35,11 @@ public class ProbeTask {
|
|||
@ManyToOne
|
||||
@JoinColumn(name = "TYPE_ID", nullable = false)
|
||||
public MetaProbeTaskType getMetaProbeTaskType() {
|
||||
return metaProbeTaskType;
|
||||
return taskType;
|
||||
}
|
||||
|
||||
public void setMetaProbeTaskType(MetaProbeTaskType metaProbeTaskType) {
|
||||
this.metaProbeTaskType = metaProbeTaskType;
|
||||
public void setMetaProbeTaskType(MetaProbeTaskType taskType) {
|
||||
this.taskType = taskType;
|
||||
}
|
||||
|
||||
@ManyToOne
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user