100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Added energyType to ElectricVehicleAsset Added EnergyLock to ConnectorType
Michael Rademaker107a3ca305f6
diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.javaindex 67bfe90f5..af283ef8a 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricVehicleAsset.java@@ -27,6 +27,7 @@ import org.openremote.model.attribute.MetaItem;import org.openremote.model.geo.GeoJSONPoint;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.MetaItemType;+import org.openremote.model.value.ValueDescriptor;import org.openremote.model.value.ValueType;import javax.persistence.Entity;@@ -38,6 +39,14 @@ import static org.openremote.model.Constants.*;@Entitypublic class ElectricVehicleAsset extends ElectricityBatteryAsset {+ public enum EnergyType {+ EV,+ PHEV+ }++ public static final ValueDescriptor<EnergyType> ENERGY_TYPE_VALUE = new ValueDescriptor<>("energyType", EnergyType.class);++ public static final AttributeDescriptor<EnergyType> ENERGY_TYPE = new AttributeDescriptor<>("energyType", ENERGY_TYPE_VALUE);public static final AttributeDescriptor<ElectricityChargerAsset.ConnectorType> CONNECTOR_TYPE = new AttributeDescriptor<>("connectorType", ElectricityChargerAsset.CONNECTOR_TYPE_VALUE);public static final AttributeDescriptor<Integer> ODOMETER = new AttributeDescriptor<>("odometer", ValueType.POSITIVE_INTEGER,new MetaItem<>(MetaItemType.READ_ONLY))@@ -67,6 +76,15 @@ public class ElectricVehicleAsset extends ElectricityBatteryAsset {super(name);}+ public Optional<EnergyType> getEnergyType() {+ return getAttributes().getValue(ENERGY_TYPE);+ }++ public ElectricVehicleAsset setEnergyType(EnergyType value) {+ getAttributes().getOrCreate(ENERGY_TYPE).setValue(value);+ return this;+ }+public Optional<ElectricityChargerAsset.ConnectorType> getConnectorType() {return getAttributes().getValue(CONNECTOR_TYPE);}diff --git a/model/src/main/java/org/openremote/model/asset/impl/ElectricityChargerAsset.java b/model/src/main/java/org/openremote/model/asset/impl/ElectricityChargerAsset.javaindex b541954f7..9b7850e46 100644--- a/model/src/main/java/org/openremote/model/asset/impl/ElectricityChargerAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/ElectricityChargerAsset.java@@ -38,7 +38,8 @@ public class ElectricityChargerAsset extends ElectricityStorageAsset {LE_GRAND,CHADEMO,COMBO,- SCHUKO+ SCHUKO,+ ENERGYLOCK}public static final ValueDescriptor<ConnectorType> CONNECTOR_TYPE_VALUE = new ValueDescriptor<>("connectorType", ConnectorType.class);