lixing 3 éve
szülő
commit
8a78c9a633

+ 1 - 1
src/main/java/com/persagy/cache/AlarmRedisCache.java

@@ -99,7 +99,7 @@ public class AlarmRedisCache implements RedisCache {
 				return objConditionInfo;
 			}
 		} catch (Exception e) {
-			log.warn("从redis获取设备的报警条件信息失败" + e);
+			log.warn("从redis获取设备的报警条件信息失败", e);
 		}
 		return null;
 	}

+ 5 - 3
src/main/java/com/persagy/utils/DateUtils.java

@@ -310,9 +310,11 @@ public class DateUtils {
 //        LocalDateTime parse2 = DateUtils.parse("20150613152610");
 //        System.out.println(betweenTwoTime(parse1, parse2, ChronoUnit.HOURS));
 //        test1();
-        String time = "20210913162100";
-        Date date = parseDate(time);
-        System.out.println(date);
+//        String time = "20211229181500";
+//        Date date = parseDate(time);
+//        System.out.println(date);
+
+        System.out.println(betweenTwoTimeSecond("20211228224500", "20211229083000"));
 
     }