overflow_backup_2018_0455/overflow_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some modle variables has changed.

Browse Source
This commit is contained in:
insanity 2017-07-28 12:39:32 +09:00
parent bc2d33f5f5
commit b9be479aa5
8 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/loafle/overflow/module/infra/model/Infra.java
View File

@ -15,7 +15,7 @@ import java.util.Date;
@Table(name = "INFRA", schema = "public", catalog = "postgres") @Table(name = "INFRA", schema = "public", catalog = "postgres")
public class Infra { public class Infra {
private long id; private long id;
private MetaInfraType type; private MetaInfraType infraType;
private long childId; private long childId;
private Date createDate; private Date createDate;
private Probe probe; private Probe probe;
@ -23,7 +23,7 @@ public class Infra {
/* /*
private long id; private long id;
private MetaInfraType type; private MetaInfraType infraType;
private long childId; private long childId;
private Date createDate; private Date createDate;
private Probe probeId; private Probe probeId;
@ -43,11 +43,11 @@ public class Infra {
@ManyToOne @ManyToOne
@JoinColumn(name = "TYPE_ID", nullable = false) @JoinColumn(name = "TYPE_ID", nullable = false)
public MetaInfraType getType() { public MetaInfraType getType() {
return type; return infraType;
} }
public void setType(MetaInfraType type) { public void setType(MetaInfraType infraType) {
this.type = type; this.infraType = infraType;
} }
@Basic @Basic
@ -95,30 +95,30 @@ public class Infra {
Infra infra = new Infra(); Infra infra = new Infra();
infra.setChildId(id); infra.setChildId(id);
MetaInfraType type = new MetaInfraType(); MetaInfraType infraType = new MetaInfraType();
if(c == InfraMachine.class) { if(c == InfraMachine.class) {
type.setId(1); infraType.setId(1);
} }
else if(c == InfraHost.class) { else if(c == InfraHost.class) {
type.setId(2); infraType.setId(2);
} }
else if(c == InfraOS.class) { else if(c == InfraOS.class) {
type.setId(3); infraType.setId(3);
} }
else if(c == InfraOSApplication.class) { else if(c == InfraOSApplication.class) {
type.setId(4); infraType.setId(4);
} }
else if(c == InfraOSDaemon.class) { else if(c == InfraOSDaemon.class) {
type.setId(5); infraType.setId(5);
} }
else if(c == InfraOSPort.class) { else if(c == InfraOSPort.class) {
type.setId(6); infraType.setId(6);
} }
else if(c == InfraService.class) { else if(c == InfraService.class) {
type.setId(7); infraType.setId(7);
} }
infra.setType(type); infra.setType(infraType);
return infra; return infra;
} }

16
src/main/java/com/loafle/overflow/module/meta/model/MetaCrawlerInputItem.java
View File

@ -10,8 +10,8 @@ import java.util.Date;
@Table(name = "META_CRAWLER_INPUT_ITEM", schema = "public", catalog = "postgres") @Table(name = "META_CRAWLER_INPUT_ITEM", schema = "public", catalog = "postgres")
public class MetaCrawlerInputItem { public class MetaCrawlerInputItem {
private int id; private int id;
private MetaInputType metaInputType; private MetaInputType inputType;
private MetaCrawler metaCrawler; private MetaCrawler crawler;
private String description; private String description;
private String name; private String name;
private Date createDate; private Date createDate;
@ -34,21 +34,21 @@ public class MetaCrawlerInputItem {
@ManyToOne @ManyToOne
@JoinColumn(name = "TYPE_ID", nullable = false) @JoinColumn(name = "TYPE_ID", nullable = false)
public MetaInputType getMetaInputType() { public MetaInputType getMetaInputType() {
return metaInputType; return inputType;
} }
public void setMetaInputType(MetaInputType metaInputType) { public void setMetaInputType(MetaInputType inputType) {
this.metaInputType = metaInputType; this.inputType = inputType;
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "CRAWLER_ID", nullable = false) @JoinColumn(name = "CRAWLER_ID", nullable = false)
public MetaCrawler getMetaCrawler() { public MetaCrawler getMetaCrawler() {
return metaCrawler; return crawler;
} }
public void setMetaCrawler(MetaCrawler metaCrawler) { public void setMetaCrawler(MetaCrawler crawler) {
this.metaCrawler = metaCrawler; this.crawler = crawler;
} }
@Column(name = "DESCRIPTION", nullable = true, length = 50) @Column(name = "DESCRIPTION", nullable = true, length = 50)

8
src/main/java/com/loafle/overflow/module/meta/model/MetaInfraVendor.java
View File

@ -12,7 +12,7 @@ public class MetaInfraVendor {
private int id; private int id;
private String name; private String name;
private Date createDate; private Date createDate;
private MetaInfraType metaInfraType; private MetaInfraType infraType;
@Id @Id
public int getId() { public int getId() {
@ -47,11 +47,11 @@ public class MetaInfraVendor {
@ManyToOne @ManyToOne
@JoinColumn(name = "TYPE_ID", nullable=false) @JoinColumn(name = "TYPE_ID", nullable=false)
public MetaInfraType getMetaInfraType() { public MetaInfraType getMetaInfraType() {
return metaInfraType; return infraType;
} }
public void setMetaInfraType(MetaInfraType metaInfraType) { public void setMetaInfraType(MetaInfraType infraType) {
this.metaInfraType = metaInfraType; this.infraType = infraType;
} }

8
src/main/java/com/loafle/overflow/module/meta/model/MetaSensorItem.java
View File

@ -10,7 +10,7 @@ import java.util.Date;
@Table(name = "META_SENSOR_ITEM", schema = "public", catalog = "postgres") @Table(name = "META_SENSOR_ITEM", schema = "public", catalog = "postgres")
public class MetaSensorItem { public class MetaSensorItem {
private int id; private int id;
private MetaSensorItemType metaSensorItemType; private MetaSensorItemType itemType;
private String key; private String key;
private String name; private String name;
private Date createDate; private Date createDate;
@ -38,11 +38,11 @@ public class MetaSensorItem {
@ManyToOne @ManyToOne
@JoinColumn(name = "TYPE_ID", nullable = false) @JoinColumn(name = "TYPE_ID", nullable = false)
public MetaSensorItemType getMetaSensorItemType() { public MetaSensorItemType getMetaSensorItemType() {
return metaSensorItemType; return itemType;
} }
public void setMetaSensorItemType(MetaSensorItemType metaSensorItemType) { public void setMetaSensorItemType(MetaSensorItemType itemType) {
this.metaSensorItemType = metaSensorItemType; this.itemType = itemType;
} }
@Column(name = "KEY", nullable = true, length = 50) @Column(name = "KEY", nullable = true, length = 50)

16
src/main/java/com/loafle/overflow/module/meta/model/MetaVendorCrawler.java
View File

@ -10,8 +10,8 @@ import java.util.Date;
@Table(name = "META_VENDOR_CRAWLER", schema = "public", catalog = "postgres") @Table(name = "META_VENDOR_CRAWLER", schema = "public", catalog = "postgres")
public class MetaVendorCrawler { public class MetaVendorCrawler {
private int id; private int id;
private MetaCrawler metaCrawler; private MetaCrawler crawler;
private MetaInfraVendor metaInfraVendor; private MetaInfraVendor infraVendor;
private Date createDate; private Date createDate;
@Id @Id
@ -26,21 +26,21 @@ public class MetaVendorCrawler {
@ManyToOne @ManyToOne
@JoinColumn(name = "CRAWLER_ID", nullable = false) @JoinColumn(name = "CRAWLER_ID", nullable = false)
public MetaCrawler getMetaCrawler() { public MetaCrawler getMetaCrawler() {
return metaCrawler; return crawler;
} }
public void setMetaCrawler(MetaCrawler metaCrawler) { public void setMetaCrawler(MetaCrawler crawler) {
this.metaCrawler = metaCrawler; this.crawler = crawler;
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "VENDOR_ID", nullable = false) @JoinColumn(name = "VENDOR_ID", nullable = false)
public MetaInfraVendor getMetaInfraVendor() { public MetaInfraVendor getMetaInfraVendor() {
return metaInfraVendor; return infraVendor;
} }
public void setMetaInfraVendor(MetaInfraVendor metaInfraVendor) { public void setMetaInfraVendor(MetaInfraVendor infraVendor) {
this.metaInfraVendor = metaInfraVendor; this.infraVendor = infraVendor;
} }
// @Basic // @Basic

16
src/main/java/com/loafle/overflow/module/meta/model/MetaVendorCrawlerSensorItem.java
View File

@ -13,8 +13,8 @@ public class MetaVendorCrawlerSensorItem {
private String interval; private String interval;
private String warnCondition; private String warnCondition;
private Date createDate; private Date createDate;
private MetaSensorItem metaSensorItem; private MetaSensorItem sensorItem;
private MetaInfraVendor metaInfraVendor; private MetaInfraVendor infraVendor;
private short crawlerId; private short crawlerId;
@Id @Id
@ -81,21 +81,21 @@ public class MetaVendorCrawlerSensorItem {
@ManyToOne @ManyToOne
@JoinColumn(name = "ITEM_ID", nullable = false) @JoinColumn(name = "ITEM_ID", nullable = false)
public MetaSensorItem getMetaSensorItem() { public MetaSensorItem getMetaSensorItem() {
return metaSensorItem; return sensorItem;
} }
public void setMetaSensorItem(MetaSensorItem metaSensorItem) { public void setMetaSensorItem(MetaSensorItem sensorItem) {
this.metaSensorItem = metaSensorItem; this.sensorItem = sensorItem;
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "VENDOR_ID", nullable = false) @JoinColumn(name = "VENDOR_ID", nullable = false)
public MetaInfraVendor getMetaInfraVendor() { public MetaInfraVendor getMetaInfraVendor() {
return metaInfraVendor; return infraVendor;
} }
public void setMetaInfraVendor(MetaInfraVendor metaInfraVendor) { public void setMetaInfraVendor(MetaInfraVendor infraVendor) {
this.metaInfraVendor = metaInfraVendor; this.infraVendor = infraVendor;
} }
@Basic @Basic

10
src/main/java/com/loafle/overflow/module/probe/model/Probe.java
View File

@ -26,7 +26,7 @@ createdDate Date
restartedDated Date restartedDated Date
authorizedDate Date authorizedDate Date
authorizedMember Member authorizedMember Member
infraHost InfraHost // infraHost > infraOS > infraMachine -> Probe host InfraHost // host > infraOS > infraMachine -> Probe
probeKey String probeKey String
encryptionKey String encryptionKey String
status (Meta) status (Meta)
@ -50,7 +50,7 @@ status (Meta)
private String cidr; private String cidr;
private Date authorizeDate; private Date authorizeDate;
private Member authorizeMember; private Member authorizeMember;
private InfraHost infraHost; private InfraHost host;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy= GenerationType.IDENTITY)
@ -181,10 +181,10 @@ status (Meta)
@ManyToOne @ManyToOne
@JoinColumn(name = "HOST_ID", nullable = false) @JoinColumn(name = "HOST_ID", nullable = false)
public InfraHost getInfraHost() { public InfraHost getInfraHost() {
return infraHost; return host;
} }
public void setInfraHost(InfraHost infraHost) { public void setInfraHost(InfraHost host) {
this.infraHost = infraHost; this.host = host;
} }
} }

8
src/main/java/com/loafle/overflow/module/probe/model/ProbeTask.java
View File

@ -13,7 +13,7 @@ import java.util.Date;
@Table(name = "PROBE_TASK", schema = "public", catalog = "postgres") @Table(name = "PROBE_TASK", schema = "public", catalog = "postgres")
public class ProbeTask { public class ProbeTask {
private long id; private long id;
private MetaProbeTaskType metaProbeTaskType; private MetaProbeTaskType taskType;
private Probe probe; private Probe probe;
private String data; private String data;
private Date createDate; private Date createDate;
@ -35,11 +35,11 @@ public class ProbeTask {
@ManyToOne @ManyToOne
@JoinColumn(name = "TYPE_ID", nullable = false) @JoinColumn(name = "TYPE_ID", nullable = false)
public MetaProbeTaskType getMetaProbeTaskType() { public MetaProbeTaskType getMetaProbeTaskType() {
return metaProbeTaskType; return taskType;
} }
public void setMetaProbeTaskType(MetaProbeTaskType metaProbeTaskType) { public void setMetaProbeTaskType(MetaProbeTaskType taskType) {
this.metaProbeTaskType = metaProbeTaskType; this.taskType = taskType;
} }
@ManyToOne @ManyToOne