topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-14 13:47:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[improvement][headless]Remove fixed TimeEnums fields.

Browse Source
This commit is contained in:
jerryjzhang
2024-12-12 00:27:09 +08:00
parent a8868ba9ab
commit 9f8793bfe2
7 changed files with 96 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/com/tencent/supersonic/common/pojo/enums/TimeDimensionEnum.java
View File

@@ -1,7 +1,5 @@
package com.tencent.supersonic.common.pojo.enums;
public enum TimeDimensionEnum {
DAY,
WEEK,
MONTH;
DAY, WEEK, MONTH;
}

15
common/src/main/java/com/tencent/supersonic/common/util/DateModeUtils.java
View File

@@ -126,19 +126,20 @@ public class DateModeUtils {
return ImmutablePair.of(start, dateDate.getEndDate());
}
public String recentMonthStr(LocalDate endData, Long unit, String dateFormatStr, DateConf dateInfo) {
public String recentMonthStr(LocalDate endData, Long unit, String dateFormatStr,
DateConf dateInfo) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(dateFormatStr);
String endStr = endData.format(formatter);
String start = endData.minusMonths(unit).format(formatter);
return String.format("(%s >= '%s' and %s <= '%s')", dateInfo.getDateField(), start, dateInfo.getDateField(),
endStr);
return String.format("(%s >= '%s' and %s <= '%s')", dateInfo.getDateField(), start,
dateInfo.getDateField(), endStr);
}
public String recentMonthStr(ItemDateResp dateDate, DateConf dateInfo) {
List<ImmutablePair<String, String>> range = recentMonth(dateDate, dateInfo);
if (range.size() == 1) {
return String.format("(%s >= '%s' and %s <= '%s')", dateInfo.getDateField(), range.get(0).left,
dateInfo.getDateField(), range.get(0).right);
return String.format("(%s >= '%s' and %s <= '%s')", dateInfo.getDateField(),
range.get(0).left, dateInfo.getDateField(), range.get(0).right);
}
if (range.size() > 0) {
StringJoiner joiner = new StringJoiner(",");
@@ -176,8 +177,8 @@ public class DateModeUtils {
public String recentWeekStr(LocalDate endData, Long unit, DateConf dataInfo) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DAY_FORMAT);
String start = endData.minusDays(unit * 7).format(formatter);
return String.format("(%s >= '%s' and %s <= '%s')", dataInfo.getDateField(), start, dataInfo.getDateField(),
endData.format(formatter));
return String.format("(%s >= '%s' and %s <= '%s')", dataInfo.getDateField(), start,
dataInfo.getDateField(), endData.format(formatter));
}
public String recentWeekStr(ItemDateResp dateDate, DateConf dateInfo) {