From 7e9b9ae0f03d506b7115460da28ccc583058639f Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei9588@foxmail.com>
Date: Tue, 23 Mar 2021 17:30:24 +0800
Subject: [PATCH] 调整泵站,增加水泵和集水池
---
hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/literal/AttributeNames.java | 6
hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/PumpStation.java | 106 ------------
hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Sump.java | 122 +++++++++++++++
hbbohua-water-domain/src/main/resources/META-INF/modeling-scripts/30-water.1.8.0/20210317-1800-water-单位派生.ms | 71 ++++++--
hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/WaterPump.java | 154 +++++++++++++++++++
hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Valve.java | 2
hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Flowmeter.java | 2
hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Manometer.java | 2
hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Pipeline.java | 2
hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/WaterDetectingInstrument.java | 2
10 files changed, 344 insertions(+), 125 deletions(-)
diff --git a/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Flowmeter.java b/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Flowmeter.java
index e71e7a5..16852cb 100644
--- a/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Flowmeter.java
+++ b/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Flowmeter.java
@@ -13,7 +13,7 @@
*/
public class Flowmeter extends Unit {
/**
- * 获取地图标记的类型
+ * 指定地图标记的类型(点、线、圆、矩形、多边形等)
*
* @return 地图标记的类型
*/
diff --git a/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Manometer.java b/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Manometer.java
index bc7cff7..b18e951 100644
--- a/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Manometer.java
+++ b/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Manometer.java
@@ -13,7 +13,7 @@
*/
public class Manometer extends Unit {
/**
- * 获取地图标记的类型
+ * 指定地图标记的类型(点、线、圆、矩形、多边形等)
*
* @return 地图标记的类型
*/
diff --git a/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Pipeline.java b/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Pipeline.java
index b62767e..4a0c437 100644
--- a/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Pipeline.java
+++ b/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Pipeline.java
@@ -13,7 +13,7 @@
*/
public class Pipeline extends Unit {
/**
- * 获取地图标记的类型
+ * 指定地图标记的类型(点、线、圆、矩形、多边形等)
*
* @return 地图标记的类型
*/
diff --git a/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/PumpStation.java b/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/PumpStation.java
index fb78f74..0b0e9ce 100644
--- a/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/PumpStation.java
+++ b/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/PumpStation.java
@@ -1,120 +1,20 @@
package com.hbbohua.water.domain;
-import com.hbbohua.water.domain.literal.AttributeNames;
-import com.ooxsoft.ecsi.domain.Unit;
import com.hbbohua.water.domain.literal.ValueIds;
+import com.ooxsoft.ecsi.domain.ProductionUnit;
import com.ooxsoft.objekt.domain.Value;
-import com.ooxsoft.platform.domain.UnitOfMeasure;
-import com.ooxsoft.platform.domain.literal.UnitOfMeasureIdsHex;
-import org.jetbrains.annotations.Nullable;
/**
* 泵站
*/
-public class PumpStation extends Unit {
+public final class PumpStation extends ProductionUnit {
/**
- * 获取地图标记的类型
+ * 指定地图标记的类型(点、线、圆、矩形、多边形等)
*
* @return 地图标记的类型
*/
@Override
public Value locationType() {
return Value.forId(ValueIds.LocationType_marker);
- }
-
- /**
- * 获取液位
- *
- * @return 液位
- */
- @Nullable
- public Double getLiquidLevel() {
- return getAttributeValue(AttributeNames.liquidLevel);
- }
-
- /**
- * 设置液位
- *
- * @param liquidLevel 液位
- */
- public void setLiquidLevel(Double liquidLevel) {
- setAttributeValue(AttributeNames.liquidLevel, liquidLevel);
- }
-
- /**
- * 获取警戒液位计量单位
- *
- * @return 警戒液位计量单位
- */
- @Nullable
- public UnitOfMeasure getWarningLevelUnitOfMeasure() {
- return getAttributeValue(AttributeNames.warningLevelUnitOfMeasure);
- }
-
- /**
- * 设置警戒液位计量单位
- *
- * @param warningLevelUnitOfMeasure 警戒液位计量单位
- */
- public void setWarningLevelUnitOfMeasure(UnitOfMeasure warningLevelUnitOfMeasure) {
- setAttributeValue(AttributeNames.warningLevelUnitOfMeasure, warningLevelUnitOfMeasure);
- }
-
- /**
- * 获取液位计量单位
- *
- * @return 液位计量单位
- */
- @Nullable
- public UnitOfMeasure getLiquidLevelUnitOfMeasure() {
- return getAttributeValue(AttributeNames.liquidLevelUnitOfMeasure);
- }
-
- /**
- * 设置液位计量单位
- *
- * @param liquidLevelUnitOfMeasure 液位计量单位
- */
- public void setLiquidLevelUnitOfMeasure(UnitOfMeasure liquidLevelUnitOfMeasure) {
- setAttributeValue(AttributeNames.liquidLevelUnitOfMeasure, liquidLevelUnitOfMeasure);
- }
-
- /**
- * 获取警戒液位
- *
- * @return 警戒液位
- */
- @Nullable
- public Double getWarningLevel() {
- return getAttributeValue(AttributeNames.warningLevel);
- }
-
- /**
- * 设置警戒液位
- *
- * @param warningLevel 警戒液位
- */
- public void setWarningLevel(Double warningLevel) {
- setAttributeValue(AttributeNames.warningLevel, warningLevel);
- }
- /**
- * 对象持久化前处理。该方法由对象持久化框架回调。在将对象从非持久化状态"TRANSIENT"转换为已持久化状态"MANAGED"之前触发。
- * 子类重写该方法时,要考虑是否调用super.xxx(),以及调用先后时机,以免造成无意的父类代码逻辑被覆盖(丢失)
- */
- @Override
- protected void prePersist() {
- super.prePersist();
- //默认液位 米
- if (getLiquidLevelUnitOfMeasure() == null) {
- setLiquidLevelUnitOfMeasure(UnitOfMeasure.forId(UnitOfMeasureIdsHex.M));
- }
- //默认液位 米
- if (getWarningLevelUnitOfMeasure() == null) {
- setWarningLevelUnitOfMeasure(UnitOfMeasure.forId(UnitOfMeasureIdsHex.M));
- }
- //增加动态属性名,填充实时库标签用
- if(!containsDynamicAttribute(AttributeNames.liquidLevel)){
- setDynamicAttribute(AttributeNames.liquidLevel,null,true);
- }
}
}
\ No newline at end of file
diff --git a/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Sump.java b/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Sump.java
new file mode 100644
index 0000000..a6c1732
--- /dev/null
+++ b/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Sump.java
@@ -0,0 +1,122 @@
+package com.hbbohua.water.domain;
+
+import com.hbbohua.water.domain.literal.AttributeNames;
+import com.hbbohua.water.domain.literal.ValueIds;
+import com.ooxsoft.ecsi.domain.Unit;
+import com.ooxsoft.objekt.domain.Value;
+import com.ooxsoft.platform.domain.UnitOfMeasure;
+import com.ooxsoft.platform.domain.literal.UnitOfMeasureIdsHex;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * 集水池
+ */
+public final class Sump extends Unit {
+
+ /**
+ * 指定地图标记的类型(点、线、圆、矩形、多边形等)
+ *
+ * @return 地图标记的类型
+ */
+ @Override
+ public Value locationType() {
+ return Value.forId(ValueIds.LocationType_marker);
+ }
+
+ /**
+ * 获取警戒液位
+ *
+ * @return 警戒液位
+ */
+ @Nullable
+ public Double getWarningLevel() {
+ return getAttributeValue(AttributeNames.warningLevel);
+ }
+
+ /**
+ * 设置警戒液位
+ *
+ * @param warningLevel 警戒液位
+ */
+ public void setWarningLevel(Double warningLevel) {
+ setAttributeValue(AttributeNames.warningLevel, warningLevel);
+ }
+
+ /**
+ * 获取液位
+ *
+ * @return 液位
+ */
+ @Nullable
+ public Double getLiquidLevel() {
+ return getAttributeValue(AttributeNames.liquidLevel);
+ }
+
+ /**
+ * 设置液位
+ *
+ * @param liquidLevel 液位
+ */
+ public void setLiquidLevel(Double liquidLevel) {
+ setAttributeValue(AttributeNames.liquidLevel, liquidLevel);
+ }
+
+ /**
+ * 获取警戒液位计量单位
+ *
+ * @return 警戒液位计量单位
+ */
+ @Nullable
+ public UnitOfMeasure getWarningLevelUnitOfMeasure() {
+ return getAttributeValue(AttributeNames.warningLevelUnitOfMeasure);
+ }
+
+ /**
+ * 设置警戒液位计量单位
+ *
+ * @param warningLevelUnitOfMeasure 警戒液位计量单位
+ */
+ public void setWarningLevelUnitOfMeasure(UnitOfMeasure warningLevelUnitOfMeasure) {
+ setAttributeValue(AttributeNames.warningLevelUnitOfMeasure, warningLevelUnitOfMeasure);
+ }
+
+ /**
+ * 获取液位计量单位
+ *
+ * @return 液位计量单位
+ */
+ @Nullable
+ public UnitOfMeasure getLiquidLevelUnitOfMeasure() {
+ return getAttributeValue(AttributeNames.liquidLevelUnitOfMeasure);
+ }
+
+ /**
+ * 设置液位计量单位
+ *
+ * @param liquidLevelUnitOfMeasure 液位计量单位
+ */
+ public void setLiquidLevelUnitOfMeasure(UnitOfMeasure liquidLevelUnitOfMeasure) {
+ setAttributeValue(AttributeNames.liquidLevelUnitOfMeasure, liquidLevelUnitOfMeasure);
+ }
+
+ /**
+ * 对象持久化前处理。该方法由对象持久化框架回调。在将对象从非持久化状态"TRANSIENT"转换为已持久化状态"MANAGED"之前触发。
+ * 子类重写该方法时,要考虑是否调用super.xxx(),以及调用先后时机,以免造成无意的父类代码逻辑被覆盖(丢失)
+ */
+ @Override
+ protected void prePersist() {
+ super.prePersist();
+ //默认液位单位 米
+ if (getLiquidLevelUnitOfMeasure() == null) {
+ setLiquidLevelUnitOfMeasure(UnitOfMeasure.forId(UnitOfMeasureIdsHex.M));
+ }
+ //默认警戒液位单位 米
+ if (getWarningLevelUnitOfMeasure() == null) {
+ setWarningLevelUnitOfMeasure(UnitOfMeasure.forId(UnitOfMeasureIdsHex.M));
+ }
+ //增加动态属性名,填充实时库标签用
+ if(!containsDynamicAttribute(AttributeNames.liquidLevel)){
+ setDynamicAttribute(AttributeNames.liquidLevel,null,true);
+ }
+ }
+}
\ No newline at end of file
diff --git a/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Valve.java b/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Valve.java
index 4fe2433..4deed30 100644
--- a/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Valve.java
+++ b/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Valve.java
@@ -11,7 +11,7 @@
*/
public class Valve extends Unit {
/**
- * 获取地图标记的类型
+ * 指定地图标记的类型(点、线、圆、矩形、多边形等)
*
* @return 地图标记的类型
*/
diff --git a/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/WaterDetectingInstrument.java b/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/WaterDetectingInstrument.java
index d1306d0..c631437 100644
--- a/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/WaterDetectingInstrument.java
+++ b/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/WaterDetectingInstrument.java
@@ -13,7 +13,7 @@
*/
public class WaterDetectingInstrument extends Unit {
/**
- * 获取地图标记的类型
+ * 指定地图标记的类型(点、线、圆、矩形、多边形等)
*
* @return 地图标记的类型
*/
diff --git a/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/WaterPump.java b/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/WaterPump.java
new file mode 100644
index 0000000..0ff3029
--- /dev/null
+++ b/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/WaterPump.java
@@ -0,0 +1,154 @@
+package com.hbbohua.water.domain;
+
+import com.hbbohua.water.domain.literal.AttributeNames;
+import com.ooxsoft.ecsi.domain.Unit;
+import com.ooxsoft.platform.domain.UnitOfMeasure;
+import com.ooxsoft.platform.domain.literal.UnitOfMeasureIdsHex;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * 水泵
+ */
+public final class WaterPump extends Unit {
+
+ /**
+ * 获取频率反馈计量单位
+ *
+ * @return 频率反馈计量单位
+ */
+ @Nullable
+ public UnitOfMeasure getFrequencyFeedbackUnitOfMeasure() {
+ return getAttributeValue(AttributeNames.frequencyFeedbackUnitOfMeasure);
+ }
+
+ /**
+ * 设置频率反馈计量单位
+ *
+ * @param frequencyFeedbackUnitOfMeasure 频率反馈计量单位
+ */
+ public void setFrequencyFeedbackUnitOfMeasure(UnitOfMeasure frequencyFeedbackUnitOfMeasure) {
+ setAttributeValue(AttributeNames.frequencyFeedbackUnitOfMeasure, frequencyFeedbackUnitOfMeasure);
+ }
+
+ /**
+ * 获取电流反馈计量单位
+ *
+ * @return 电流反馈计量单位
+ */
+ @Nullable
+ public UnitOfMeasure getElectricCurrentFeedbackUOM() {
+ return getAttributeValue(AttributeNames.electricCurrentFeedbackUOM);
+ }
+
+ /**
+ * 设置电流反馈计量单位
+ *
+ * @param electricCurrentFeedbackUOM 电流反馈计量单位
+ */
+ public void setElectricCurrentFeedbackUOM(UnitOfMeasure electricCurrentFeedbackUOM) {
+ setAttributeValue(AttributeNames.electricCurrentFeedbackUOM, electricCurrentFeedbackUOM);
+ }
+
+ /**
+ * 获取频率给定
+ *
+ * @return 频率给定
+ */
+ @Nullable
+ public Double getFrequencySetting() {
+ return getAttributeValue(AttributeNames.frequencySetting);
+ }
+
+ /**
+ * 设置频率给定
+ *
+ * @param frequencySetting 频率给定
+ */
+ public void setFrequencySetting(Double frequencySetting) {
+ setAttributeValue(AttributeNames.frequencySetting, frequencySetting);
+ }
+
+ /**
+ * 获取电流反馈
+ *
+ * @return 电流反馈
+ */
+ @Nullable
+ public Double getElectricCurrentFeedback() {
+ return getAttributeValue(AttributeNames.electricCurrentFeedback);
+ }
+
+ /**
+ * 设置电流反馈
+ *
+ * @param electricCurrentFeedback 电流反馈
+ */
+ public void setElectricCurrentFeedback(Double electricCurrentFeedback) {
+ setAttributeValue(AttributeNames.electricCurrentFeedback, electricCurrentFeedback);
+ }
+
+ /**
+ * 获取频率给定计量单位
+ *
+ * @return 频率给定计量单位
+ */
+ @Nullable
+ public UnitOfMeasure getFrequencySettingUnitOfMeasure() {
+ return getAttributeValue(AttributeNames.frequencySettingUnitOfMeasure);
+ }
+
+ /**
+ * 设置频率给定计量单位
+ *
+ * @param frequencySettingUnitOfMeasure 频率给定计量单位
+ */
+ public void setFrequencySettingUnitOfMeasure(UnitOfMeasure frequencySettingUnitOfMeasure) {
+ setAttributeValue(AttributeNames.frequencySettingUnitOfMeasure, frequencySettingUnitOfMeasure);
+ }
+
+ /**
+ * 获取频率反馈
+ *
+ * @return 频率反馈
+ */
+ @Nullable
+ public Double getFrequencyFeedback() {
+ return getAttributeValue(AttributeNames.frequencyFeedback);
+ }
+
+ /**
+ * 设置频率反馈
+ *
+ * @param frequencyFeedback 频率反馈
+ */
+ public void setFrequencyFeedback(Double frequencyFeedback) {
+ setAttributeValue(AttributeNames.frequencyFeedback, frequencyFeedback);
+ }
+ /**
+ * 对象持久化前处理。该方法由对象持久化框架回调。在将对象从非持久化状态"TRANSIENT"转换为已持久化状态"MANAGED"之前触发。
+ * 子类重写该方法时,要考虑是否调用super.xxx(),以及调用先后时机,以免造成无意的父类代码逻辑被覆盖(丢失)
+ */
+ @Override
+ protected void prePersist() {
+ super.prePersist();
+ //默认给定频率单位 HZ
+ if (getFrequencySettingUnitOfMeasure() == null) {
+ setFrequencySettingUnitOfMeasure(UnitOfMeasure.forId(UnitOfMeasureIdsHex.HZ));
+ }
+ //默认反馈频率单位 HZ
+ if (getElectricCurrentFeedbackUOM() == null) {
+ setElectricCurrentFeedbackUOM(UnitOfMeasure.forId(UnitOfMeasureIdsHex.HZ));
+ }
+ //增加动态属性名,填充实时库标签用
+ if(!containsDynamicAttribute(AttributeNames.frequencySetting)){
+ setDynamicAttribute(AttributeNames.frequencySetting,null,true);
+ }
+ if(!containsDynamicAttribute(AttributeNames.frequencyFeedback)){
+ setDynamicAttribute(AttributeNames.frequencyFeedback,null,true);
+ }
+ if(!containsDynamicAttribute(AttributeNames.electricCurrentFeedback)){
+ setDynamicAttribute(AttributeNames.electricCurrentFeedback,null,true);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/literal/AttributeNames.java b/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/literal/AttributeNames.java
index 5037966..c1850bc 100644
--- a/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/literal/AttributeNames.java
+++ b/hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/literal/AttributeNames.java
@@ -35,4 +35,10 @@
public static String liquidLevelUnitOfMeasure = "liquidLevelUnitOfMeasure";
public static String warningLevelUnitOfMeasure = "warningLevelUnitOfMeasure";
public static String flowValue = "flowValue";
+ public static String frequencyFeedbackUnitOfMeasure = "frequencyFeedbackUnitOfMeasure";
+ public static String electricCurrentFeedbackUOM = "electricCurrentFeedbackUOM";
+ public static String frequencySetting = "frequencySetting";
+ public static String electricCurrentFeedback = "electricCurrentFeedback";
+ public static String frequencySettingUnitOfMeasure = "frequencySettingUnitOfMeasure";
+ public static String frequencyFeedback = "frequencyFeedback";
}
diff --git "a/hbbohua-water-domain/src/main/resources/META-INF/modeling-scripts/30-water.1.8.0/20210317-1800-water-\345\215\225\344\275\215\346\264\276\347\224\237.ms" "b/hbbohua-water-domain/src/main/resources/META-INF/modeling-scripts/30-water.1.8.0/20210317-1800-water-\345\215\225\344\275\215\346\264\276\347\224\237.ms"
index daf4041..fc0acc4 100644
--- "a/hbbohua-water-domain/src/main/resources/META-INF/modeling-scripts/30-water.1.8.0/20210317-1800-water-\345\215\225\344\275\215\346\264\276\347\224\237.ms"
+++ "b/hbbohua-water-domain/src/main/resources/META-INF/modeling-scripts/30-water.1.8.0/20210317-1800-water-\345\215\225\344\275\215\346\264\276\347\224\237.ms"
@@ -23,12 +23,6 @@
{"$DUN$":"N","id":"ff808181783e463d01783ed573bd00254f626a656b74416363657373","canRead":"true","sortOrder":"0.0","target":"cef5004e763e4ff49a0d013316426fe14964656e74697479","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-17T14:17:59.486","notLockable":"false","config":"ff808181783e463d01783ed573bd00254f626a656b74416363657373","current":"true","released":"true","modifiedAt":"2021-03-17T14:17:59.486","canDelete":"true","newVersion":"true","canChangeAccess":"false","version":"1","trashed":"false","majorRevision":"A","source":"ff808181783e463d01783ed573bd00234f626a656b745065726d697373696f6e","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","canUpdate":"true","canDiscover":"true","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
{"$DUN$":"N","id":"ff808181783e463d01783ed573be00264f626a656b74416363657373","canRead":"true","sortOrder":"0.0","target":"5cfc53bf6c654ad99b3ee2ea0ff7af234964656e74697479","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-17T14:17:59.486","notLockable":"false","config":"ff808181783e463d01783ed573be00264f626a656b74416363657373","current":"true","released":"true","modifiedAt":"2021-03-17T14:17:59.486","canDelete":"false","newVersion":"true","canChangeAccess":"false","version":"1","trashed":"false","majorRevision":"A","source":"ff808181783e463d01783ed573bd00234f626a656b745065726d697373696f6e","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","canUpdate":"false","canDiscover":"true","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
{"$DUN$":"N","id":"ff808181783e463d01783ed573be00277ff2def68f1a449b5bafdc67e5a7faf2","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-17T14:17:59.486","notLockable":"false","config":"ff808181783e463d01783ed573be00277ff2def68f1a449b5bafdc67e5a7faf2","current":"true","released":"true","default":"true","modifiedAt":"2021-03-17T14:17:59.486","newVersion":"true","source":"56616c7665","target":"ff808181783e463d01783ed573bd00234f626a656b745065726d697373696f6e","version":"1","trashed":"false","majorRevision":"A","name":"Valve","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"Valve","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","sortOrder":"0.0"}
-{"$DUN$":"N","id":"50756d7053746174696f6e","bpmable":"false","defaultPageSize":"25","usingSourcePermission":"false","logRetentionTime":"0","associationKlass":"false","abstract":"false","allowPrivatePermission":"false","config":"50756d7053746174696f6e","parent":"556e6974","current":"true","objektDetailViewLayout":"c729dc4cce634d318f0887da3cc71c2a56616c7565","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","loggable":"false","generation":"1","persistenceFacility":"PumpStation","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","final":"false","autoSearch":"false","combinedLabel":"PumpStation 泵站","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","path":"4f626a656b74/45717569706d656e74/576f726b556e6974/556e6974/50756d7053746174696f6e","revisionable":"false","label":"泵站","unlockOnLogout":"true","logMaxNumber":"0","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-17T14:17:59.613","notLockable":"false","released":"true","modifiedAt":"2021-03-17T14:17:59.613","version":"1","enforceDiscovery":"false","manualVersioning":"false","majorRevision":"A","manualSwitchingState":"false","name":"PumpStation","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","entityClass":"com.hbbohua.water.domain.PumpStation"}
-{"$DUN$":"N","id":"ff808181783e463d01783ed5743d00284f626a656b745065726d697373696f6e","description":"所有用户可读取;系统管理员拥有完全权限;创建者拥有除授权之外的权限。","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-17T14:17:59.614","notLockable":"false","config":"ff808181783e463d01783ed5743d00284f626a656b745065726d697373696f6e","current":"true","released":"true","modifiedAt":"2021-03-17T14:17:59.614","private":"false","newVersion":"true","version":"1","trashed":"false","majorRevision":"A","name":"PumpStation","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","label":"泵站的权限","combinedLabel":"泵站的权限","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
-{"$DUN$":"N","id":"ff808181783e463d01783ed5743d00294f626a656b74416363657373","canRead":"true","sortOrder":"0.0","target":"85f8466975bd4716808f6f0ee954ab56526f6c65","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-17T14:17:59.614","notLockable":"false","config":"ff808181783e463d01783ed5743d00294f626a656b74416363657373","current":"true","released":"true","modifiedAt":"2021-03-17T14:17:59.614","canDelete":"true","newVersion":"true","canChangeAccess":"true","version":"1","trashed":"false","majorRevision":"A","source":"ff808181783e463d01783ed5743d00284f626a656b745065726d697373696f6e","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","canUpdate":"true","canDiscover":"true","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
-{"$DUN$":"N","id":"ff808181783e463d01783ed5743d002a4f626a656b74416363657373","canRead":"true","sortOrder":"0.0","target":"cef5004e763e4ff49a0d013316426fe14964656e74697479","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-17T14:17:59.614","notLockable":"false","config":"ff808181783e463d01783ed5743d002a4f626a656b74416363657373","current":"true","released":"true","modifiedAt":"2021-03-17T14:17:59.614","canDelete":"true","newVersion":"true","canChangeAccess":"false","version":"1","trashed":"false","majorRevision":"A","source":"ff808181783e463d01783ed5743d00284f626a656b745065726d697373696f6e","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","canUpdate":"true","canDiscover":"true","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
-{"$DUN$":"N","id":"ff808181783e463d01783ed5743e002b4f626a656b74416363657373","canRead":"true","sortOrder":"0.0","target":"5cfc53bf6c654ad99b3ee2ea0ff7af234964656e74697479","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-17T14:17:59.614","notLockable":"false","config":"ff808181783e463d01783ed5743e002b4f626a656b74416363657373","current":"true","released":"true","modifiedAt":"2021-03-17T14:17:59.614","canDelete":"false","newVersion":"true","canChangeAccess":"false","version":"1","trashed":"false","majorRevision":"A","source":"ff808181783e463d01783ed5743d00284f626a656b745065726d697373696f6e","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","canUpdate":"false","canDiscover":"true","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
-{"$DUN$":"N","id":"ff808181783e463d01783ed5743e002c7ff2def68f1a449b5bafdc67e5a7faf2","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-17T14:17:59.615","notLockable":"false","config":"ff808181783e463d01783ed5743e002c7ff2def68f1a449b5bafdc67e5a7faf2","current":"true","released":"true","default":"true","modifiedAt":"2021-03-17T14:17:59.615","newVersion":"true","source":"50756d7053746174696f6e","target":"ff808181783e463d01783ed5743d00284f626a656b745065726d697373696f6e","version":"1","trashed":"false","majorRevision":"A","name":"PumpStation","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"PumpStation","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","sortOrder":"0.0"}
{"$DUN$":"N","id":"506970656c696e65","bpmable":"false","defaultPageSize":"25","usingSourcePermission":"false","logRetentionTime":"0","associationKlass":"false","abstract":"false","allowPrivatePermission":"false","config":"506970656c696e65","parent":"556e6974","current":"true","objektDetailViewLayout":"c729dc4cce634d318f0887da3cc71c2a56616c7565","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","loggable":"false","generation":"1","persistenceFacility":"Pipeline","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","final":"false","autoSearch":"false","combinedLabel":"Pipeline 管道","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","path":"4f626a656b74/45717569706d656e74/576f726b556e6974/556e6974/506970656c696e65","revisionable":"false","label":"管道","unlockOnLogout":"true","logMaxNumber":"0","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-17T14:17:59.725","notLockable":"false","released":"true","modifiedAt":"2021-03-17T14:17:59.725","version":"1","enforceDiscovery":"false","manualVersioning":"false","majorRevision":"A","manualSwitchingState":"false","name":"Pipeline","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","entityClass":"com.hbbohua.water.domain.Pipeline"}
{"$DUN$":"N","id":"ff808181783e463d01783ed574ad002d4f626a656b745065726d697373696f6e","description":"所有用户可读取;系统管理员拥有完全权限;创建者拥有除授权之外的权限。","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-17T14:17:59.726","notLockable":"false","config":"ff808181783e463d01783ed574ad002d4f626a656b745065726d697373696f6e","current":"true","released":"true","modifiedAt":"2021-03-17T14:17:59.726","private":"false","newVersion":"true","version":"1","trashed":"false","majorRevision":"A","name":"Pipeline","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","label":"管道的权限","combinedLabel":"管道的权限","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
{"$DUN$":"N","id":"ff808181783e463d01783ed574ad002e4f626a656b74416363657373","canRead":"true","sortOrder":"0.0","target":"85f8466975bd4716808f6f0ee954ab56526f6c65","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-17T14:17:59.726","notLockable":"false","config":"ff808181783e463d01783ed574ad002e4f626a656b74416363657373","current":"true","released":"true","modifiedAt":"2021-03-17T14:17:59.726","canDelete":"true","newVersion":"true","canChangeAccess":"true","version":"1","trashed":"false","majorRevision":"A","source":"ff808181783e463d01783ed574ad002d4f626a656b745065726d697373696f6e","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","canUpdate":"true","canDiscover":"true","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
@@ -40,10 +34,6 @@
{"$DUN$":"N","id":"ff808181783e463d01783ef190590033417474726962757465","unique":"false","hiddenInAocSimpleView":"false","config":"ff808181783e463d01783ef190590033417474726962757465","current":"true","name":"diameter","source":"506970656c696e65","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","required":"false","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"diameter 管径","writeOnCreating":"false","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","description":"公制(mm)管径","readonly":"false","longDefaultValue":"0","richText":"false","dataType":"346df36bea7945e5a1a395eb476e660756616c7565","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-17T14:52:58.893","notLockable":"false","cascaded":"false","booleanDefaultValue":"false","released":"true","integerDefaultValue":"0","tristate":"false","modifiedAt":"2021-03-17T14:52:58.893","label":"管径","multiline":"false","expressionable":"false","length":"10","i18n":"false","version":"1","hiddenInOcSimpleView":"false","majorRevision":"A","hiddenInObjektSimpleView":"false","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","sortOrder":"0.0"}
{"$DUN$":"N","id":"ff808181783f70e801783f71983a0003417474726962757465","unique":"false","hiddenInAocSimpleView":"false","config":"ff808181783f70e801783f71983a0003417474726962757465","current":"true","name":"status","source":"56616c7665","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","required":"false","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"status 开关状态","writeOnCreating":"false","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","description":"开关状态","readonly":"false","longDefaultValue":"0","richText":"false","dataType":"f7036b21e6e34919b504df2cfc2d88e256616c7565","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-17T17:09:49.236","notLockable":"false","cascaded":"false","booleanDefaultValue":"false","released":"true","integerDefaultValue":"0","tristate":"false","modifiedAt":"2021-03-17T17:09:49.236","label":"开关状态","multiline":"false","expressionable":"false","length":"1","i18n":"false","version":"1","hiddenInOcSimpleView":"false","majorRevision":"A","hiddenInObjektSimpleView":"false","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","sortOrder":"0.0"}
//accept at 2021-03-17T17:09:49.399
-//begin at 2021-03-17T17:17:56.499
-{"$DUN$":"N","id":"ff808181783f70e801783f73d5fb0004417474726962757465","unique":"false","hiddenInAocSimpleView":"false","config":"ff808181783f70e801783f73d5fb0004417474726962757465","current":"true","name":"liquidLevel","source":"50756d7053746174696f6e","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","required":"false","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"liquidLevel 液位","writeOnCreating":"false","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","description":"液位","readonly":"false","longDefaultValue":"0","richText":"false","dataType":"8c561fdc3d774ec387a597143dbd1ad556616c7565","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-17T17:17:56.519","notLockable":"false","cascaded":"false","booleanDefaultValue":"false","released":"true","integerDefaultValue":"0","tristate":"false","modifiedAt":"2021-03-17T17:17:56.519","label":"液位","multiline":"false","expressionable":"false","i18n":"false","version":"1","hiddenInOcSimpleView":"false","majorRevision":"A","hiddenInObjektSimpleView":"false","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","sortOrder":"0.0"}
-{"$DUN$":"N","id":"ff808181783f70e801783f77080d0005417474726962757465","unique":"false","hiddenInAocSimpleView":"false","config":"ff808181783f70e801783f77080d0005417474726962757465","current":"true","name":"warningLevel","source":"50756d7053746174696f6e","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","required":"false","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"warningLevel 警戒液位","writeOnCreating":"false","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","description":"警戒液位","readonly":"false","longDefaultValue":"0","richText":"false","dataType":"8c561fdc3d774ec387a597143dbd1ad556616c7565","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-17T17:17:56.523","notLockable":"false","cascaded":"false","booleanDefaultValue":"false","released":"true","integerDefaultValue":"0","tristate":"false","modifiedAt":"2021-03-17T17:17:56.523","label":"警戒液位","multiline":"false","expressionable":"false","i18n":"false","version":"1","hiddenInOcSimpleView":"false","majorRevision":"A","hiddenInObjektSimpleView":"false","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","sortOrder":"0.0"}
-//accept at 2021-03-17T17:17:56.662
//begin at 2021-03-17T17:46:18.239
{"$DUN$":"N","id":"ff808181783f70e801783f7a89470006417474726962757465","unique":"false","hiddenInAocSimpleView":"false","config":"ff808181783f70e801783f7a89470006417474726962757465","current":"true","name":"conductivity","source":"a3c6b03630807dfa8b86809b9cb97871","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","required":"false","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"conductivity 电导率","writeOnCreating":"false","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","description":"电导率","readonly":"false","longDefaultValue":"0","richText":"false","dataType":"346df36bea7945e5a1a395eb476e660756616c7565","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-17T17:45:52.028","notLockable":"false","cascaded":"false","booleanDefaultValue":"false","released":"true","integerDefaultValue":"0","tristate":"false","modifiedAt":"2021-03-17T17:45:52.028","label":"电导率","multiline":"false","expressionable":"false","length":"10","i18n":"false","version":"1","hiddenInOcSimpleView":"false","majorRevision":"A","hiddenInObjektSimpleView":"false","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","sortOrder":"10.0"}
{"$DUN$":"N","id":"ff808181783f70e801783f81a7ce0007417474726962757465","unique":"false","hiddenInAocSimpleView":"false","config":"ff808181783f70e801783f81a7ce0007417474726962757465","current":"true","name":"ph","source":"a3c6b03630807dfa8b86809b9cb97871","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","required":"false","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"ph PH值","writeOnCreating":"false","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","description":"PH值","readonly":"false","longDefaultValue":"0","richText":"false","dataType":"9111af76dd554decb9094ee914665a8656616c7565","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-17T17:45:52.030","notLockable":"false","cascaded":"false","booleanDefaultValue":"false","released":"true","integerDefaultValue":"0","tristate":"false","modifiedAt":"2021-03-17T17:45:52.030","label":"PH值","multiline":"false","expressionable":"false","length":"3","i18n":"false","version":"1","hiddenInOcSimpleView":"false","majorRevision":"A","hiddenInObjektSimpleView":"false","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","sortOrder":"20.0"}
@@ -104,15 +94,62 @@
//begin at 2021-03-18T09:25:55.380
{"$DUN$":"U","id":"ff808181783fd3f4017842ef26a90013417474726962757465","objektDataSource":"556e69744f664d656173757265","modifiedAt":"2021-03-18T09:25:55.388","version":"2"}
//accept at 2021-03-18T09:25:55.421
-//begin at 2021-03-18T09:27:35.557
-{"$DUN$":"N","id":"ff808181783fd3f4017842f0cb440014417474726962757465","unique":"false","hiddenInAocSimpleView":"false","config":"ff808181783fd3f4017842f0cb440014417474726962757465","current":"true","indexName":"liquidLevelUnitOfMeasure","name":"liquidLevelUnitOfMeasure","source":"50756d7053746174696f6e","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","required":"false","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"liquidLevelUnitOfMeasure 液位计量单位","writeOnCreating":"false","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","description":"液位计量单位","readonly":"false","longDefaultValue":"0","richText":"false","dataType":"c80693211fc4426a88ebca05b34a5f2d56616c7565","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-18T09:27:35.576","notLockable":"false","cascaded":"false","booleanDefaultValue":"false","scale":"3","released":"true","integerDefaultValue":"0","tristate":"false","modifiedAt":"2021-03-18T09:27:35.576","label":"液位计量单位","multiline":"false","expressionable":"false","length":"32","i18n":"false","version":"1","hiddenInOcSimpleView":"false","precision":"18","majorRevision":"A","hiddenInObjektSimpleView":"false","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","sortOrder":"20.0"}
-{"$DUN$":"N","id":"ff808181783fd3f4017842f17d540015417474726962757465","unique":"false","hiddenInAocSimpleView":"false","config":"ff808181783fd3f4017842f17d540015417474726962757465","current":"true","indexName":"warningLevelUnitOfMeasure","name":"warningLevelUnitOfMeasure","source":"50756d7053746174696f6e","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","required":"false","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"warningLevelUnitOfMeasure 警戒液位计量单位","writeOnCreating":"false","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","description":"警戒液位计量单位","readonly":"false","longDefaultValue":"0","richText":"false","dataType":"c80693211fc4426a88ebca05b34a5f2d56616c7565","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-18T09:27:35.579","notLockable":"false","cascaded":"false","booleanDefaultValue":"false","scale":"3","released":"true","integerDefaultValue":"0","tristate":"false","modifiedAt":"2021-03-18T09:27:35.579","label":"警戒液位计量单位","multiline":"false","expressionable":"false","length":"32","i18n":"false","version":"1","hiddenInOcSimpleView":"false","precision":"18","majorRevision":"A","hiddenInObjektSimpleView":"false","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","sortOrder":"40.0"}
-{"$DUN$":"U","id":"ff808181783f70e801783f73d5fb0004417474726962757465","sortOrder":"10.0"}
-{"$DUN$":"U","id":"ff808181783f70e801783f77080d0005417474726962757465","sortOrder":"30.0"}
-//accept at 2021-03-18T09:27:35.792
//begin at 2021-03-18T09:28:38.065
{"$DUN$":"U","id":"ff808181783fd3f4017842f0cb440014417474726962757465","objektDataSource":"556e69744f664d656173757265","modifiedAt":"2021-03-18T09:28:38.075","version":"2"}
//accept at 2021-03-18T09:28:38.082
//begin at 2021-03-18T09:28:55.891
{"$DUN$":"U","id":"ff808181783fd3f4017842f17d540015417474726962757465","objektDataSource":"556e69744f664d656173757265","modifiedAt":"2021-03-18T09:28:55.902","version":"2"}
-//accept at 2021-03-18T09:28:55.937
\ No newline at end of file
+//accept at 2021-03-18T09:28:55.937
+//begin at 2021-03-23T15:59:38.268 泵站
+{"$DUN$":"N","id":"50756d7053746174696f6e","bpmable":"false","defaultPageSize":"25","usingSourcePermission":"false","logRetentionTime":"0","associationKlass":"false","abstract":"false","allowPrivatePermission":"false","config":"50756d7053746174696f6e","parent":"50726f64756374696f6e556e6974","current":"true","objektDetailViewLayout":"c729dc4cce634d318f0887da3cc71c2a56616c7565","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","loggable":"false","generation":"1","persistenceFacility":"PumpStation","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","final":"true","autoSearch":"false","combinedLabel":"PumpStation 泵站","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","path":"4f626a656b74/45717569706d656e74/576f726b43656e746572/50726f64756374696f6e556e6974/50756d7053746174696f6e","revisionable":"false","label":"泵站","unlockOnLogout":"true","logMaxNumber":"0","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T15:59:38.290","notLockable":"false","released":"true","modifiedAt":"2021-03-23T15:59:38.290","version":"1","enforceDiscovery":"false","manualVersioning":"false","majorRevision":"A","manualSwitchingState":"false","name":"PumpStation","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","entityClass":"com.hbbohua.water.domain.PumpStation"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e18ab3a000f4f626a656b745065726d697373696f6e","description":"所有用户可读取;系统管理员拥有完全权限;创建者拥有除授权之外的权限。","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T15:59:38.322","notLockable":"false","config":"ff808181785e0d9c01785e18ab3a000f4f626a656b745065726d697373696f6e","current":"true","released":"true","modifiedAt":"2021-03-23T15:59:38.322","private":"false","newVersion":"true","version":"1","trashed":"false","majorRevision":"A","name":"PumpStation","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","label":"泵站的权限","combinedLabel":"泵站的权限","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e18ab4300104f626a656b74416363657373","canRead":"true","sortOrder":"0.0","target":"85f8466975bd4716808f6f0ee954ab56526f6c65","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T15:59:38.324","notLockable":"false","config":"ff808181785e0d9c01785e18ab4300104f626a656b74416363657373","current":"true","released":"true","modifiedAt":"2021-03-23T15:59:38.324","canDelete":"true","newVersion":"true","canChangeAccess":"true","version":"1","trashed":"false","majorRevision":"A","source":"ff808181785e0d9c01785e18ab3a000f4f626a656b745065726d697373696f6e","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","canUpdate":"true","canDiscover":"true","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e18ab4800114f626a656b74416363657373","canRead":"true","sortOrder":"0.0","target":"cef5004e763e4ff49a0d013316426fe14964656e74697479","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T15:59:38.324","notLockable":"false","config":"ff808181785e0d9c01785e18ab4800114f626a656b74416363657373","current":"true","released":"true","modifiedAt":"2021-03-23T15:59:38.324","canDelete":"true","newVersion":"true","canChangeAccess":"false","version":"1","trashed":"false","majorRevision":"A","source":"ff808181785e0d9c01785e18ab3a000f4f626a656b745065726d697373696f6e","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","canUpdate":"true","canDiscover":"true","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e18ab4d00124f626a656b74416363657373","canRead":"true","sortOrder":"0.0","target":"5cfc53bf6c654ad99b3ee2ea0ff7af234964656e74697479","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T15:59:38.324","notLockable":"false","config":"ff808181785e0d9c01785e18ab4d00124f626a656b74416363657373","current":"true","released":"true","modifiedAt":"2021-03-23T15:59:38.324","canDelete":"false","newVersion":"true","canChangeAccess":"false","version":"1","trashed":"false","majorRevision":"A","source":"ff808181785e0d9c01785e18ab3a000f4f626a656b745065726d697373696f6e","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","canUpdate":"false","canDiscover":"true","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e18ab5400137ff2def68f1a449b5bafdc67e5a7faf2","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T15:59:38.324","notLockable":"false","config":"ff808181785e0d9c01785e18ab5400137ff2def68f1a449b5bafdc67e5a7faf2","current":"true","released":"true","default":"true","modifiedAt":"2021-03-23T15:59:38.324","newVersion":"true","source":"50756d7053746174696f6e","target":"ff808181785e0d9c01785e18ab3a000f4f626a656b745065726d697373696f6e","version":"1","trashed":"false","majorRevision":"A","name":"PumpStation","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"PumpStation","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","sortOrder":"0.0"}
+//accept at 2021-03-23T15:59:38.507
+//begin at 2021-03-23T16:01:16.641 水泵begin
+{"$DUN$":"N","id":"576174657250756d70","bpmable":"false","defaultPageSize":"25","usingSourcePermission":"false","logRetentionTime":"0","associationKlass":"false","abstract":"false","allowPrivatePermission":"false","config":"576174657250756d70","parent":"556e6974","current":"true","objektDetailViewLayout":"c729dc4cce634d318f0887da3cc71c2a56616c7565","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","loggable":"false","generation":"1","persistenceFacility":"WaterPump","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","final":"true","autoSearch":"false","combinedLabel":"WaterPump 水泵","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","path":"4f626a656b74/45717569706d656e74/576f726b556e6974/556e6974/576174657250756d70","revisionable":"false","label":"水泵","unlockOnLogout":"true","logMaxNumber":"0","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:01:16.660","notLockable":"false","released":"true","modifiedAt":"2021-03-23T16:01:16.660","version":"1","enforceDiscovery":"false","manualVersioning":"false","majorRevision":"A","manualSwitchingState":"false","name":"WaterPump","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","entityClass":"com.hbbohua.water.domain.WaterPump"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e1a2b7a00164f626a656b745065726d697373696f6e","description":"所有用户可读取;系统管理员拥有完全权限;创建者拥有除授权之外的权限。","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:01:16.684","notLockable":"false","config":"ff808181785e0d9c01785e1a2b7a00164f626a656b745065726d697373696f6e","current":"true","released":"true","modifiedAt":"2021-03-23T16:01:16.684","private":"false","newVersion":"true","version":"1","trashed":"false","majorRevision":"A","name":"WaterPump","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","label":"水泵的权限","combinedLabel":"水泵的权限","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e1a2b8300174f626a656b74416363657373","canRead":"true","sortOrder":"0.0","target":"85f8466975bd4716808f6f0ee954ab56526f6c65","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:01:16.684","notLockable":"false","config":"ff808181785e0d9c01785e1a2b8300174f626a656b74416363657373","current":"true","released":"true","modifiedAt":"2021-03-23T16:01:16.684","canDelete":"true","newVersion":"true","canChangeAccess":"true","version":"1","trashed":"false","majorRevision":"A","source":"ff808181785e0d9c01785e1a2b7a00164f626a656b745065726d697373696f6e","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","canUpdate":"true","canDiscover":"true","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e1a2b8600184f626a656b74416363657373","canRead":"true","sortOrder":"0.0","target":"cef5004e763e4ff49a0d013316426fe14964656e74697479","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:01:16.684","notLockable":"false","config":"ff808181785e0d9c01785e1a2b8600184f626a656b74416363657373","current":"true","released":"true","modifiedAt":"2021-03-23T16:01:16.684","canDelete":"true","newVersion":"true","canChangeAccess":"false","version":"1","trashed":"false","majorRevision":"A","source":"ff808181785e0d9c01785e1a2b7a00164f626a656b745065726d697373696f6e","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","canUpdate":"true","canDiscover":"true","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e1a2b8900194f626a656b74416363657373","canRead":"true","sortOrder":"0.0","target":"5cfc53bf6c654ad99b3ee2ea0ff7af234964656e74697479","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:01:16.684","notLockable":"false","config":"ff808181785e0d9c01785e1a2b8900194f626a656b74416363657373","current":"true","released":"true","modifiedAt":"2021-03-23T16:01:16.684","canDelete":"false","newVersion":"true","canChangeAccess":"false","version":"1","trashed":"false","majorRevision":"A","source":"ff808181785e0d9c01785e1a2b7a00164f626a656b745065726d697373696f6e","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","canUpdate":"false","canDiscover":"true","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e1a2b8c001a7ff2def68f1a449b5bafdc67e5a7faf2","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:01:16.684","notLockable":"false","config":"ff808181785e0d9c01785e1a2b8c001a7ff2def68f1a449b5bafdc67e5a7faf2","current":"true","released":"true","default":"true","modifiedAt":"2021-03-23T16:01:16.684","newVersion":"true","source":"576174657250756d70","target":"ff808181785e0d9c01785e1a2b7a00164f626a656b745065726d697373696f6e","version":"1","trashed":"false","majorRevision":"A","name":"WaterPump","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"WaterPump","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","sortOrder":"0.0"}
+//accept at 2021-03-23T16:01:16.862
+//begin at 2021-03-23T16:29:27.957
+{"$DUN$":"N","id":"ff808181785e0d9c01785e24ff6c001b417474726962757465","unique":"false","hiddenInAocSimpleView":"false","config":"ff808181785e0d9c01785e24ff6c001b417474726962757465","current":"true","name":"frequencySetting","source":"576174657250756d70","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","required":"false","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"frequencySetting 频率给定","writeOnCreating":"false","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","description":"频率给定","readonly":"false","longDefaultValue":"0","richText":"false","dataType":"8c561fdc3d774ec387a597143dbd1ad556616c7565","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:29:27.977","notLockable":"false","cascaded":"false","booleanDefaultValue":"false","scale":"3","released":"true","integerDefaultValue":"0","tristate":"false","modifiedAt":"2021-03-23T16:29:27.977","label":"频率给定","multiline":"false","expressionable":"false","i18n":"false","version":"1","hiddenInOcSimpleView":"false","precision":"18","majorRevision":"A","hiddenInObjektSimpleView":"false","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","sortOrder":"10.0"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e2b09a2001c417474726962757465","unique":"false","hiddenInAocSimpleView":"false","config":"ff808181785e0d9c01785e2b09a2001c417474726962757465","current":"true","indexName":"frequencySettingUnitOfMeasure","name":"frequencySettingUnitOfMeasure","source":"576174657250756d70","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","required":"false","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"frequencySettingUnitOfMeasure 频率给定计量单位","writeOnCreating":"false","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","description":"频率给定计量单位","readonly":"false","longDefaultValue":"0","richText":"false","dataType":"c80693211fc4426a88ebca05b34a5f2d56616c7565","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:29:27.998","notLockable":"false","cascaded":"false","booleanDefaultValue":"false","released":"true","integerDefaultValue":"0","tristate":"false","modifiedAt":"2021-03-23T16:29:27.998","label":"频率给定计量单位","multiline":"false","expressionable":"false","length":"32","i18n":"false","version":"1","hiddenInOcSimpleView":"false","majorRevision":"A","hiddenInObjektSimpleView":"false","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","sortOrder":"20.0"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e2df88d001d417474726962757465","unique":"false","hiddenInAocSimpleView":"false","config":"ff808181785e0d9c01785e2df88d001d417474726962757465","current":"true","name":"frequencyFeedback","source":"576174657250756d70","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","required":"false","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"frequencyFeedback 频率反馈","writeOnCreating":"false","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","description":"频率反馈","readonly":"false","longDefaultValue":"0","richText":"false","dataType":"8c561fdc3d774ec387a597143dbd1ad556616c7565","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:29:28","notLockable":"false","cascaded":"false","booleanDefaultValue":"false","scale":"3","released":"true","integerDefaultValue":"0","tristate":"false","modifiedAt":"2021-03-23T16:29:28","label":"频率反馈","multiline":"false","expressionable":"false","i18n":"false","version":"1","hiddenInOcSimpleView":"false","precision":"18","majorRevision":"A","hiddenInObjektSimpleView":"false","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","sortOrder":"30.0"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e314f00001e417474726962757465","unique":"false","hiddenInAocSimpleView":"false","config":"ff808181785e0d9c01785e314f00001e417474726962757465","current":"true","indexName":"frequencyFeedbackUnitOfMeasure","name":"frequencyFeedbackUnitOfMeasure","source":"576174657250756d70","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","required":"false","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"frequencyFeedbackUnitOfMeasure 频率反馈计量单位","writeOnCreating":"false","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","description":"频率反馈计量单位","readonly":"false","longDefaultValue":"0","richText":"false","dataType":"c80693211fc4426a88ebca05b34a5f2d56616c7565","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:29:28.002","notLockable":"false","cascaded":"false","booleanDefaultValue":"false","released":"true","integerDefaultValue":"0","tristate":"false","modifiedAt":"2021-03-23T16:29:28.002","label":"频率反馈计量单位","multiline":"false","expressionable":"false","length":"32","i18n":"false","version":"1","hiddenInOcSimpleView":"false","majorRevision":"A","hiddenInObjektSimpleView":"false","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","sortOrder":"40.0"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e31b3b9001f417474726962757465","unique":"false","hiddenInAocSimpleView":"false","config":"ff808181785e0d9c01785e31b3b9001f417474726962757465","current":"true","name":"electricCurrentFeedback","source":"576174657250756d70","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","required":"false","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"electricCurrentFeedback 电流反馈","writeOnCreating":"false","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","description":"电流反馈","readonly":"false","longDefaultValue":"0","richText":"false","dataType":"8c561fdc3d774ec387a597143dbd1ad556616c7565","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:29:28.004","notLockable":"false","cascaded":"false","booleanDefaultValue":"false","scale":"3","released":"true","integerDefaultValue":"0","tristate":"false","modifiedAt":"2021-03-23T16:29:28.004","label":"电流反馈","multiline":"false","expressionable":"false","i18n":"false","version":"1","hiddenInOcSimpleView":"false","precision":"18","majorRevision":"A","hiddenInObjektSimpleView":"false","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","sortOrder":"50.0"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e333f0e0020417474726962757465","unique":"false","hiddenInAocSimpleView":"false","config":"ff808181785e0d9c01785e333f0e0020417474726962757465","current":"true","indexName":"electricCurrentFeedbackUOM","name":"electricCurrentFeedbackUOM","source":"576174657250756d70","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","required":"false","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"electricCurrentFeedbackUOM 电流反馈计量单位","writeOnCreating":"false","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","description":"电流反馈计量单位","readonly":"false","longDefaultValue":"0","richText":"false","dataType":"c80693211fc4426a88ebca05b34a5f2d56616c7565","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:29:28.005","notLockable":"false","cascaded":"false","booleanDefaultValue":"false","released":"true","integerDefaultValue":"0","tristate":"false","modifiedAt":"2021-03-23T16:29:28.005","label":"电流反馈计量单位","multiline":"false","expressionable":"false","length":"32","i18n":"false","version":"1","hiddenInOcSimpleView":"false","majorRevision":"A","hiddenInObjektSimpleView":"false","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","sortOrder":"60.0"}
+//accept at 2021-03-23T16:29:28.501
+//begin at 2021-03-23T16:30:04.523
+{"$DUN$":"U","id":"ff808181785e0d9c01785e2b09a2001c417474726962757465","objektDataSource":"556e69744f664d656173757265","modifiedAt":"2021-03-23T16:30:04.534","version":"2"}
+//accept at 2021-03-23T16:30:04.543
+//begin at 2021-03-23T16:31:06.532
+{"$DUN$":"U","id":"ff808181785e0d9c01785e314f00001e417474726962757465","objektDataSource":"556e69744f664d656173757265","modifiedAt":"2021-03-23T16:31:06.544","version":"2"}
+//accept at 2021-03-23T16:31:06.580
+//begin at 2021-03-23T16:31:25
+{"$DUN$":"U","id":"ff808181785e0d9c01785e333f0e0020417474726962757465","objektDataSource":"556e69744f664d656173757265","modifiedAt":"2021-03-23T16:31:25.014","version":"2"}
+//accept at 2021-03-23T16:31:25.048 水泵end
+//begin at 2021-03-23T16:35:51.472 集水池begin
+{"$DUN$":"N","id":"53756d70","bpmable":"false","defaultPageSize":"25","usingSourcePermission":"false","logRetentionTime":"0","associationKlass":"false","abstract":"false","allowPrivatePermission":"false","config":"53756d70","parent":"556e6974","current":"true","objektDetailViewLayout":"c729dc4cce634d318f0887da3cc71c2a56616c7565","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","loggable":"false","generation":"1","persistenceFacility":"Sump","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","final":"true","autoSearch":"false","combinedLabel":"Sump 集水池","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","path":"4f626a656b74/45717569706d656e74/576f726b556e6974/556e6974/53756d70","revisionable":"false","label":"集水池","unlockOnLogout":"true","logMaxNumber":"0","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:35:51.489","notLockable":"false","released":"true","modifiedAt":"2021-03-23T16:35:51.489","version":"1","enforceDiscovery":"false","manualVersioning":"false","majorRevision":"A","manualSwitchingState":"false","name":"Sump","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","entityClass":"com.hbbohua.water.domain.Sump"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e39d44400224f626a656b745065726d697373696f6e","description":"所有用户可读取;系统管理员拥有完全权限;创建者拥有除授权之外的权限。","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:35:51.510","notLockable":"false","config":"ff808181785e0d9c01785e39d44400224f626a656b745065726d697373696f6e","current":"true","released":"true","modifiedAt":"2021-03-23T16:35:51.510","private":"false","newVersion":"true","version":"1","trashed":"false","majorRevision":"A","name":"Sump","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","label":"集水池的权限","combinedLabel":"集水池的权限","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e39d44c00234f626a656b74416363657373","canRead":"true","sortOrder":"0.0","target":"85f8466975bd4716808f6f0ee954ab56526f6c65","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:35:51.510","notLockable":"false","config":"ff808181785e0d9c01785e39d44c00234f626a656b74416363657373","current":"true","released":"true","modifiedAt":"2021-03-23T16:35:51.510","canDelete":"true","newVersion":"true","canChangeAccess":"true","version":"1","trashed":"false","majorRevision":"A","source":"ff808181785e0d9c01785e39d44400224f626a656b745065726d697373696f6e","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","canUpdate":"true","canDiscover":"true","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e39d45000244f626a656b74416363657373","canRead":"true","sortOrder":"0.0","target":"cef5004e763e4ff49a0d013316426fe14964656e74697479","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:35:51.511","notLockable":"false","config":"ff808181785e0d9c01785e39d45000244f626a656b74416363657373","current":"true","released":"true","modifiedAt":"2021-03-23T16:35:51.511","canDelete":"true","newVersion":"true","canChangeAccess":"false","version":"1","trashed":"false","majorRevision":"A","source":"ff808181785e0d9c01785e39d44400224f626a656b745065726d697373696f6e","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","canUpdate":"true","canDiscover":"true","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e39d45300254f626a656b74416363657373","canRead":"true","sortOrder":"0.0","target":"5cfc53bf6c654ad99b3ee2ea0ff7af234964656e74697479","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:35:51.511","notLockable":"false","config":"ff808181785e0d9c01785e39d45300254f626a656b74416363657373","current":"true","released":"true","modifiedAt":"2021-03-23T16:35:51.511","canDelete":"false","newVersion":"true","canChangeAccess":"false","version":"1","trashed":"false","majorRevision":"A","source":"ff808181785e0d9c01785e39d44400224f626a656b745065726d697373696f6e","permission":"f1d2d313ee5046f686b62242aaaf2cc54f626a656b745065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","canUpdate":"false","canDiscover":"true","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e39d45700267ff2def68f1a449b5bafdc67e5a7faf2","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:35:51.511","notLockable":"false","config":"ff808181785e0d9c01785e39d45700267ff2def68f1a449b5bafdc67e5a7faf2","current":"true","released":"true","default":"true","modifiedAt":"2021-03-23T16:35:51.511","newVersion":"true","source":"53756d70","target":"ff808181785e0d9c01785e39d44400224f626a656b745065726d697373696f6e","version":"1","trashed":"false","majorRevision":"A","name":"Sump","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"Sump","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","sortOrder":"0.0"}
+//accept at 2021-03-23T16:35:51.697
+//begin at 2021-03-23T16:39:21.244
+{"$DUN$":"N","id":"ff808181785e0d9c01785e3a3fc20027417474726962757465","unique":"false","hiddenInAocSimpleView":"false","config":"ff808181785e0d9c01785e3a3fc20027417474726962757465","current":"true","name":"liquidLevel","source":"53756d70","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","required":"false","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"liquidLevel 液位","writeOnCreating":"false","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","description":"液位","readonly":"false","longDefaultValue":"0","richText":"false","dataType":"8c561fdc3d774ec387a597143dbd1ad556616c7565","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:39:21.261","notLockable":"false","cascaded":"false","booleanDefaultValue":"false","scale":"3","released":"true","integerDefaultValue":"0","tristate":"false","modifiedAt":"2021-03-23T16:39:21.261","label":"液位","multiline":"false","expressionable":"false","i18n":"false","version":"1","hiddenInOcSimpleView":"false","precision":"18","majorRevision":"A","hiddenInObjektSimpleView":"false","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","sortOrder":"10.0"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e3b1f070028417474726962757465","unique":"false","hiddenInAocSimpleView":"false","config":"ff808181785e0d9c01785e3b1f070028417474726962757465","current":"true","indexName":"liquidLevelUnitOfMeasure","name":"liquidLevelUnitOfMeasure","source":"53756d70","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","required":"false","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"liquidLevelUnitOfMeasure 液位计量单位","writeOnCreating":"false","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","description":"液位计量单位","readonly":"false","longDefaultValue":"0","richText":"false","dataType":"c80693211fc4426a88ebca05b34a5f2d56616c7565","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:39:21.265","notLockable":"false","cascaded":"false","booleanDefaultValue":"false","released":"true","integerDefaultValue":"0","tristate":"false","modifiedAt":"2021-03-23T16:39:21.265","label":"液位计量单位","multiline":"false","expressionable":"false","length":"32","i18n":"false","version":"1","hiddenInOcSimpleView":"false","majorRevision":"A","hiddenInObjektSimpleView":"false","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","sortOrder":"20.0"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e3baee10029417474726962757465","unique":"false","hiddenInAocSimpleView":"false","config":"ff808181785e0d9c01785e3baee10029417474726962757465","current":"true","name":"warningLevel","source":"53756d70","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","required":"false","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"warningLevel 警戒液位","writeOnCreating":"false","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","description":"警戒液位","readonly":"false","longDefaultValue":"0","richText":"false","dataType":"8c561fdc3d774ec387a597143dbd1ad556616c7565","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:39:21.267","notLockable":"false","cascaded":"false","booleanDefaultValue":"false","scale":"3","released":"true","integerDefaultValue":"0","tristate":"false","modifiedAt":"2021-03-23T16:39:21.267","label":"警戒液位","multiline":"false","expressionable":"false","i18n":"false","version":"1","hiddenInOcSimpleView":"false","precision":"18","majorRevision":"A","hiddenInObjektSimpleView":"false","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","sortOrder":"30.0"}
+{"$DUN$":"N","id":"ff808181785e0d9c01785e3bfc21002a417474726962757465","unique":"false","hiddenInAocSimpleView":"false","config":"ff808181785e0d9c01785e3bfc21002a417474726962757465","current":"true","indexName":"warningLevelUnitOfMeasure","name":"warningLevelUnitOfMeasure","source":"53756d70","newVersion":"true","trashed":"false","permission":"31f57973ad1243119bcf5db93ad0debd4b6c6173735065726d697373696f6e","required":"false","generation":"1","modifier":"36128a7d7ff34a09891677bc0eed79bc55736572","combinedLabel":"warningLevelUnitOfMeasure 警戒液位计量单位","writeOnCreating":"false","owner":"36128a7d7ff34a09891677bc0eed79bc55736572","domain":"6c52d6fa749c4a3fa951254f1fc2f6cb446f6d61696e","description":"警戒液位计量单位","readonly":"false","longDefaultValue":"0","richText":"false","dataType":"c80693211fc4426a88ebca05b34a5f2d56616c7565","creator":"36128a7d7ff34a09891677bc0eed79bc55736572","createdAt":"2021-03-23T16:39:21.270","notLockable":"false","cascaded":"false","booleanDefaultValue":"false","released":"true","integerDefaultValue":"0","tristate":"false","modifiedAt":"2021-03-23T16:39:21.270","label":"警戒液位计量单位","multiline":"false","expressionable":"false","length":"32","i18n":"false","version":"1","hiddenInOcSimpleView":"false","majorRevision":"A","hiddenInObjektSimpleView":"false","state":"130a2908340148d7a9c0c5ee6d0e9cce4c6966656379636c655374617465","sortOrder":"40.0"}
+//accept at 2021-03-23T16:39:21.615
+//begin at 2021-03-23T16:39:38.393
+{"$DUN$":"U","id":"ff808181785e0d9c01785e3b1f070028417474726962757465","objektDataSource":"556e69744f664d656173757265","modifiedAt":"2021-03-23T16:39:38.404","version":"2"}
+//accept at 2021-03-23T16:39:38.416
+//begin at 2021-03-23T16:39:48.979
+{"$DUN$":"U","id":"ff808181785e0d9c01785e3bfc21002a417474726962757465","objektDataSource":"556e69744f664d656173757265","modifiedAt":"2021-03-23T16:39:48.990","version":"2"}
+//accept at 2021-03-23T16:39:49.024 集水池end
\ No newline at end of file
--
Gitblit v1.9.1