Expose JSON data for data point and data source models

as per MangoAutomation/ma-core-public#1560
MangoAutomation · Mar 12, 2020 · f353956 · f353956
1 parent 774ac3f
commit f353956
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/Mango API/src/com/infiniteautomation/mango/rest/v2/model/dataPoint/DataPointModel.java b/Mango API/src/com/infiniteautomation/mango/rest/v2/model/dataPoint/DataPointModel.java
@@ -12,6 +12,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.infiniteautomation.mango.rest.v2.model.AbstractVoModel;
 import com.infiniteautomation.mango.rest.v2.model.dataPoint.textRenderer.BaseTextRendererModel;
 import com.infiniteautomation.mango.spring.service.PermissionService;
@@ -67,6 +68,7 @@ public class DataPointModel extends AbstractVoModel<DataPointVO> {
     Double setExtremeLowLimit;
     @JsonInclude(JsonInclude.Include.NON_NULL)
     Double setExtremeHighLimit;
+    JsonNode data;
 
     Integer dataSourceId;
     String dataSourceXid;
@@ -143,6 +145,7 @@ public void fromVO(DataPointVO point) {
             }
         }
         this.extendedName = point.getExtendedName();
+        this.data = point.getData();
     }
 
     @Override
@@ -302,6 +305,10 @@ public DataPointVO toVO() {
         if (this.setExtremeHighLimit != null) {
             point.setSetExtremeHighLimit(this.setExtremeHighLimit);
         }
+        if(this.data != null) {
+            point.setData(data);
+        }
+
         return point;
     }
 
@@ -574,6 +581,14 @@ public String getExtendedName() {
         return extendedName;
     }
 
+    public JsonNode getData() {
+        return data;
+    }
+
+    public void setData(JsonNode data) {
+        this.data = data;
+    }
+
     @Override
     protected DataPointVO newVO() {
         return new DataPointVO();

diff --git a/...PI/src/com/infiniteautomation/mango/rest/v2/model/datasource/AbstractDataSourceModel.java b/...PI/src/com/infiniteautomation/mango/rest/v2/model/datasource/AbstractDataSourceModel.java
@@ -13,6 +13,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.infiniteautomation.mango.rest.v2.exception.GenericRestException;
 import com.infiniteautomation.mango.rest.v2.model.AbstractVoModel;
 import com.infiniteautomation.mango.spring.service.PermissionService;
@@ -50,6 +51,7 @@ public abstract class AbstractDataSourceModel<T extends DataSourceVO> extends Ab
     private PurgeSettings purgeSettings;
     private Set<String> editPermission;
     private Set<String> readPermission;
+    private JsonNode data;
 
     public AbstractDataSourceModel() {
 
@@ -107,6 +109,8 @@ public void fromVO(T vo) {
         for(Role role : vo.getReadRoles()) {
             this.readPermission.add(role.getXid());
         }
+
+        this.data = vo.getData();
     }
 
     @Override
@@ -124,6 +128,8 @@ public T toVO() {
         PermissionService service = Common.getBean(PermissionService.class);
         vo.setEditRoles(service.explodeLegacyPermissionGroupsToRoles(editPermission));
         vo.setReadRoles(service.explodeLegacyPermissionGroupsToRoles(readPermission));
+        vo.setData(data);
+
         return vo;
     }
 
@@ -215,4 +221,12 @@ public void setReadPermission(Set<String> readPermission) {
         this.readPermission = readPermission;
     }
 
+    public JsonNode getData() {
+        return data;
+    }
+
+    public void setData(JsonNode data) {
+        this.data = data;
+    }
+
 }