diff --git a/src/main/java/com/wb/domainserver/domain/admin/sys/ctgry/controller/MaCtgryController.java b/src/main/java/com/wb/domainserver/domain/admin/sys/ctgry/controller/MaCtgryController.java index 174ebc29..b9b13321 100644 --- a/src/main/java/com/wb/domainserver/domain/admin/sys/ctgry/controller/MaCtgryController.java +++ b/src/main/java/com/wb/domainserver/domain/admin/sys/ctgry/controller/MaCtgryController.java @@ -3,12 +3,21 @@ package com.wb.domainserver.domain.admin.sys.ctgry.controller; import com.fasterxml.jackson.databind.ObjectMapper; import com.nimbusds.jose.shaded.gson.Gson; import com.wb.domainserver.common.msg.GconeMessageSource; +import com.wb.domainserver.domain.admin.store.sopmal.service.BOMaSopmalService; +import com.wb.domainserver.domain.admin.sys.comncd.service.BOMaComncdService; +import com.wb.domainserver.domain.admin.sys.comncd.vo.BOMaComncdVO; +import com.wb.domainserver.domain.admin.sys.ctgry.service.BOMaCtgryService; +import com.wb.domainserver.domain.admin.sys.ctgry.vo.BOMaCtgryVO; import com.wb.domainserver.domain.admin.sys.ctgry.vo.MaCtgryVO; import com.wb.domainserver.domain.crm.ordr.vo.CrmGoodsVO; +import com.wb.domainserver.domain.gcone.goods.goods.vo.BOGoodsVO; +import com.wb.domainserver.domain.gcone.goods.goodsinfo.service.BOGoodsinfoService; import com.wb.domainserver.exception.WnbtRestException; import com.wb.domainserver.response.WnbtResponse; import com.wb.domainserver.response.WnbtResponseBody; import com.wb.domainserver.response.WnbtWebClientResponseHandler; +import com.wb.domainserver.security.authentication.AnonymousUser; +import com.wb.domainserver.security.authentication.MemberJwtContextHolder; import com.wb.domainserver.util.communicate.*; import com.wb.domainserver.util.file.service.FileStorageService; import jakarta.servlet.http.HttpServletRequest; @@ -16,6 +25,7 @@ import jakarta.servlet.http.HttpSession; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -64,18 +74,41 @@ public class MaCtgryController { @Autowired private FileStorageService filestore; + @Autowired + private BOMaCtgryService service; + @Autowired + private BOGoodsinfoService giService; + @Autowired + private BOMaComncdService boMaComncdService; /** * 카테고리 수정 화면이동 * @return */ @Policy(AuthPolicy.RESTRICTED) @RequestMapping("/selectCtgrySaveForm") - public String selectCtgrySaveForm(MaCtgryVO vo, ModelMap model) { + public String selectCtgrySaveForm(BOMaCtgryVO vo, ModelMap model) { - Map resultMap = responseHandler.handleResponseAsMap( - sendToResrc.ofPost(RESRC.GCONEBO, "/admin/sys/ctgry/selectBOCtgryManage",vo) - ); + // 공통코드 호출 + BOMaComncdVO bOMaComncdVO = new BOMaComncdVO(); + bOMaComncdVO.setGroupCd("URL_DV"); //URL구분 (URL_DV) + List urlDvCd = boMaComncdService.selectBOCommcdDetailList(bOMaComncdVO); + + bOMaComncdVO.setGroupCd("EXPSR"); //노출구분 (EXPSR) + List expsrCd = boMaComncdService.selectBOCommcdDetailList(bOMaComncdVO); + + bOMaComncdVO.setGroupCd("CTGRY_DV"); //카테고리구분코드 (CTGRY_DV_CD) + List ctgryDvCd = boMaComncdService.selectBOCommcdDetailList(bOMaComncdVO); + + Map resultMap = new HashMap<>(); + resultMap.put("urlDvCd", urlDvCd); + resultMap.put("expsrCd", expsrCd); + resultMap.put("ctgryDvCd", ctgryDvCd); + resultMap.put("ctgryList", service.selectBOCtgryManage(vo)); + resultMap.put("giList", giService.selectBOGoodsInfoListNotLimit()); +// Map resultMap = responseHandler.handleResponseAsMap( +// sendToResrc.ofPost(RESRC.GCONEBO, "/admin/sys/ctgry/selectBOCtgryManage",vo) +// ); List> resultMapList = (List>) resultMap.get("ctgryList"); String jsonMenuList = new Gson().toJson(resultMapList); @@ -90,8 +123,8 @@ public class MaCtgryController { * @return */ @Policy(AuthPolicy.RESTRICTED) - @RequestMapping(value = "/updateCtgryUpdt", method = RequestMethod.POST) - public ResponseEntity updateCtgryUpdt(MaCtgryVO vo, HttpServletRequest request) { + @RequestMapping(value = "/updateCtgryUpdt", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity updateCtgryUpdt(BOMaCtgryVO vo, HttpServletRequest request) { request.setAttribute("shopCd", vo.getSopmalCd()); @@ -109,10 +142,23 @@ public class MaCtgryController { log.error(e.getMessage(), e); } - return responseHandler.handleResponse( - sendToResrc.ofPost(RESRC.GCONEBO, "/admin/sys/ctgry/updateBOCtgryManage", vo), - ReplyFromResrc::getReply - ); + Map message = new HashMap<>(); + //사용자 정보 추출 및 적용 + AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); + vo.setRegusr(user.getUserInnb()); + vo.setUpdusr(user.getUserInnb()); + + message = service.updateBOCtgryManage(vo); + + return ResponseEntity.ok( + WnbtResponse.builder() + .resBody(new WnbtResponseBody(message)) + .build() + ); +// return responseHandler.handleResponse( +// sendToResrc.ofPost(RESRC.GCONEBO, "/admin/sys/ctgry/updateBOCtgryManage", vo), +// ReplyFromResrc::getReply +// ); } @@ -121,13 +167,24 @@ public class MaCtgryController { * @return */ @Policy(AuthPolicy.RESTRICTED) - @RequestMapping(value = "/deleteCtgryDel", method = RequestMethod.POST) - public ResponseEntity deleteCtgryDel(MaCtgryVO vo) { + @RequestMapping(value = "/deleteCtgryDel", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity deleteCtgryDel(BOMaCtgryVO vo) { - return responseHandler.handleResponse( - sendToResrc.ofPost(RESRC.GCONEBO, "/admin/sys/ctgry/deleteBOCtgryManage", vo), - ReplyFromResrc::getReply - ); + //사용자 정보 추출 및 적용 + AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); + vo.setRegusr(user.getUserInnb()); + vo.setUpdusr(user.getUserInnb()); + + Map message = service.deleteBOCtgryManage(vo); + return ResponseEntity.ok( + WnbtResponse.builder() + .resBody(new WnbtResponseBody(message)) + .build() + ); +// return responseHandler.handleResponse( +// sendToResrc.ofPost(RESRC.GCONEBO, "/admin/sys/ctgry/deleteBOCtgryManage", vo), +// ReplyFromResrc::getReply +// ); } @@ -137,13 +194,17 @@ public class MaCtgryController { */ @Policy(AuthPolicy.RESTRICTED) @RequestMapping("/selectCtgryGoodsListInqurePopup") - public String selectCtgryGoodsListInqurePopup(MaCtgryVO vo, ModelMap model) { + public String selectCtgryGoodsListInqurePopup(BOMaCtgryVO vo, ModelMap model) { - responseHandler.handleResponse( - sendToResrc.ofPost(RESRC.GCONEBO, "/admin/sys/ctgry/selectBOCtgryGoodsListInqurePopup", vo), - model, - "resultMap" - ); + Map resultMap = new HashMap<>(); + resultMap.put("ctgryGoodsList", service.selectBOCtgryGoodsListInqurePopup(vo)); + + model.addAttribute("resultMap", resultMap); +// responseHandler.handleResponse( +// sendToResrc.ofPost(RESRC.GCONEBO, "/admin/sys/ctgry/selectBOCtgryGoodsListInqurePopup", vo), +// model, +// "resultMap" +// ); return "admin/sys/ctgry/MaCtgryGoodsListInqurePopupR"; } @@ -152,25 +213,50 @@ public class MaCtgryController { * @return */ @Policy(AuthPolicy.RESTRICTED) - @RequestMapping("/updateCtgryGoodsOrdr") - public ResponseEntity updateCtgryGoodsOrdr(MaCtgryVO vo) { + @RequestMapping(value="/updateCtgryGoodsOrdr", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity updateCtgryGoodsOrdr(BOMaCtgryVO vo) { - return responseHandler.handleResponse( - sendToResrc.ofPost(RESRC.GCONEBO, "/admin/sys/ctgry/updateBOCtgryGoodsOrdr", vo), - ReplyFromResrc::getReply + //사용자 정보 추출 및 적용 + AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); + vo.setUpdusr(user.getUserInnb()); + + Map message = service.updateBOCtgryGoodsOrdr(vo); + + return ResponseEntity.ok( + WnbtResponse.builder() + .resBody(new WnbtResponseBody(message)) + .build() ); +// return responseHandler.handleResponse( +// sendToResrc.ofPost(RESRC.GCONEBO, "/admin/sys/ctgry/updateBOCtgryGoodsOrdr", vo), +// ReplyFromResrc::getReply +// ); } @Policy(AuthPolicy.RESTRICTED) - @RequestMapping(value="/selectGoodsCategoryList") - public ResponseEntity selectGoodsCategoryList(CrmGoodsVO goodsVO, @CookieValue(value = "authSopmalCd") String authSopmalCd) { + @RequestMapping(value="/selectGoodsCategoryList", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity selectGoodsCategoryList(BOGoodsVO vo, @CookieValue(value = "authSopmalCd") String authSopmalCd) { + vo.setSopmalCd(authSopmalCd); - goodsVO.setSopmalCd(authSopmalCd); + AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); + if("01".equals(user.getSopmalCd())){ + vo.setSopmalCd(user.getSopmalCd()); + } - return responseHandler.handleResponse( - sendToResrc.ofPost(RESRC.GCONEBO, "/admin/sys/ctgry/selectBOGoodsCategoryList", goodsVO), - ReplyFromResrc::getReply - ); + Map content = new HashMap<>(); + + List godosCategoryList = service.selectGoodsCategoryList(vo); + + content.put("goodsCategoryList", godosCategoryList); + return ResponseEntity.ok( + WnbtResponse.builder() + .resBody(new WnbtResponseBody(content)) + .build() + ); +// return responseHandler.handleResponse( +// sendToResrc.ofPost(RESRC.GCONEBO, "/admin/sys/ctgry/selectBOGoodsCategoryList", goodsVO), +// ReplyFromResrc::getReply +// ); } } diff --git a/src/main/java/com/wb/domainserver/domain/gcone/setup/site/service/BOSiteService.java b/src/main/java/com/wb/domainserver/domain/gcone/setup/site/service/BOSiteService.java index 8c262bb0..7bc68fbf 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/setup/site/service/BOSiteService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/setup/site/service/BOSiteService.java @@ -174,7 +174,7 @@ public class BOSiteService { /** * 상품그룹 조회 - * @param sopmalCd + * @param goodsGroup * @return 상품그룹 정보 결과 */ public List selectBOSiteCartGoodsListInqire(BOGoodsgrpVO goodsGroup) { @@ -740,7 +740,7 @@ public class BOSiteService { throw new WnbtRestException(wre.getMessage()); } catch (Exception e){ log.error(e.getMessage()); - throw new Exception(e.getMessage()); + throw new WnbtRestException(e.getMessage()); }