From bc8a34add41098d482224b5b549d624a5b7f9011 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 08 五月 2025 17:06:38 +0800
Subject: [PATCH] ArcDataApi 测点新增 平滑尺度 值类型 为空的bug
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/enums/ArcTypeEnum.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/enums/ArcTypeEnum.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/enums/ArcTypeEnum.java
index 99f4c45..2ca7389 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/enums/ArcTypeEnum.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/enums/ArcTypeEnum.java
@@ -3,6 +3,9 @@
import lombok.AllArgsConstructor;
import lombok.Getter;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
/**
* @author DongYukun
* @Description
@@ -12,20 +15,23 @@
@AllArgsConstructor
public enum ArcTypeEnum {
- MIN15("MIN15","15分钟"),
+ MIN15("MIN15","15分钟",new SimpleDateFormat("yyyy-MM-dd HH:mm"), Calendar.MINUTE,-15),
- HOUR("HOUR","时"),
+ HOUR("HOUR","时",new SimpleDateFormat("yyyy-MM-dd HH"),Calendar.HOUR_OF_DAY,-1),
- SHIFT("SHIFT","班"),
+ SHIFT("SHIFT","班",new SimpleDateFormat("yyyy-MM-dd HH"),Calendar.HOUR_OF_DAY,-8),
- DAY("DAY","日"),
+ DAY("DAY","日",new SimpleDateFormat("yyyy-MM-dd"),Calendar.DAY_OF_YEAR,-1),
- MONTH("MONTH", "月"),
+ MONTH("MONTH", "月",new SimpleDateFormat("yyyy-MM"),Calendar.MONTH,-1),
- YEAR("YEAR", "年");
+ YEAR("YEAR", "年",new SimpleDateFormat("yyyy"),Calendar.YEAR,-1);
private String code;
private String desc;
+ SimpleDateFormat dateFormat;
+ int calendarType;
+ int calendarNum;
public static ArcTypeEnum getEumByCode(String code) {
if (code == null) {
--
Gitblit v1.9.3