|
|
@@ -9,6 +9,7 @@ import java.util.HashMap;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
+import com.style24.persistence.domain.searchengine.PlanningResponse;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.mobile.device.Device;
|
|
|
@@ -1033,6 +1034,7 @@ public class TsfDisplayController extends TsfBaseController {
|
|
|
params.setCustGb(TsfSession.getCustGb());
|
|
|
|
|
|
Collection<SearchEngine> dataList = new ArrayList<SearchEngine>();
|
|
|
+ Collection<SearchEngine> planList = new ArrayList<SearchEngine>();
|
|
|
|
|
|
log.info("getSearchGoodsList params::{}",params);
|
|
|
// 검색엔진 연동 여부
|
|
|
@@ -1041,6 +1043,12 @@ public class TsfDisplayController extends TsfBaseController {
|
|
|
GoodsListResponse response = diquest.getGoodsList(params);
|
|
|
pageable.setTotalCount(response.getTotalCount());
|
|
|
dataList = response.getResponse();
|
|
|
+
|
|
|
+ PlanningResponse responsePlan = diquest.getPlanningList(params.getKeyword(),params.getPageNo(),params.getPageSize());
|
|
|
+// pageable.setTotalPlanCount(responsePlan.getTotalSize());
|
|
|
+// planList = responsePlan.getResponse();
|
|
|
+
|
|
|
+ PlanningResponse responseEvent = diquest.getEventList(params.getKeyword(),params.getPageNo(),params.getPageSize());
|
|
|
} else { // DB를 통한 상품리스트 조회
|
|
|
pageable.setTotalCount(goodsService.getSearchGoodsCount(params));
|
|
|
params.setPageable(pageable);
|
|
|
@@ -1049,6 +1057,7 @@ public class TsfDisplayController extends TsfBaseController {
|
|
|
|
|
|
result.set("paging", pageable);
|
|
|
result.set("dataList", dataList);
|
|
|
+ result.set("planList", planList);
|
|
|
|
|
|
return result;
|
|
|
}
|