From f8bffb3ae6854fbcf6f78ed953bf73e33fadc8a9 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 28 四月 2025 14:52:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java
index 33dbae2..a2e3f09 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java
@@ -3,6 +3,7 @@
import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.module.data.common.enums.IndStatFuncEnum;
import com.iailab.module.data.common.enums.IndTimeLimitEnum;
+import com.iailab.module.data.enums.TimeGranularityEnum;
import com.iailab.module.data.ind.data.dto.IndDataSetDTO;
import com.iailab.module.data.ind.data.service.IndDataSetService;
import com.iailab.module.data.ind.item.entity.IndItemEntity;
@@ -46,7 +47,11 @@
public final static String PATTERN_MON = "yyyy-MM";
- public final static String PATTERN_DATE = "yyyy-MM-dd";
+ public final static String PATTERN_DAY = "yyyy-MM-dd";
+
+ public final static String PATTERN_HOUR = "yyyy-MM-dd HH";
+
+ public static final String PATTERN_MIN = "yyyy-MM-dd HH:mm:ss";
public QuerySourceValueDTO getAtomSql(String itemId) {
QuerySourceValueDTO result = new QuerySourceValueDTO();
@@ -125,40 +130,60 @@
calendar.set(Calendar.MILLISECOND, 0);
calendar.set(Calendar.SECOND, 0);
IndTimeLimitEnum timeLimit = IndTimeLimitEnum.getEumByCode(indItem.getTimeLimit());
+ // 根据时间粒度确定 时间格式
+ String datePattern = PATTERN_MIN;
+ if (StringUtils.isNotBlank(itemEntity.getTimeGranularity())) {
+ switch (TimeGranularityEnum.getEumByCode(itemEntity.getTimeGranularity())){
+ case TG_MIN:
+ datePattern = PATTERN_MIN;
+ break;
+ case TG_HOUR:
+ datePattern = PATTERN_HOUR;
+ break;
+ case TG_DAY:
+ datePattern = PATTERN_DAY;
+ break;
+ case TG_MON:
+ datePattern = PATTERN_MON;
+ break;
+ default:
+ datePattern = PATTERN_YEAR;
+ }
+ }
switch (timeLimit) {
case TODAY:
whereSql.append(indItem.getTimeLabel());
whereSql.append("='");
- whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_DATE));
+ whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("'");
break;
case YESTERDAY:
calendar.add(Calendar.DAY_OF_YEAR, -1);
whereSql.append(indItem.getTimeLabel());
whereSql.append("='");
- whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_DATE));
+ whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("'");
break;
case LAST_DAY_7:
whereSql.append(indItem.getTimeLabel());
whereSql.append(" <= '");
- whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_DATE));
+ whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("' AND ");
whereSql.append(indItem.getTimeLabel());
whereSql.append(" >= '");
calendar.add(Calendar.DAY_OF_YEAR, -7);
- whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_DATE));
+ whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("'");
break;
case LAST_DAY_30:
whereSql.append(indItem.getTimeLabel());
whereSql.append(" <= '");
- whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_DATE));
+ whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("' AND ");
whereSql.append(indItem.getTimeLabel());
whereSql.append(" >= '");
calendar.add(Calendar.DAY_OF_YEAR, -30);
- whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_DATE));
+ whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("'");
break;
case THIS_MONTH:
@@ -193,46 +218,46 @@
whereSql.append(indItem.getTimeLabel());
whereSql.append(" <= '");
calendar.set(Calendar.MONTH, 11);
- whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON));
+ whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("' AND ");
whereSql.append(indItem.getTimeLabel());
whereSql.append(" >= '");
calendar.set(Calendar.MONTH, 0);
- whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON));
+ whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("'");
break;
case LAST_YEAR:
calendar.add(Calendar.YEAR, -1);
whereSql.append(indItem.getTimeLabel());
whereSql.append("='");
- whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_YEAR));
+ whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("'");
break;
case THIS_YEAR:
whereSql.append(indItem.getTimeLabel());
whereSql.append("='");
- whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_YEAR));
+ whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("'");
break;
case LAST_HOUR_24:
whereSql.append(indItem.getTimeLabel());
whereSql.append(" <= '");
- whereSql.append(DateUtils.format(calendar.getTime(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("' AND ");
whereSql.append(indItem.getTimeLabel());
whereSql.append(" >= '");
calendar.add(Calendar.HOUR_OF_DAY, -24);
- whereSql.append(DateUtils.format(calendar.getTime(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ whereSql.append(DateUtils.format(calendar.getTime(), datePattern));
whereSql.append("'");
break;
case CUSTOM:
whereSql.append(indItem.getTimeLabel());
whereSql.append(" <= '");
- whereSql.append(DateUtils.format(indItem.getTimeEnd(), PATTERN_MON));
+ whereSql.append(DateUtils.format(indItem.getTimeEnd(), datePattern));
whereSql.append("' AND ");
whereSql.append(indItem.getTimeLabel());
whereSql.append(" >= '");
- whereSql.append(DateUtils.format(indItem.getTimeStart(), PATTERN_MON));
+ whereSql.append(DateUtils.format(indItem.getTimeStart(), datePattern));
whereSql.append("'");
break;
case ALL:
--
Gitblit v1.9.3