From 8b37a3da0aea0ba2857fbdd208cd4c655356e854 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 17 三月 2025 10:43:26 +0800
Subject: [PATCH] getLastValues
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 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 afdc8c2..127c42e 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
@@ -164,22 +164,21 @@
whereSql.append("'");
break;
case LAST_MONTH:
- calendar.add(Calendar.MONTH, -1); // 将当前日期减去一个月，得到上个月的日期
- whereSql.append(indItem.getTimeLabel());
- whereSql.append(" >= '");
- whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON)); // 上个月的第一天
- calendar.add(Calendar.MONTH, 1); // 再加一个月，回到当前月
- whereSql.append("' AND '");
whereSql.append(indItem.getTimeLabel());
whereSql.append("' < '");
- whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON)); // 当前月
+ whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON));
+ whereSql.append("' AND ");
+ whereSql.append(indItem.getTimeLabel());
+ whereSql.append(" >= '");
+ calendar.add(Calendar.MONTH, -1);
+ whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON));
whereSql.append("'");
break;
case LAST_MONTH_12:
whereSql.append(indItem.getTimeLabel());
whereSql.append(" <= '");
whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_MON));
- whereSql.append("' AND '");
+ whereSql.append("' AND ");
whereSql.append(indItem.getTimeLabel());
whereSql.append("' >= '");
calendar.add(Calendar.MONTH, -12);
@@ -211,6 +210,17 @@
whereSql.append(DateUtils.format(calendar.getTime(), PATTERN_YEAR));
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("' 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("'");
+ break;
case CUSTOM:
whereSql.append(indItem.getTimeLabel());
whereSql.append(" <= '");
--
Gitblit v1.9.3