유량제어 이력 검색조건 추가

src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlLogService.java

@@ -1,5 +1,6 @@
 package com.eactive.eai.rms.data.entity.onl.inflow;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -63,11 +64,19 @@ public class InflowControlLogService
 
 	public Iterable<InflowControlLog> findAll(InflowControlHistoryManUISearch uiSearch) {
 		QInflowControlLog qInflowConfrolLog = QInflowControlLog.inflowControlLog;
+		String startTime = StringUtils.defaultIfEmpty(uiSearch.getSearchStartTime(), "000000");
+		String endTime = StringUtils.defaultIfEmpty(uiSearch.getSearchEndTime(), "235959");
 		BooleanBuilder booleanBuilder = new BooleanBuilder();
 		booleanBuilder
 				.and(qInflowConfrolLog.id.msgdpstyms
-						.between(uiSearch.getSearchStartDate() + "000000000",
-								uiSearch.getSearchEndDate() + "235959999"));
+						.between(uiSearch.getSearchStartDate() + startTime + "000",
+								uiSearch.getSearchEndDate() + endTime + "999"));
+		if (!StringUtils.isEmpty(uiSearch.getSearchInstanceName()))
+			booleanBuilder.and(qInflowConfrolLog.eaisevrinstncname.contains(uiSearch.getSearchInstanceName()));
+		if (!StringUtils.isEmpty(uiSearch.getSearchApiName()))
+			booleanBuilder.and(qInflowConfrolLog.eaisvcname.contains(uiSearch.getSearchApiName()));
+		if (!StringUtils.isEmpty(uiSearch.getSearchAdapterGroupName()))
+			booleanBuilder.and(qInflowConfrolLog.adptrbzwkgroupname.contains(uiSearch.getSearchAdapterGroupName()));
 		return super.repository.findAll(booleanBuilder);
 	}
 }

src/main/java/com/eactive/eai/rms/data/entity/onl/inflow/InflowControlService.java

@@ -294,12 +294,21 @@ public class InflowControlService extends AbstractDataService<InflowControl, Inf
 		QInflowControlLog qInflowConfrolLog = QInflowControlLog.inflowControlLog;
         QInflowControlGroup qinflowControlGroup = QInflowControlGroup.inflowControlGroup;
         
+        String startTime = StringUtils.defaultIfEmpty(uiSearch.getSearchStartTime(), "000000");
+        String endTime = StringUtils.defaultIfEmpty(uiSearch.getSearchEndTime(), "235959");
+
         BooleanBuilder predicate = new BooleanBuilder();
         predicate
 				.and(qInflowConfrolLog.id.msgdpstyms
-						.between(uiSearch.getSearchStartDate() + "000000000",
-								uiSearch.getSearchEndDate() + "235959999"));
-        
+						.between(uiSearch.getSearchStartDate() + startTime + "000",
+								uiSearch.getSearchEndDate() + endTime + "999"));
+        if (!StringUtils.isEmpty(uiSearch.getSearchInstanceName()))
+        	predicate.and(qInflowConfrolLog.eaisevrinstncname.contains(uiSearch.getSearchInstanceName()));
+        if (!StringUtils.isEmpty(uiSearch.getSearchApiName()))
+        	predicate.and(qInflowConfrolLog.eaisvcname.contains(uiSearch.getSearchApiName()));
+        if (!StringUtils.isEmpty(uiSearch.getSearchAdapterGroupName()))
+        	predicate.and(qInflowConfrolLog.adptrbzwkgroupname.contains(uiSearch.getSearchAdapterGroupName()));
+
         return getJPAQueryFactory()
         		.select(
         				qInflowConfrolLog,

src/main/java/com/eactive/eai/rms/onl/manage/inflow/history/InflowControlHistoryManUISearch.java

@@ -24,4 +24,29 @@ public class InflowControlHistoryManUISearch {
 	 * 유량제어일 끝(20231221)
 	 */
 	private String searchEndDate;
+
+	/**
+	 * 유량제어일 시작 시간(000000)
+	 */
+	private String searchStartTime;
+
+	/**
+	 * 유량제어일 끝 시간(235959)
+	 */
+	private String searchEndTime;
+
+	/**
+	 * 인스턴스명
+	 */
+	private String searchInstanceName;
+
+	/**
+	 * API 명
+	 */
+	private String searchApiName;
+
+	/**
+	 * 어댑터그룹명
+	 */
+	private String searchAdapterGroupName;
 }