overflow_cloud/commons-java
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.loafle.net/overflow/commons-java

Browse Source
This commit is contained in:
crusader 2018-04-24 22:19:10 +09:00
commit c28819be96
2 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/main/java/com/loafle/overflow/model/meta/MetaSensorDisplayItem.java
View File

@ -12,15 +12,23 @@ import java.util.Date;
public class MetaSensorDisplayItem { public class MetaSensorDisplayItem {
private long id; private long id;
private String name; private String key;
private String displayName;
private String description;
private MetaCrawler crawler; private MetaCrawler crawler;
private MetaSensorItemUnit unit; private MetaSensorItemUnit unit;
private Date createDate; private Date createDate;
private boolean isDefault;
private MetaSensorItemType itemType; private MetaSensorItemType itemType;
private String key;
public MetaSensorDisplayItem() {
}
public MetaSensorDisplayItem(long id) {
this.id = id;
}
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() { public long getId() {
return id; return id;
} }
@ -29,15 +37,34 @@ public class MetaSensorDisplayItem {
this.id = id; this.id = id;
} }
@Column(name = "NAME", nullable = false, length = 50) @Column(name = "KEY", nullable = false)
public String getName() { public String getKey() {
return name; return key;
} }
public void setName(String name) { public void setKey(String key) {
this.name = name; this.key = key;
} }
@Column(name = "DISPLAY_NAME", nullable = false)
public String getDisplayName() {
return displayName;
}
public void setDisplayName(String displayName) {
this.displayName = displayName;
}
@Column(name = "DESCRIPTION", nullable = false)
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
@ManyToOne @ManyToOne
@JoinColumn(name = "CRAWLER_ID", nullable = false) @JoinColumn(name = "CRAWLER_ID", nullable = false)
public MetaCrawler getCrawler() { public MetaCrawler getCrawler() {
@ -69,6 +96,16 @@ public class MetaSensorDisplayItem {
} }
@Basic
@Column(name="IS_DEFAULT", nullable = false, columnDefinition = "boolean default false")
public boolean getDefault() {
return isDefault;
}
public void setDefault(boolean aDefault) {
isDefault = aDefault;
}
@ManyToOne @ManyToOne
@JoinColumn(name = "TYPE_ID", nullable = false) @JoinColumn(name = "TYPE_ID", nullable = false)
public MetaSensorItemType getItemType() { public MetaSensorItemType getItemType() {
@ -79,12 +116,4 @@ public class MetaSensorDisplayItem {
this.itemType = itemType; this.itemType = itemType;
} }
@Column(name = "KEY", nullable = false, length = 50)
public String getKey() {
return key;
}
public void setKey(String key) {
this.key = key;
}
} }

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

@ -21,13 +21,11 @@ public class Probe {
private Domain domain; private Domain domain;
private String probeKey; private String probeKey;
private String encryptionKey; private String encryptionKey;
private int targetCount;
private int sensorCount;
private String displayName; private String displayName;
private String cidr; private String cidr;
private Date authorizeDate; private Date authorizeDate;
private Member authorizeMember; private Member authorizeMember;
// private InfraHost host;
public Probe() { public Probe() {
@ -107,24 +105,6 @@ public class Probe {
this.encryptionKey = encryptionKey; this.encryptionKey = encryptionKey;
} }
@Column(name = "TARGET_COUNT", nullable = false)
public int getTargetCount() {
return targetCount;
}
public void setTargetCount(int targetCount) {
this.targetCount = targetCount;
}
@Column(name = "SENSOR_COUNT", nullable = false)
public int getSensorCount() {
return sensorCount;
}
public void setSensorCount(int sensorCount) {
this.sensorCount = sensorCount;
}
@Column(name = "DISPLAY_NAME") @Column(name = "DISPLAY_NAME")
public String getDisplayName() { public String getDisplayName() {
return displayName; return displayName;
@ -162,14 +142,5 @@ public class Probe {
public void setAuthorizeMember(Member authorizeMember) { public void setAuthorizeMember(Member authorizeMember) {
this.authorizeMember = authorizeMember; this.authorizeMember = authorizeMember;
} }
//
// @ManyToOne
// @JoinColumn(name = "HOST_ID", nullable = false)
// public InfraHost getHost() {
// return host;
// }
//
// public void setHost(InfraHost host) {
// this.host = host;
// }
} }