itfirst/sake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fo bo 머지작업(mngr)

Browse Source
This commit is contained in:
jazz
2025-11-17 17:25:24 +09:00
parent 3db04aba20
commit ac993b597e
2 changed files with 122 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
src/main/java/com/wb/domainserver/domain/admin/sys/ctgry/controller/MaCtgryController.java
View File

@@ -3,12 +3,21 @@ package com.wb.domainserver.domain.admin.sys.ctgry.controller;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.nimbusds.jose.shaded.gson.Gson; import com.nimbusds.jose.shaded.gson.Gson;
import com.wb.domainserver.common.msg.GconeMessageSource; 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.admin.sys.ctgry.vo.MaCtgryVO;
import com.wb.domainserver.domain.crm.ordr.vo.CrmGoodsVO; 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.exception.WnbtRestException;
import com.wb.domainserver.response.WnbtResponse; import com.wb.domainserver.response.WnbtResponse;
import com.wb.domainserver.response.WnbtResponseBody; import com.wb.domainserver.response.WnbtResponseBody;
import com.wb.domainserver.response.WnbtWebClientResponseHandler; 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.communicate.*;
import com.wb.domainserver.util.file.service.FileStorageService; import com.wb.domainserver.util.file.service.FileStorageService;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
@@ -16,6 +25,7 @@ import jakarta.servlet.http.HttpSession;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
@@ -64,18 +74,41 @@ public class MaCtgryController {
@Autowired @Autowired
private FileStorageService filestore; private FileStorageService filestore;
@Autowired
private BOMaCtgryService service;
@Autowired
private BOGoodsinfoService giService;
@Autowired
private BOMaComncdService boMaComncdService;
/** /**
* 카테고리 수정 화면이동 * 카테고리 수정 화면이동
* @return * @return
*/ */
@Policy(AuthPolicy.RESTRICTED) @Policy(AuthPolicy.RESTRICTED)
@RequestMapping("/selectCtgrySaveForm") @RequestMapping("/selectCtgrySaveForm")
public String selectCtgrySaveForm(MaCtgryVO vo, ModelMap model) { public String selectCtgrySaveForm(BOMaCtgryVO vo, ModelMap model) {
Map<String,Object> 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<String, Object> 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<String,Object> resultMap = responseHandler.handleResponseAsMap(
// sendToResrc.ofPost(RESRC.GCONEBO, "/admin/sys/ctgry/selectBOCtgryManage",vo)
// );
List<Map<String, Object>> resultMapList = (List<Map<String, Object>>) resultMap.get("ctgryList"); List<Map<String, Object>> resultMapList = (List<Map<String, Object>>) resultMap.get("ctgryList");
String jsonMenuList = new Gson().toJson(resultMapList); String jsonMenuList = new Gson().toJson(resultMapList);
@@ -90,8 +123,8 @@ public class MaCtgryController {
* @return * @return
*/ */
@Policy(AuthPolicy.RESTRICTED) @Policy(AuthPolicy.RESTRICTED)
@RequestMapping(value = "/updateCtgryUpdt", method = RequestMethod.POST) @RequestMapping(value = "/updateCtgryUpdt", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<WnbtResponse> updateCtgryUpdt(MaCtgryVO vo, HttpServletRequest request) { public ResponseEntity<WnbtResponse> updateCtgryUpdt(BOMaCtgryVO vo, HttpServletRequest request) {
request.setAttribute("shopCd", vo.getSopmalCd()); request.setAttribute("shopCd", vo.getSopmalCd());
@@ -109,10 +142,23 @@ public class MaCtgryController {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
} }
return responseHandler.handleResponse( Map<String, Object> message = new HashMap<>();
sendToResrc.ofPost(RESRC.GCONEBO, "/admin/sys/ctgry/updateBOCtgryManage", vo), //사용자 정보 추출 및 적용
ReplyFromResrc::getReply 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 * @return
*/ */
@Policy(AuthPolicy.RESTRICTED) @Policy(AuthPolicy.RESTRICTED)
@RequestMapping(value = "/deleteCtgryDel", method = RequestMethod.POST) @RequestMapping(value = "/deleteCtgryDel", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<WnbtResponse> deleteCtgryDel(MaCtgryVO vo) { public ResponseEntity<WnbtResponse> deleteCtgryDel(BOMaCtgryVO vo) {
return responseHandler.handleResponse( //사용자 정보 추출 및 적용
sendToResrc.ofPost(RESRC.GCONEBO, "/admin/sys/ctgry/deleteBOCtgryManage", vo), AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
ReplyFromResrc::getReply vo.setRegusr(user.getUserInnb());
); vo.setUpdusr(user.getUserInnb());
Map<String, Object> 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) @Policy(AuthPolicy.RESTRICTED)
@RequestMapping("/selectCtgryGoodsListInqurePopup") @RequestMapping("/selectCtgryGoodsListInqurePopup")
public String selectCtgryGoodsListInqurePopup(MaCtgryVO vo, ModelMap model) { public String selectCtgryGoodsListInqurePopup(BOMaCtgryVO vo, ModelMap model) {
responseHandler.handleResponse( Map<String, Object> resultMap = new HashMap<>();
sendToResrc.ofPost(RESRC.GCONEBO, "/admin/sys/ctgry/selectBOCtgryGoodsListInqurePopup", vo), resultMap.put("ctgryGoodsList", service.selectBOCtgryGoodsListInqurePopup(vo));
model,
"resultMap" model.addAttribute("resultMap", resultMap);
); // responseHandler.handleResponse(
// sendToResrc.ofPost(RESRC.GCONEBO, "/admin/sys/ctgry/selectBOCtgryGoodsListInqurePopup", vo),
// model,
// "resultMap"
// );
return "admin/sys/ctgry/MaCtgryGoodsListInqurePopupR"; return "admin/sys/ctgry/MaCtgryGoodsListInqurePopupR";
} }
@@ -152,25 +213,50 @@ public class MaCtgryController {
* @return * @return
*/ */
@Policy(AuthPolicy.RESTRICTED) @Policy(AuthPolicy.RESTRICTED)
@RequestMapping("/updateCtgryGoodsOrdr") @RequestMapping(value="/updateCtgryGoodsOrdr", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<WnbtResponse> updateCtgryGoodsOrdr(MaCtgryVO vo) { public ResponseEntity<WnbtResponse> updateCtgryGoodsOrdr(BOMaCtgryVO vo) {
return responseHandler.handleResponse( //사용자 정보 추출 및 적용
sendToResrc.ofPost(RESRC.GCONEBO, "/admin/sys/ctgry/updateBOCtgryGoodsOrdr", vo), AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
ReplyFromResrc::getReply vo.setUpdusr(user.getUserInnb());
Map<String, Object> 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) @Policy(AuthPolicy.RESTRICTED)
@RequestMapping(value="/selectGoodsCategoryList") @RequestMapping(value="/selectGoodsCategoryList", produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<WnbtResponse> selectGoodsCategoryList(CrmGoodsVO goodsVO, @CookieValue(value = "authSopmalCd") String authSopmalCd) { public ResponseEntity<WnbtResponse> 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( Map<String, Object> content = new HashMap<>();
sendToResrc.ofPost(RESRC.GCONEBO, "/admin/sys/ctgry/selectBOGoodsCategoryList", goodsVO),
ReplyFromResrc::getReply 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
// );
} }
} }

4
src/main/java/com/wb/domainserver/domain/gcone/setup/site/service/BOSiteService.java
View File

@@ -174,7 +174,7 @@ public class BOSiteService {
/** /**
* 상품그룹 조회 * 상품그룹 조회
* @param sopmalCd * @param goodsGroup
* @return 상품그룹 정보 결과 * @return 상품그룹 정보 결과
*/ */
public List<DataMap> selectBOSiteCartGoodsListInqire(BOGoodsgrpVO goodsGroup) { public List<DataMap> selectBOSiteCartGoodsListInqire(BOGoodsgrpVO goodsGroup) {
@@ -740,7 +740,7 @@ public class BOSiteService {
throw new WnbtRestException(wre.getMessage()); throw new WnbtRestException(wre.getMessage());
} catch (Exception e){ } catch (Exception e){
log.error(e.getMessage()); log.error(e.getMessage());
throw new Exception(e.getMessage()); throw new WnbtRestException(e.getMessage());
} }