Merge branch '20250428首页' into uat

suishenbang-system/src/main/java/com/dgtly/system/service/impl/AlertConfigurationServiceImpl.java

@@ -101,20 +101,21 @@ public class AlertConfigurationServiceImpl implements IAlertConfigurationService
                         if(orgCodes.contains(alert.getOrgCode())){
                             Date start2 = alert.getAlertStartTime();
                             Date end2 = alert.getAlertEndTime();
-                            if ((start1.after(start2) && start1.before(end2)) ||
-                                    (end1.after(start2) && end1.before(end2)) ||
-                                    (start2.after(start1) && start2.before(end1)) ||
-                                    (end2.after(start1) && end2.before(end1))) {
+//
+                            if(isOverlap(start1, end1, start2, end2)){
                                return 1;
                             }
                         }
                 }else{
                         Date start2 = alert.getAlertStartTime();
                         Date end2 = alert.getAlertEndTime();
-                        if ((start1.after(start2) && start1.before(end2)) ||
-                                (end1.after(start2) && end1.before(end2)) ||
-                                (start2.after(start1) && start2.before(end1)) ||
-                                (end2.after(start1) && end2.before(end1))) {
+//                        if ((start1.after(start2) && start1.before(end2)) ||
+//                                (end1.after(start2) && end1.before(end2)) ||
+//                                (start2.after(start1) && start2.before(end1)) ||
+//                                (end2.after(start1) && end2.before(end1))) {
+//                            return 1;
+//                        }
+                        if(isOverlap(start1, end1, start2, end2)){
                             return 1;
                         }
                     }
@@ -127,6 +128,22 @@ public class AlertConfigurationServiceImpl implements IAlertConfigurationService
         return 0;
     }
 
+
+
+
+    public static boolean isOverlap(Date start1, Date end1, Date start2, Date end2) {
+        // 判断时间段1是否在时间段2之前
+        if (end1.before(start2)) {
+            return false;
+        }
+        // 判断时间段2是否在时间段1之前
+        if (end2.before(start1)) {
+            return false;
+        }
+        // 如果以上两个条件都不满足，则时间段重叠
+        return true;
+    }
+
     /**
      * 新增弹框配置
      *