Merge branch 'ver1.1' of http://192.168.0.204/yzg/yzg-util

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

@@ -46,7 +46,7 @@ public class YzgMqProcedure implements InitializingBean {
     /**
      * 6 小时
      */
-    public static final TimeUnit YZG_MQ_SYSTEM_QUEUE_PLAN_MAX = new TimeUnit("Hour", 1000 * 60 * 15);
+    public static final TimeUnit YZG_MQ_SYSTEM_QUEUE_PLAN_MAX = new TimeUnit("Hour", 1000 * 60 * 8);
     public static final List<TimeUnit> YZG_MQ_SYSTEM_QUEUE_PLAN_TIME = new ArrayList<>();
     /**
      * 执行的消息队列
@@ -126,8 +126,8 @@ public class YzgMqProcedure implements InitializingBean {
     /**
      * 获取等待时间单位
      *
-     * @param waitTime
-     * @return
+     * @param waitTime 等待时间
+     * @return 单位
      */
     private TimeUnit getTimeUnit(long waitTime) {
         TimeUnit prevUnit = null;
@@ -137,7 +137,7 @@ public class YzgMqProcedure implements InitializingBean {
                 continue;
             }
             // 在时间范围内，则返回大于等待时间的队列
-            if (timeUnit.unit > waitTime) {
+            if (timeUnit.unit > waitTime / 2) {
                 break;
             }
             // 上次单位