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
Update assettypes city, building, door
Don6206e5bbfa4c
diff --git a/model/src/main/java/org/openremote/model/asset/impl/BuildingAsset.java b/model/src/main/java/org/openremote/model/asset/impl/BuildingAsset.javaindex 615cfb64b..5839bc39d 100644--- a/model/src/main/java/org/openremote/model/asset/impl/BuildingAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/BuildingAsset.java@@ -42,6 +42,7 @@ public class BuildingAsset extends CityAsset {public static final AttributeDescriptor<Integer> AREA = new AttributeDescriptor<>("area", ValueType.POSITIVE_INTEGER).withUnits(UNITS_METRE, UNITS_SQUARED);public static final AttributeDescriptor<String> COUNTRY = CityAsset.COUNTRY.withOptional(true);+ public static final AttributeDescriptor<String> CITY = CityAsset.CITY.withOptional(false);public static final AssetDescriptor<BuildingAsset> DESCRIPTOR = new AssetDescriptor<>("office-building", "4b5966", BuildingAsset.class);diff --git a/model/src/main/java/org/openremote/model/asset/impl/CityAsset.java b/model/src/main/java/org/openremote/model/asset/impl/CityAsset.javaindex 66333d839..4c692b26a 100644--- a/model/src/main/java/org/openremote/model/asset/impl/CityAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/CityAsset.java@@ -30,7 +30,8 @@ import java.util.Optional;@Entitypublic class CityAsset extends Asset<CityAsset> {- public static final AttributeDescriptor<String> REGION = new AttributeDescriptor<>("region", ValueType.TEXT);+ public static final AttributeDescriptor<String> REGION = new AttributeDescriptor<>("region", ValueType.TEXT)+ .withOptional(true);public static final AttributeDescriptor<String> COUNTRY = new AttributeDescriptor<>("country", ValueType.TEXT);public static final AttributeDescriptor<String> CITY = new AttributeDescriptor<>("city", ValueType.TEXT).withOptional(true);diff --git a/model/src/main/java/org/openremote/model/asset/impl/DoorSensorAsset.java b/model/src/main/java/org/openremote/model/asset/impl/DoorSensorAsset.javaindex 20eaeeda9..433c571e6 100644--- a/model/src/main/java/org/openremote/model/asset/impl/DoorSensorAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/DoorSensorAsset.java@@ -34,8 +34,7 @@ public class DoorSensorAsset extends Asset<DoorSensorAsset> {public static final AttributeDescriptor<Boolean> OPEN = new AttributeDescriptor<>("open", ValueType.BOOLEAN,new MetaItem<>(MetaItemType.READ_ONLY));- public static final AttributeDescriptor<Boolean> LOCKED = new AttributeDescriptor<>("locked", ValueType.BOOLEAN,- new MetaItem<>(MetaItemType.READ_ONLY));+ public static final AttributeDescriptor<Boolean> LOCKED = new AttributeDescriptor<>("locked", ValueType.BOOLEAN);public static final AssetDescriptor<DoorSensorAsset> DESCRIPTOR = new AssetDescriptor<>("door", "ae2eb6", DoorSensorAsset.class);