修改公式和计算帮助类

yzg-util-mq/src/main/java/com/yanzuoguang/mq/plan/YzgMqProcedure.java

@@ -30,9 +30,12 @@ public class YzgMqProcedure implements InitializingBean {
      * 默认100天延迟
      */
     public static final TimeUnit[] YZG_MQ_SYSTEM_QUEUE_PLAN_TIME = new TimeUnit[]{
-            new TimeUnit("Second", 1000 * 8),
+            new TimeUnit("Second", 1000),
+            new TimeUnit("Second:8", 1000 * 8),
             new TimeUnit("Minute", 1000 * 60),
-            new TimeUnit("Hour", 1000 * 60 * 60)
+            new TimeUnit("Minute:8", 1000 * 60 * 8),
+            new TimeUnit("Hour", 1000 * 60 * 60),
+            new TimeUnit("Hour:8", 1000 * 60 * 60 * 8)
     };
     /**
      * 执行的消息队列
@@ -80,14 +83,14 @@ public class YzgMqProcedure implements InitializingBean {
      * @return
      */
     private TimeUnit getTimeUnit(long waitTime) {
-        TimeUnit timeUnit = YZG_MQ_SYSTEM_QUEUE_PLAN_TIME[0];
-        for (int i = YZG_MQ_SYSTEM_QUEUE_PLAN_TIME.length - 1; i >= 0; i--) {
-            timeUnit = YZG_MQ_SYSTEM_QUEUE_PLAN_TIME[i];
-            if (waitTime >= timeUnit.unit) {
-                break;
+        for (TimeUnit timeUnit : YZG_MQ_SYSTEM_QUEUE_PLAN_TIME) {
+            // 在时间范围内，则返回大于等待时间的队列
+            if (timeUnit.unit >= waitTime) {
+                return timeUnit;
             }
         }
-        return timeUnit;
+        // 返回最大时间的队列
+        return YZG_MQ_SYSTEM_QUEUE_PLAN_TIME[YZG_MQ_SYSTEM_QUEUE_PLAN_TIME.length - 1];
     }
 
     /**