From 85a5c630b52966d187f2e2e6ba0386e6ca408420 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Wed, 10 Dec 2025 22:04:47 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Property=20=ED=95=A8=EC=88=98=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitoringProperty/service/MonitoringPropertyService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java b/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java index 02791b6..2956b26 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java @@ -20,7 +20,7 @@ public class MonitoringPropertyService public String findPrpty2ValById(String prptyGroupName, String key) { MonitoringPropertyId id = new MonitoringPropertyId(); id.setPrptyGroupName(prptyGroupName); - id.setPrptyGroupName(key); + id.setPrptyName(key); Optional property = repository.findById(id); return property.map(MonitoringProperty::getPrpty2Val).orElse(null); From 7136a36e78e182e7041302140fb4f6e8d92cab41 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Wed, 10 Dec 2025 22:13:23 +0900 Subject: [PATCH 2/3] =?UTF-8?q?MonitoringProperty=20=EB=A1=9C=EA=B1=B0=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/MonitoringPropertyService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java b/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java index 2956b26..6ce6042 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/man/monitoringProperty/service/MonitoringPropertyService.java @@ -2,6 +2,7 @@ package com.eactive.eai.rms.data.entity.man.monitoringProperty.service; import java.util.Optional; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -14,6 +15,7 @@ import com.querydsl.core.types.dsl.BooleanExpression; @Service @Transactional +@Slf4j public class MonitoringPropertyService extends AbstractDataService { @@ -44,9 +46,12 @@ public class MonitoringPropertyService if (property.isPresent()) { String value = property.get().getPrpty2Val(); if (value != null && !value.isEmpty()) { + log.debug("getPropertyValue - {} : {}", prptyName, value); return value; } } + + log.debug("getPropertyValue - {} : {} (defaultValue)", prptyName, defaultValue); return defaultValue; } From 9868547459aa177c8417ca88ccd48592edfe0f9e Mon Sep 17 00:00:00 2001 From: Rinjae Date: Wed, 10 Dec 2025 22:22:06 +0900 Subject: [PATCH 3/3] =?UTF-8?q?KjbPropertyInjector=20=EB=B2=84=EA=B7=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/eactive/ext/kjb/util/KjbPropertyInjector.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/eactive/ext/kjb/util/KjbPropertyInjector.java b/src/main/java/com/eactive/ext/kjb/util/KjbPropertyInjector.java index 9173847..dd2c738 100644 --- a/src/main/java/com/eactive/ext/kjb/util/KjbPropertyInjector.java +++ b/src/main/java/com/eactive/ext/kjb/util/KjbPropertyInjector.java @@ -94,12 +94,12 @@ public class KjbPropertyInjector { private static Object convertValue(Class type, String rawValue) { if (rawValue == null) return null; - if (type == String.class) return rawValue; - - // 빈 문자열인 경우 primitive 타입은 null 반환 (필드의 기본값 유지) + // 빈 문자열인 경우 null 반환 (필드의 기본값 유지) if (StringUtils.isEmpty(rawValue)) { return null; } + + if (type == String.class) return rawValue; try { if (type == Integer.class || type == int.class) return Integer.valueOf(rawValue);