From 0a695e95f2ce522d707f45690c8d4f91d544d1a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=9A=B1?= Date: Tue, 23 Dec 2025 19:34:50 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=8C=80?= =?UTF-8?q?=EC=8B=9C=EB=B3=B4=EB=93=9C=20=EB=8C=80=EC=B2=B4(=EB=8C=80?= =?UTF-8?q?=EC=8B=9C=EB=B3=B4=EB=93=9C=20->=20=EA=B2=8C=EC=8B=9C=EA=B8=80)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/controller/MngrMainController.java | 111 ++++++++++++------ 1 file changed, 75 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/wb/domainserver/domain/mngr/main/controller/MngrMainController.java b/src/main/java/com/wb/domainserver/domain/mngr/main/controller/MngrMainController.java index 2a0e95cc..23bf53e7 100644 --- a/src/main/java/com/wb/domainserver/domain/mngr/main/controller/MngrMainController.java +++ b/src/main/java/com/wb/domainserver/domain/mngr/main/controller/MngrMainController.java @@ -3,8 +3,12 @@ package com.wb.domainserver.domain.mngr.main.controller; import com.fasterxml.jackson.databind.ObjectMapper; import com.wb.domainserver.domain.admin.store.sopmal.service.BOMaSopmalService; import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO; +import com.wb.domainserver.domain.gcone.bbs.bbs.service.BOBbsService; +import com.wb.domainserver.domain.gcone.bbs.bbs.vo.BOBbsVO; import com.wb.domainserver.domain.gcone.main.service.BOMainService; import com.wb.domainserver.domain.mngr.main.vo.MainVO; +import com.wb.domainserver.exception.WnbtRestException; +import com.wb.domainserver.exception.code.ErrorCode; import com.wb.domainserver.realm.RealmContextHolder; import com.wb.domainserver.response.WnbtResponse; import com.wb.domainserver.response.WnbtResponseBody; @@ -43,6 +47,8 @@ public class MngrMainController { private BOMainService service; @Autowired private BOMaSopmalService maSopmalService; + @Autowired + private BOBbsService bbsService; /** WebClient 호출을 위한 wrapper */ @Autowired @@ -68,52 +74,85 @@ public class MngrMainController { @Policy(AuthPolicy.PUBLIC) @RequestMapping(value = "/main") // public String selectMngrMainInqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, ModelMap model, HttpServletRequest request) { - public String selectMngrMainInqire(String authSopmalCd, ModelMap model, HttpServletRequest request ) { - DataMap vo = new DataMap(); - - log.debug("authSopmalCd index1 {}", authSopmalCd); - - if("".equals(authSopmalCd)|| authSopmalCd == null) { - log.debug("index authSopmalCd is null"); - authSopmalCd = request.getAttribute("authSopmalCd") != null ? request.getAttribute("authSopmalCd").toString() : ""; -// log.debug("request Attribute authSopmalCd X"); + public String selectMngrMainInqire(String authSopmalCd, ModelMap model, HttpServletRequest request, HttpServletResponse response ) { + BOBbsVO vo = new BOBbsVO(); + vo.setSopmalCd(authSopmalCd); + // 작성자 정보 할당 + AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); + if("01".equals(user.getSysDvCd())){ + vo.setSopmalCd(user.getSopmalCd()); } + // 쇼핑몰코드 + vo.setRegusr(user.getUserInnb()); // 등록자 + vo.setUpdusr(user.getUserInnb()); // 수정자 - log.debug("authSopmalCd index2 {}", authSopmalCd); + DataMap resultMap = new DataMap(); + resultMap = bbsService.selectBOBbscttDshboardInqireForm(vo); - String sopmalCd = ""; + ObjectMapper objectMapper = new ObjectMapper(); - //최초 로그인이 아니면 쿠키에서 쇼핑몰정보 조회 - if(StringUtil.isEmpty(authSopmalCd)) { + try { + resultMap.put("updBbsList", objectMapper.writeValueAsString(resultMap.get("updBbsList"))); - if(request.getCookies()!=null) { - - for(Cookie cookie : request.getCookies()){ - if("authSopmalCd".equals(cookie.getName())){ - sopmalCd = cookie.getValue(); - break; - } - } - } - - }else{ - sopmalCd = authSopmalCd; + } catch (WnbtRestException wre){ + log.error(wre.getMessage(), wre); + throw new WnbtRestException(wre.getMessage()); + } catch(Exception e) { + log.error(e.getMessage(), e); + throw new WnbtRestException(ErrorCode.INTERNAL_SERVER_ERROR); } + model.addAttribute("resultMap", resultMap); - log.debug("main sopmalCd set {}", sopmalCd); + return "mngr/bbs/bbsmngr/BbscttDshboardForm"; - vo.put("sopmalCd", sopmalCd); - //쇼핑몰 지정후 메인 이동시 sopmalCd 세팅 - model.addAttribute("cookieAuthSopmalCd", sopmalCd); - - log.debug("mainindex {}", model.getAttribute("cookieAuthSopmalCd")); - -// vo.put("sopmalCd", authSopmalCd); - Map content = service.selectBOMngrMainInqire(vo); - model.addAttribute("resultMap", content); - return "mngr/index"; +// DataMap vo = new DataMap(); +// +// log.debug("authSopmalCd index1 {}", authSopmalCd); +// +// if("".equals(authSopmalCd)|| authSopmalCd == null) { +// log.debug("index authSopmalCd is null"); +// authSopmalCd = request.getAttribute("authSopmalCd") != null ? request.getAttribute("authSopmalCd").toString() : ""; +//// log.debug("request Attribute authSopmalCd X"); +// +// } +// +// log.debug("authSopmalCd index2 {}", authSopmalCd); +// +// String sopmalCd = ""; +// +// //최초 로그인이 아니면 쿠키에서 쇼핑몰정보 조회 +// if(StringUtil.isEmpty(authSopmalCd)) { +// +// if(request.getCookies()!=null) { +// +// for(Cookie cookie : request.getCookies()){ +// if("authSopmalCd".equals(cookie.getName())){ +// sopmalCd = cookie.getValue(); +// break; +// } +// } +// } +// +// }else{ +// sopmalCd = authSopmalCd; +// } +// +// log.debug("main sopmalCd set {}", sopmalCd); +// +// vo.put("sopmalCd", sopmalCd); +// +// //쇼핑몰 지정후 메인 이동시 sopmalCd 세팅 +// model.addAttribute("cookieAuthSopmalCd", sopmalCd); +// +// log.debug("mainindex {}", model.getAttribute("cookieAuthSopmalCd")); +// +// +//// vo.put("sopmalCd", authSopmalCd); +// Map content = service.selectBOMngrMainInqire(vo); +// model.addAttribute("resultMap", content); +// return "mngr/index"; } /**