From 87960c9729c3087fb88f54ec6b7a144fba066cd5 Mon Sep 17 00:00:00 2001 From: bcjang Date: Mon, 27 Oct 2025 15:15:03 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=BC=EB=B0=98=20guid=20=EC=83=9D=EC=84=B1?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80=20=EB=B6=84=20>=20=EC=B4=88=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../global/common/utils/CommonUtils.java | 9 +++-- .../admin/global/common/utils/DateUtils.java | 36 +++++++++++-------- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/caliverse/admin/global/common/utils/CommonUtils.java b/src/main/java/com/caliverse/admin/global/common/utils/CommonUtils.java index 05cfdeb..a1f78de 100644 --- a/src/main/java/com/caliverse/admin/global/common/utils/CommonUtils.java +++ b/src/main/java/com/caliverse/admin/global/common/utils/CommonUtils.java @@ -3,6 +3,7 @@ package com.caliverse.admin.global.common.utils; import java.math.BigDecimal; import java.math.RoundingMode; import java.nio.charset.StandardCharsets; +import java.security.SecureRandom; import java.time.*; import java.time.format.DateTimeFormatter; import java.util.*; @@ -41,6 +42,7 @@ public class CommonUtils { private static final Logger logger = LoggerFactory.getLogger(CommonUtils.class); private static UserDetails userDetails; private static AdminMapper adminMapper; + private static final String CHARACTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; public static Admin getAdmin(){ Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); @@ -77,6 +79,10 @@ public class CommonUtils { return UUID.randomUUID().toString(); } + public static String getSimpleCreateGuId() { + return UUID.randomUUID().toString().replace("-", ""); + } + public static String objectToString(Object object){ if (object == null) { return ""; @@ -365,8 +371,7 @@ public class CommonUtils { } public static String convertUTCDate(LocalDateTime date){ - DateTimeFormatter formatter = DateTimeFormatter.ofPattern(CommonConstants.FORMAT_DATE_ISO_DATETIME_MILLIS); - return date.atOffset(ZoneOffset.UTC).format(formatter); + return DateUtils.stringToISODateTimeMillis(date); } public static LocalTime stringToTime(String time){ diff --git a/src/main/java/com/caliverse/admin/global/common/utils/DateUtils.java b/src/main/java/com/caliverse/admin/global/common/utils/DateUtils.java index 7aeaf2b..79e9b7b 100644 --- a/src/main/java/com/caliverse/admin/global/common/utils/DateUtils.java +++ b/src/main/java/com/caliverse/admin/global/common/utils/DateUtils.java @@ -6,41 +6,31 @@ import java.time.*; import java.time.format.DateTimeFormatter; public class DateUtils { + //return ex) 2025-08-25 14:30:45 public static String stringToDateTime(LocalDateTime date) { if(date == null) return null; DateTimeFormatter formatter = DateTimeFormatter.ofPattern(CommonConstants.FORMAT_DATE_DATETIME); return date.format(formatter); } + //return ex) 2025-08-25T14:30:45 public static String stringToISODateTime(LocalDateTime date){ DateTimeFormatter formatter = DateTimeFormatter.ofPattern(CommonConstants.FORMAT_DATE_ISO_DATETIME); return date.atOffset(ZoneOffset.UTC).format(formatter); } + //return ex) 2025-08-25T14:30:45.123Z public static String stringToISODateTimeMillis(LocalDateTime date){ DateTimeFormatter formatter = DateTimeFormatter.ofPattern(CommonConstants.FORMAT_DATE_ISO_DATETIME_MILLIS); return date.atOffset(ZoneOffset.UTC).format(formatter); } + //return ex) 2025-08-25T14:30:45.1234567Z public static String stringToISODateTimeMillisNano(LocalDateTime date){ DateTimeFormatter formatter = DateTimeFormatter.ofPattern(CommonConstants.FORMAT_DATE_ISO_DATETIME_MILLIS_NANO); return date.atOffset(ZoneOffset.UTC).format(formatter); } - public static LocalDateTime stringISOToLocalDateTime(String date){ - Instant instant = Instant.parse(date); - return LocalDateTime.ofInstant(instant, ZoneId.systemDefault()); - } - - public static LocalDateTime stringToDateTime(String str){ - return LocalDateTime.parse(str, DateTimeFormatter.ISO_LOCAL_DATE_TIME); - } - - public static LocalDateTime stringToLocalDateTime(String date){ - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - return LocalDateTime.parse(date, formatter); - } - public static String nowDateTime(){ LocalDateTime now = LocalDateTime.now(); return stringToDateTime(now); @@ -56,6 +46,20 @@ public class DateUtils { return date.atOffset(ZoneOffset.UTC).format(formatter); } + public static LocalDateTime stringISOToLocalDateTime(String date){ + Instant instant = Instant.parse(date); + return LocalDateTime.ofInstant(instant, ZoneId.systemDefault()); + } + + public static LocalDateTime stringToDateTime(String str){ + return LocalDateTime.parse(str, DateTimeFormatter.ISO_LOCAL_DATE_TIME); + } + + public static LocalDateTime stringToLocalDateTime(String date){ + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + return LocalDateTime.parse(date, formatter); + } + public static LocalDateTime getMaxTime(){ return LocalDateTime.of(3000, 1, 1, 0, 0, 0, 0); } @@ -63,4 +67,8 @@ public class DateUtils { public static long dateToISOUnixTime(LocalDateTime date){ return date.atOffset(ZoneOffset.UTC).toEpochSecond(); } + + public static int minutesToSeconds(int minutes) { + return minutes * 60; + } }