Доделан поиск сигнатур

This commit is contained in:
serega6531
2019-04-30 22:35:57 +03:00
parent 64507a6d07
commit a121a5550d
6 changed files with 99 additions and 81 deletions

View File

@@ -10,7 +10,7 @@ import java.util.List;
@Data
@Entity
@Table(name = "service")
@ToString(of = {"port", "name"})
@ToString(exclude = "streams")
public class CtfService {
@Id

View File

@@ -3,9 +3,8 @@ package ru.serega6531.packmate.model;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.*;
import java.util.List;
@Data
@Entity
@@ -30,4 +29,7 @@ public class Pattern {
private String color; // для вставки в css
@ManyToMany(mappedBy = "foundPatterns", cascade = CascadeType.ALL)
private List<Stream> matchedStreams;
}

View File

@@ -2,14 +2,15 @@ package ru.serega6531.packmate.model;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import lombok.ToString;
import org.hibernate.annotations.GenericGenerator;
import ru.serega6531.packmate.Protocol;
import javax.persistence.*;
import java.util.List;
import java.util.Set;
@Data
@ToString(exclude = "packets")
@Entity
@GenericGenerator(
name = "stream_generator",
@@ -40,6 +41,7 @@ public class Stream {
private long endTimestamp;
private Set<Pattern> foundPatterns;
@ManyToMany(cascade = CascadeType.ALL)
private List<Pattern> foundPatterns;
}