From 1abf79f98f7de1fd492cc12a7586c4461ae959c6 Mon Sep 17 00:00:00 2001 From: xins Date: Sat, 16 Sep 2023 18:17:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=A5=E4=BE=9D=E5=BE=AE=E6=9C=8D=E5=8A=A11.?= =?UTF-8?q?2.1=E7=89=88=E6=9C=AC=20=E7=9B=91=E6=8E=A7=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=96=B9=E6=B3=95=E9=87=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/constant/HwDictConstants.java | 15 +++++++++++++ .../core/constant/TdEngineConstants.java | 18 ++++++++++++++++ .../ruoyi/common/core/utils/NumberUtils.java | 21 +++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/NumberUtils.java 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 77c88a5..8ad93df 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 @@ -32,4 +32,19 @@ public class HwDictConstants { public static final String DEVICE_STATUS_PUBLISH = "1";//设备状态:已发布 + public static final String FENCE_TYPE_DEVICE = "1";//电子围栏规则类型,设备 + public static final String FENCE_TYPE_MONITOR_UNIT = "2";//电子围栏规则类型,监控单元 + public static final String FENCE_TYPE_SCENE = "3";//电子围栏规则类型,场景 + + public static final String CONTROL_DEVICE = "1";//监控型设备 + + public static final String ACQUISITION_DEVICE = "2";//采集型设备 + + public static final String CONTROL_DEVICE_NAME = "control";//监控型设备 + + public static final String ACQUISITION_DEVICE_NAME = "acquisition";//采集型设备 + + public static final String DEVICE_DEFAULT_FLAG_YES="1";//默认是 + public static final String DEVICE_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 6e7dbb1..312d2b2 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 @@ -60,6 +60,13 @@ public class TdEngineConstants { TDENGINE_KEY_TRANSFER_MAP.put("value", "value1"); } + 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, "设备名称"); + } + /** * @return String * @param: sceneId @@ -71,6 +78,17 @@ public class TdEngineConstants { return DEFAULT_DB_NAME_PREFIX + sceneId; } + /** + * @param: deviceModeId + * @description 获取超级表名称 + * @author xins + * @date 2023-09-16 14:42 + * @return String + */ + public static String getSupertTableName(Long deviceModeId) { + return DEFAULT_SUPER_TABLE_NAME_PREFIX + deviceModeId; + } + /** * @param: deviceId * @return String diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/NumberUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/NumberUtils.java new file mode 100644 index 0000000..bfe6261 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/NumberUtils.java @@ -0,0 +1,21 @@ +package com.ruoyi.common.core.utils; + +import java.text.DecimalFormat; + +/** + * @Description: 数字处理通用工具类 + * @ClassName: NumberUtils + * @Author : xins + * @Date :2023-09-15 9:28 + * @Version :1.0 + */ +public class NumberUtils { + + public static String getPercentage(int x, int y) { + double d1 = x * 1.0; + double d2 = y * 1.0; + // 设置保留几位小数, “.”后面几个零就保留几位小数,这里设置保留四位小数 + DecimalFormat decimalFormat = new DecimalFormat("##.00%"); + return decimalFormat.format(d1 / d2); + } +}