From 8ffbde1bd68f81541e26970bc0e1d578e5c695bf Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 08 十一月 2024 17:51:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/enums/DataPointFreqEnum.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/enums/DataPointFreq.java b/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/enums/DataPointFreqEnum.java
similarity index 62%
rename from iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/enums/DataPointFreq.java
rename to iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/enums/DataPointFreqEnum.java
index 9615258..6221f9c 100644
--- a/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/enums/DataPointFreq.java
+++ b/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/enums/DataPointFreqEnum.java
@@ -8,21 +8,21 @@
*/
@Getter
@AllArgsConstructor
-public enum DataPointFreq {
- NET10("NET10", 10),
- NET30("NET30", 30),
- NET60("NET60",60);
+public enum DataPointFreqEnum {
+ NET_10S("10s", 10),
+ NET_30S("30s", 30),
+ NET_1MIN("1min",60);
private String code;
private Integer value;
- public static DataPointFreq getEumByCode(String code) {
+ public static DataPointFreqEnum getEumByCode(String code) {
if (code == null) {
return null;
}
- for (DataPointFreq statusEnum : DataPointFreq.values()) {
+ for (DataPointFreqEnum statusEnum : DataPointFreqEnum.values()) {
if (statusEnum.getCode().equals(code)) {
return statusEnum;
}
--
Gitblit v1.9.3