From 5f36cf7ff958577d1b8ba8d5841352e12c8f4e49 Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei9588@foxmail.com>
Date: Tue, 23 Mar 2021 19:02:48 +0800
Subject: [PATCH] 重命名ValueIds
---
hbbohua-water-domain/src/main/java/com/hbbohua/water/domain/Flowmeter.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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..c33c93a 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
@@ -2,7 +2,7 @@
import com.hbbohua.water.domain.literal.AttributeNames;
import com.ooxsoft.ecsi.domain.Unit;
-import com.hbbohua.water.domain.literal.ValueIds;
+import com.hbbohua.water.domain.literal.ValueIdsHex;
import com.ooxsoft.objekt.domain.Value;
import com.ooxsoft.platform.domain.UnitOfMeasure;
import com.ooxsoft.platform.domain.literal.UnitOfMeasureIdsHex;
@@ -13,13 +13,13 @@
*/
public class Flowmeter extends Unit {
/**
- * 获取地图标记的类型
+ * 指定地图标记的类型（点、线、圆、矩形、多边形等）
*
* @return 地图标记的类型
*/
@Override
public Value locationType() {
- return Value.forId(ValueIds.LocationType_marker);
+ return Value.forId(ValueIdsHex.LocationType_marker);
}
/**
@@ -113,8 +113,8 @@
setTotalValueUnitOfMeasure(UnitOfMeasure.forId(UnitOfMeasureIdsHex.MQH));
}
//增加动态属性名,填充实时库标签用
- if(!containsDynamicAttribute(AttributeNames.currentValue)){
- setDynamicAttribute(AttributeNames.currentValue,null,true);
+ if(!containsDynamicAttribute(AttributeNames.flowValue)){
+ setDynamicAttribute(AttributeNames.flowValue,null,true);
}
if(!containsDynamicAttribute(AttributeNames.totalValue)){
setDynamicAttribute(AttributeNames.totalValue,null,true);
--
Gitblit v1.9.1