Merge remote-tracking branch 'origin/V1' into V1

common/src/main/java/com/jpsoft/smart/modules/base/service/impl/PersonDeviceFilterLogServiceImpl.java

@@ -16,6 +16,7 @@ import com.jpsoft.smart.modules.base.service.PersonInfoService;
 import com.jpsoft.smart.modules.common.dto.Sort;
 import com.jpsoft.smart.modules.common.utils.LApiUtil;
 import com.jpsoft.smart.modules.common.utils.OSSUtil;
+import com.jpsoft.smart.modules.common.utils.TimeZonesUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -87,7 +88,8 @@ public class PersonDeviceFilterLogServiceImpl implements PersonDeviceFilterLogSe
             }
 
             //记录的时间段
-            String timeZones = DateUtil.format(date, "yyyy-MM-dd-HH");
+            String recordTimeZons = DateUtil.format(date, "yyyy-MM-dd-HH-mm");
+            String timeZones = TimeZonesUtil.getUpperTimeZone(recordTimeZons);
             Integer personId = LApiUtil.getPersonCode(libMatInfoListJson, matchPersonInfo);
             if (personId != 0 && temperature.compareTo(BigDecimal.ZERO) == 1) {
 

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

@@ -0,0 +1,64 @@
+package com.jpsoft.smart.modules.common.utils;
+
+import java.math.BigDecimal;
+
+/**
+ * @author 墨鱼_mo
+ * @date 2020-4-1 13:14
+ */
+public class TimeZonesUtil {
+
+    public static String getUpperTimeZone(String timeZones){
+        String timeZoneStr = timeZones.substring(0,timeZones.lastIndexOf("-")+1);
+        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 = 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;
+    }
+}

common/src/main/java/com/jpsoft/smart/modules/lapi/service/ILapiService.java

@@ -152,7 +152,7 @@ public interface ILapiService {
      * @param deviceInfoId 设备id
      * @param needCap 安全帽验证 （0：不验证，1：验证）
      * @param needMask 口罩验证 （0：不验证，1：验证）
-     * @param measureTemperature 测试验证 （0：不验证，1：验证）
+     * @param measureTemperature 测温验证 （0：不验证，1：验证）
      * @param type 测试验证类型 （0：测额温，1：测腕温）
      * @param minTemper 温度下限
      * @param maxTemper 温度上限

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

@@ -2,7 +2,11 @@ package com.jpsoft.smart;
 
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.RandomUtil;
+import com.jpsoft.smart.modules.common.utils.TimeZonesUtil;
+
+import java.util.Date;
 
 public class HutoolTest {
     public static synchronized String batchId(int tenantId, int module) {
@@ -11,13 +15,15 @@ public class HutoolTest {
     }
 
     public static void main(String[] args) {
-        for (int i = 0; i < 3; i++) {
-//            Snowflake snowflake = IdUtil.createSnowflake(1,1);
-//
-//            System.out.println(snowflake.nextId());
-//            System.out.println(snowflake.nextIdStr());
-
+       /* String timeZones = DateUtil.format(new Date(), "yyyy-MM-dd-HH-mm");
+        Double d = Math.floor(12/10);
+        String result =String.valueOf(d*10);
+        System.out.println(result.substring(0,result.indexOf(".")));*/
+        /*for (int i = 0; i < 3; i++) {
             System.out.println(batchId(2019,1));
-        }
+        }*/
+        String timeZones = DateUtil.format(new Date(), "yyyy-MM-dd-HH-mm");
+        String result = TimeZonesUtil.getUpperTimeZone("2020-03-01-08-26");
+        System.out.println(result);
     }
 }