검색엔진 및 인피니티 스크롤 수정

pom.xml

@@ -178,9 +178,9 @@
 		<dependency>
 			<groupId>com.diquest</groupId>
 			<artifactId>istyle</artifactId>
-			<version>1.1</version>
+			<version>1.3</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/Istyle1.1.jar</systemPath>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/Istyle.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>com.diquest.ir</groupId>

src/main/java/com/style24/front/biz/thirdparty/SearchEngineDiquest.java

@@ -74,7 +74,7 @@ public class SearchEngineDiquest {
 
 		// 인기검색어
 		Map<String, Object> paramMap = new HashMap<String, Object>();
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		log.info("///[getTrendKeywordList] paramMap: {}", paramMap);
 
@@ -103,7 +103,7 @@ public class SearchEngineDiquest {
 		AutoCompleteResponse result = new AutoCompleteResponse();
 
 		Map<String, Object> paramMap = new HashMap<String, Object>();
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		paramMap.put("keyword", keyword);
 		log.info("///[getAutoComplete] paramMap: {}", paramMap);
@@ -133,7 +133,7 @@ public class SearchEngineDiquest {
 		Collection<Cate1> result = new ArrayList<Cate1>();
 
 		Map<String, Object> paramMap = this.convertObjectToMap(params);
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 //		paramMap.put("cate1No", 1300);
 //		paramMap.put("brandGroupNo", 0);
@@ -176,7 +176,7 @@ public class SearchEngineDiquest {
 		Collection<Filter> result = new ArrayList<Filter>();
 
 		Map<String, Object> paramMap = this.convertObjectToMap(params);
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		log.info("///[getFilterList] paramMap: {}", paramMap);
 
@@ -209,7 +209,7 @@ public class SearchEngineDiquest {
 		GoodsListResponse result = new GoodsListResponse();
 
 		Map<String, Object> paramMap = this.convertObjectToMap(params);
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		paramMap.put("pageNumber", String.valueOf(params.getPageNo()));
 		paramMap.put("rowsPerPage", String.valueOf(params.getPageSize()));
@@ -253,7 +253,7 @@ public class SearchEngineDiquest {
 		PlanningResponse result = new PlanningResponse();
 
 		Map<String, Object> paramMap = new HashMap<String, Object>();
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		paramMap.put("keyword", keyword);
 		paramMap.put("pageNumber", String.valueOf(pageNo));
@@ -287,7 +287,7 @@ public class SearchEngineDiquest {
 		PlanningResponse result = new PlanningResponse();
 
 		Map<String, Object> paramMap = new HashMap<String, Object>();
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		paramMap.put("keyword", keyword);
 		paramMap.put("pageNumber", String.valueOf(pageNo));

src/main/webapp/WEB-INF/views/mob/display/BestMainFormMob.html

@@ -332,10 +332,10 @@
 		// 상품 검색
 		var fnGetInfiniteScrollDataList = function (pageNum){
 			$("#bestGoodsForm input[name=pageNo]").val(pageNum+1);
-			if(idx==1 || totalCnt > Number($("#bestGoodsForm").find("input[name=pageSize]").val())){
-				idx++;
+			// if(idx==1 || totalCnt > Number($("#bestGoodsForm").find("input[name=pageSize]").val())){
+			// 	idx++;
 				gagajf.ajaxFormSubmit("/display/best/main/goods/list", document.bestGoodsForm,  gagaInfiniteScroll.jsonToHtml);
-			}
+			// }
 		}
 
 		var fnDrawInfiniteScrollData = function (result){
@@ -351,10 +351,12 @@
 				var htm = fnCreateGoodsList(result, ithrCd, contentLoc, goodsUrl, lastPage, endRow, 'Mob');
 				gagaInfiniteScroll.draw(htm);
 			}else{
-				if($("#bestGoodsForm input[name=pageNo]").val()==1){
-					$('#listBox').html('<li class="none">상품정보가 존재하지 않습니다.</li>');
+				if(totalCnt > Number($("#bestGoodsForm").find("input[name=pageSize]").val())){
+					if($("#bestGoodsForm input[name=pageNo]").val()==1){
+						$('#listBox').html('<li class="none">상품정보가 존재하지 않습니다.</li>');
+					}
+					$("#divLastPage").show();
 				}
-				$("#divLastPage").show();
 				gagaInfiniteScroll.draw('not');
 			}
 		}

src/main/webapp/WEB-INF/views/mob/display/BrandLookbookMainFormMob.html

@@ -70,10 +70,10 @@
 	var idx = 1;
 	var fnGetInfiniteScrollDataList = function (pageNum){
 		$("#lbMainForm input[name=pageNo]").val(pageNum+1);
-		if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
-			idx++;
+		// if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+		// 	idx++;
 			gagajf.ajaxFormSubmit("/display/lookbook/main/list", document.lbMainForm,  gagaInfiniteScroll.jsonToHtml);
-		}
+		// }
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
@@ -91,11 +91,14 @@
 			var htm = fnGetLookbookList(result);
 			gagaInfiniteScroll.draw(htm);
 		}else{
-			if($("#lbMainForm input[name=pageNo]").val()==1){
-				$("#divLookbookNoData").show();
-			}else{
-				$("#divLastPage").show();
+			if(totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+				if($("#lbMainForm input[name=pageNo]").val()==1){
+					$("#divLookbookNoData").show();
+				}else{
+					$("#divLastPage").show();
+				}
 			}
+
 			gagaInfiniteScroll.draw('not');
 		}
 	}

src/main/webapp/WEB-INF/views/mob/display/CategoryGoodsListFormMob.html

@@ -959,10 +959,10 @@
 		// 상품 검색
 		var fnGetInfiniteScrollDataList = function (pageNum){
 			$("#searchGoodsForm input[name=pageNo]").val(pageNum+1);
-			if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
-				idx++;
+			// if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+			// 	idx++;
 				gagajf.ajaxFormSubmit("/display/category/goods/list", document.searchGoodsForm,  gagaInfiniteScroll.jsonToHtml , true);
-			}
+			// }
 		}
 
 		var fnDrawInfiniteScrollData = function (result){
@@ -987,15 +987,18 @@
 				var htm = fnCreateGoodsList(result, ithrCd, contentLoc, goodsUrl, lastPage, endRow, 'Mob');
 				gagaInfiniteScroll.draw(htm);
 			}else {
-				if($("#searchGoodsForm input[name=pageNo]").val()==1){
-					// 필터 값으로 조회 데이터 없을때
-					$('.list_content .list_defult').show();
-					//$('.list_content .count_wrap').hide();
-				}else{
-					// 마지막 페이지 일때
-					$('#endPage').show();
-					//$('.list_content .count_wrap').hide();
+				if(totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+					if($("#searchGoodsForm input[name=pageNo]").val()==1){
+						// 필터 값으로 조회 데이터 없을때
+						$('.list_content .list_defult').show();
+						//$('.list_content .count_wrap').hide();
+					}else{
+						// 마지막 페이지 일때
+						$('#endPage').show();
+						//$('.list_content .count_wrap').hide();
+					}
 				}
+
 				gagaInfiniteScroll.draw('not');
 			}
 		}

src/main/webapp/WEB-INF/views/mob/display/LookbookMainFormMob.html

@@ -128,10 +128,10 @@
 	var idx = 1;
 	var fnGetInfiniteScrollDataList = function (pageNum){
 		$("#lbMainForm input[name=pageNo]").val(pageNum+1);
-		if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
-			idx++;
+		// if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+		// 	idx++;
 			gagajf.ajaxFormSubmit("/display/lookbook/main/list", document.lbMainForm,  gagaInfiniteScroll.jsonToHtml);
-		}
+		// }
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
@@ -148,11 +148,14 @@
 			var htm = fnGetLookbookList(result);
 			gagaInfiniteScroll.draw(htm);
 		}else{
-			if($("#lbMainForm input[name=pageNo]").val()==1){
-				$("#divLookbookNoData").show();
-			}else{
-				$("#divLastPage").show();
+			if(totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+				if($("#lbMainForm input[name=pageNo]").val()==1){
+					$("#divLookbookNoData").show();
+				}else{
+					$("#divLastPage").show();
+				}
 			}
+
 			gagaInfiniteScroll.draw('not');
 		}
 	}

src/main/webapp/WEB-INF/views/mob/display/SearchGoodsListFormMob.html

@@ -672,10 +672,10 @@
 	// 상품 검색
 	var fnGetInfiniteScrollDataList = function (pageNum) {
 		$("#searchGoodsForm input[name=pageNo]").val(pageNum + 1);
-		if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
-			idx++;
+		// if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+		// 	idx++;
 			gagajf.ajaxFormSubmit("/display/search/goods/list", document.searchGoodsForm, gagaInfiniteScroll.jsonToHtml);
-		}
+		// }
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
@@ -700,15 +700,17 @@
 			gagaInfiniteScroll.draw(htm);
 			//fnImgOnoff();
 		}else{
-			if($("#searchGoodsForm input[name=pageNo]").val()==1){
-				// 필터 값으로 조회 데이터 없을때
-				$('#noDataFilter').show();
-				// $('.list_content .count_wrap').hide();
-				$('#endPage').hide();
-			}else{
-				// 마지막 페이지 일때
-				$('#endPage').show();
-				$('#noDataFilter').hide();
+			if(totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+				if($("#searchGoodsForm input[name=pageNo]").val()==1){
+					// 필터 값으로 조회 데이터 없을때
+					$('#noDataFilter').show();
+					// $('.list_content .count_wrap').hide();
+					$('#endPage').hide();
+				}else{
+					// 마지막 페이지 일때
+					$('#endPage').show();
+					$('#noDataFilter').hide();
+				}
 			}
 			gagaInfiniteScroll.draw('not');
 		}

src/main/webapp/WEB-INF/views/web/display/BestMainFormWeb.html

@@ -319,10 +319,10 @@
 	// 상품 검색
 	var fnGetInfiniteScrollDataList = function (pageNum){
 		$("#bestGoodsForm input[name=pageNo]").val(pageNum+1);
-		if(idx==1 || totalCnt > Number($("#bestGoodsForm").find("input[name=pageSize]").val())){
-			idx++;
+		// if(idx==1 || totalCnt > Number($("#bestGoodsForm").find("input[name=pageSize]").val())){
+		// 	idx++;
 			gagajf.ajaxFormSubmit("/display/best/main/goods/list", document.bestGoodsForm,  gagaInfiniteScroll.jsonToHtml);
-		}
+		// }
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
@@ -338,10 +338,13 @@
 			var htm = fnCreateGoodsList(result, ithrCd, contentLoc, goodsUrl, lastPage, endRow);
 			gagaInfiniteScroll.draw(htm);
 		}else{
-			if($("#bestGoodsForm input[name=pageNo]").val()==1){
-				$('#listBox').html('<li class="none">상품정보가 존재하지 않습니다.</li>');
+			if(totalCnt > Number($("#bestGoodsForm").find("input[name=pageSize]").val())){
+				if($("#bestGoodsForm input[name=pageNo]").val()==1){
+					$('#listBox').html('<li class="none">상품정보가 존재하지 않습니다.</li>');
+				}
+				$("#divLastPage").show();
 			}
-			$("#divLastPage").show();
+
 			gagaInfiniteScroll.draw('not');
 		}
 	}

src/main/webapp/WEB-INF/views/web/display/BrandLookbookMainFormWeb.html

@@ -117,10 +117,10 @@
 	var idx = 1;
 	var fnGetInfiniteScrollDataList = function (pageNum){
 		$("#lbMainForm input[name=pageNo]").val(pageNum+1);
-		if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
-			idx++;
+		// if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+		// 	idx++;
 			gagajf.ajaxFormSubmit("/display/lookbook/main/list", document.lbMainForm,  gagaInfiniteScroll.jsonToHtml);
-		}
+		// }
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
@@ -137,11 +137,14 @@
 			var htm = fnGetLookbookList(result);
 			gagaInfiniteScroll.draw(htm);
 		}else{
-			if($("#lbMainForm input[name=pageNo]").val()==1){
-				$("#divLookbookNoData").show();
-			}else{
-				$("#divLastPage").show();
+			if(totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+				if($("#lbMainForm input[name=pageNo]").val()==1){
+					$("#divLookbookNoData").show();
+				}else{
+					$("#divLastPage").show();
+				}
 			}
+
 			gagaInfiniteScroll.draw('not');
 		}
 	}

src/main/webapp/WEB-INF/views/web/display/CategoryGoodsListFormWeb.html

@@ -698,10 +698,10 @@ console.log(allCateList);
 		// 상품 검색
 		var fnGetInfiniteScrollDataList = function (pageNum){
 			$("#searchGoodsForm input[name=pageNo]").val(pageNum+1);
-			if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
-				idx++;
+			// if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+			// 	idx++;
 				gagajf.ajaxFormSubmit("/display/category/goods/list", document.searchGoodsForm,  gagaInfiniteScroll.jsonToHtml, true);
-			}
+			// }
 		}
 
 		var fnDrawInfiniteScrollData = function (result){
@@ -727,17 +727,20 @@ console.log(allCateList);
 				gagaInfiniteScroll.draw(htm);
 				fnImgOnoff();
 			}else {
-				if($("#searchGoodsForm input[name=pageNo]").val()==1){
-					// 필터 값으로 조회 데이터 없을때
-					$('#noFilterData').show();
-					$('.list_content .count_wrap').hide();
-					$('#endPage').hide();
-				}else{
-					// 마지막 페이지 일때
-					$('#endPage').show();
-					$('#noFilterData').hide();
-					//$('.list_content .count_wrap').hide();
+				if(totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+					if($("#searchGoodsForm input[name=pageNo]").val()==1){
+						// 필터 값으로 조회 데이터 없을때
+						$('#noFilterData').show();
+						$('.list_content .count_wrap').hide();
+						$('#endPage').hide();
+					}else{
+						// 마지막 페이지 일때
+						$('#endPage').show();
+						$('#noFilterData').hide();
+						//$('.list_content .count_wrap').hide();
+					}
 				}
+
 				gagaInfiniteScroll.draw('not');
 			}
 		}

src/main/webapp/WEB-INF/views/web/display/LookbookMainFormWeb.html

@@ -117,10 +117,10 @@
 	var idx = 1;
 	var fnGetInfiniteScrollDataList = function (pageNum){
 		$("#lbMainForm input[name=pageNo]").val(pageNum+1);
-		if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
-			idx++;
+		// if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+		// 	idx++;
 			gagajf.ajaxFormSubmit("/display/lookbook/main/list", document.lbMainForm,  gagaInfiniteScroll.jsonToHtml);
-		}
+		// }
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
@@ -137,11 +137,14 @@
 			var htm = fnGetLookbookList(result);
 			gagaInfiniteScroll.draw(htm);
 		}else{
-			if($("#lbMainForm input[name=pageNo]").val()==1){
-				$("#divLookbookNoData").show();
-			}else{
-				$("#divLastPage").show();
+			if(totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+				if($("#lbMainForm input[name=pageNo]").val()==1){
+					$("#divLookbookNoData").show();
+				}else{
+					$("#divLastPage").show();
+				}
 			}
+
 			gagaInfiniteScroll.draw('not');
 		}
 	}

src/main/webapp/WEB-INF/views/web/display/SearchGoodsListFormWeb.html

@@ -592,13 +592,10 @@
 		// 상품 검색
 		var fnGetInfiniteScrollDataList = function (pageNum) {
 			$("#searchGoodsForm input[name=pageNo]").val(pageNum + 1);
-			// gagajf.ajaxFormSubmit("/display/search/goods/list", document.searchGoodsForm, function(result) {
-			// 	console.log(result);
-			// }, true);
-			if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
-				idx++;
+			// if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+			// 	idx++;
 				gagajf.ajaxFormSubmit("/display/search/goods/list", document.searchGoodsForm, gagaInfiniteScroll.jsonToHtml);
-			}
+			// }
 		}
 
 		var fnDrawInfiniteScrollData = function (result){
@@ -624,15 +621,17 @@
 				gagaInfiniteScroll.draw(htm);
 				//fnImgOnoff();
 			}else{
-				if($("#searchGoodsForm input[name=pageNo]").val()==1){
-					// 필터 값으로 조회 데이터 없을때
-					$('#noFilterData').show();
-					$('.cont .count_wrap').hide();
-					$('#endPage').hide();
-				}else{
-					// 마지막 페이지 일때
-					$('#endPage').show();
-					$('#noFilterData').hide();
+				if(totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+					if($("#searchGoodsForm input[name=pageNo]").val()==1){
+						// 필터 값으로 조회 데이터 없을때
+						$('#noFilterData').show();
+						$('.cont .count_wrap').hide();
+						$('#endPage').hide();
+					}else{
+						// 마지막 페이지 일때
+						$('#endPage').show();
+						$('#noFilterData').hide();
+					}
 				}
 				gagaInfiniteScroll.draw('not');
 			}