From 257d66798aa538f8737980f13d94c547bf0b51ea Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java
index 1cf964f..547ad0b 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RedPackegeSetController.java
@@ -13,6 +13,9 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
/**
@@ -30,7 +33,7 @@
private RedPackegeSetService redPackegeSetService;
//获取当前生效的红包设置
@ResponseBody
- @GetMapping("/get")
+ @PostMapping("/get")
public R<BigDecimal> get(){
LocalDateTime now = LocalDateTime.now();
RedPackegeSet one = redPackegeSetService.lambdaQuery().le(RedPackegeSet::getStartTime, now).ge(RedPackegeSet::getEndTime, now).one();
@@ -63,20 +66,11 @@
@PostMapping("/addRedPackegeSet")
@Transactional(rollbackFor = Exception.class)
public R<Void> addRedPackegeSet(@RequestBody RedPackegeSetDto redPackegeSets){
- redPackegeSetService.remove(null);
List<RedPackegeSet> redPackegeSetList = redPackegeSets.getRedPackegeSets();
- for (int i = 0; i < redPackegeSetList.size(); i++) {
- RedPackegeSet redPackegeSet = redPackegeSetList.get(i);
- LocalDateTime startTime = redPackegeSet.getStartTime();
- LocalDateTime endTime = redPackegeSet.getEndTime();
- for (RedPackegeSet redPackegeSet1 : redPackegeSetList) {
- LocalDateTime startTime1 = redPackegeSet1.getStartTime();
- LocalDateTime endTime1 = redPackegeSet1.getEndTime();
- if (!(endTime.isBefore(startTime1) || startTime.isAfter(endTime1))) {
- return R.fail("时间有重叠，请重新配置");
- }
- }
+ if (hasOverlap(redPackegeSetList)) {
+ return R.fail("时间段存在重叠，请重新配置");
}
+ redPackegeSetService.remove(null);
redPackegeSetService.saveBatch(redPackegeSetList);
return R.ok();
}
@@ -91,5 +85,44 @@
return R.ok();
}
+ public static boolean hasOverlap(List<RedPackegeSet> redPackegeSetList) {
+ // 首先根据startTime对列表进行排序
+ Collections.sort(redPackegeSetList, Comparator.comparing(RedPackegeSet::getStartTime));
+
+ // 然后检查是否存在重叠
+ for (int i = 0; i < redPackegeSetList.size() - 1; i++) {
+ RedPackegeSet current = redPackegeSetList.get(i);
+ RedPackegeSet next = redPackegeSetList.get(i + 1);
+
+ // 如果当前时间段的结束时间晚于或等于下一个时间段的开始时间，则存在重叠
+ if (current.getEndTime().isAfter(next.getStartTime()) ||
+ current.getEndTime().isEqual(next.getStartTime())) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ public static void main(String[] args) {
+ // 示例数据
+ RedPackegeSet redPackegeSet = new RedPackegeSet();
+ redPackegeSet.setStartTime(LocalDateTime.of(2025, 1, 13, 0, 0));
+ redPackegeSet.setEndTime(LocalDateTime.of(2025, 1, 14, 0, 0));
+
+ RedPackegeSet redPackegeSet2 = new RedPackegeSet();
+ redPackegeSet2.setStartTime(LocalDateTime.of(2025, 1, 13, 0, 0));
+ redPackegeSet2.setEndTime(LocalDateTime.of(2025, 1, 14, 0, 0));
+ List<RedPackegeSet> redPackegeSetList = Arrays.asList(
+ redPackegeSet,redPackegeSet2
+ );
+
+ boolean overlapExists = hasOverlap(redPackegeSetList);
+ System.out.println("是否存在重叠: " + overlapExists);
+ }
+
+
+
+
}
--
Gitblit v1.7.1