diff --git a/src/main/java/org/hbp/mip/controllers/ModelsApi.java b/src/main/java/org/hbp/mip/controllers/ModelsApi.java index 3367c8e7ef47eaf15bd320396804f1b12c7cf131..c1ed903e45553a21aed407f90aa7d5461e2d9296 100644 --- a/src/main/java/org/hbp/mip/controllers/ModelsApi.java +++ b/src/main/java/org/hbp/mip/controllers/ModelsApi.java @@ -17,8 +17,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import java.security.Principal; -import java.util.Date; -import java.util.List; +import java.util.*; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; @@ -141,6 +140,23 @@ public class ModelsApi { Model model = (Model) query.uniqueResult(); session.getTransaction().commit(); + // Inject mock data + List<Object> values = new LinkedList<>(); + values.add(18422); + values.add(16972); + values.add(17330); + values.add(16398); + values.add(21614); + values.add(21386); + values.add(20474); + values.add(19867); + values.add(20398); + values.add(19741); + values.add(18595); + values.add(18018); + model.getDataset().getData().put("MidTemp", values); + model.getDataset().getHeader().add("MidTemp"); + return new ResponseEntity<Model>(HttpStatus.OK).ok(model); } diff --git a/src/main/java/org/hbp/mip/model/Dataset.java b/src/main/java/org/hbp/mip/model/Dataset.java index 21b2555ed19f980fa50110540e505b6aa41f4f69..f7f63ec75a0c1840b21b5e888b5990eb276d1edc 100644 --- a/src/main/java/org/hbp/mip/model/Dataset.java +++ b/src/main/java/org/hbp/mip/model/Dataset.java @@ -10,9 +10,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import javax.persistence.*; -import java.util.Date; -import java.util.LinkedList; -import java.util.List; +import java.util.*; @Entity @Table(name = "`dataset`") @@ -24,6 +22,8 @@ public class Dataset { private Date date = null; @ElementCollection(fetch = FetchType.EAGER) private List<String> header = new LinkedList<String>(); + @Transient + private Map<String, List<Object>> data = new HashMap<>(); public Dataset() { } @@ -67,6 +67,13 @@ public class Dataset { this.header = header; } + public Map<String, List<Object>> getData() { + return data; + } + + public void setData(Map<String, List<Object>> data) { + this.data = data; + } @Override public String toString() { @@ -76,6 +83,7 @@ public class Dataset { sb.append(" code: ").append(code).append("\n"); sb.append(" date: ").append(date).append("\n"); sb.append(" header: ").append(header).append("\n"); + sb.append(" data: ").append(data).append("\n"); sb.append("}\n"); return sb.toString(); }