人员记录过滤表时间区间改为5分钟

common/src/main/java/com/jpsoft/smart/modules/common/utils/TimeZonesUtil.java

@@ -1,5 +1,7 @@
 package com.jpsoft.smart.modules.common.utils;
 
+import java.math.BigDecimal;
+
 /**
  * @author 墨鱼_mo
  * @date 2020-4-1 13:14
@@ -11,12 +13,50 @@ public class TimeZonesUtil {
         String minStr = timeZones.substring(timeZones.lastIndexOf("-")+1,timeZones.length());
         String s = minStr.replace("",".");
         Double minDou = Double.valueOf(s.substring(1,s.length()-1));
-        Double timeZoneMinDou = Math.floor(minDou);
-        String timZoneMinStr = String.valueOf(timeZoneMinDou*10);
+        Double timeZoneMinDou = minDou;
+        String resultTimeZoneMinStr = "";
+        /*String timZoneMinStr = String.valueOf(timeZoneMinDou*10);
         String resultTimeZoneMinStr = timZoneMinStr.substring(0,timZoneMinStr.indexOf("."));
         if ("0".equals(resultTimeZoneMinStr)){
             resultTimeZoneMinStr = resultTimeZoneMinStr+"0";
+        }*/
+        if (timeZoneMinDou.compareTo(0.5) ==-1){
+            resultTimeZoneMinStr ="00";
+        }
+        if (timeZoneMinDou.compareTo(0.5) !=-1 && timeZoneMinDou.compareTo(1.0) ==-1){
+            resultTimeZoneMinStr = "05";
+        }
+        if (timeZoneMinDou.compareTo(1.0) !=-1 && timeZoneMinDou.compareTo(1.5) ==-1){
+            resultTimeZoneMinStr = "10";
+        }
+        if (timeZoneMinDou.compareTo(1.5) !=-1 && timeZoneMinDou.compareTo(2.0) ==-1){
+            resultTimeZoneMinStr = "15";
+        }
+        if (timeZoneMinDou.compareTo(2.0) !=-1 && timeZoneMinDou.compareTo(2.5) ==-1){
+            resultTimeZoneMinStr = "20";
+        }
+        if (timeZoneMinDou.compareTo(2.5) !=-1 && timeZoneMinDou.compareTo(3.0) ==-1){
+            resultTimeZoneMinStr = "25";
+        }
+        if (timeZoneMinDou.compareTo(3.0) !=-1 && timeZoneMinDou.compareTo(3.5) ==-1){
+            resultTimeZoneMinStr = "30";
         }
+        if (timeZoneMinDou.compareTo(3.5) !=-1 && timeZoneMinDou.compareTo(4.0) ==-1){
+            resultTimeZoneMinStr = "35";
+        }
+        if (timeZoneMinDou.compareTo(4.0) !=-1 && timeZoneMinDou.compareTo(4.5) ==-1){
+            resultTimeZoneMinStr = "40";
+        }
+        if (timeZoneMinDou.compareTo(4.5) !=-1 && timeZoneMinDou.compareTo(5.0) ==-1){
+            resultTimeZoneMinStr = "45";
+        }
+        if (timeZoneMinDou.compareTo(5.0) !=-1 && timeZoneMinDou.compareTo(5.5) ==-1){
+            resultTimeZoneMinStr = "50";
+        }
+        if (timeZoneMinDou.compareTo(5.5) !=-1 && timeZoneMinDou.compareTo(6.0) ==-1){
+            resultTimeZoneMinStr = "55";
+        }
+
         String resultTimeZone = timeZoneStr + resultTimeZoneMinStr;
 
         return resultTimeZone;

web/src/test/java/com/jpsoft/smart/HutoolTest.java

@@ -23,7 +23,7 @@ public class HutoolTest {
             System.out.println(batchId(2019,1));
         }*/
         String timeZones = DateUtil.format(new Date(), "yyyy-MM-dd-HH-mm");
-        String result = TimeZonesUtil.getUpperTimeZone(timeZones);
+        String result = TimeZonesUtil.getUpperTimeZone("2020-03-01-08-26");
         System.out.println(result);
     }
 }