Revert "- API 한글명(eaisvcdesc) 검색 기능 추가"

This reverts commit f8af1f2401.

WebContent/jsp/onl/transaction/tracking/trackingMan.jsp

@@ -617,9 +617,8 @@
                     </td>
                 </tr>
                 <tr>
-                	<th>API 명</th>
+                    <th><%=localeMessage.getString("tracking.eaisvcserno_tmp")%></th>
-                    <td><input type="text" name="searchEaiSvcDesc" value="${param.searchEaiSvcDesc}"></td>
+                    <td><input type="text" name="searchEaiSvcSerno" value="${param.searchEaiSvcSerno}"></td>
-
                     <th><%=localeMessage.getString("tracking.logprcssserno")%></th>
                     <td>
                         <div >
@@ -658,11 +657,8 @@
 							</td> -->
                 </tr>
                 <tr>
-                    <th><%=localeMessage.getString("tracking.eaisvcserno_tmp")%></th>
-                    <td colspan="3"><input type="text" name="searchEaiSvcSerno" value="${param.searchEaiSvcSerno}"></td>
-                
                     <th><%=localeMessage.getString("tracking.keymgtmsgctnt")%></th>
-                    <td colspan="2"><input type="text" name="searchKeyMgtMsgCtnt" value="${param.searchKeyMgtMsgCtnt}"></td>
+                    <td colspan="5"><input type="text" name="searchKeyMgtMsgCtnt" value="${param.searchKeyMgtMsgCtnt}"></td>
 
                     <%-- <th><%=localeMessage.getString("tracking.orgGUID")%></th>
                     <td colspan="4"><input type="text" name="searchGuid" value="" maxlength="<%=DbTrackingService.GUID_LENGTH%>"></td> --%>

src/main/java/com/eactive/eai/rms/data/entity/onl/logger/EAILogRepositoryImpl.java

@@ -8,6 +8,12 @@ import java.util.stream.Collectors;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+
 import com.eactive.eai.data.entity.onl.logger.EAILog;
 import com.eactive.eai.data.entity.onl.logger.EAILogId;
 import com.eactive.eai.data.entity.onl.logger.QEAILog;
@@ -20,12 +26,6 @@ import com.querydsl.core.types.dsl.EntityPathBase;
 import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Repository;
-
 @Repository
 public class EAILogRepositoryImpl implements EAILogRepository {
 
@@ -43,43 +43,26 @@ public class EAILogRepositoryImpl implements EAILogRepository {
 		EntityPathBase<?> entityPathBase = new EntityPathBase<>(clazz, qeaiLog.getMetadata().getName());
 
 		QEAIMessageEntity qeaiMessageEntity = QEAIMessageEntity.eAIMessageEntity;
-		
-		// Count Query
- 		JPAQuery<?> countQuery = new JPAQueryFactory(em)
-				.from(entityPathBase)
-				.leftJoin(qeaiMessageEntity)
-				.on(qeaiLog.eaisvcname.eq(qeaiMessageEntity.eaisvcname));
-		
-		appendConditions(eaiLogSearch, qeaiLog, entityPathBase, qeaiMessageEntity, countQuery);
 
-		long totalCount = countQuery.select(qeaiLog.id.msgdpstyms.count()).fetchOne();
+		JPAQuery<?> query = new JPAQueryFactory(em).from(entityPathBase);
+		appendConditions(eaiLogSearch, qeaiLog, entityPathBase, query);
+
+		long totalCount = query.select(qeaiLog.id.msgdpstyms.count()).fetchOne();
 
 		if (totalCount == 0) {
 			return new PageImpl<>(new ArrayList<>(), pageable, 0);
 		}
-		
-		// List Query 분리
-		JPAQuery<?> listQuery = new JPAQueryFactory(em)
-	            .from(entityPathBase)
-	            .leftJoin(qeaiMessageEntity)
-	            .on(qeaiLog.eaisvcname.eq(qeaiMessageEntity.eaisvcname));
 
-		List<EAILogDto> list = listQuery
+		List<EAILogDto> list = query
 //				.select(Projections.constructor(EAILogDto.class, qeaiLog, qeaiMessageEntity.eaisvcdesc))
 				.select(Projections.constructor(EAILogDto.class,
-						qeaiLog.id, 
+						qeaiLog.id, qeaiLog.trackasiskey1ctnt, qeaiLog.trackasiskey2ctnt, qeaiLog.keymgtmsgctnt,
-						qeaiLog.trackasiskey1ctnt,
+						qeaiLog.eaisvcname, qeaiLog.extbizcd, qeaiLog.refkey, qeaiLog.clientname,
-						qeaiLog.trackasiskey2ctnt, 
+						qeaiLog.orgname, qeaiLog.msgprcssyms, qeaiLog.companycode, qeaiLog.eaierrctnt,
-						qeaiLog.keymgtmsgctnt,
-						qeaiLog.eaisvcname, 
-						qeaiLog.extbizcd, 
-						qeaiLog.refkey,
-						qeaiLog.clientname, 
-						qeaiLog.orgname, 
-						qeaiLog.msgprcssyms, 
-						qeaiLog.companycode, 
-						qeaiLog.eaierrctnt, 
 						qeaiMessageEntity.eaisvcdesc))
+				.from(entityPathBase)
+				.leftJoin(qeaiMessageEntity)
+				.on(qeaiLog.eaisvcname.eq(qeaiMessageEntity.eaisvcname))
 				.orderBy(qeaiLog.id.msgdpstyms.desc(), qeaiLog.id.eaisvcserno.asc(), qeaiLog.id.logprcssserno.asc())
 				.limit(1000)
 				.fetch();
@@ -90,15 +73,9 @@ public class EAILogRepositoryImpl implements EAILogRepository {
 	public Map<String, Long> countDetailedTransactions(Class<? extends EAILog> clazz, EAILogSearch eaiLogSearch) {
 		QEAILog qeaiLog = QEAILog.eAILog;
 		EntityPathBase<?> entityPathBase = new EntityPathBase<>(clazz, qeaiLog.getMetadata().getName());
-		
-		QEAIMessageEntity qeaiMessageEntity = QEAIMessageEntity.eAIMessageEntity;
 
- 		JPAQuery<?> query = new JPAQueryFactory(em)
+		JPAQuery<?> query = new JPAQueryFactory(em).from(entityPathBase);
-				.from(entityPathBase)
+		appendConditions(eaiLogSearch, qeaiLog, entityPathBase, query);
-				.leftJoin(qeaiMessageEntity)
-				.on(qeaiLog.eaisvcname.eq(qeaiMessageEntity.eAIMessageEntity.eaisvcname));
- 		
-		appendConditions(eaiLogSearch, qeaiLog, entityPathBase, qeaiMessageEntity, query);
 
 		List<Tuple> results = query.select(
 					qeaiLog.id.logprcssserno,    // 로그 처리 상태
@@ -114,7 +91,8 @@ public class EAILogRepositoryImpl implements EAILogRepository {
 		return reult;
 	}
 
-	private void appendConditions(EAILogSearch eaiLogSearch, QEAILog qeaiLog, EntityPathBase<?> entityPathBase, QEAIMessageEntity qeaiMessageEntity, JPAQuery<?> query) {
+	private void appendConditions(EAILogSearch eaiLogSearch, QEAILog qeaiLog, EntityPathBase<?> entityPathBase, JPAQuery<?> query) {
+
 		if (StringUtils.equalsIgnoreCase(eaiLogSearch.getAuthChk(), "Y")) {
 			QUserBusiness qUserBusiness = QUserBusiness.userBusiness;
 			JPAQuery<String> subQuery = new JPAQueryFactory(em)
@@ -149,10 +127,6 @@ public class EAILogRepositoryImpl implements EAILogRepository {
 		if (StringUtils.isNotBlank(eaiLogSearch.getSearchEaiSvcName())) {
 			query.where(qeaiLog.eaisvcname.containsIgnoreCase(eaiLogSearch.getSearchEaiSvcName()));
 		}
-		
-		if (StringUtils.isNotBlank(eaiLogSearch.getSearchEaiSvcDesc())) {
-			query.where(qeaiMessageEntity.eaisvcdesc.containsIgnoreCase(eaiLogSearch.getSearchEaiSvcDesc()));
-		}
 
 		if (StringUtils.isNotBlank(eaiLogSearch.getSearchKeyMgtMsgCtnt())) {
 			query.where(qeaiLog.keymgtmsgctnt.contains(eaiLogSearch.getSearchKeyMgtMsgCtnt()));

src/main/java/com/eactive/eai/rms/data/entity/onl/logger/EAILogSearch.java

@@ -15,7 +15,6 @@ public class EAILogSearch {
 	private String searchEaiBzwkDstcd;
 	private String searchEaiSvcSerno;
 	private String searchEaiSvcName;
-	private String searchEaiSvcDesc;
 	private String searchKeyMgtMsgCtnt;
 	private String searchTrackAsisKey1Ctnt;
 	private String searchTrackAsisKey2Ctnt;