Client API 추가 Popup Scope화면에도 적용. bzwksvckeyname를 화면에 넘겨주기위해 일부 수정.

추가요건 1. 팝업 및 리스트에 API명, API FULL PATH 추가.
추가요건 2. API-SCOPE 매핑하면 -> SCOPE 화면에서 통합관리 할 수 있게 변경.

src/main/java/com/eactive/eai/rms/data/entity/onl/eaimsg/ApiScopeDto.java

@@ -9,6 +9,9 @@ import lombok.Data;
 @AllArgsConstructor
 public class ApiScopeDto {
 
+	@JsonProperty("EAISVCNAME")
+	private String eaiSvcName;
+
 	@JsonProperty("EAISVCDESC")
 	private String eaiSvcDesc;
 
@@ -20,5 +23,8 @@ public class ApiScopeDto {
 
 	@JsonProperty("SCOPENAME")
 	private String scopeName;
+	
+	@JsonProperty("APIFULLPATH")
+	private String apiFullPath;
 
 }

src/main/java/com/eactive/eai/rms/data/entity/onl/eaimsg/EAIMessageService.java

@@ -59,6 +59,8 @@ public class EAIMessageService extends AbstractDataService<EAIMessageEntity, Str
 					, qServiceMessageEntity.psvsysadptrbzwkgroupname
 					, qRouting.nonmotivrouturiname
 					, qStdInfo.apifullpath
+					, qStdInfo.bzwksvckeyname 
+					
 			)
 			.limit(pageable.getPageSize())
 			.offset(pageable.getOffset())			
@@ -111,6 +113,7 @@ public class EAIMessageService extends AbstractDataService<EAIMessageEntity, Str
 						, qServiceMessageEntity.psvintfacdsticname
 						, qRouting.nonmotivrouturiname
 						, qStdInfo.apifullpath
+						, qStdInfo.bzwksvckeyname
 				)
 				.from(qeaiMessageEntity)
 				.join(qRouting)
@@ -290,10 +293,14 @@ public class EAIMessageService extends AbstractDataService<EAIMessageEntity, Str
 
 		List<ApiScopeDto> result =  getJPAQueryFactory()
 				.select(Projections.constructor(ApiScopeDto.class ,
+						qEaiMessageEntity.eaisvcname ,
 						qEaiMessageEntity.eaisvcdesc ,
 						qScopeEntity.id.scopeid ,
 						qScopeEntity.id.bzwksvckeyname ,
-						qScopeInfo.scopeName ))
+						qScopeInfo.scopeName  ,
+						qStandardMessageInfo.apifullpath
+						)
+				 )
 				.from(qEaiMessageEntity)
 				.join(qStandardMessageInfo)
 				.on(qEaiMessageEntity.eaisvcname.eq(qStandardMessageInfo.eaisvcname))
@@ -313,19 +320,20 @@ public class EAIMessageService extends AbstractDataService<EAIMessageEntity, Str
 	private BooleanExpression booleanPredicate(QEAIMessageEntity qEaiMessageEntity, QScopeEntity qScopeEntity,
 											   QScopeInfo qScopeInfo, ApiScopeSearch apiScopeSearch) {
 
-		BooleanExpression predicate = qEaiMessageEntity.eaisvcdesc.containsIgnoreCase(apiScopeSearch.getSearchEaiSvcDesc());
+		BooleanExpression predicate = qScopeEntity.id.scopeid.containsIgnoreCase(apiScopeSearch.getSearchScopeId());
+//		BooleanExpression predicate = qEaiMessageEntity.eaisvcdesc.containsIgnoreCase(apiScopeSearch.getSearchEaiSvcDesc());
 
-		if(StringUtils.isNotBlank(apiScopeSearch.getSearchBzwkSvcKeyName())) {
-			predicate = predicate.and(qScopeEntity.id.bzwksvckeyname.containsIgnoreCase(apiScopeSearch.getSearchBzwkSvcKeyName()));
-		}
-
-		if(StringUtils.isNotBlank(apiScopeSearch.getSearchScopeId())) {
-			predicate = predicate.and(qScopeEntity.id.scopeid.containsIgnoreCase(apiScopeSearch.getSearchScopeId()));
-		}
-
-		if(StringUtils.isNotBlank(apiScopeSearch.getSearchScopeName())) {
-			predicate = predicate.and(qScopeInfo.scopeName.containsIgnoreCase(apiScopeSearch.getSearchScopeName()));
-		}
+//		if(StringUtils.isNotBlank(apiScopeSearch.getSearchBzwkSvcKeyName())) {
+//			predicate = predicate.and(qScopeEntity.id.bzwksvckeyname.containsIgnoreCase(apiScopeSearch.getSearchBzwkSvcKeyName()));
+//		}
+//
+//		if(StringUtils.isNotBlank(apiScopeSearch.getSearchScopeId())) {
+//			predicate = predicate.and(qScopeEntity.id.scopeid.containsIgnoreCase(apiScopeSearch.getSearchScopeId()));
+//		}
+//
+//		if(StringUtils.isNotBlank(apiScopeSearch.getSearchScopeName())) {
+//			predicate = predicate.and(qScopeInfo.scopeName.containsIgnoreCase(apiScopeSearch.getSearchScopeName()));
+//		}
 
 		return predicate;
 	}