BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 1c9b5ddae9503c1b62394f0d956e50833b7ad8cf

Authored by YunaiV
1 parent b380b5b8

【优化】降低 JDK 21 最低到 17 版本

Inline Side-by-side
Showing 2 changed files with 11 additions and 11 deletions
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 <properties> 32 <properties>
33 <revision>2.0.1-snapshot</revision> 33 <revision>2.0.1-snapshot</revision>
34 <!-- Maven 相关 --> 34 <!-- Maven 相关 -->
35 - <java.version>21</java.version> 35 + <java.version>17</java.version>
36 <maven.compiler.source>${java.version}</maven.compiler.source> 36 <maven.compiler.source>${java.version}</maven.compiler.source>
37 <maven.compiler.target>${java.version}</maven.compiler.target> 37 <maven.compiler.target>${java.version}</maven.compiler.target>
38 <maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version> 38 <maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
  View file @1c9b5dd
@@ -227,27 +227,27 @@ public class LocalDateTimeUtils { @@ -227,27 +227,27 @@ public class LocalDateTimeUtils {
227 // 2. 循环，生成时间范围 227 // 2. 循环，生成时间范围
228 List<LocalDateTime[]> timeRanges = new ArrayList<>(); 228 List<LocalDateTime[]> timeRanges = new ArrayList<>();
229 switch (intervalEnum) { 229 switch (intervalEnum) {
230 - case DateIntervalEnum.DAY: 230 + case DAY:
231 while (startTime.isBefore(endTime)) { 231 while (startTime.isBefore(endTime)) {
232 timeRanges.add(new LocalDateTime[]{startTime, startTime.plusDays(1).minusNanos(1)}); 232 timeRanges.add(new LocalDateTime[]{startTime, startTime.plusDays(1).minusNanos(1)});
233 startTime = startTime.plusDays(1); 233 startTime = startTime.plusDays(1);
234 } 234 }
235 break; 235 break;
236 - case DateIntervalEnum.WEEK: 236 + case WEEK:
237 while (startTime.isBefore(endTime)) { 237 while (startTime.isBefore(endTime)) {
238 LocalDateTime endOfWeek = startTime.with(DayOfWeek.SUNDAY).plusDays(1).minusNanos(1); 238 LocalDateTime endOfWeek = startTime.with(DayOfWeek.SUNDAY).plusDays(1).minusNanos(1);
239 timeRanges.add(new LocalDateTime[]{startTime, endOfWeek}); 239 timeRanges.add(new LocalDateTime[]{startTime, endOfWeek});
240 startTime = endOfWeek.plusNanos(1); 240 startTime = endOfWeek.plusNanos(1);
241 } 241 }
242 break; 242 break;
243 - case DateIntervalEnum.MONTH: 243 + case MONTH:
244 while (startTime.isBefore(endTime)) { 244 while (startTime.isBefore(endTime)) {
245 LocalDateTime endOfMonth = startTime.with(TemporalAdjusters.lastDayOfMonth()).plusDays(1).minusNanos(1); 245 LocalDateTime endOfMonth = startTime.with(TemporalAdjusters.lastDayOfMonth()).plusDays(1).minusNanos(1);
246 timeRanges.add(new LocalDateTime[]{startTime, endOfMonth}); 246 timeRanges.add(new LocalDateTime[]{startTime, endOfMonth});
247 startTime = endOfMonth.plusNanos(1); 247 startTime = endOfMonth.plusNanos(1);
248 } 248 }
249 break; 249 break;
250 - case DateIntervalEnum.QUARTER: 250 + case QUARTER:
251 while (startTime.isBefore(endTime)) { 251 while (startTime.isBefore(endTime)) {
252 int quarterOfYear = getQuarterOfYear(startTime); 252 int quarterOfYear = getQuarterOfYear(startTime);
253 LocalDateTime quarterEnd = quarterOfYear == 4 253 LocalDateTime quarterEnd = quarterOfYear == 4
@@ -257,7 +257,7 @@ public class LocalDateTimeUtils { @@ -257,7 +257,7 @@ public class LocalDateTimeUtils {
257 startTime = quarterEnd.plusNanos(1); 257 startTime = quarterEnd.plusNanos(1);
258 } 258 }
259 break; 259 break;
260 - case DateIntervalEnum.YEAR: 260 + case YEAR:
261 while (startTime.isBefore(endTime)) { 261 while (startTime.isBefore(endTime)) {
262 LocalDateTime endOfYear = startTime.with(TemporalAdjusters.lastDayOfYear()).plusDays(1).minusNanos(1); 262 LocalDateTime endOfYear = startTime.with(TemporalAdjusters.lastDayOfYear()).plusDays(1).minusNanos(1);
263 timeRanges.add(new LocalDateTime[]{startTime, endOfYear}); 263 timeRanges.add(new LocalDateTime[]{startTime, endOfYear});
@@ -290,16 +290,16 @@ public class LocalDateTimeUtils { @@ -290,16 +290,16 @@ public class LocalDateTimeUtils {
290 290
291 // 2. 循环，生成时间范围 291 // 2. 循环，生成时间范围
292 switch (intervalEnum) { 292 switch (intervalEnum) {
293 - case DateIntervalEnum.DAY: 293 + case DAY:
294 return LocalDateTimeUtil.format(startTime, DatePattern.NORM_DATE_PATTERN); 294 return LocalDateTimeUtil.format(startTime, DatePattern.NORM_DATE_PATTERN);
295 - case DateIntervalEnum.WEEK: 295 + case WEEK:
296 return LocalDateTimeUtil.format(startTime, DatePattern.NORM_DATE_PATTERN) 296 return LocalDateTimeUtil.format(startTime, DatePattern.NORM_DATE_PATTERN)
297 + StrUtil.format("(第 {} 周)", LocalDateTimeUtil.weekOfYear(startTime)); 297 + StrUtil.format("(第 {} 周)", LocalDateTimeUtil.weekOfYear(startTime));
298 - case DateIntervalEnum.MONTH: 298 + case MONTH:
299 return LocalDateTimeUtil.format(startTime, DatePattern.NORM_MONTH_PATTERN); 299 return LocalDateTimeUtil.format(startTime, DatePattern.NORM_MONTH_PATTERN);
300 - case DateIntervalEnum.QUARTER: 300 + case QUARTER:
301 return StrUtil.format("{}-Q{}", startTime.getYear(), getQuarterOfYear(startTime)); 301 return StrUtil.format("{}-Q{}", startTime.getYear(), getQuarterOfYear(startTime));
302 - case DateIntervalEnum.YEAR: 302 + case YEAR:
303 return LocalDateTimeUtil.format(startTime, DatePattern.NORM_YEAR_PATTERN); 303 return LocalDateTimeUtil.format(startTime, DatePattern.NORM_YEAR_PATTERN);
304 default: 304 default:
305 throw new IllegalArgumentException("Invalid interval: " + interval); 305 throw new IllegalArgumentException("Invalid interval: " + interval);