fo bo 머지작업(mngr)

src/main/java/com/wb/domainserver/domain/mngr/matchmb/controller/MatchMemberController.java

@@ -1,15 +1,27 @@
 package com.wb.domainserver.domain.mngr.matchmb.controller;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.wb.domainserver.domain.gcone.analytics.service.BOAnalyticsService;
+import com.wb.domainserver.domain.gcone.analytics.vo.BOAnanlyticsErpGoodsSrchVO;
+import com.wb.domainserver.domain.gcone.common.service.BOCommonService;
+import com.wb.domainserver.domain.gcone.match.service.BOMatchMemberService;
+import com.wb.domainserver.domain.gcone.match.vo.BOMatchMemberVO;
 import com.wb.domainserver.domain.mngr.analytics.vo.AnalyticsErpGoodsSrchVO;
 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.security.authorization.annotation.AuthPolicy;
 import com.wb.domainserver.security.authorization.annotation.Policy;
 import com.wb.domainserver.util.communicate.RESRC;
 import com.wb.domainserver.util.communicate.ReplyFromResrc;
 import com.wb.domainserver.util.communicate.SendToResrc;
+import com.wb.domainserver.util.dataaccess.DataMap;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -18,6 +30,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 @Controller
@@ -32,6 +47,17 @@ public class MatchMemberController {
 
     @Autowired
     private SendToResrc sendToResrc;
+    @Autowired
+    private BOAnalyticsService service;
+
+    @Autowired
+    private BOCommonService boCommonService;
+
+    @Autowired
+    private BOMatchMemberService matchMemberService;
+
+    @Value("${secret.key}")
+    private String secretKey;
 
     /**
      * 회원 매칭 화면
@@ -40,15 +66,28 @@ public class MatchMemberController {
 
     @Policy(AuthPolicy.RESTRICTED)
     @RequestMapping(value ="/view/match-member")
-    public String matchMember (AnalyticsErpGoodsSrchVO vo , ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+    public String matchMember (BOAnanlyticsErpGoodsSrchVO vo , ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
         log.debug("matchMember()");
-
         vo.setSopmalCd(authSopmalCd);
-        responseHandler.handleResponse(
-                sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/match/view/match-member", vo),
-                model,
-                "resultMap"
-        );
+
+        // 작성자 정보 할당
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        if("01".equals(user.getSysDvCd())){
+            vo.setSopmalCd(user.getSopmalCd());
+        }
+
+        log.debug(" 검색 파라미터 확인 리스트 검색조건 : {}", vo);
+
+        DataMap content = new DataMap();
+        List<DataMap> sopmalList = service.selectSopmalCd();
+        content.put("sopmalList",sopmalList);
+
+        model.addAttribute("resultMap",content);
+//        responseHandler.handleResponse(
+//                sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/match/view/match-member", vo),
+//                model,
+//                "resultMap"
+//        );
 
         return "mngr/match/MatchMember";
     }
@@ -59,12 +98,38 @@ public class MatchMemberController {
      */
 
     @Policy(AuthPolicy.RESTRICTED)
-    @RequestMapping(value="/select/match-member",  method = RequestMethod.POST)
+    @RequestMapping(value="/select/match-member",  method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<WnbtResponse> selectMatchMember(@RequestBody Map<String,Object> jsonData){
-        return responseHandler.handleResponse(
-                sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/match/select/match-member", jsonData),
-                ReplyFromResrc::getReply
+
+        log.debug("파라미터당 " + jsonData);
+        String telNb = jsonData.get("telNb").toString();
+        List<BOMatchMemberVO> result = new ArrayList<>();
+        List<String> telnbList = Arrays.asList(telNb.split("\\s+"));
+
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+
+        jsonData.put("secretKey",boCommonService.selectSecretkey());
+        jsonData.put("telnbList",telnbList);
+
+        DataMap content = new DataMap();
+
+        result = matchMemberService.selectMatchMember(jsonData);
+
+        log.debug("결과 " + result);
+
+        content.put("matchMemberList",result);
+        content.put("status", "success");
+        content.put("message", "데이터 추출 성공");
+
+        return ResponseEntity.ok(
+                WnbtResponse.builder()
+                        .resBody(new WnbtResponseBody(content))
+                        .build()
         );
+//        return responseHandler.handleResponse(
+//                sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/match/select/match-member", jsonData),
+//                ReplyFromResrc::getReply
+//        );
     }
 
 }