This commit is contained in:
crusader 2018-06-05 19:51:49 +09:00
parent b3b052b5bd
commit 1d3ae7c6a7
116 changed files with 3258 additions and 3168 deletions

View File

@ -13,7 +13,7 @@
<groupId>com.loafle.overflow</groupId> <groupId>com.loafle.overflow</groupId>
<artifactId>commons-java</artifactId> <artifactId>commons-java</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0.1-SNAPSHOT</version> <version>1.0.3-SNAPSHOT</version>
<name>com.loafle.overflow.commons-java</name> <name>com.loafle.overflow.commons-java</name>
<properties> <properties>

View File

@ -5,7 +5,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
@Target({ElementType.METHOD}) @Target({ ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
public @interface ProbeAPI { public @interface ProbeAPI {
String value() default ""; String value() default "";

View File

@ -8,7 +8,7 @@ import java.lang.annotation.Target;
import org.springframework.core.annotation.AliasFor; import org.springframework.core.annotation.AliasFor;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Target({ElementType.TYPE}) @Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Component @Component
public @interface RPCService { public @interface RPCService {

View File

@ -5,7 +5,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
@Target({ElementType.METHOD}) @Target({ ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
public @interface WebappAPI { public @interface WebappAPI {
String value() default ""; String value() default "";

View File

@ -2,7 +2,11 @@ package com.loafle.overflow.core.exception;
public class OverflowException extends Exception { public class OverflowException extends Exception {
private static final long serialVersionUID = -2737018677113628699L; private static final long serialVersionUID = -2737018677113628699L;
public OverflowException(String message){ super(message); }
public OverflowException(String message) {
super(message);
}
public OverflowException(String message, Throwable throwable) { public OverflowException(String message, Throwable throwable) {
super(message, throwable); super(message, throwable);
} }

View File

@ -15,11 +15,10 @@ public class Mail {
private String mailSubject; private String mailSubject;
private String mailContent; private String mailContent;
private String contentType; private String contentType;
private List< Object > attachments; private List<Object> attachments;
private Map< String, Object > model; private Map<String, Object> model;
private String templateLoacation; private String templateLoacation;
public Mail() { public Mail() {
contentType = "text/plain"; contentType = "text/plain";
} }
@ -84,19 +83,19 @@ public class Mail {
this.mailContent = mailContent; this.mailContent = mailContent;
} }
public List< Object > getAttachments() { public List<Object> getAttachments() {
return attachments; return attachments;
} }
public void setAttachments(List < Object > attachments) { public void setAttachments(List<Object> attachments) {
this.attachments = attachments; this.attachments = attachments;
} }
public Map< String, Object > getModel() { public Map<String, Object> getModel() {
return model; return model;
} }
public void setModel(Map < String, Object > model) { public void setModel(Map<String, Object> model) {
this.model = model; this.model = model;
} }

View File

@ -40,9 +40,7 @@ public class PublishMessage {
} }
public static enum TargetType { public static enum TargetType {
MEMBER_SESSION("MEMBER_SESSION"), MEMBER_SESSION("MEMBER_SESSION"), MEMBER("MEMBER"), PROBE("PROBE");
MEMBER("MEMBER"),
PROBE("PROBE");
final private String name; final private String name;

View File

@ -8,7 +8,10 @@ public enum CryptoType {
TLS("TLS"); TLS("TLS");
private String stringValue; private String stringValue;
CryptoType(String string) {stringValue = string;}
CryptoType(String string) {
stringValue = string;
}
@Override @Override
public String toString() { public String toString() {

View File

@ -9,7 +9,10 @@ public enum PortType {
TLS("TLS"); TLS("TLS");
private String stringValue; private String stringValue;
PortType(String string) {stringValue = string;}
PortType(String string) {
stringValue = string;
}
@Override @Override
public String toString() { public String toString() {

View File

@ -14,7 +14,7 @@ public class ApiKey {
private Domain domain; private Domain domain;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }
@ -23,7 +23,7 @@ public class ApiKey {
this.id = id; this.id = id;
} }
@Column(name = "API_KEY", nullable = false, unique = true,length = 50) @Column(name = "API_KEY", nullable = false, unique = true, length = 50)
public String getApiKey() { public String getApiKey() {
return apiKey; return apiKey;
} }
@ -33,7 +33,7 @@ public class ApiKey {
} }
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
@Column(name="CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false) @Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false)
public Date getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
} }
@ -43,7 +43,7 @@ public class ApiKey {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "DOMAIN_ID", nullable=false) @JoinColumn(name = "DOMAIN_ID", nullable = false)
public Domain getDomain() { public Domain getDomain() {
return domain; return domain;
} }
@ -51,28 +51,30 @@ public class ApiKey {
public void setDomain(Domain domain) { public void setDomain(Domain domain) {
this.domain = domain; this.domain = domain;
} }
// //
// @Override // @Override
// public boolean equals(Object o) { // public boolean equals(Object o) {
// if (this == o) return true; // if (this == o) return true;
// if (o == null || getClass() != o.getClass()) return false; // if (o == null || getClass() != o.getClass()) return false;
// //
// TblApiKey tblApiKey = (TblApiKey) o; // TblApiKey tblApiKey = (TblApiKey) o;
// //
// if (id != tblApiKey.id) return false; // if (id != tblApiKey.id) return false;
// if (domainId != tblApiKey.domainId) return false; // if (domainId != tblApiKey.domainId) return false;
// if (apiKey != null ? !apiKey.equals(tblApiKey.apiKey) : tblApiKey.apiKey != null) return false; // if (apiKey != null ? !apiKey.equals(tblApiKey.apiKey) : tblApiKey.apiKey !=
// if (createDate != null ? !createDate.equals(tblApiKey.createDate) : tblApiKey.createDate != null) return false; // null) return false;
// // if (createDate != null ? !createDate.equals(tblApiKey.createDate) :
// return true; // tblApiKey.createDate != null) return false;
// } //
// // return true;
// @Override // }
// public int hashCode() { //
// int result = (int) (id ^ (id >>> 32)); // @Override
// result = 31 * result + (apiKey != null ? apiKey.hashCode() : 0); // public int hashCode() {
// result = 31 * result + (createDate != null ? createDate.hashCode() : 0); // int result = (int) (id ^ (id >>> 32));
// result = 31 * result + (int) (domainId ^ (domainId >>> 32)); // result = 31 * result + (apiKey != null ? apiKey.hashCode() : 0);
// return result; // result = 31 * result + (createDate != null ? createDate.hashCode() : 0);
// } // result = 31 * result + (int) (domainId ^ (domainId >>> 32));
// return result;
// }
} }

View File

@ -15,13 +15,13 @@ import java.util.Date;
@Table(name = "AUTH_CRAWLER", schema = "public") @Table(name = "AUTH_CRAWLER", schema = "public")
public class AuthCrawler { public class AuthCrawler {
private Long id; private Long id;
private MetaCrawler crawler; private MetaCrawler metaCrawler;
private Target target; private Target target;
private String authJson; private String authJson;
private Date createDate; private Date createDate;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }
@ -31,13 +31,13 @@ public class AuthCrawler {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "CRAWLER_ID", nullable = false) @JoinColumn(name = "META_CRAWLER_ID", nullable = false)
public MetaCrawler getCrawler() { public MetaCrawler getMetaCrawler() {
return crawler; return metaCrawler;
} }
public void setCrawler(MetaCrawler crawler) { public void setMetaCrawler(MetaCrawler metaCrawler) {
this.crawler = crawler; this.metaCrawler = metaCrawler;
} }
@ManyToOne @ManyToOne

View File

@ -27,30 +27,35 @@ public class Metric {
public String getSensorConfigID() { public String getSensorConfigID() {
return sensorConfigID; return sensorConfigID;
} }
/** /**
* @param sensorConfigID the sensorConfigID to set * @param sensorConfigID the sensorConfigID to set
*/ */
public void setSensorConfigID(String sensorConfigID) { public void setSensorConfigID(String sensorConfigID) {
this.sensorConfigID = sensorConfigID; this.sensorConfigID = sensorConfigID;
} }
/** /**
* @return the data * @return the data
*/ */
public Map<String, String> getData() { public Map<String, String> getData() {
return data; return data;
} }
/** /**
* @param data the data to set * @param data the data to set
*/ */
public void setData(Map<String, String> data) { public void setData(Map<String, String> data) {
this.data = data; this.data = data;
} }
/** /**
* @return the collectDate * @return the collectDate
*/ */
public Date getCollectDate() { public Date getCollectDate() {
return collectDate; return collectDate;
} }
/** /**
* @param collectDate the collectDate to set * @param collectDate the collectDate to set
*/ */

View File

@ -1,6 +1,5 @@
package com.loafle.overflow.model.discovery; package com.loafle.overflow.model.discovery;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;

View File

@ -1,6 +1,5 @@
package com.loafle.overflow.model.discovery; package com.loafle.overflow.model.discovery;
import java.util.Date; import java.util.Date;
import com.loafle.overflow.core.type.CryptoType; import com.loafle.overflow.core.type.CryptoType;

View File

@ -15,12 +15,13 @@ public class Domain {
public Domain() { public Domain() {
} }
public Domain(Long id) { public Domain(Long id) {
this.id = id; this.id = id;
} }
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }

View File

@ -17,7 +17,7 @@ public class DomainMember {
private Domain domain; private Domain domain;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }
@ -36,7 +36,6 @@ public class DomainMember {
this.createDate = createDate; this.createDate = createDate;
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "MEMBER_ID", nullable = false) @JoinColumn(name = "MEMBER_ID", nullable = false)
public Member getMember() { public Member getMember() {

View File

@ -17,10 +17,10 @@ public class EmailAuth {
private Date createDate; private Date createDate;
private Date authConfirmDate; private Date authConfirmDate;
private Member member; private Member member;
private MetaEmailStatus emailStatus; private MetaEmailStatus metaEmailStatus;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }
@ -70,12 +70,12 @@ public class EmailAuth {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "STATUS", nullable = false) @JoinColumn(name = "META_EMAIL_STATUS_ID", nullable = false)
public MetaEmailStatus getEmailStatus() { public MetaEmailStatus getMetaEmailStatus() {
return emailStatus; return metaEmailStatus;
} }
public void setEmailStatus(MetaEmailStatus emailStatus) { public void setMetaEmailStatus(MetaEmailStatus metaEmailStatus) {
this.emailStatus = emailStatus; this.metaEmailStatus = metaEmailStatus;
} }
} }

View File

@ -16,17 +16,16 @@ import java.util.Date;
public class History { public class History {
private Long id; private Long id;
private Date createDate; private Date createDate;
private MetaHistoryType type; private MetaHistoryType metaHistoryType;
private String message; private String message;
private Probe probe; private Probe probe;
private Member member; private Member member;
private Domain domain; private Domain domain;
//private MetaResultType resultType; // i'm not sure this is necessary // private MetaResultType resultType; // i'm not sure this is necessary
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }
@ -46,13 +45,13 @@ public class History {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "TYPE_ID", nullable = false) @JoinColumn(name = "META_HISTORY_TYPE_ID", nullable = false)
public MetaHistoryType getType() { public MetaHistoryType getMetaHistoryType() {
return type; return metaHistoryType;
} }
public void setType(MetaHistoryType type) { public void setMetaHistoryType(MetaHistoryType metaHistoryType) {
this.type = type; this.metaHistoryType = metaHistoryType;
} }
@Column(name = "MESSAGE", nullable = false, length = 255) @Column(name = "MESSAGE", nullable = false, length = 255)
@ -96,13 +95,17 @@ public class History {
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o)
if (o == null || getClass() != o.getClass()) return false; return true;
if (o == null || getClass() != o.getClass())
return false;
History that = (History) o; History that = (History) o;
if (id != that.id) return false; if (id != that.id)
if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false; return false;
if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null)
return false;
return true; return true;
} }

View File

@ -1,6 +1,5 @@
package com.loafle.overflow.model.infra; package com.loafle.overflow.model.infra;
import com.loafle.overflow.model.meta.MetaInfraType; import com.loafle.overflow.model.meta.MetaInfraType;
import com.loafle.overflow.model.probe.Probe; import com.loafle.overflow.model.probe.Probe;
import javax.persistence.*; import javax.persistence.*;
@ -15,12 +14,12 @@ import java.util.Date;
@DiscriminatorColumn(name = "INFRA_TYPE", discriminatorType = DiscriminatorType.INTEGER) @DiscriminatorColumn(name = "INFRA_TYPE", discriminatorType = DiscriminatorType.INTEGER)
public abstract class Infra { public abstract class Infra {
private Long id; private Long id;
private MetaInfraType infraType; private MetaInfraType metaInfraType;
private Date createDate; private Date createDate;
private Probe probe; private Probe probe;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }
@ -30,13 +29,13 @@ public abstract class Infra {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "TYPE_ID", nullable = false) @JoinColumn(name = "META_INFRA_TYPE_ID", nullable = false)
public MetaInfraType getInfraType() { public MetaInfraType getMetaInfraType() {
return infraType; return metaInfraType;
} }
public void setInfraType(MetaInfraType infraType) { public void setMetaInfraType(MetaInfraType metaInfraType) {
this.infraType = infraType; this.metaInfraType = metaInfraType;
} }
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
@ -59,5 +58,4 @@ public abstract class Infra {
this.probe = probe; this.probe = probe;
} }
} }

View File

@ -10,31 +10,31 @@ import java.util.Date;
@Table(name = "INFRA_HOST", schema = "public") @Table(name = "INFRA_HOST", schema = "public")
@DiscriminatorValue("2") @DiscriminatorValue("2")
public class InfraHost extends Infra { public class InfraHost extends Infra {
// private Long id; // private Long id;
private InfraOS os; private InfraOS infraOS;
private String ipv4; private String ipv4;
private String ipv6; private String ipv6;
private String mac; private String mac;
private Date createDate; private Date createDate;
// @Id // @Id
// @GeneratedValue(strategy= GenerationType.IDENTITY) // @GeneratedValue(strategy= GenerationType.IDENTITY)
// public Long getId() { // public Long getId() {
// return id; // return id;
// } // }
// //
// public void setId(Long id) { // public void setId(Long id) {
// this.id = id; // this.id = id;
// } // }
@ManyToOne @ManyToOne
@JoinColumn(name = "OS_ID", nullable = true) @JoinColumn(name = "INFRA_OS_ID", nullable = true)
public InfraOS getOs() { public InfraOS getInfraOS() {
return os; return infraOS;
} }
public void setOs(InfraOS os) { public void setInfraOS(InfraOS infraOS) {
this.os = os; this.infraOS = infraOS;
} }
@Basic @Basic

View File

@ -10,26 +10,24 @@ import java.util.Date;
@Table(name = "INFRA_MACHINE", schema = "public") @Table(name = "INFRA_MACHINE", schema = "public")
@DiscriminatorValue("1") @DiscriminatorValue("1")
public class InfraMachine extends Infra { public class InfraMachine extends Infra {
// private Long id; // private Long id;
private String meta; private String meta;
private Date createDate; private Date createDate;
/* /*
private Long id; * private Long id; private String meta; private Date createDate;
private String meta;
private Date createDate;
*/ */
// @Id // @Id
// @GeneratedValue(strategy= GenerationType.IDENTITY) // @GeneratedValue(strategy= GenerationType.IDENTITY)
// public Long getId() { // public Long getId() {
// return id; // return id;
// } // }
// //
// public void setId(Long id) { // public void setId(Long id) {
// this.id = id; // this.id = id;
// } // }
@Basic @Basic
@Column(name = "META", nullable = true, length = 1000) @Column(name = "META", nullable = true, length = 1000)
@ -52,4 +50,3 @@ public class InfraMachine extends Infra {
} }
} }

View File

@ -1,6 +1,5 @@
package com.loafle.overflow.model.infra; package com.loafle.overflow.model.infra;
import com.loafle.overflow.model.meta.MetaInfraVendor; import com.loafle.overflow.model.meta.MetaInfraVendor;
import javax.persistence.*; import javax.persistence.*;
@ -13,30 +12,30 @@ import java.util.Date;
@Table(name = "INFRA_OS", schema = "public") @Table(name = "INFRA_OS", schema = "public")
@DiscriminatorValue("3") @DiscriminatorValue("3")
public class InfraOS extends Infra { public class InfraOS extends Infra {
// private Long id; // private Long id;
private InfraMachine machine; private InfraMachine infraMachine;
private String meta; private String meta;
private Date createDate; private Date createDate;
private MetaInfraVendor vendor; private MetaInfraVendor metaInfraVendor;
// @Id // @Id
// @GeneratedValue(strategy= GenerationType.IDENTITY) // @GeneratedValue(strategy= GenerationType.IDENTITY)
// public Long getId() { // public Long getId() {
// return id; // return id;
// } // }
// //
// public void setId(Long id) { // public void setId(Long id) {
// this.id = id; // this.id = id;
// } // }
@ManyToOne @ManyToOne
@JoinColumn(name = "MACHINE_ID", nullable = true) @JoinColumn(name = "INFRA_MACHINE_ID", nullable = true)
public InfraMachine getMachine() { public InfraMachine getInfraMachine() {
return machine; return infraMachine;
} }
public void setMachine(InfraMachine machine) { public void setInfraMachine(InfraMachine infraMachine) {
this.machine = machine; this.infraMachine = infraMachine;
} }
@Basic @Basic
@ -60,13 +59,13 @@ public class InfraOS extends Infra {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "VENDOR_ID", nullable = true) @JoinColumn(name = "META_INFRA_VENDOR_ID", nullable = true)
public MetaInfraVendor getVendor() { public MetaInfraVendor getMetaInfraVendor() {
return vendor; return metaInfraVendor;
} }
public void setVendor(MetaInfraVendor vendor) { public void setMetaInfraVendor(MetaInfraVendor metaInfraVendor) {
this.vendor = vendor; this.metaInfraVendor = metaInfraVendor;
} }
} }

View File

@ -10,29 +10,29 @@ import java.util.Date;
@Table(name = "INFRA_OS_APPLICATION", schema = "public") @Table(name = "INFRA_OS_APPLICATION", schema = "public")
@DiscriminatorValue("4") @DiscriminatorValue("4")
public class InfraOSApplication extends Infra { public class InfraOSApplication extends Infra {
// private Long id; // private Long id;
private InfraOS os; private InfraOS infraOS;
private String name; private String name;
private Date createDate; private Date createDate;
// @Id // @Id
// @GeneratedValue(strategy= GenerationType.IDENTITY) // @GeneratedValue(strategy= GenerationType.IDENTITY)
// public Long getId() { // public Long getId() {
// return id; // return id;
// } // }
// //
// public void setId(Long id) { // public void setId(Long id) {
// this.id = id; // this.id = id;
// } // }
@ManyToOne @ManyToOne
@JoinColumn(name = "OS_ID", nullable = true) @JoinColumn(name = "INFRA_OS_ID", nullable = true)
public InfraOS getOs() { public InfraOS getInfraOS() {
return os; return infraOS;
} }
public void setOs(InfraOS os) { public void setInfraOS(InfraOS infraOS) {
this.os = os; this.infraOS = infraOS;
} }
@Basic @Basic

View File

@ -10,29 +10,29 @@ import java.util.Date;
@Table(name = "INFRA_OS_DAEMON", schema = "public") @Table(name = "INFRA_OS_DAEMON", schema = "public")
@DiscriminatorValue("5") @DiscriminatorValue("5")
public class InfraOSDaemon extends Infra { public class InfraOSDaemon extends Infra {
// private Long id; // private Long id;
private InfraOS os; private InfraOS infraOS;
private String name; private String name;
private Date createDate; private Date createDate;
// @Id // @Id
// @GeneratedValue(strategy= GenerationType.IDENTITY) // @GeneratedValue(strategy= GenerationType.IDENTITY)
// public Long getId() { // public Long getId() {
// return id; // return id;
// } // }
// //
// public void setId(Long id) { // public void setId(Long id) {
// this.id = id; // this.id = id;
// } // }
@ManyToOne @ManyToOne
@JoinColumn(name = "OS_ID", nullable = true) @JoinColumn(name = "INFRA_OS_ID", nullable = true)
public InfraOS getOs() { public InfraOS getInfraOS() {
return os; return infraOS;
} }
public void setOs(InfraOS os) { public void setInfraOS(InfraOS infraOS) {
this.os = os; this.infraOS = infraOS;
} }
@Basic @Basic

View File

@ -1,6 +1,5 @@
package com.loafle.overflow.model.infra; package com.loafle.overflow.model.infra;
import com.loafle.overflow.model.meta.MetaInfraVendor; import com.loafle.overflow.model.meta.MetaInfraVendor;
import javax.persistence.*; import javax.persistence.*;
@ -13,32 +12,32 @@ import java.util.Date;
@Table(name = "INFRA_OS_PORT", schema = "public") @Table(name = "INFRA_OS_PORT", schema = "public")
@DiscriminatorValue("6") @DiscriminatorValue("6")
public class InfraOSPort extends Infra { public class InfraOSPort extends Infra {
// private Long id; // private Long id;
private InfraOS os; private InfraOS infraOS;
private Date createDate; private Date createDate;
private Integer port; private Integer port;
private String portType; private String portType;
private MetaInfraVendor vendor; private MetaInfraVendor metaInfraVendor;
private Boolean tlsType; private Boolean tlsType;
// //
// @Id // @Id
// @GeneratedValue(strategy= GenerationType.IDENTITY) // @GeneratedValue(strategy= GenerationType.IDENTITY)
// public Long getId() { // public Long getId() {
// return id; // return id;
// } // }
// //
// public void setId(Long id) { // public void setId(Long id) {
// this.id = id; // this.id = id;
// } // }
@ManyToOne @ManyToOne
@JoinColumn(name = "OS_ID", nullable = true) @JoinColumn(name = "INFRA_OS_ID", nullable = true)
public InfraOS getOs() { public InfraOS getInfraOS() {
return this.os; return infraOS;
} }
public void setOs(InfraOS os) { public void setInfraOS(InfraOS infraOS) {
this.os = os; this.infraOS = infraOS;
} }
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
@ -72,13 +71,13 @@ public class InfraOSPort extends Infra {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "VENDOR_ID", nullable = true) @JoinColumn(name = "META_INFRA_VENDOR_ID", nullable = true)
public MetaInfraVendor getVendor() { public MetaInfraVendor getMetaInfraVendor() {
return vendor; return metaInfraVendor;
} }
public void setVendor(MetaInfraVendor vendor) { public void setMetaInfraVendor(MetaInfraVendor metaInfraVendor) {
this.vendor = vendor; this.metaInfraVendor = metaInfraVendor;
} }
@Basic @Basic

View File

@ -1,6 +1,5 @@
package com.loafle.overflow.model.infra; package com.loafle.overflow.model.infra;
import com.loafle.overflow.model.meta.MetaInfraVendor; import com.loafle.overflow.model.meta.MetaInfraVendor;
import javax.persistence.*; import javax.persistence.*;
@ -12,33 +11,33 @@ import java.util.Date;
@Entity(name = "INFRA_SERVICE") @Entity(name = "INFRA_SERVICE")
@Table(name = "INFRA_SERVICE", schema = "public") @Table(name = "INFRA_SERVICE", schema = "public")
@DiscriminatorValue("7") @DiscriminatorValue("7")
public class InfraService extends Infra{ public class InfraService extends Infra {
// private Long id; // private Long id;
private InfraHost host; private InfraHost infraHost;
private String portType; private String portType;
private Integer port; private Integer port;
private MetaInfraVendor vendor; private MetaInfraVendor metaInfraVendor;
private Date createDate; private Date createDate;
private Boolean tlsType; private Boolean tlsType;
// @Id // @Id
// @GeneratedValue(strategy= GenerationType.IDENTITY) // @GeneratedValue(strategy= GenerationType.IDENTITY)
// public Long getId() { // public Long getId() {
// return id; // return id;
// } // }
// //
// public void setId(Long id) { // public void setId(Long id) {
// this.id = id; // this.id = id;
// } // }
@ManyToOne @ManyToOne
@JoinColumn(name = "HOST_ID", nullable = true) @JoinColumn(name = "INFRA_HOST_ID", nullable = true)
public InfraHost getHost() { public InfraHost getInfraHost() {
return host; return infraHost;
} }
public void setHost(InfraHost host) { public void setInfraHost(InfraHost infraHost) {
this.host = host; this.infraHost = infraHost;
} }
@Basic @Basic
@ -62,13 +61,13 @@ public class InfraService extends Infra{
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "VENDOR_ID", nullable = true) @JoinColumn(name = "META_INFRA_VENDOR_ID", nullable = true)
public MetaInfraVendor getVendor() { public MetaInfraVendor getMetaInfraVendor() {
return vendor; return metaInfraVendor;
} }
public void setVendor(MetaInfraVendor vendor) { public void setMetaInfraVendor(MetaInfraVendor metaInfraVendor) {
this.vendor = vendor; this.metaInfraVendor = metaInfraVendor;
} }
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)

View File

@ -20,7 +20,7 @@ public class Member {
private String phone; private String phone;
private String companyName; private String companyName;
private Date createDate; private Date createDate;
private MetaMemberStatus status; private MetaMemberStatus metaMemberStatus;
private Integer signinFailCount; private Integer signinFailCount;
private Boolean totpType; private Boolean totpType;
@ -32,7 +32,7 @@ public class Member {
} }
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }
@ -103,17 +103,17 @@ public class Member {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "STATUS_ID", nullable = false) @JoinColumn(name = "META_MEMBER_STATUS_ID", nullable = false)
public MetaMemberStatus getStatus() { public MetaMemberStatus getMetaMemberStatus() {
return status; return metaMemberStatus;
} }
public void setStatus(MetaMemberStatus status) { public void setMetaMemberStatus(MetaMemberStatus metaMemberStatus) {
this.status = status; this.metaMemberStatus = metaMemberStatus;
} }
@Column(name = "SIGNIN_FAIL_COUNT", nullable = true, columnDefinition = "int default 0") @Column(name = "SIGNIN_FAIL_COUNT", nullable = true, columnDefinition = "int default 0")
public Integer getSigninFailCount(){ public Integer getSigninFailCount() {
return this.signinFailCount; return this.signinFailCount;
} }
@ -131,4 +131,3 @@ public class Member {
this.totpType = totpType; this.totpType = totpType;
} }
} }

View File

@ -1,6 +1,5 @@
package com.loafle.overflow.model.member; package com.loafle.overflow.model.member;
import javax.persistence.*; import javax.persistence.*;
import java.util.Date; import java.util.Date;
@ -25,7 +24,7 @@ public class MemberTotp {
} }
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }

View File

@ -24,7 +24,7 @@ public class MetaCrawler {
} }
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
@Column(name="CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false) @Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false)
public Date getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
} }
@ -51,5 +51,4 @@ public class MetaCrawler {
this.description = description; this.description = description;
} }
} }

View File

@ -10,8 +10,8 @@ import java.util.Date;
@Table(name = "META_CRAWLER_INPUT_ITEM", schema = "public") @Table(name = "META_CRAWLER_INPUT_ITEM", schema = "public")
public class MetaCrawlerInputItem { public class MetaCrawlerInputItem {
private Integer id; private Integer id;
private MetaInputType inputType; private MetaInputType metaInputType;
private MetaCrawler crawler; private MetaCrawler metaCrawler;
private String description; private String description;
private String name; private String name;
private Date createDate; private Date createDate;
@ -30,25 +30,24 @@ public class MetaCrawlerInputItem {
this.id = id; this.id = id;
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "TYPE_ID", nullable = false) @JoinColumn(name = "META_INPUT_TYPE_ID", nullable = false)
public MetaInputType getInputType() { public MetaInputType getMetaInputType() {
return inputType; return metaInputType;
} }
public void setInputType(MetaInputType inputType) { public void setMetaInputType(MetaInputType metaInputType) {
this.inputType = inputType; this.metaInputType = metaInputType;
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "CRAWLER_ID", nullable = false) @JoinColumn(name = "META_CRAWLER_ID", nullable = false)
public MetaCrawler getCrawler() { public MetaCrawler getMetaCrawler() {
return crawler; return metaCrawler;
} }
public void setCrawler(MetaCrawler crawler) { public void setMetaCrawler(MetaCrawler metaCrawler) {
this.crawler = crawler; this.metaCrawler = metaCrawler;
} }
@Column(name = "DESCRIPTION", nullable = true, length = 50) @Column(name = "DESCRIPTION", nullable = true, length = 50)
@ -97,7 +96,6 @@ public class MetaCrawlerInputItem {
this.defaultValue = defaultValue; this.defaultValue = defaultValue;
} }
@Column(name = "PATTERN", nullable = true, length = 50) @Column(name = "PATTERN", nullable = true, length = 50)
public String getPattern() { public String getPattern() {
return pattern; return pattern;
@ -107,7 +105,6 @@ public class MetaCrawlerInputItem {
this.pattern = pattern; this.pattern = pattern;
} }
@Column(name = "KEY_NAME", nullable = true, length = 50) @Column(name = "KEY_NAME", nullable = true, length = 50)
public String getKeyName() { public String getKeyName() {
return keyName; return keyName;
@ -117,7 +114,6 @@ public class MetaCrawlerInputItem {
this.keyName = keyName; this.keyName = keyName;
} }
@Column(name = "KEY_VALUE", nullable = true, length = 50) @Column(name = "KEY_VALUE", nullable = true, length = 50)
public String getKeyValue() { public String getKeyValue() {
return keyValue; return keyValue;
@ -127,41 +123,46 @@ public class MetaCrawlerInputItem {
this.keyValue = keyValue; this.keyValue = keyValue;
} }
// @Override // @Override
// public Boolean equals(Object o) { // public Boolean equals(Object o) {
// if (this == o) return true; // if (this == o) return true;
// if (o == null || getClass() != o.getClass()) return false; // if (o == null || getClass() != o.getClass()) return false;
// //
// MetaCrawlerInputItem that = (MetaCrawlerInputItem) o; // MetaCrawlerInputItem that = (MetaCrawlerInputItem) o;
// //
// if (id != that.id) return false; // if (id != that.id) return false;
// if (typeId != that.typeId) return false; // if (typeId != that.typeId) return false;
// if (crawlerId != that.crawlerId) return false; // if (crawlerId != that.crawlerId) return false;
// if (required != that.required) return false; // if (required != that.required) return false;
// if (desc != null ? !desc.equals(that.desc) : that.desc != null) return false; // if (desc != null ? !desc.equals(that.desc) : that.desc != null) return false;
// if (name != null ? !name.equals(that.name) : that.name != null) return false; // if (name != null ? !name.equals(that.name) : that.name != null) return false;
// if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false; // if (createDate != null ? !createDate.equals(that.createDate) :
// if (defaultValue != null ? !defaultValue.equals(that.defaultValue) : that.defaultValue != null) return false; // that.createDate != null) return false;
// if (pattern != null ? !pattern.equals(that.pattern) : that.pattern != null) return false; // if (defaultValue != null ? !defaultValue.equals(that.defaultValue) :
// if (keyName != null ? !keyName.equals(that.keyName) : that.keyName != null) return false; // that.defaultValue != null) return false;
// if (keyValue != null ? !keyValue.equals(that.keyValue) : that.keyValue != null) return false; // if (pattern != null ? !pattern.equals(that.pattern) : that.pattern != null)
// // return false;
// return true; // if (keyName != null ? !keyName.equals(that.keyName) : that.keyName != null)
// } // return false;
// // if (keyValue != null ? !keyValue.equals(that.keyValue) : that.keyValue !=
// @Override // null) return false;
// public int hashCode() { //
// int result = id; // return true;
// result = 31 * result + (int) typeId; // }
// result = 31 * result + (int) crawlerId; //
// result = 31 * result + (desc != null ? desc.hashCode() : 0); // @Override
// result = 31 * result + (name != null ? name.hashCode() : 0); // public int hashCode() {
// result = 31 * result + (createDate != null ? createDate.hashCode() : 0); // int result = id;
// result = 31 * result + (required ? 1 : 0); // result = 31 * result + (int) typeId;
// result = 31 * result + (defaultValue != null ? defaultValue.hashCode() : 0); // result = 31 * result + (int) crawlerId;
// result = 31 * result + (pattern != null ? pattern.hashCode() : 0); // result = 31 * result + (desc != null ? desc.hashCode() : 0);
// result = 31 * result + (keyName != null ? keyName.hashCode() : 0); // result = 31 * result + (name != null ? name.hashCode() : 0);
// result = 31 * result + (keyValue != null ? keyValue.hashCode() : 0); // result = 31 * result + (createDate != null ? createDate.hashCode() : 0);
// return result; // result = 31 * result + (required ? 1 : 0);
// } // result = 31 * result + (defaultValue != null ? defaultValue.hashCode() : 0);
// result = 31 * result + (pattern != null ? pattern.hashCode() : 0);
// result = 31 * result + (keyName != null ? keyName.hashCode() : 0);
// result = 31 * result + (keyValue != null ? keyValue.hashCode() : 0);
// return result;
// }
} }

View File

@ -11,7 +11,8 @@ public class MetaEmailStatus {
private String name; private String name;
private Date createDate; private Date createDate;
public MetaEmailStatus(){} public MetaEmailStatus() {
}
public MetaEmailStatus(Integer id) { public MetaEmailStatus(Integer id) {
this.id = id; this.id = id;
@ -26,7 +27,6 @@ public class MetaEmailStatus {
this.id = id; this.id = id;
} }
@Column(name = "NAME", nullable = true, length = 50) @Column(name = "NAME", nullable = true, length = 50)
public String getName() { public String getName() {
return name; return name;
@ -37,7 +37,7 @@ public class MetaEmailStatus {
} }
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
@Column(name="CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false) @Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false)
public Date getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
} }

View File

@ -30,7 +30,6 @@ public class MetaHistoryType {
this.id = id; this.id = id;
} }
@Column(name = "NAME", nullable = true, length = 50) @Column(name = "NAME", nullable = true, length = 50)
public String getName() { public String getName() {
return name; return name;
@ -41,7 +40,7 @@ public class MetaHistoryType {
} }
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
@Column(name="CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false) @Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false)
public Date getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
} }

View File

@ -13,6 +13,10 @@ public class MetaInfraType {
private String name; private String name;
private Date createDate; private Date createDate;
public MetaInfraType(Integer id) {
this.id = id;
}
@Id @Id
public Integer getId() { public Integer getId() {
return id; return id;
@ -22,7 +26,6 @@ public class MetaInfraType {
this.id = id; this.id = id;
} }
@Column(name = "NAME", nullable = true, length = 50) @Column(name = "NAME", nullable = true, length = 50)
public String getName() { public String getName() {
return name; return name;

View File

@ -12,7 +12,7 @@ public class MetaInfraVendor {
private Integer id; private Integer id;
private String name; private String name;
private Date createDate; private Date createDate;
private MetaInfraType infraType; private MetaInfraType metaInfraType;
@Id @Id
public Integer getId() { public Integer getId() {
@ -23,7 +23,6 @@ public class MetaInfraVendor {
this.id = id; this.id = id;
} }
@Column(name = "NAME", nullable = true, length = 50) @Column(name = "NAME", nullable = true, length = 50)
public String getName() { public String getName() {
return name; return name;
@ -43,31 +42,28 @@ public class MetaInfraVendor {
this.createDate = createDate; this.createDate = createDate;
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "TYPE_ID", nullable=false) @JoinColumn(name = "META_INFRA_TYPE_ID", nullable = false)
public MetaInfraType getInfraType() { public MetaInfraType getMetaInfraType() {
return infraType; return metaInfraType;
} }
public void setInfraType(MetaInfraType infraType) { public void setMetaInfraType(MetaInfraType metaInfraType) {
this.infraType = infraType; this.metaInfraType = metaInfraType;
} }
public static MetaInfraVendor CreateInfraVendorByOS(String osName) { public static MetaInfraVendor CreateInfraVendorByOS(String osName) {
MetaInfraVendor vendor = new MetaInfraVendor(); MetaInfraVendor vendor = new MetaInfraVendor();
if(osName == null || osName.length() <= 0) { if (osName == null || osName.length() <= 0) {
vendor.setId(24); // FIXME: Unknown vendor.setId(24); // FIXME: Unknown
return vendor; return vendor;
} }
if(osName.equals("Windows")) { if (osName.equals("Windows")) {
vendor.setId(26); vendor.setId(26);
} } else if (osName.equals("Linux")) {
else if(osName.equals("Linux")) {
vendor.setId(28); // ubuntu vendor.setId(28); // ubuntu
} else { } else {
vendor.setId(24); // FIXME: Unknown vendor.setId(24); // FIXME: Unknown
@ -84,23 +80,18 @@ public class MetaInfraVendor {
MetaInfraVendor vendor = new MetaInfraVendor(); MetaInfraVendor vendor = new MetaInfraVendor();
if(serviceName.equals("mysql")) { if (serviceName.equals("mysql")) {
vendor.setId(11); vendor.setId(11);
} } else if (serviceName.equals("portgresql")) {
else if(serviceName.equals("portgresql")) {
vendor.setId(15); vendor.setId(15);
} } else if (serviceName.equals("wmi")) {
else if(serviceName.equals("wmi")) {
vendor.setId(23); vendor.setId(23);
} } else if (serviceName.equals("snmpv2")) {
else if(serviceName.equals("snmpv2")) {
vendor.setId(20); vendor.setId(20);
} } else {
else {
vendor.setId(24); // unknown vendor.setId(24); // unknown
} }
return vendor; return vendor;
} }
} }

View File

@ -23,7 +23,6 @@ public class MetaInputType {
this.id = id; this.id = id;
} }
@Column(name = "NAME", nullable = true, length = 50) @Column(name = "NAME", nullable = true, length = 50)
public String getName() { public String getName() {
return name; return name;
@ -33,7 +32,6 @@ public class MetaInputType {
this.name = name; this.name = name;
} }
@Column(name = "DESCRIPTION", nullable = true, length = 50) @Column(name = "DESCRIPTION", nullable = true, length = 50)
public String getDescription() { public String getDescription() {
return description; return description;

View File

@ -31,7 +31,6 @@ public class MetaMemberStatus {
this.id = id; this.id = id;
} }
@Column(name = "Name", nullable = false, length = 10) @Column(name = "Name", nullable = false, length = 10)
public String getName() { public String getName() {
return name; return name;

View File

@ -31,7 +31,6 @@ public class MetaNoAuthProbeStatus {
this.id = id; this.id = id;
} }
@Column(name = "Name", nullable = false, length = 10) @Column(name = "Name", nullable = false, length = 10)
public String getName() { public String getName() {
return name; return name;

View File

@ -33,7 +33,6 @@ public class MetaNotification {
this.createDate = createDate; this.createDate = createDate;
} }
@Column(name = "NAME", nullable = true, length = 50) @Column(name = "NAME", nullable = true, length = 50)
public String getName() { public String getName() {
return name; return name;

View File

@ -22,7 +22,6 @@ public class MetaProbeArchitecture {
this.id = id; this.id = id;
} }
@Column(name = "ARCHITECTURE", nullable = true, length = 10) @Column(name = "ARCHITECTURE", nullable = true, length = 10)
public String getArchitecture() { public String getArchitecture() {
return architecture; return architecture;

View File

@ -22,7 +22,6 @@ public class MetaProbeOs {
this.id = id; this.id = id;
} }
@Column(name = "NAME", nullable = true, length = 50) @Column(name = "NAME", nullable = true, length = 50)
public String getName() { public String getName() {
return name; return name;

View File

@ -10,13 +10,13 @@ import java.util.Date;
@Table(name = "META_PROBE_PACKAGE", schema = "public") @Table(name = "META_PROBE_PACKAGE", schema = "public")
public class MetaProbePackage { public class MetaProbePackage {
private Long id; private Long id;
private MetaProbeVersion version; private MetaProbeVersion metaProbeVersion;
private MetaProbeOs os; private MetaProbeOs metaProbeOs;
private MetaProbeArchitecture architecture; private MetaProbeArchitecture metaProbeArchitecture;
private Date createDate; private Date createDate;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }
@ -26,33 +26,33 @@ public class MetaProbePackage {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "VERSION_ID", nullable = false) @JoinColumn(name = "META_PROBE_VERSION_ID", nullable = false)
public MetaProbeVersion getVersion() { public MetaProbeVersion getMetaProbeVersion() {
return version; return metaProbeVersion;
} }
public void setVersion(MetaProbeVersion version) { public void setMetaProbeVersion(MetaProbeVersion metaProbeVersion) {
this.version = version; this.metaProbeVersion = metaProbeVersion;
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "OS_ID", nullable = false) @JoinColumn(name = "META_PROBE_OS_ID", nullable = false)
public MetaProbeOs getOs() { public MetaProbeOs getMetaProbeOs() {
return os; return metaProbeOs;
} }
public void setOs(MetaProbeOs os) { public void setMetaProbeOs(MetaProbeOs metaProbeOs) {
this.os = os; this.metaProbeOs = metaProbeOs;
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "ARCHITECTURE_ID", nullable = false) @JoinColumn(name = "META_PROBE_ARCHITECTURE_ID", nullable = false)
public MetaProbeArchitecture getArchitecture() { public MetaProbeArchitecture getMetaProbeArchitecture() {
return architecture; return metaProbeArchitecture;
} }
public void setArchitecture(MetaProbeArchitecture architecture) { public void setMetaProbeArchitecture(MetaProbeArchitecture metaProbeArchitecture) {
this.architecture = architecture; this.metaProbeArchitecture = metaProbeArchitecture;
} }
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)

View File

@ -31,7 +31,6 @@ public class MetaProbeStatus {
this.id = id; this.id = id;
} }
@Column(name = "Name", nullable = false, length = 10) @Column(name = "Name", nullable = false, length = 10)
public String getName() { public String getName() {
return name; return name;

View File

@ -23,7 +23,6 @@ public class MetaProbeTaskType {
this.id = id; this.id = id;
} }
@Column(name = "NAME", nullable = false, length = 50) @Column(name = "NAME", nullable = false, length = 50)
public String getName() { public String getName() {
return name; return name;
@ -52,5 +51,4 @@ public class MetaProbeTaskType {
this.createDate = createDate; this.createDate = createDate;
} }
} }

View File

@ -14,7 +14,7 @@ public class MetaProbeVersion {
private Date createDate; private Date createDate;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Short getId() { public Short getId() {
return id; return id;
} }
@ -23,7 +23,6 @@ public class MetaProbeVersion {
this.id = id; this.id = id;
} }
@Column(name = "VERSION", nullable = true, length = 10) @Column(name = "VERSION", nullable = true, length = 10)
public String getVersion() { public String getVersion() {
return version; return version;

View File

@ -1,6 +1,5 @@
package com.loafle.overflow.model.meta; package com.loafle.overflow.model.meta;
import javax.persistence.*; import javax.persistence.*;
import java.util.Date; import java.util.Date;
@ -15,15 +14,16 @@ public class MetaSensorDisplayItem {
private String key; private String key;
private String displayName; private String displayName;
private String description; private String description;
private MetaCrawler crawler; private MetaCrawler metaCrawler;
private MetaSensorItemUnit unit; private MetaSensorItemUnit metaSensorItemUnit;
private Date createDate; private Date createDate;
private Boolean isDefault; private Boolean isDefault;
private MetaSensorItemType itemType; private MetaSensorItemType metaSensorItemType;
public MetaSensorDisplayItem() { public MetaSensorDisplayItem() {
} }
public MetaSensorDisplayItem(Long id) { public MetaSensorDisplayItem(Long id) {
this.id = id; this.id = id;
} }
@ -64,29 +64,28 @@ public class MetaSensorDisplayItem {
this.description = description; this.description = description;
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "CRAWLER_ID", nullable = false) @JoinColumn(name = "META_CRAWLER_ID", nullable = false)
public MetaCrawler getCrawler() { public MetaCrawler getMetaCrawler() {
return crawler; return metaCrawler;
} }
public void setCrawler(MetaCrawler crawler) { public void setMetaCrawler(MetaCrawler metaCrawler) {
this.crawler = crawler; this.metaCrawler = metaCrawler;
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "UNIT_ID", nullable = true) @JoinColumn(name = "META_SENSOR_ITEM_UNIT_ID", nullable = true)
public MetaSensorItemUnit getUnit() { public MetaSensorItemUnit getMetaSensorItemUnit() {
return unit; return metaSensorItemUnit;
} }
public void setUnit(MetaSensorItemUnit unit) { public void setMetaSensorItemUnit(MetaSensorItemUnit metaSensorItemUnit) {
this.unit = unit; this.metaSensorItemUnit = metaSensorItemUnit;
} }
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
@Column(name="CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false) @Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false)
public Date getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
} }
@ -95,9 +94,8 @@ public class MetaSensorDisplayItem {
this.createDate = createDate; this.createDate = createDate;
} }
@Basic @Basic
@Column(name="IS_DEFAULT", nullable = false, columnDefinition = "Boolean default false") @Column(name = "IS_DEFAULT", nullable = false, columnDefinition = "Boolean default false")
public Boolean getDefault() { public Boolean getDefault() {
return isDefault; return isDefault;
} }
@ -107,13 +105,13 @@ public class MetaSensorDisplayItem {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "TYPE_ID", nullable = false) @JoinColumn(name = "META_SENSOR_ITEM_TYPE_ID", nullable = false)
public MetaSensorItemType getItemType() { public MetaSensorItemType getMetaSensorItemType() {
return itemType; return metaSensorItemType;
} }
public void setItemType(MetaSensorItemType itemType) { public void setMetaSensorItemType(MetaSensorItemType metaSensorItemType) {
this.itemType = itemType; this.metaSensorItemType = metaSensorItemType;
} }
} }

View File

@ -10,11 +10,11 @@ import javax.persistence.*;
public class MetaSensorDisplayMapping { public class MetaSensorDisplayMapping {
private Long id; private Long id;
private MetaSensorDisplayItem displayItem; private MetaSensorDisplayItem metaSensorDisplayItem;
private MetaSensorItemKey itemKey; private MetaSensorItemKey metaSensorItemKey;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }
@ -24,22 +24,22 @@ public class MetaSensorDisplayMapping {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "DISPLAY_ITEM_ID", nullable = false) @JoinColumn(name = "META_SENSOR_DISPLAY_ITEM_ID", nullable = false)
public MetaSensorDisplayItem getDisplayItem() { public MetaSensorDisplayItem getMetaSensorDisplayItem() {
return displayItem; return metaSensorDisplayItem;
} }
public void setDisplayItem(MetaSensorDisplayItem displayItem) { public void setMetaSensorDisplayItem(MetaSensorDisplayItem metaSensorDisplayItem) {
this.displayItem = displayItem; this.metaSensorDisplayItem = metaSensorDisplayItem;
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "ITEM_KEY_ID", nullable = false) @JoinColumn(name = "META_SENSOR_ITEM_KEY_ID", nullable = false)
public MetaSensorItemKey getItemKey() { public MetaSensorItemKey getMetaSensorItemKey() {
return itemKey; return metaSensorItemKey;
} }
public void setItemKey(MetaSensorItemKey itemKey) { public void setMetaSensorItemKey(MetaSensorItemKey metaSensorItemKey) {
this.itemKey = itemKey; this.metaSensorItemKey = metaSensorItemKey;
} }
} }

View File

@ -23,7 +23,6 @@ public class MetaSensorItem {
this.id = id; this.id = id;
} }
@Column(name = "KEY", nullable = true, length = 100) @Column(name = "KEY", nullable = true, length = 100)
public String getKey() { public String getKey() {
return key; return key;

View File

@ -10,16 +10,16 @@ import java.util.Date;
@Table(name = "META_SENSOR_ITEM_KEY", schema = "public") @Table(name = "META_SENSOR_ITEM_KEY", schema = "public")
public class MetaSensorItemKey { public class MetaSensorItemKey {
private Long id; private Long id;
private MetaSensorItem item; private MetaSensorItem metaSensorItem;
private String key; private String key;
private String froms; private String froms;
private String option; private String option;
private MetaCrawler crawler; private MetaCrawler metaCrawler;
private Date createDate; private Date createDate;
private MetaSensorItemUnit unit; private MetaSensorItemUnit metaSensorItemUnit;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }
@ -29,13 +29,13 @@ public class MetaSensorItemKey {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "ITEM_ID", nullable = false) @JoinColumn(name = "META_SENSOR_ITEM_ID", nullable = false)
public MetaSensorItem getItem() { public MetaSensorItem getMetaSensorItem() {
return item; return metaSensorItem;
} }
public void setItem(MetaSensorItem item) { public void setMetaSensorItem(MetaSensorItem metaSensorItem) {
this.item = item; this.metaSensorItem = metaSensorItem;
} }
@Column(name = "KEY", nullable = false, length = 100) @Column(name = "KEY", nullable = false, length = 100)
@ -66,17 +66,17 @@ public class MetaSensorItemKey {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "CRAWLER_ID", nullable = false) @JoinColumn(name = "META_CRAWLER_ID", nullable = false)
public MetaCrawler getCrawler() { public MetaCrawler getMetaCrawler() {
return crawler; return metaCrawler;
} }
public void setCrawler(MetaCrawler crawler) { public void setMetaCrawler(MetaCrawler metaCrawler) {
this.crawler = crawler; this.metaCrawler = metaCrawler;
} }
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
@Column(name="CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false) @Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false)
public Date getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
} }
@ -86,12 +86,12 @@ public class MetaSensorItemKey {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "UNIT_ID", nullable = true) @JoinColumn(name = "META_SENSOR_ITEM_UNIT_ID", nullable = true)
public MetaSensorItemUnit getUnit() { public MetaSensorItemUnit getMetaSensorItemUnit() {
return unit; return metaSensorItemUnit;
} }
public void setUnit(MetaSensorItemUnit unit) { public void setMetaSensorItemUnit(MetaSensorItemUnit metaSensorItemUnit) {
this.unit = unit; this.metaSensorItemUnit = metaSensorItemUnit;
} }
} }

View File

@ -30,7 +30,6 @@ public class MetaSensorItemType {
this.id = id; this.id = id;
} }
@Column(name = "NAME", nullable = true, length = 50) @Column(name = "NAME", nullable = true, length = 50)
public String getName() { public String getName() {
return name; return name;
@ -40,7 +39,6 @@ public class MetaSensorItemType {
this.name = name; this.name = name;
} }
@Column(name = "DESCRIPTION", nullable = true, length = 50) @Column(name = "DESCRIPTION", nullable = true, length = 50)
public String getDescription() { public String getDescription() {
return description; return description;

View File

@ -33,7 +33,7 @@ public class MetaSensorItemUnit {
} }
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
@Column(name="CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false) @Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false)
public Date getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
} }

View File

@ -31,7 +31,6 @@ public class MetaSensorStatus {
this.id = id; this.id = id;
} }
@Column(name = "Name", nullable = false, length = 10) @Column(name = "Name", nullable = false, length = 10)
public String getName() { public String getName() {
return name; return name;

View File

@ -10,8 +10,8 @@ import java.util.Date;
@Table(name = "META_VENDOR_CRAWLER", schema = "public") @Table(name = "META_VENDOR_CRAWLER", schema = "public")
public class MetaVendorCrawler { public class MetaVendorCrawler {
private Integer id; private Integer id;
private MetaCrawler crawler; private MetaCrawler metaCrawler;
private MetaInfraVendor infraVendor; private MetaInfraVendor metaInfraVendor;
private Date createDate; private Date createDate;
@Id @Id
@ -24,44 +24,44 @@ public class MetaVendorCrawler {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "CRAWLER_ID", nullable = false) @JoinColumn(name = "META_CRAWLER_ID", nullable = false)
public MetaCrawler getCrawler() { public MetaCrawler getMetaCrawler() {
return crawler; return metaCrawler;
} }
public void setCrawler(MetaCrawler crawler) { public void setMetaCrawler(MetaCrawler metaCrawler) {
this.crawler = crawler; this.metaCrawler = metaCrawler;
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "VENDOR_ID", nullable = false) @JoinColumn(name = "META_INFRA_VENDOR_ID", nullable = false)
public MetaInfraVendor getInfraVendor() { public MetaInfraVendor getMetaInfraVendor() {
return infraVendor; return metaInfraVendor;
} }
public void setInfraVendor(MetaInfraVendor infraVendor) { public void setMetaInfraVendor(MetaInfraVendor metaInfraVendor) {
this.infraVendor = infraVendor; this.metaInfraVendor = metaInfraVendor;
} }
// @Basic // @Basic
// @Column(name = "CRAWLER_ID", nullable = false) // @Column(name = "CRAWLER_ID", nullable = false)
// public short getCrawlerId() { // public short getCrawlerId() {
// return crawlerId; // return crawlerId;
// } // }
// //
// public void setCrawlerId(short crawlerId) { // public void setCrawlerId(short crawlerId) {
// this.crawlerId = crawlerId; // this.crawlerId = crawlerId;
// } // }
// //
// @Basic // @Basic
// @Column(name = "VENDOR_ID", nullable = false) // @Column(name = "VENDOR_ID", nullable = false)
// public int getVendorId() { // public int getVendorId() {
// return vendorId; // return vendorId;
// } // }
// //
// public void setVendorId(int vendorId) { // public void setVendorId(int vendorId) {
// this.vendorId = vendorId; // this.vendorId = vendorId;
// } // }
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
@Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false) @Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false)

View File

@ -13,12 +13,12 @@ public class MetaVendorCrawlerSensorItem {
private String interval; private String interval;
private String warnCondition; private String warnCondition;
private Date createDate; private Date createDate;
private MetaSensorItem sensorItem; private MetaSensorItem metaSensorItem;
private MetaInfraVendor vendor; private MetaInfraVendor metaInfraVendor;
private Short crawlerId; private Short crawlerId;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }
@ -27,7 +27,6 @@ public class MetaVendorCrawlerSensorItem {
this.id = id; this.id = id;
} }
@Column(name = "INTERVAL", nullable = true, length = 50) @Column(name = "INTERVAL", nullable = true, length = 50)
public String getInterval() { public String getInterval() {
return interval; return interval;
@ -37,7 +36,6 @@ public class MetaVendorCrawlerSensorItem {
this.interval = interval; this.interval = interval;
} }
@Column(name = "WARN_CONDITION", nullable = true, length = 50) @Column(name = "WARN_CONDITION", nullable = true, length = 50)
public String getWarnCondition() { public String getWarnCondition() {
return warnCondition; return warnCondition;
@ -57,25 +55,24 @@ public class MetaVendorCrawlerSensorItem {
this.createDate = createDate; this.createDate = createDate;
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "ITEM_ID", nullable = false) @JoinColumn(name = "META_SENSOR_ITEM_ID", nullable = false)
public MetaSensorItem getSensorItem() { public MetaSensorItem getMetaSensorItem() {
return sensorItem; return metaSensorItem;
} }
public void setSensorItem(MetaSensorItem sensorItem) { public void setMetaSensorItem(MetaSensorItem metaSensorItem) {
this.sensorItem = sensorItem; this.metaSensorItem = metaSensorItem;
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "VENDOR_ID", nullable = false) @JoinColumn(name = "VENDOR_ID", nullable = false)
public MetaInfraVendor getVendor() { public MetaInfraVendor getMetaInfraVendor() {
return vendor; return metaInfraVendor;
} }
public void setVendor(MetaInfraVendor vendor) { public void setMetaInfraVendor(MetaInfraVendor metaInfraVendor) {
this.vendor = vendor; this.metaInfraVendor = metaInfraVendor;
} }
@Basic @Basic

View File

@ -5,31 +5,30 @@ package com.loafle.overflow.model.meta.type;
*/ */
public enum MetaCrawlerEnum { public enum MetaCrawlerEnum {
ACTIVEDIRECTORY_CRAWLER((short)1), ACTIVEDIRECTORY_CRAWLER((short) 1),
CASSANDRA_CRAWLER((short)2), CASSANDRA_CRAWLER((short) 2),
DHCP_CRAWLER((short)3), DHCP_CRAWLER((short) 3),
DNS_CRAWLER((short)4), DNS_CRAWLER((short) 4),
FTP_CRAWLER((short)5), FTP_CRAWLER((short) 5),
HTTP_CRAWLER((short)6), HTTP_CRAWLER((short) 6),
IMAP_CRAWLER((short)7), IMAP_CRAWLER((short) 7),
LDAP_CRAWLER((short)8), LDAP_CRAWLER((short) 8),
MONGODB_CRAWLER((short)9), MONGODB_CRAWLER((short) 9),
MSSQL_CRAWLER((short)10), MSSQL_CRAWLER((short) 10),
MYSQL_CRAWLER((short)11), MYSQL_CRAWLER((short) 11),
NETBIOS_CRAWLER((short)12), NETBIOS_CRAWLER((short) 12),
ORACLE_CRAWLER((short)13), ORACLE_CRAWLER((short) 13),
POP_CRAWLER((short)14), POP_CRAWLER((short) 14),
POSTGRESQL_CRAWLER((short)15), POSTGRESQL_CRAWLER((short) 15),
REDIS_CRAWLER((short)16), REDIS_CRAWLER((short) 16),
JMX_CRAWLER((short)17), JMX_CRAWLER((short) 17),
SMB_CRAWLER((short)18), SMB_CRAWLER((short) 18),
SMTP_CRAWLER((short)19), SMTP_CRAWLER((short) 19),
SNMP_CRAWLER((short)20), SNMP_CRAWLER((short) 20),
SSH_CRAWLER((short)21), SSH_CRAWLER((short) 21),
TELNET_CRAWLER((short)22), TELNET_CRAWLER((short) 22),
WMI_CRAWLER((short)23), WMI_CRAWLER((short) 23),
UNKNOWN_CRAWLER((short)24); UNKNOWN_CRAWLER((short) 24);
private Short value; private Short value;

View File

@ -1,6 +1,5 @@
package com.loafle.overflow.model.noauthprobe; package com.loafle.overflow.model.noauthprobe;
import com.loafle.overflow.model.domain.Domain; import com.loafle.overflow.model.domain.Domain;
import com.loafle.overflow.model.meta.MetaNoAuthProbeStatus; import com.loafle.overflow.model.meta.MetaNoAuthProbeStatus;
import com.loafle.overflow.model.probe.Probe; import com.loafle.overflow.model.probe.Probe;
@ -16,7 +15,7 @@ import java.util.Date;
public class NoAuthProbe { public class NoAuthProbe {
private Long id; private Long id;
private String description; private String description;
private MetaNoAuthProbeStatus status; private MetaNoAuthProbeStatus metaNoAuthProbeStatus;
private String tempProbeKey; private String tempProbeKey;
private Date connectDate; private Date connectDate;
private String apiKey; private String apiKey;
@ -26,7 +25,7 @@ public class NoAuthProbe {
private Date createDate; private Date createDate;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }
@ -45,13 +44,13 @@ public class NoAuthProbe {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "STATUS", nullable = false) @JoinColumn(name = "META_NOAUTH_PROBE_STATUS_ID", nullable = false)
public MetaNoAuthProbeStatus getStatus() { public MetaNoAuthProbeStatus getMetaNoAuthProbeStatus() {
return status; return metaNoAuthProbeStatus;
} }
public void setStatus(MetaNoAuthProbeStatus status) { public void setMetaNoAuthProbeStatus(MetaNoAuthProbeStatus metaNoAuthProbeStatus) {
this.status = status; this.metaNoAuthProbeStatus = metaNoAuthProbeStatus;
} }
@Column(name = "TEMP_PROBE_KEY", nullable = false, length = 50, unique = true) @Column(name = "TEMP_PROBE_KEY", nullable = false, length = 50, unique = true)
@ -83,7 +82,7 @@ public class NoAuthProbe {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "DOMAIN_ID", nullable=false) @JoinColumn(name = "DOMAIN_ID", nullable = false)
public Domain getDomain() { public Domain getDomain() {
return domain; return domain;
} }
@ -121,39 +120,47 @@ public class NoAuthProbe {
this.connectAddress = connectAddress; this.connectAddress = connectAddress;
} }
// @Override // @Override
// public boolean equals(Object o) { // public boolean equals(Object o) {
// if (this == o) return true; // if (this == o) return true;
// if (o == null || getClass() != o.getClass()) return false; // if (o == null || getClass() != o.getClass()) return false;
// //
// NoAuthProbe that = (NoAuthProbe) o; // NoAuthProbe that = (NoAuthProbe) o;
// //
// if (id != that.id) return false; // if (id != that.id) return false;
// if (domainId != that.domainId) return false; // if (domainId != that.domainId) return false;
// if (hostName != null ? !hostName.equals(that.hostName) : that.hostName != null) return false; // if (hostName != null ? !hostName.equals(that.hostName) : that.hostName !=
// if (macAddress != null ? !macAddress.equals(that.macAddress) : that.macAddress != null) return false; // null) return false;
// if (ipAddress != null ? !ipAddress.equals(that.ipAddress) : that.ipAddress != null) return false; // if (macAddress != null ? !macAddress.equals(that.macAddress) :
// if (status != null ? !status.equals(that.status) : that.status != null) return false; // that.macAddress != null) return false;
// if (tempProbeKey != null ? !tempProbeKey.equals(that.tempProbeKey) : that.tempProbeKey != null) return false; // if (ipAddress != null ? !ipAddress.equals(that.ipAddress) : that.ipAddress !=
// if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false; // null) return false;
// if (apiKey != null ? !apiKey.equals(that.apiKey) : that.apiKey != null) return false; // if (status != null ? !status.equals(that.status) : that.status != null)
// if (probeId != null ? !probeId.equals(that.probeId) : that.probeId != null) return false; // return false;
// // if (tempProbeKey != null ? !tempProbeKey.equals(that.tempProbeKey) :
// return true; // that.tempProbeKey != null) return false;
// } // if (createDate != null ? !createDate.equals(that.createDate) :
// // that.createDate != null) return false;
// @Override // if (apiKey != null ? !apiKey.equals(that.apiKey) : that.apiKey != null)
// public int hashCode() { // return false;
// int result = (int) (id ^ (id >>> 32)); // if (probeId != null ? !probeId.equals(that.probeId) : that.probeId != null)
// result = 31 * result + (hostName != null ? hostName.hashCode() : 0); // return false;
// result = 31 * result + (macAddress != null ? macAddress.hashCode() : 0); //
// result = 31 * result + (ipAddress != null ? ipAddress.hashCode() : 0); // return true;
// result = 31 * result + (status != null ? status.hashCode() : 0); // }
// result = 31 * result + (tempProbeKey != null ? tempProbeKey.hashCode() : 0); //
// result = 31 * result + (createDate != null ? createDate.hashCode() : 0); // @Override
// result = 31 * result + (apiKey != null ? apiKey.hashCode() : 0); // public int hashCode() {
// result = 31 * result + (int) (domainId ^ (domainId >>> 32)); // int result = (int) (id ^ (id >>> 32));
// result = 31 * result + (probeId != null ? probeId.hashCode() : 0); // result = 31 * result + (hostName != null ? hostName.hashCode() : 0);
// return result; // result = 31 * result + (macAddress != null ? macAddress.hashCode() : 0);
// } // result = 31 * result + (ipAddress != null ? ipAddress.hashCode() : 0);
// result = 31 * result + (status != null ? status.hashCode() : 0);
// result = 31 * result + (tempProbeKey != null ? tempProbeKey.hashCode() : 0);
// result = 31 * result + (createDate != null ? createDate.hashCode() : 0);
// result = 31 * result + (apiKey != null ? apiKey.hashCode() : 0);
// result = 31 * result + (int) (domainId ^ (domainId >>> 32));
// result = 31 * result + (probeId != null ? probeId.hashCode() : 0);
// return result;
// }
} }

View File

@ -6,24 +6,28 @@ package com.loafle.overflow.model.noauthprobe;
public class NoAuthProbeDescription { public class NoAuthProbeDescription {
private NoAuthProbeDescriptionHost host; private NoAuthProbeDescriptionHost host;
private NoAuthProbeDescriptionNetwork network; private NoAuthProbeDescriptionNetwork network;
/** /**
* @return the host * @return the host
*/ */
public NoAuthProbeDescriptionHost getHost() { public NoAuthProbeDescriptionHost getHost() {
return host; return host;
} }
/** /**
* @param host the host to set * @param host the host to set
*/ */
public void setHost(NoAuthProbeDescriptionHost host) { public void setHost(NoAuthProbeDescriptionHost host) {
this.host = host; this.host = host;
} }
/** /**
* @return the network * @return the network
*/ */
public NoAuthProbeDescriptionNetwork getNetwork() { public NoAuthProbeDescriptionNetwork getNetwork() {
return network; return network;
} }
/** /**
* @param network the network to set * @param network the network to set
*/ */
@ -31,5 +35,4 @@ public class NoAuthProbeDescription {
this.network = network; this.network = network;
} }
} }

View File

@ -13,18 +13,21 @@ public class NoAuthProbeDescriptionHost {
private String platformVersion; private String platformVersion;
private String kernelVersion; private String kernelVersion;
private String hostID; private String hostID;
/** /**
* @return the name * @return the name
*/ */
public String getName() { public String getName() {
return name; return name;
} }
/** /**
* @param name the name to set * @param name the name to set
*/ */
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
} }
/** /**
* @return the os * @return the os
*/ */
@ -32,6 +35,7 @@ public class NoAuthProbeDescriptionHost {
public String getOS() { public String getOS() {
return os; return os;
} }
/** /**
* @param os the os to set * @param os the os to set
*/ */
@ -39,60 +43,70 @@ public class NoAuthProbeDescriptionHost {
public void setOS(String os) { public void setOS(String os) {
this.os = os; this.os = os;
} }
/** /**
* @return the platform * @return the platform
*/ */
public String getPlatform() { public String getPlatform() {
return platform; return platform;
} }
/** /**
* @param platform the platform to set * @param platform the platform to set
*/ */
public void setPlatform(String platform) { public void setPlatform(String platform) {
this.platform = platform; this.platform = platform;
} }
/** /**
* @return the platformFamily * @return the platformFamily
*/ */
public String getPlatformFamily() { public String getPlatformFamily() {
return platformFamily; return platformFamily;
} }
/** /**
* @param platformFamily the platformFamily to set * @param platformFamily the platformFamily to set
*/ */
public void setPlatformFamily(String platformFamily) { public void setPlatformFamily(String platformFamily) {
this.platformFamily = platformFamily; this.platformFamily = platformFamily;
} }
/** /**
* @return the platformVersion * @return the platformVersion
*/ */
public String getPlatformVersion() { public String getPlatformVersion() {
return platformVersion; return platformVersion;
} }
/** /**
* @param platformVersion the platformVersion to set * @param platformVersion the platformVersion to set
*/ */
public void setPlatformVersion(String platformVersion) { public void setPlatformVersion(String platformVersion) {
this.platformVersion = platformVersion; this.platformVersion = platformVersion;
} }
/** /**
* @return the kernelVersion * @return the kernelVersion
*/ */
public String getKernelVersion() { public String getKernelVersion() {
return kernelVersion; return kernelVersion;
} }
/** /**
* @param kernelVersion the kernelVersion to set * @param kernelVersion the kernelVersion to set
*/ */
public void setKernelVersion(String kernelVersion) { public void setKernelVersion(String kernelVersion) {
this.kernelVersion = kernelVersion; this.kernelVersion = kernelVersion;
} }
/** /**
* @return the hostID * @return the hostID
*/ */
public String getHostID() { public String getHostID() {
return hostID; return hostID;
} }
/** /**
* @param hostID the hostID to set * @param hostID the hostID to set
*/ */

View File

@ -8,48 +8,56 @@ public class NoAuthProbeDescriptionNetwork {
private String address; private String address;
private String gateway; private String gateway;
private String macAddress; private String macAddress;
/** /**
* @return the name * @return the name
*/ */
public String getName() { public String getName() {
return name; return name;
} }
/** /**
* @param name the name to set * @param name the name to set
*/ */
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
} }
/** /**
* @return the address * @return the address
*/ */
public String getAddress() { public String getAddress() {
return address; return address;
} }
/** /**
* @param address the address to set * @param address the address to set
*/ */
public void setAddress(String address) { public void setAddress(String address) {
this.address = address; this.address = address;
} }
/** /**
* @return the gateway * @return the gateway
*/ */
public String getGateway() { public String getGateway() {
return gateway; return gateway;
} }
/** /**
* @param gateway the gateway to set * @param gateway the gateway to set
*/ */
public void setGateway(String gateway) { public void setGateway(String gateway) {
this.gateway = gateway; this.gateway = gateway;
} }
/** /**
* @return the macAddress * @return the macAddress
*/ */
public String getMacAddress() { public String getMacAddress() {
return macAddress; return macAddress;
} }
/** /**
* @param macAddress the macAddress to set * @param macAddress the macAddress to set
*/ */
@ -57,5 +65,4 @@ public class NoAuthProbeDescriptionNetwork {
this.macAddress = macAddress; this.macAddress = macAddress;
} }
} }

View File

@ -20,7 +20,7 @@ public class Notification {
private String url; private String url;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }
@ -77,7 +77,6 @@ public class Notification {
this.confirmDate = confirmDate; this.confirmDate = confirmDate;
} }
@Column(name = "URL", nullable = false, length = 255) @Column(name = "URL", nullable = false, length = 255)
public String getUrl() { public String getUrl() {
return url; return url;

View File

@ -4,7 +4,6 @@ import com.loafle.overflow.model.domain.Domain;
import com.loafle.overflow.model.member.Member; import com.loafle.overflow.model.member.Member;
import com.loafle.overflow.model.meta.MetaProbeStatus; import com.loafle.overflow.model.meta.MetaProbeStatus;
import javax.persistence.*; import javax.persistence.*;
import java.util.Date; import java.util.Date;
@ -16,7 +15,7 @@ import java.util.Date;
public class Probe { public class Probe {
private Long id; private Long id;
private MetaProbeStatus status; private MetaProbeStatus metaProbeStatus;
private String description; private String description;
private Date createDate; private Date createDate;
private Domain domain; private Domain domain;
@ -49,13 +48,13 @@ public class Probe {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "STATUS", nullable = false) @JoinColumn(name = "META_PROBE_STATUS_ID", nullable = false)
public MetaProbeStatus getStatus() { public MetaProbeStatus getMetaProbeStatus() {
return status; return metaProbeStatus;
} }
public void setStatus(MetaProbeStatus status) { public void setMetaProbeStatus(MetaProbeStatus metaProbeStatus) {
this.status = status; this.metaProbeStatus = metaProbeStatus;
} }
@Column(name = "DESCRIPTION", nullable = true, length = 50) @Column(name = "DESCRIPTION", nullable = true, length = 50)

View File

@ -17,7 +17,7 @@ public class ProbeHost {
private InfraHost host; private InfraHost host;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }

View File

@ -1,6 +1,5 @@
package com.loafle.overflow.model.probe; package com.loafle.overflow.model.probe;
import com.loafle.overflow.model.meta.MetaProbeTaskType; import com.loafle.overflow.model.meta.MetaProbeTaskType;
import javax.persistence.*; import javax.persistence.*;
@ -13,7 +12,7 @@ import java.util.Date;
@Table(name = "PROBE_TASK", schema = "public") @Table(name = "PROBE_TASK", schema = "public")
public class ProbeTask { public class ProbeTask {
private Long id; private Long id;
private MetaProbeTaskType taskType; private MetaProbeTaskType metaProbeTaskType;
private Probe probe; private Probe probe;
private String data; private String data;
private Date createDate; private Date createDate;
@ -23,7 +22,7 @@ public class ProbeTask {
private Boolean succeed; private Boolean succeed;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }
@ -33,13 +32,13 @@ public class ProbeTask {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "TYPE_ID", nullable = false) @JoinColumn(name = "META_PROBE_TASK_TYPE_ID", nullable = false)
public MetaProbeTaskType getTaskType() { public MetaProbeTaskType getMetaProbeTaskType() {
return taskType; return metaProbeTaskType;
} }
public void setTaskType(MetaProbeTaskType taskType) { public void setMetaProbeTaskType(MetaProbeTaskType metaProbeTaskType) {
this.taskType = taskType; this.metaProbeTaskType = metaProbeTaskType;
} }
@ManyToOne @ManyToOne
@ -107,37 +106,42 @@ public class ProbeTask {
this.succeed = succeed; this.succeed = succeed;
} }
// @Override // @Override
// public boolean equals(Object o) { // public boolean equals(Object o) {
// if (this == o) return true; // if (this == o) return true;
// if (o == null || getClass() != o.getClass()) return false; // if (o == null || getClass() != o.getClass()) return false;
// //
// ProbeTask that = (ProbeTask) o; // ProbeTask that = (ProbeTask) o;
// //
// if (id != that.id) return false; // if (id != that.id) return false;
// if (typeId != that.typeId) return false; // if (typeId != that.typeId) return false;
// if (probeId != that.probeId) return false; // if (probeId != that.probeId) return false;
// if (data != null ? !data.equals(that.data) : that.data != null) return false; // if (data != null ? !data.equals(that.data) : that.data != null) return false;
// if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false; // if (createDate != null ? !createDate.equals(that.createDate) :
// if (sendDate != null ? !sendDate.equals(that.sendDate) : that.sendDate != null) return false; // that.createDate != null) return false;
// if (startDate != null ? !startDate.equals(that.startDate) : that.startDate != null) return false; // if (sendDate != null ? !sendDate.equals(that.sendDate) : that.sendDate !=
// if (endDate != null ? !endDate.equals(that.endDate) : that.endDate != null) return false; // null) return false;
// if (succeed != null ? !succeed.equals(that.succeed) : that.succeed != null) return false; // if (startDate != null ? !startDate.equals(that.startDate) : that.startDate !=
// // null) return false;
// return true; // if (endDate != null ? !endDate.equals(that.endDate) : that.endDate != null)
// } // return false;
// // if (succeed != null ? !succeed.equals(that.succeed) : that.succeed != null)
// @Override // return false;
// public int hashCode() { //
// int result = (int) (id ^ (id >>> 32)); // return true;
// result = 31 * result + (int) typeId; // }
// result = 31 * result + (int) (probeId ^ (probeId >>> 32)); //
// result = 31 * result + (data != null ? data.hashCode() : 0); // @Override
// result = 31 * result + (createDate != null ? createDate.hashCode() : 0); // public int hashCode() {
// result = 31 * result + (sendDate != null ? sendDate.hashCode() : 0); // int result = (int) (id ^ (id >>> 32));
// result = 31 * result + (startDate != null ? startDate.hashCode() : 0); // result = 31 * result + (int) typeId;
// result = 31 * result + (endDate != null ? endDate.hashCode() : 0); // result = 31 * result + (int) (probeId ^ (probeId >>> 32));
// result = 31 * result + (succeed != null ? succeed.hashCode() : 0); // result = 31 * result + (data != null ? data.hashCode() : 0);
// return result; // result = 31 * result + (createDate != null ? createDate.hashCode() : 0);
// } // result = 31 * result + (sendDate != null ? sendDate.hashCode() : 0);
// result = 31 * result + (startDate != null ? startDate.hashCode() : 0);
// result = 31 * result + (endDate != null ? endDate.hashCode() : 0);
// result = 31 * result + (succeed != null ? succeed.hashCode() : 0);
// return result;
// }
} }

View File

@ -20,9 +20,9 @@ public class Sensor {
private Long id; private Long id;
private Date createDate; private Date createDate;
private String description; private String description;
private MetaSensorStatus status; private MetaSensorStatus metaSensorStatus;
private Target target; private Target target;
private MetaCrawler crawler; private MetaCrawler metaCrawler;
private String crawlerInputItems; private String crawlerInputItems;
private Short itemCount = 0; private Short itemCount = 0;
private String displayName; private String displayName;
@ -31,7 +31,7 @@ public class Sensor {
private List<MetaSensorDisplayItem> sensorItems; private List<MetaSensorDisplayItem> sensorItems;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }
@ -60,13 +60,13 @@ public class Sensor {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "STATUS") @JoinColumn(name = "META_SENSOR_STATUS_ID")
public MetaSensorStatus getStatus() { public MetaSensorStatus getMetaSensorStatus() {
return status; return metaSensorStatus;
} }
public void setStatus(MetaSensorStatus status) { public void setMetaSensorStatus(MetaSensorStatus metaSensorStatus) {
this.status = status; this.metaSensorStatus = metaSensorStatus;
} }
@ManyToOne @ManyToOne
@ -81,13 +81,13 @@ public class Sensor {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "CRAWLER_ID", nullable = false) @JoinColumn(name = "META_CRAWLER_ID", nullable = false)
public MetaCrawler getCrawler() { public MetaCrawler getMetaCrawler() {
return crawler; return metaCrawler;
} }
public void setCrawler(MetaCrawler crawler) { public void setMetaCrawler(MetaCrawler metaCrawler) {
this.crawler = crawler; this.metaCrawler = metaCrawler;
} }
@Column(name = "CRAWLER_INPUT_ITEMS", nullable = true, length = 50) @Column(name = "CRAWLER_INPUT_ITEMS", nullable = true, length = 50)
@ -131,5 +131,4 @@ public class Sensor {
this.sensorItems = sensorItems; this.sensorItems = sensorItems;
} }
} }

View File

@ -15,11 +15,11 @@ import java.util.Date;
public class SensorItem { public class SensorItem {
private Long id; private Long id;
private Sensor sensor; private Sensor sensor;
private MetaSensorDisplayItem item; private MetaSensorDisplayItem metaSensorDisplayItem;
private Date createDate; private Date createDate;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }
@ -40,13 +40,13 @@ public class SensorItem {
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "ITEM_ID", nullable = false) @JoinColumn(name = "META_SENSOR_DISPLAY_ITEM_ID", nullable = false)
public MetaSensorDisplayItem getItem() { public MetaSensorDisplayItem getMetaSensorDisplayItem() {
return item; return metaSensorDisplayItem;
} }
public void setItem(MetaSensorDisplayItem item) { public void setMetaSensorDisplayItem(MetaSensorDisplayItem metaSensorDisplayItem) {
this.item = item; this.metaSensorDisplayItem = metaSensorDisplayItem;
} }
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)

View File

@ -12,11 +12,11 @@ import javax.persistence.*;
@Table(name = "SENSOR_ITEM_DEPENDENCY", schema = "public") @Table(name = "SENSOR_ITEM_DEPENDENCY", schema = "public")
public class SensorItemDependency { public class SensorItemDependency {
private Long id; private Long id;
private MetaSensorDisplayItem displayItem; private MetaSensorDisplayItem metaSensorDisplayItem;
private MetaSensorItemKey sensorItem; private MetaSensorItemKey metaSensorItemKey;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }
@ -25,24 +25,23 @@ public class SensorItemDependency {
this.id = id; this.id = id;
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "DISPLAY_ITEM_ID", nullable = false) @JoinColumn(name = "META_SENSOR_DISPLAY_ITEM_ID", nullable = false)
public MetaSensorDisplayItem getDisplayItem() { public MetaSensorDisplayItem getMetaSensorDisplayItem() {
return displayItem; return metaSensorDisplayItem;
} }
public void setDisplayItem(MetaSensorDisplayItem displayItem) { public void setMetaSensorDisplayItem(MetaSensorDisplayItem metaSensorDisplayItem) {
this.displayItem = displayItem; this.metaSensorDisplayItem = metaSensorDisplayItem;
} }
@ManyToOne @ManyToOne
@JoinColumn(name = "SENSOR_ITEM_ID", nullable = false) @JoinColumn(name = "META_SENSOR_ITEM_KEY_ID", nullable = false)
public MetaSensorItemKey getSensorItem() { public MetaSensorItemKey getMetaSensorItemKey() {
return sensorItem; return metaSensorItemKey;
} }
public void setSensorItem(MetaSensorItemKey sensorItem) { public void setMetaSensorItemKey(MetaSensorItemKey metaSensorItemKey) {
this.sensorItem = sensorItem; this.metaSensorItemKey = metaSensorItemKey;
} }
} }

View File

@ -25,9 +25,8 @@ public class Target {
// Transient property // Transient property
private List<Sensor> sensors; private List<Sensor> sensors;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() { public Long getId() {
return id; return id;
} }
@ -64,7 +63,6 @@ public class Target {
this.description = description; this.description = description;
} }
@Column(name = "SENSOR_COUNT", nullable = false) @Column(name = "SENSOR_COUNT", nullable = false)
public Integer getSensorCount() { public Integer getSensorCount() {
return sensorCount; return sensorCount;
@ -101,27 +99,25 @@ public class Target {
this.infra = infra; this.infra = infra;
} }
// @ManyToOne
// @ManyToOne // @JoinColumn(name = "PROBE_ID", nullable = false)
// @JoinColumn(name = "PROBE_ID", nullable = false) // @OnDelete(action = OnDeleteAction.CASCADE)
// @OnDelete(action = OnDeleteAction.CASCADE) // public Probe getProbe() {
// public Probe getProbe() { // return probe;
// return probe; // }
// } //
// // public void setProbe(Probe probe) {
// public void setProbe(Probe probe) { // this.probe = probe;
// this.probe = probe; // }
// } //
// // @ManyToOne
// @ManyToOne // @JoinColumn(name = "INFRA_ID", nullable = false)
// @JoinColumn(name = "INFRA_ID", nullable = false) // public Infra getInfra() {
// public Infra getInfra() { // return infra;
// return infra; // }
// } //
// // public void setInfra(Infra infra) {
// public void setInfra(Infra infra) { // this.infra = infra;
// this.infra = infra; // }
// }
} }

View File

@ -10,9 +10,12 @@ import com.loafle.overflow.model.apikey.ApiKey;
public interface ApiKeyService { public interface ApiKeyService {
@WebappAPI @WebappAPI
ApiKey regist(ApiKey apiKey) throws OverflowException; ApiKey regist(ApiKey apiKey) throws OverflowException;
@WebappAPI @WebappAPI
ApiKey readByDomainID(Long domainID) throws OverflowException; ApiKey readByDomainID(Long domainID) throws OverflowException;
boolean check(String apiKey) throws OverflowException; boolean check(String apiKey) throws OverflowException;
@WebappAPI @WebappAPI
ApiKey readByApiKey(String apiKey) throws OverflowException; ApiKey readByApiKey(String apiKey) throws OverflowException;
} }

View File

@ -4,7 +4,6 @@ import com.loafle.overflow.model.auth.AuthCrawler;
import com.loafle.overflow.core.annotation.WebappAPI; import com.loafle.overflow.core.annotation.WebappAPI;
import com.loafle.overflow.core.exception.OverflowException; import com.loafle.overflow.core.exception.OverflowException;
import com.loafle.overflow.model.meta.MetaCrawler; import com.loafle.overflow.model.meta.MetaCrawler;
import com.loafle.overflow.model.target.Target;
/** /**
* Created by geek on 17. 11. 7. * Created by geek on 17. 11. 7.
@ -12,8 +11,10 @@ import com.loafle.overflow.model.target.Target;
public interface AuthCrawlerService { public interface AuthCrawlerService {
@WebappAPI @WebappAPI
AuthCrawler regist(AuthCrawler authCrawler) throws OverflowException; AuthCrawler regist(AuthCrawler authCrawler) throws OverflowException;
@WebappAPI @WebappAPI
boolean checkAuthCrawler(Long infraId, MetaCrawler crawler, String authJson) throws OverflowException; boolean checkAuthCrawler(Long infraId, MetaCrawler metaCrawler, String authJson) throws OverflowException;
@WebappAPI @WebappAPI
AuthCrawler readAuth(MetaCrawler metaCrawler, Target target) throws OverflowException; AuthCrawler readByMCrawlerIDAndTargetID(Short metaCrawlerID, Long targetID) throws OverflowException;
} }

View File

@ -20,23 +20,34 @@ import com.loafle.overflow.model.discovery.Zone;
public interface DiscoveryService { public interface DiscoveryService {
@WebappAPI @WebappAPI
void discoverZone(String probeID, DiscoverZone discoverZone) throws OverflowException; void discoverZone(String probeID, DiscoverZone discoverZone) throws OverflowException;
@WebappAPI @WebappAPI
void discoverHost(String probeID, Zone zone, DiscoverHost discoverHost) throws OverflowException; void discoverHost(String probeID, Zone zone, DiscoverHost discoverHost) throws OverflowException;
@WebappAPI @WebappAPI
void discoverPort(String probeID, Host host, DiscoverPort discoverPort) throws OverflowException; void discoverPort(String probeID, Host host, DiscoverPort discoverPort) throws OverflowException;
@WebappAPI @WebappAPI
void discoverService(String probeID, Port port, DiscoverService discoverService) throws OverflowException; void discoverService(String probeID, Port port, DiscoverService discoverService) throws OverflowException;
@WebappAPI
void stopDiscovery(String probeID) throws OverflowException;
@ProbeAPI @ProbeAPI
void discoveryStart(String requesterSessionID, Date startDate) throws OverflowException; void discoveryStart(String requesterSessionID, Date startDate) throws OverflowException;
@ProbeAPI @ProbeAPI
void discoveryStop(String requesterSessionID, Date stopDate) throws OverflowException; void discoveryStop(String requesterSessionID, Date stopDate) throws OverflowException;
@ProbeAPI @ProbeAPI
void discoveredZone(String requesterSessionID, Zone zone) throws OverflowException; void discoveredZone(String requesterSessionID, Zone zone) throws OverflowException;
@ProbeAPI @ProbeAPI
void discoveredHost(String requesterSessionID, Host host) throws OverflowException; void discoveredHost(String requesterSessionID, Host host) throws OverflowException;
@ProbeAPI @ProbeAPI
void discoveredPort(String requesterSessionID, Port port) throws OverflowException; void discoveredPort(String requesterSessionID, Port port) throws OverflowException;
@ProbeAPI @ProbeAPI
void discoveredService(String requesterSessionID, Service service) throws OverflowException; void discoveredService(String requesterSessionID, Service service) throws OverflowException;
} }

View File

@ -14,10 +14,13 @@ import com.loafle.overflow.model.member.Member;
public interface DomainMemberService { public interface DomainMemberService {
@WebappAPI @WebappAPI
void regist(DomainMember domainMember) throws OverflowException; void regist(DomainMember domainMember) throws OverflowException;
@WebappAPI @WebappAPI
Domain readDomainByMemberID(Long memberID) throws OverflowException; Domain readDomainByMemberID(Long memberID) throws OverflowException;
@WebappAPI @WebappAPI
DomainMember readByMemberEmail(String email) throws OverflowException; DomainMember readByMemberEmail(String email) throws OverflowException;
@WebappAPI @WebappAPI
List<Member> readAllMemberByDomainID(final Long domainID) throws OverflowException; List<Member> readAllMemberByDomainID(final Long domainID) throws OverflowException;
} }

View File

@ -11,11 +11,14 @@ public interface HistoryService {
History regist(History history); History regist(History history);
@WebappAPI @WebappAPI
Page<History> readAllByProbeIDAndType(Long probeID, MetaHistoryType type, PageParams pageParams); Page<History> readAllByProbeIDAndMetaHistoryTypeID(Long probeID, Integer metaHistoryTypeID, PageParams pageParams);
@WebappAPI @WebappAPI
Page<History> readAllByProbeID(Long probeID, PageParams pageParams); Page<History> readAllByProbeID(Long probeID, PageParams pageParams);
@WebappAPI @WebappAPI
Page<History> readAllByDomainID(Long domainID, PageParams pageParams); Page<History> readAllByDomainID(Long domainID, PageParams pageParams);
@WebappAPI @WebappAPI
Page<History> readAllByDomainIDAndType(Long domainID, MetaHistoryType type, PageParams pageParams); Page<History> readAllByDomainIDAndMetaHistoryTypeID(Long domainID, Integer metaHistoryTypeID, PageParams pageParams);
} }

View File

@ -9,6 +9,8 @@ import com.loafle.overflow.model.infra.InfraHost;
public interface InfraHostService { public interface InfraHostService {
InfraHost regist(InfraHost infraHost) throws OverflowException; InfraHost regist(InfraHost infraHost) throws OverflowException;
InfraHost read(Long id) throws OverflowException; InfraHost read(Long id) throws OverflowException;
InfraHost readByIp(String ip) throws OverflowException; InfraHost readByIp(String ip) throws OverflowException;
} }

View File

@ -8,5 +8,6 @@ import com.loafle.overflow.model.infra.InfraMachine;
*/ */
public interface InfraMachineService { public interface InfraMachineService {
InfraMachine regist(InfraMachine infraMachine) throws OverflowException; InfraMachine regist(InfraMachine infraMachine) throws OverflowException;
InfraMachine read(Long id) throws OverflowException; InfraMachine read(Long id) throws OverflowException;
} }

View File

@ -9,5 +9,6 @@ import com.loafle.overflow.model.infra.InfraOSApplication;
public interface InfraOSApplicationService { public interface InfraOSApplicationService {
InfraOSApplication regist(InfraOSApplication infraOSApplication) throws OverflowException; InfraOSApplication regist(InfraOSApplication infraOSApplication) throws OverflowException;
InfraOSApplication read(Long id) throws OverflowException; InfraOSApplication read(Long id) throws OverflowException;
} }

View File

@ -9,5 +9,6 @@ import com.loafle.overflow.model.infra.InfraOSDaemon;
public interface InfraOSDaemonService { public interface InfraOSDaemonService {
InfraOSDaemon regist(InfraOSDaemon infraOSDaemon) throws OverflowException; InfraOSDaemon regist(InfraOSDaemon infraOSDaemon) throws OverflowException;
InfraOSDaemon read(Long id) throws OverflowException; InfraOSDaemon read(Long id) throws OverflowException;
} }

View File

@ -9,6 +9,8 @@ import com.loafle.overflow.model.infra.InfraOSPort;
public interface InfraOSPortService { public interface InfraOSPortService {
InfraOSPort regist(InfraOSPort infraOSPort) throws OverflowException; InfraOSPort regist(InfraOSPort infraOSPort) throws OverflowException;
InfraOSPort read(Long id) throws OverflowException; InfraOSPort read(Long id) throws OverflowException;
InfraOSPort readByPort(Long osId, int portNumber, String portType) throws OverflowException;
InfraOSPort readByInfraOSIDAndPortAndPortType(Long infraOSID, Integer port, String portType) throws OverflowException;
} }

View File

@ -9,5 +9,6 @@ import com.loafle.overflow.model.infra.InfraOS;
public interface InfraOSService { public interface InfraOSService {
InfraOS regist(InfraOS infraOS) throws OverflowException; InfraOS regist(InfraOS infraOS) throws OverflowException;
InfraOS read(Long id) throws OverflowException; InfraOS read(Long id) throws OverflowException;
} }

View File

@ -16,10 +16,16 @@ import org.springframework.data.domain.Page;
public interface InfraService { public interface InfraService {
Infra regist(Infra infra) throws OverflowException; Infra regist(Infra infra) throws OverflowException;
Infra read(Long id) throws OverflowException; Infra read(Long id) throws OverflowException;
Page<Infra> readAllByProbeID(Long probeID, PageParams pageParams) throws OverflowException; Page<Infra> readAllByProbeID(Long probeID, PageParams pageParams) throws OverflowException;
Page<Infra> readAllByDomainID(Long domainID, PageParams pageParams) throws OverflowException; Page<Infra> readAllByDomainID(Long domainID, PageParams pageParams) throws OverflowException;
List<Target> readAllTargetByDomainID(Long domainID) throws OverflowException; List<Target> readAllTargetByDomainID(Long domainID) throws OverflowException;
List<Target> readAllTargetByProbeList(List<Probe> probeList) throws OverflowException;
List<Target> readAllTargetByProbes(List<Probe> probes) throws OverflowException;
Infra readByTargetID(Long targetID) throws OverflowException; Infra readByTargetID(Long targetID) throws OverflowException;
} }

View File

@ -13,24 +13,34 @@ import java.util.List;
public interface MemberService { public interface MemberService {
@WebappAPI @WebappAPI
DomainMember signin(String signinId, String signinPw) throws OverflowException; DomainMember signin(String signinId, String signinPw) throws OverflowException;
@WebappAPI @WebappAPI
Member signup(Member member, String pw) throws OverflowException; Member signup(Member member, String pw) throws OverflowException;
@WebappAPI @WebappAPI
Member sendEmailForPassword(String email) throws OverflowException; Member sendEmailForPassword(String email) throws OverflowException;
@WebappAPI @WebappAPI
Member resetPassword(String token, String pw) throws OverflowException; Member resetPassword(String token, String pw) throws OverflowException;
@WebappAPI @WebappAPI
Member modify(Member member, String pw) throws OverflowException; Member modify(Member member, String pw) throws OverflowException;
@WebappAPI @WebappAPI
Member forgotPassword(String signinId, String newPw) throws OverflowException; Member forgotPassword(String signinId, String newPw) throws OverflowException;
@WebappAPI @WebappAPI
Member read(Long memberId) throws OverflowException; Member read(Long memberId) throws OverflowException;
@WebappAPI @WebappAPI
void withdrawal(Long memberId) throws OverflowException; void withdrawal(Long memberId) throws OverflowException;
@WebappAPI @WebappAPI
List<Member> readAllByProbeKey(String probeKey) throws OverflowException; List<Member> readAllByProbeKey(String probeKey) throws OverflowException;
@WebappAPI @WebappAPI
List<Member> readAllByApiKey(String apikey) throws OverflowException; List<Member> readAllByApiKey(String apikey) throws OverflowException;
@WebappAPI @WebappAPI
List<Member> readAllByDomainID(final Long domainID) throws OverflowException; List<Member> readAllByDomainID(final Long domainID) throws OverflowException;
} }

View File

@ -12,16 +12,22 @@ import java.util.Map;
public interface MemberTotpService { public interface MemberTotpService {
@WebappAPI @WebappAPI
void regist(Member member, String secretCode, String code) throws OverflowException; void regist(Member member, String secretCode, String code) throws OverflowException;
@WebappAPI @WebappAPI
MemberTotp modify(MemberTotp totp) throws OverflowException; MemberTotp modify(MemberTotp totp) throws OverflowException;
@WebappAPI @WebappAPI
void remove(Long id) throws OverflowException; void remove(Long id) throws OverflowException;
@WebappAPI @WebappAPI
MemberTotp read(Long id) throws OverflowException; MemberTotp read(Long id) throws OverflowException;
@WebappAPI @WebappAPI
boolean checkCodeForMember(Member member, String code) throws OverflowException; boolean checkCodeForMember(String email, String code) throws OverflowException;
@WebappAPI @WebappAPI
boolean checkCode(String secretCode, String code) throws OverflowException; boolean checkCode(String secretCode, String code) throws OverflowException;
@WebappAPI @WebappAPI
Map<String, String> createTotp(Member member) throws OverflowException; Map<String, String> createTotp(Member member) throws OverflowException;
} }

View File

@ -2,7 +2,6 @@ package com.loafle.overflow.service.central.meta;
import com.loafle.overflow.core.annotation.WebappAPI; import com.loafle.overflow.core.annotation.WebappAPI;
import com.loafle.overflow.core.exception.OverflowException; import com.loafle.overflow.core.exception.OverflowException;
import com.loafle.overflow.model.meta.MetaCrawler;
import com.loafle.overflow.model.meta.MetaCrawlerInputItem; import com.loafle.overflow.model.meta.MetaCrawlerInputItem;
import java.util.List; import java.util.List;
@ -13,5 +12,5 @@ import java.util.List;
public interface MetaCrawlerInputItemService { public interface MetaCrawlerInputItemService {
@WebappAPI @WebappAPI
List<MetaCrawlerInputItem> readAllByMetaCrawler(MetaCrawler metaCrawler) throws OverflowException; List<MetaCrawlerInputItem> readAllByMetaCrawlerID(Short metaCrawlerID) throws OverflowException;
} }

View File

@ -1,6 +1,5 @@
package com.loafle.overflow.service.central.meta; package com.loafle.overflow.service.central.meta;
import com.loafle.overflow.core.annotation.WebappAPI; import com.loafle.overflow.core.annotation.WebappAPI;
import com.loafle.overflow.core.exception.OverflowException; import com.loafle.overflow.core.exception.OverflowException;
import com.loafle.overflow.model.meta.MetaHistoryType; import com.loafle.overflow.model.meta.MetaHistoryType;
@ -16,9 +15,9 @@ public interface MetaHistoryTypeService {
List<MetaHistoryType> readAll() throws OverflowException; List<MetaHistoryType> readAll() throws OverflowException;
@WebappAPI @WebappAPI
MetaHistoryType regist(MetaHistoryType type) throws OverflowException; MetaHistoryType regist(MetaHistoryType metaHistoryType) throws OverflowException;
@WebappAPI @WebappAPI
List<MetaHistoryType> registAll(List<MetaHistoryType> types) throws OverflowException; List<MetaHistoryType> registAllByMetaHistoryTypes(List<MetaHistoryType> metaHistoryTypes) throws OverflowException;
} }

View File

@ -2,7 +2,6 @@ package com.loafle.overflow.service.central.meta;
import com.loafle.overflow.core.annotation.WebappAPI; import com.loafle.overflow.core.annotation.WebappAPI;
import com.loafle.overflow.core.exception.OverflowException; import com.loafle.overflow.core.exception.OverflowException;
import com.loafle.overflow.model.meta.MetaInfraType;
import com.loafle.overflow.model.meta.MetaInfraVendor; import com.loafle.overflow.model.meta.MetaInfraVendor;
import java.util.List; import java.util.List;
@ -12,5 +11,5 @@ import java.util.List;
*/ */
public interface MetaInfraVendorService { public interface MetaInfraVendorService {
@WebappAPI @WebappAPI
List<MetaInfraVendor> readAllByMetaInfraType(MetaInfraType infraType) throws OverflowException; List<MetaInfraVendor> readAllByMetaInfraTypeID(Integer metaInfraTypeID) throws OverflowException;
} }

View File

@ -12,5 +12,5 @@ import java.util.List;
*/ */
public interface MetaProbePackageService { public interface MetaProbePackageService {
@WebappAPI @WebappAPI
List<MetaProbePackage> readAllByOs(MetaProbeOs metaProbeOs) throws OverflowException; List<MetaProbePackage> readAllByMetaProbeOs(MetaProbeOs metaProbeOs) throws OverflowException;
} }

View File

@ -2,7 +2,6 @@ package com.loafle.overflow.service.central.meta;
import com.loafle.overflow.core.annotation.WebappAPI; import com.loafle.overflow.core.annotation.WebappAPI;
import com.loafle.overflow.core.exception.OverflowException; import com.loafle.overflow.core.exception.OverflowException;
import com.loafle.overflow.model.meta.MetaCrawler;
import com.loafle.overflow.model.meta.MetaSensorDisplayItem; import com.loafle.overflow.model.meta.MetaSensorDisplayItem;
import java.util.List; import java.util.List;
@ -13,11 +12,11 @@ import java.util.List;
public interface MetaSensorDisplayItemService { public interface MetaSensorDisplayItemService {
@WebappAPI @WebappAPI
MetaSensorDisplayItem regist(MetaSensorDisplayItem item) throws OverflowException; MetaSensorDisplayItem regist(MetaSensorDisplayItem metaSensorDisplayItem) throws OverflowException;
@WebappAPI @WebappAPI
MetaSensorDisplayItem read(Long id) throws OverflowException; MetaSensorDisplayItem read(Long id) throws OverflowException;
@WebappAPI @WebappAPI
List<MetaSensorDisplayItem> readAllByCrawler(MetaCrawler crawler) throws OverflowException; List<MetaSensorDisplayItem> readAllByCrawlerID(Short metaCrawlerID) throws OverflowException;
} }

View File

@ -2,7 +2,6 @@ package com.loafle.overflow.service.central.meta;
import com.loafle.overflow.core.annotation.WebappAPI; import com.loafle.overflow.core.annotation.WebappAPI;
import com.loafle.overflow.core.exception.OverflowException; import com.loafle.overflow.core.exception.OverflowException;
import com.loafle.overflow.model.meta.MetaSensorDisplayItem;
import com.loafle.overflow.model.meta.MetaSensorDisplayMapping; import com.loafle.overflow.model.meta.MetaSensorDisplayMapping;
import com.loafle.overflow.model.meta.MetaSensorItemKey; import com.loafle.overflow.model.meta.MetaSensorItemKey;
@ -13,8 +12,8 @@ import java.util.List;
*/ */
public interface MetaSensorDisplayMappingService { public interface MetaSensorDisplayMappingService {
@WebappAPI @WebappAPI
MetaSensorDisplayMapping regist(MetaSensorDisplayMapping m) throws OverflowException; MetaSensorDisplayMapping regist(MetaSensorDisplayMapping metaSensorDisplayMapping) throws OverflowException;
@WebappAPI @WebappAPI
List<MetaSensorItemKey> readAllMetaSensorItemKeyByDisplayItem(MetaSensorDisplayItem displayItem) throws OverflowException; List<MetaSensorItemKey> readAllMetaSensorItemKeyByDisplayItemID(Long metaSensorDisplayItemID) throws OverflowException;
} }

View File

@ -2,7 +2,6 @@ package com.loafle.overflow.service.central.meta;
import com.loafle.overflow.core.annotation.WebappAPI; import com.loafle.overflow.core.annotation.WebappAPI;
import com.loafle.overflow.core.exception.OverflowException; import com.loafle.overflow.core.exception.OverflowException;
import com.loafle.overflow.model.meta.MetaCrawler;
import com.loafle.overflow.model.meta.MetaSensorItemKey; import com.loafle.overflow.model.meta.MetaSensorItemKey;
import java.util.List; import java.util.List;
@ -13,8 +12,8 @@ import java.util.Map;
*/ */
public interface MetaSensorItemKeyService { public interface MetaSensorItemKeyService {
@WebappAPI @WebappAPI
List<MetaSensorItemKey> readAllByCrawler(MetaCrawler metaCrawler) throws OverflowException; List<MetaSensorItemKey> readAllByMetaCrawlerID(Short metaCrawlerID) throws OverflowException;
@WebappAPI @WebappAPI
Map<Integer, MetaSensorItemKey> readAllMapByCrawler(MetaCrawler metaCrawler) throws OverflowException; Map<Integer, MetaSensorItemKey> readAllMapByMetaCrawlerID(Short metaCrawlerID) throws OverflowException;
} }

View File

@ -14,9 +14,9 @@ public interface MetaSensorItemTypeService {
List<MetaSensorItemType> readAll() throws OverflowException; List<MetaSensorItemType> readAll() throws OverflowException;
@WebappAPI @WebappAPI
MetaSensorItemType regist(MetaSensorItemType type) throws OverflowException; MetaSensorItemType regist(MetaSensorItemType metaSensorItemType) throws OverflowException;
@WebappAPI @WebappAPI
List<MetaSensorItemType> registAll(List<MetaSensorItemType> list) throws OverflowException; List<MetaSensorItemType> registAll(List<MetaSensorItemType> metaSensorItemTypes) throws OverflowException;
} }

View File

@ -10,5 +10,5 @@ import com.loafle.overflow.model.meta.MetaSensorItemUnit;
public interface MetaSensorItemUnitService { public interface MetaSensorItemUnitService {
@WebappAPI @WebappAPI
MetaSensorItemUnit regist(MetaSensorItemUnit sensorItemUnit) throws OverflowException; MetaSensorItemUnit regist(MetaSensorItemUnit metaSensorItemUnit) throws OverflowException;
} }

View File

@ -2,7 +2,6 @@ package com.loafle.overflow.service.central.meta;
import com.loafle.overflow.core.annotation.WebappAPI; import com.loafle.overflow.core.annotation.WebappAPI;
import com.loafle.overflow.core.exception.OverflowException; import com.loafle.overflow.core.exception.OverflowException;
import com.loafle.overflow.model.meta.MetaInfraVendor;
import com.loafle.overflow.model.meta.MetaVendorCrawler; import com.loafle.overflow.model.meta.MetaVendorCrawler;
import java.util.List; import java.util.List;
@ -13,7 +12,7 @@ import java.util.List;
public interface MetaVendorCrawlerService { public interface MetaVendorCrawlerService {
@WebappAPI @WebappAPI
List<MetaVendorCrawler> readAllByInfraVendor(MetaInfraVendor infraVendor) throws OverflowException; List<MetaVendorCrawler> readAllByMetaInfraVendorID(Integer metaInfraVendorID) throws OverflowException;
@WebappAPI @WebappAPI
MetaVendorCrawler regist(MetaVendorCrawler metaVendorCrawler) throws OverflowException; MetaVendorCrawler regist(MetaVendorCrawler metaVendorCrawler) throws OverflowException;

View File

@ -13,17 +13,22 @@ import java.util.List;
public interface NoAuthProbeService { public interface NoAuthProbeService {
@ProbeAPI @ProbeAPI
NoAuthProbe regist(NoAuthProbe noAuthProbe) throws OverflowException; NoAuthProbe regist(NoAuthProbe noAuthProbe) throws OverflowException;
@ProbeAPI @ProbeAPI
NoAuthProbe readByTempProbeKey(String tempKey) throws OverflowException; NoAuthProbe readByTempProbeKey(String tempKey) throws OverflowException;
@ProbeAPI @ProbeAPI
void onConnect(String tempKey, String connectAddress) throws OverflowException; void onConnect(String tempKey, String connectAddress) throws OverflowException;
@ProbeAPI @ProbeAPI
void onDisconnect(String tempKey) throws OverflowException; void onDisconnect(String tempKey) throws OverflowException;
@WebappAPI @WebappAPI
List<NoAuthProbe> readAllByDomainID(Long id) throws OverflowException; List<NoAuthProbe> readAllByDomainID(Long id) throws OverflowException;
@WebappAPI @WebappAPI
List<NoAuthProbe> acceptNoAuthProbe(Long id) throws OverflowException; List<NoAuthProbe> acceptNoAuthProbe(Long id) throws OverflowException;
@WebappAPI @WebappAPI
List<NoAuthProbe> denyNoauthProbe(Long id) throws OverflowException; List<NoAuthProbe> denyNoauthProbe(Long id) throws OverflowException;

View File

@ -6,22 +6,29 @@ import com.loafle.overflow.core.model.PageParams;
import com.loafle.overflow.model.member.Member; import com.loafle.overflow.model.member.Member;
import com.loafle.overflow.model.notification.Notification; import com.loafle.overflow.model.notification.Notification;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
/** /**
* Created by insanity on 17. 8. 25. * Created by insanity on 17. 8. 25.
*/ */
public interface NotificationService { public interface NotificationService {
@WebappAPI @WebappAPI
Notification regist(Notification notification) throws OverflowException; Notification regist(Notification notification) throws OverflowException;
@WebappAPI @WebappAPI
Page<Notification> readAllByMember(Member member, PageParams pageParams) throws OverflowException; Page<Notification> readAllByMemberEmail(String memberEmail, PageParams pageParams) throws OverflowException;
@WebappAPI @WebappAPI
Page<Notification> readAllUnconfirmedByMember(Member member, PageParams pageParams) throws OverflowException; Page<Notification> readAllUnconfirmedByMemberEmail(String memberEmail, PageParams pageParams) throws OverflowException;
@WebappAPI @WebappAPI
int readUnconfirmedCount(Member member) throws OverflowException; int readUnconfirmedCountByMemberEmail(String memberEmail) throws OverflowException;
@WebappAPI @WebappAPI
Page<Notification> markAllAsRead(Member member, PageParams pageParams) throws OverflowException; Page<Notification> markAllAsReadByMemberEmail(String memberEmail, PageParams pageParams) throws OverflowException;
@WebappAPI @WebappAPI
Page<Notification> markAllAsUnread(Member member, PageParams pageParams) throws OverflowException; Page<Notification> markAllAsUnreadMemberEmail(String memberEmail, PageParams pageParams) throws OverflowException;
@WebappAPI @WebappAPI
Notification markAsRead(Notification notification) throws OverflowException; Notification markAsRead(Long notificationID) throws OverflowException;
} }

View File

@ -11,7 +11,9 @@ import com.loafle.overflow.model.probe.ProbeHost;
*/ */
public interface ProbeHostService { public interface ProbeHostService {
ProbeHost read(Long id) throws OverflowException; ProbeHost read(Long id) throws OverflowException;
ProbeHost readByProbeID(Long probeID) throws OverflowException; ProbeHost readByProbeID(Long probeID) throws OverflowException;
ProbeHost regist(ProbeHost probeHost) throws OverflowException; ProbeHost regist(ProbeHost probeHost) throws OverflowException;
@WebappAPI @WebappAPI

View File

@ -13,23 +13,28 @@ import java.util.List;
public interface ProbeService { public interface ProbeService {
// NoauthProbe.acceptNoAuthProbe // NoauthProbe.acceptNoAuthProbe
Probe regist(Probe probe) throws OverflowException; Probe regist(Probe probe) throws OverflowException;
// NoauthProbe.acceptNoAuthProbe // NoauthProbe.acceptNoAuthProbe
List<Probe> regist(List<Probe> probes) throws OverflowException; List<Probe> regist(List<Probe> probes) throws OverflowException;
@WebappAPI @WebappAPI
List<Probe> readAllByDomainID(Long id) throws OverflowException; List<Probe> readAllByDomainID(Long id) throws OverflowException;
@WebappAPI @WebappAPI
Probe read(Long id) throws OverflowException; Probe read(Long id) throws OverflowException;
@WebappAPI @WebappAPI
Probe modifyDisplayName(Long probeId, String displayName) throws OverflowException; Probe modifyDisplayName(Long probeId, String displayName) throws OverflowException;
@ProbeAPI //? @ProbeAPI // ?
Probe readByProbeKey(String probeKey) throws OverflowException; Probe readByProbeKey(String probeKey) throws OverflowException;
@ProbeAPI //?
@ProbeAPI // ?
Probe modify(Probe probe) throws OverflowException; Probe modify(Probe probe) throws OverflowException;
@ProbeAPI @ProbeAPI
void onConnect(String probeKey, String connectAddress) throws OverflowException; void onConnect(String probeKey, String connectAddress) throws OverflowException;
@ProbeAPI @ProbeAPI
void onDisconnect(String probeKey) throws OverflowException; void onDisconnect(String probeKey) throws OverflowException;

View File

@ -12,6 +12,7 @@ import java.util.List;
public interface ProbeTaskService { public interface ProbeTaskService {
@ProbeAPI @ProbeAPI
ProbeTask regist(ProbeTask probeTask) throws OverflowException; ProbeTask regist(ProbeTask probeTask) throws OverflowException;
@ProbeAPI @ProbeAPI
List<ProbeTask> readAllByProbeID(Long probeID) throws OverflowException; List<ProbeTask> readAllByProbeID(Long probeID) throws OverflowException;
} }

View File

@ -16,9 +16,12 @@ import java.util.Map;
public interface SensorItemDependencyService { public interface SensorItemDependencyService {
@WebappAPI @WebappAPI
SensorItemDependency regist(SensorItemDependency dependency) throws OverflowException; SensorItemDependency regist(SensorItemDependency dependency) throws OverflowException;
@WebappAPI @WebappAPI
List<MetaSensorItemKey> readAllByDisplayItem(MetaSensorDisplayItem displayItem) throws OverflowException; List<MetaSensorItemKey> readAllMetaSensorItemKeyByMetaSensorDisplayItemID(Long metaSensorDisplayItemID) throws OverflowException;
@WebappAPI @WebappAPI
Map<String, List<MetaSensorItemKey>> readAllByDisplayItems(List<MetaSensorDisplayItem> displayItems) throws OverflowException; Map<String, List<MetaSensorItemKey>> readAllMapByMetaSensorDisplayItems(List<MetaSensorDisplayItem> metaSensorDisplayItems)
throws OverflowException;
} }

View File

@ -3,7 +3,6 @@ package com.loafle.overflow.service.central.sensor;
import com.loafle.overflow.core.annotation.WebappAPI; import com.loafle.overflow.core.annotation.WebappAPI;
import com.loafle.overflow.core.exception.OverflowException; import com.loafle.overflow.core.exception.OverflowException;
import com.loafle.overflow.core.model.PageParams; import com.loafle.overflow.core.model.PageParams;
import com.loafle.overflow.model.sensor.Sensor;
import com.loafle.overflow.model.sensor.SensorItem; import com.loafle.overflow.model.sensor.SensorItem;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
@ -15,12 +14,16 @@ import java.util.List;
public interface SensorItemService { public interface SensorItemService {
@WebappAPI @WebappAPI
SensorItem regist(SensorItem sensorItem) throws OverflowException; SensorItem regist(SensorItem sensorItem) throws OverflowException;
@WebappAPI @WebappAPI
boolean registAll(List<SensorItem> sensorItemList) throws OverflowException; boolean registAll(List<SensorItem> sensorItemList) throws OverflowException;
@WebappAPI @WebappAPI
SensorItem read(String id) throws OverflowException; SensorItem read(String id) throws OverflowException;
@WebappAPI @WebappAPI
Page<SensorItem> readAllBySensor(Sensor sensor, PageParams pageParams) throws OverflowException; Page<SensorItem> readAllBySensorID(Long sensorID, PageParams pageParams) throws OverflowException;
@WebappAPI @WebappAPI
void remove(SensorItem sensorItem) throws OverflowException; void remove(SensorItem sensorItem) throws OverflowException;
} }

View File

@ -15,23 +15,31 @@ import java.util.List;
public interface SensorService { public interface SensorService {
@WebappAPI @WebappAPI
Sensor regist(Sensor sensor) throws OverflowException; Sensor regist(Sensor sensor) throws OverflowException;
@WebappAPI @WebappAPI
Sensor read(Long id) throws OverflowException; Sensor read(Long id) throws OverflowException;
@WebappAPI @WebappAPI
void remove(Long id) throws OverflowException; void remove(Long id) throws OverflowException;
@WebappAPI @WebappAPI
Sensor start(Long id) throws OverflowException; Sensor start(Long id) throws OverflowException;
@WebappAPI @WebappAPI
Sensor stop(Long id) throws OverflowException; Sensor stop(Long id) throws OverflowException;
@WebappAPI @WebappAPI
Sensor registSensorConfig(Sensor sensor, List<SensorItem> sensorItemList, String etcJson) throws OverflowException; Sensor registSensorConfig(Sensor sensor, List<SensorItem> sensorItemList, String etcJson) throws OverflowException;
@WebappAPI @WebappAPI
String generateSensorConfig(Sensor sensor) throws OverflowException; String generateSensorConfig(Sensor sensor) throws OverflowException;
@WebappAPI @WebappAPI
Page<Sensor> readAllByDomainID(Long domainID, PageParams pageParams) throws OverflowException; Page<Sensor> readAllByDomainID(Long domainID, PageParams pageParams) throws OverflowException;
@WebappAPI @WebappAPI
Page<Sensor> readAllByInfraID(Long infraID, PageParams pageParams) throws OverflowException; Page<Sensor> readAllByInfraID(Long infraID, PageParams pageParams) throws OverflowException;
@WebappAPI @WebappAPI
Page<Sensor> readAllByTargetID(Long targetID, PageParams pageParams) throws OverflowException; Page<Sensor> readAllByTargetID(Long targetID, PageParams pageParams) throws OverflowException;
} }

View File

@ -11,13 +11,18 @@ import com.loafle.overflow.model.target.Target;
public interface TargetService { public interface TargetService {
public Target regist(Target target, Probe probe) throws OverflowException; public Target regist(Target target, Probe probe) throws OverflowException;
public void remove(Target target, Probe probe) throws OverflowException; public void remove(Target target, Probe probe) throws OverflowException;
public Target read(String id) throws OverflowException; public Target read(String id) throws OverflowException;
public Target increaseSensorCount(Target target) throws OverflowException; public Target increaseSensorCount(Target target) throws OverflowException;
public Target decreaseSensorCount(Target target) throws OverflowException; public Target decreaseSensorCount(Target target) throws OverflowException;
@WebappAPI @WebappAPI
public Target modify(Target target) throws OverflowException; public Target modify(Target target) throws OverflowException;
@WebappAPI @WebappAPI
void remove(Target target) throws OverflowException; void remove(Target target) throws OverflowException;
} }

View File

@ -13,10 +13,13 @@ import com.loafle.overflow.model.sensorconfig.SensorConfig;
public interface SensorConfigService extends Service { public interface SensorConfigService extends Service {
@ProbeAPI @ProbeAPI
void InitConfig(List<SensorConfig> sensorConfigs) throws OverflowException; void InitConfig(List<SensorConfig> sensorConfigs) throws OverflowException;
@ProbeAPI @ProbeAPI
void AddConfig(SensorConfig sensorConfig) throws OverflowException; void AddConfig(SensorConfig sensorConfig) throws OverflowException;
@ProbeAPI @ProbeAPI
void UpdateConfig(SensorConfig sensorConfig) throws OverflowException; void UpdateConfig(SensorConfig sensorConfig) throws OverflowException;
@ProbeAPI @ProbeAPI
void RemoveConfig(String configID) throws OverflowException; void RemoveConfig(String configID) throws OverflowException;
} }