From 98357fdf5a1af232bb9d41b0696a8b5d8f97fcd7 Mon Sep 17 00:00:00 2001 From: xins Date: Fri, 26 Apr 2024 17:41:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=A5=E4=BE=9D=E5=BE=AE=E6=9C=8D=E5=8A=A12.?= =?UTF-8?q?0.3=20=E4=BF=AE=E6=94=B9=E9=87=91=E7=91=9E=E9=93=AD=E4=BB=A5?= =?UTF-8?q?=E4=B8=8B=E9=97=AE=E9=A2=98=EF=BC=9A=201=E3=80=81Web=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=AE=BE=E5=A4=87-=E6=97=A0=E6=B3=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=B7=B2=E5=88=A0=E9=99=A4=E7=9A=84=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=202=E3=80=81=E5=91=8A=E8=AD=A6=E8=A7=84?= =?UTF-8?q?=E5=88=99=E8=AE=BE=E7=BD=AE=E6=97=A0=E7=94=9F=E6=95=88=203?= =?UTF-8?q?=E3=80=81=E6=A8=A1=E5=9E=8B=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E5=B0=86=E6=A8=A1=E5=9E=8B=E6=9F=90=E9=A1=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=AE=BE=E7=BD=AE=E4=B8=BA=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=97=A0=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/core/constant/HwDictConstants.java | 3 +++ .../java/com/ruoyi/common/core/constant/TdEngineConstants.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwDictConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwDictConstants.java index 3c68d1c..2b547df 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwDictConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwDictConstants.java @@ -81,6 +81,9 @@ public class HwDictConstants { public static final String DEVICE_MODE_STATUS_NORMAL = "1";//设备模型正常状态 public static final String DEVICE_MODE_STATUS_DELETED = "9";//设备模型删除状态 + public static final String DEVICE_MODE_FUNCTION_DISPLAY_FLAG_NO = "0";//设备模型功能显示标识，不显示 + + public static final String SCENE_DEFAULT_FLAG_YES = "1";//场景是否默认标识：是 public static final String SCENE_DEFAULT_FLAG_NO = "0";//场景是否默认标识：否 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TdEngineConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TdEngineConstants.java index d65f96b..3970059 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TdEngineConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TdEngineConstants.java @@ -76,12 +76,13 @@ public class TdEngineConstants { */ public static final List ABNDON_FUNCTION_IDENTIFIERS = Arrays.asList("ts","value1","type"); + public static final String DEFAULT_FIRST_FIELD_NAME_DISPLAY = "时间";//timestamp格式首字段的显示名称 public static final Map DEVICE_DATA_COLUMN_MAP = new HashMap(); static { DEVICE_DATA_COLUMN_MAP.put(ST_TAG_DEVICECODE, "设备编号"); DEVICE_DATA_COLUMN_MAP.put(ST_TAG_DEVICENAME, "设备名称"); - DEVICE_DATA_COLUMN_MAP.put(DEFAULT_FIRST_FIELD_NAME, "时间"); + DEVICE_DATA_COLUMN_MAP.put(DEFAULT_FIRST_FIELD_NAME, DEFAULT_FIRST_FIELD_NAME_DISPLAY); } /**