|
@@ -4,7 +4,6 @@ import java.io.IOException;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.Collection;
|
|
import java.util.Collection;
|
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
|
-import java.util.Locale;
|
|
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
|
@@ -22,18 +21,14 @@ import com.style24.core.biz.service.TscEnvsetService;
|
|
|
import com.style24.core.support.message.TscMessageByLocale;
|
|
import com.style24.core.support.message.TscMessageByLocale;
|
|
|
import com.style24.front.biz.service.TsfDisplayService;
|
|
import com.style24.front.biz.service.TsfDisplayService;
|
|
|
import com.style24.front.support.controller.TsfBaseController;
|
|
import com.style24.front.support.controller.TsfBaseController;
|
|
|
-import com.style24.front.support.env.TsfConstants;
|
|
|
|
|
|
|
+import com.style24.front.support.security.session.TsfSession;
|
|
|
import com.style24.persistence.domain.BrandGroup;
|
|
import com.style24.persistence.domain.BrandGroup;
|
|
|
-import com.style24.persistence.domain.Cate1;
|
|
|
|
|
|
|
+import com.style24.persistence.domain.Cate4Srch;
|
|
|
import com.style24.persistence.domain.Contents;
|
|
import com.style24.persistence.domain.Contents;
|
|
|
import com.style24.persistence.domain.GnbTab;
|
|
import com.style24.persistence.domain.GnbTab;
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-import com.style24.front.support.security.session.TsfSession;
|
|
|
|
|
-
|
|
|
|
|
-import com.style24.persistence.domain.MainLayout;
|
|
|
|
|
-import com.style24.persistence.domain.Cate4Srch;
|
|
|
|
|
import com.style24.persistence.domain.GoodsSearch;
|
|
import com.style24.persistence.domain.GoodsSearch;
|
|
|
|
|
+import com.style24.persistence.domain.MainLayout;
|
|
|
|
|
+
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -66,9 +61,9 @@ public class TsfDisplayController extends TsfBaseController {
|
|
|
public ModelAndView mallMain(Device device, @RequestParam HashMap<String, String> paramMap) {
|
|
public ModelAndView mallMain(Device device, @RequestParam HashMap<String, String> paramMap) {
|
|
|
ModelAndView mav = new ModelAndView();
|
|
ModelAndView mav = new ModelAndView();
|
|
|
String mainCateNo = "";
|
|
String mainCateNo = "";
|
|
|
- if(device.isMobile() || "Y".equals(paramMap.get("mobileYn"))){
|
|
|
|
|
|
|
+ if (device.isMobile() || "Y".equals(paramMap.get("mobileYn"))) {
|
|
|
mainCateNo = "1720";
|
|
mainCateNo = "1720";
|
|
|
- }else{
|
|
|
|
|
|
|
+ } else {
|
|
|
mainCateNo = "1700";
|
|
mainCateNo = "1700";
|
|
|
}
|
|
}
|
|
|
Collection<MainLayout> mainLayoutCollection = displayService.getMainLayout(mainCateNo);
|
|
Collection<MainLayout> mainLayoutCollection = displayService.getMainLayout(mainCateNo);
|
|
@@ -76,10 +71,10 @@ public class TsfDisplayController extends TsfBaseController {
|
|
|
//mav.addObject("preview", paramMap.get("preview"));
|
|
//mav.addObject("preview", paramMap.get("preview"));
|
|
|
//mav.addObject("viewDt", paramMap.get("viewDt"));
|
|
//mav.addObject("viewDt", paramMap.get("viewDt"));
|
|
|
//mav.addObject("viewPage", "20");
|
|
//mav.addObject("viewPage", "20");
|
|
|
- for(MainLayout mainLayout : mainLayoutCollection){
|
|
|
|
|
|
|
+ for (MainLayout mainLayout : mainLayoutCollection) {
|
|
|
String contentsLoc = mainLayout.getContentsLoc();
|
|
String contentsLoc = mainLayout.getContentsLoc();
|
|
|
Contents contents = new Contents();
|
|
Contents contents = new Contents();
|
|
|
- log.info("mallMain contentsLoc:::{}",contentsLoc);
|
|
|
|
|
|
|
+ log.info("mallMain contentsLoc:::{}", contentsLoc);
|
|
|
contents.setContentsLoc(contentsLoc);
|
|
contents.setContentsLoc(contentsLoc);
|
|
|
contents.setPreview(paramMap.get("preview"));
|
|
contents.setPreview(paramMap.get("preview"));
|
|
|
contents.setViewDt(paramMap.get("viewDt"));
|
|
contents.setViewDt(paramMap.get("viewDt"));
|
|
@@ -90,10 +85,10 @@ public class TsfDisplayController extends TsfBaseController {
|
|
|
cate4Srch = displayService.getCate4srch(cate4Srch);
|
|
cate4Srch = displayService.getCate4srch(cate4Srch);
|
|
|
mainLayout.setCate4Srch(cate4Srch);
|
|
mainLayout.setCate4Srch(cate4Srch);
|
|
|
|
|
|
|
|
- if("C".equals(mainLayout.getContentsYn())){
|
|
|
|
|
|
|
+ if ("C".equals(mainLayout.getContentsYn())) {
|
|
|
mainLayout.setContentsList(displayService.getContentsList(contents));
|
|
mainLayout.setContentsList(displayService.getContentsList(contents));
|
|
|
- }else{
|
|
|
|
|
- log.info("nullpoint contentsLoc::::{}",contentsLoc);
|
|
|
|
|
|
|
+ } else {
|
|
|
|
|
+ log.info("nullpoint contentsLoc::::{}", contentsLoc);
|
|
|
GoodsSearch goodsSearch = new GoodsSearch();
|
|
GoodsSearch goodsSearch = new GoodsSearch();
|
|
|
goodsSearch.setCateType("G031_20");
|
|
goodsSearch.setCateType("G031_20");
|
|
|
goodsSearch.setSoldoutGoodsDisplayYn("N");
|
|
goodsSearch.setSoldoutGoodsDisplayYn("N");
|
|
@@ -102,11 +97,11 @@ public class TsfDisplayController extends TsfBaseController {
|
|
|
goodsSearch.setFrontGb(getSession().getFrontGb());
|
|
goodsSearch.setFrontGb(getSession().getFrontGb());
|
|
|
//int floorUnit = envsetService.getPayUnit(TscConstants.Site.STYLE24.value()); // 가격 원단위 관리
|
|
//int floorUnit = envsetService.getPayUnit(TscConstants.Site.STYLE24.value()); // 가격 원단위 관리
|
|
|
//goodsSearch.setFloorUnit(floorUnit);
|
|
//goodsSearch.setFloorUnit(floorUnit);
|
|
|
- if(TsfSession.getInfo() != null){
|
|
|
|
|
|
|
+ if (TsfSession.getInfo() != null) {
|
|
|
goodsSearch.setCustGb(TsfSession.getInfo().getCustGb());
|
|
goodsSearch.setCustGb(TsfSession.getInfo().getCustGb());
|
|
|
goodsSearch.setCustNo(TsfSession.getInfo().getCustNo());
|
|
goodsSearch.setCustNo(TsfSession.getInfo().getCustNo());
|
|
|
goodsSearch.setCustGrade(TsfSession.getInfo().getCustGrade());
|
|
goodsSearch.setCustGrade(TsfSession.getInfo().getCustGrade());
|
|
|
- }else{
|
|
|
|
|
|
|
+ } else {
|
|
|
goodsSearch.setCustGb("00");
|
|
goodsSearch.setCustGb("00");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -119,7 +114,7 @@ public class TsfDisplayController extends TsfBaseController {
|
|
|
}
|
|
}
|
|
|
mainLayoutList.add(mainLayout);
|
|
mainLayoutList.add(mainLayout);
|
|
|
}
|
|
}
|
|
|
- log.info("mainLayoutList::{}",mainLayoutList);
|
|
|
|
|
|
|
+ log.info("mainLayoutList::{}", mainLayoutList);
|
|
|
mav.addObject("mainLayoutList", mainLayoutList);
|
|
mav.addObject("mainLayoutList", mainLayoutList);
|
|
|
mav.setViewName(super.getDeviceViewName("display/MallMainForm"));
|
|
mav.setViewName(super.getDeviceViewName("display/MallMainForm"));
|
|
|
|
|
|
|
@@ -141,17 +136,17 @@ public class TsfDisplayController extends TsfBaseController {
|
|
|
return displayService.getGnbBrandGroupList(contents);
|
|
return displayService.getGnbBrandGroupList(contents);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- /**
|
|
|
|
|
- * 전체 카테고리 목록
|
|
|
|
|
- * @return
|
|
|
|
|
- * @author gagamel
|
|
|
|
|
- * @since 2021. 3. 15
|
|
|
|
|
- */
|
|
|
|
|
- @GetMapping("/all/cate/list")
|
|
|
|
|
- @ResponseBody
|
|
|
|
|
- public Collection<Cate1> getAllCategoryList() {
|
|
|
|
|
- return displayService.getAllCategoryList(TsfConstants.CateGb.BYITEM.value());
|
|
|
|
|
- }
|
|
|
|
|
|
|
+// /**
|
|
|
|
|
+// * 전체 카테고리 목록
|
|
|
|
|
+// * @return
|
|
|
|
|
+// * @author gagamel
|
|
|
|
|
+// * @since 2021. 3. 15
|
|
|
|
|
+// */
|
|
|
|
|
+// @GetMapping("/all/cate/list")
|
|
|
|
|
+// @ResponseBody
|
|
|
|
|
+// public Collection<Cate1> getAllCategoryList() {
|
|
|
|
|
+// return displayService.getAllCategoryList(TsfConstants.CateGb.BYITEM.value());
|
|
|
|
|
+// }
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* GNB 탭 목록
|
|
* GNB 탭 목록
|