From 736f08accc8a3acb01ec4d0db82977a89ad6246b Mon Sep 17 00:00:00 2001 From: junheelee Date: Fri, 2 Sep 2022 17:31:13 +0900 Subject: [PATCH] . --- .../controller/AcntCrtfyhpController.java | 53 ++++++++++++++----- .../crtfyhp/model/AcntCrtfyhpRsModel.java | 9 ++++ .../crtfyhp/service/AcntCrtfyhpService.java | 2 + 3 files changed, 50 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/palnet/biz/api/acnt/crtfyhp/model/AcntCrtfyhpRsModel.java diff --git a/src/main/java/com/palnet/biz/api/acnt/crtfyhp/controller/AcntCrtfyhpController.java b/src/main/java/com/palnet/biz/api/acnt/crtfyhp/controller/AcntCrtfyhpController.java index b4fb9ba..c079123 100644 --- a/src/main/java/com/palnet/biz/api/acnt/crtfyhp/controller/AcntCrtfyhpController.java +++ b/src/main/java/com/palnet/biz/api/acnt/crtfyhp/controller/AcntCrtfyhpController.java @@ -12,9 +12,8 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.palnet.biz.api.acnt.crtfyhp.model.AcntCrtfyhpRsModel; import com.palnet.biz.api.acnt.crtfyhp.service.AcntCrtfyhpService; -import com.palnet.biz.api.acnt.cstmr.controller.AcntCstmrController; -import com.palnet.biz.api.acnt.cstmr.service.AcntCstmrService; import com.palnet.biz.api.comn.response.BasicResponse; import com.palnet.biz.api.comn.response.ErrorResponse; import com.palnet.biz.api.comn.response.SuccessResponse; @@ -107,22 +106,48 @@ public class AcntCrtfyhpController { } + //아이디 찾기 시 인증번호 발송 로직 @GetMapping(value = "/find/sendForId") - public boolean certifNum(String memberName, String hpno) throws Exception{ - boolean result = service.certifNum(memberName, hpno); - - log.info("result>>>>>>>>>>>>>>>>>>>>>>>> {}",result); - - return result; + public ResponseEntity sendForId(String memberName, String hpno) { + Map resultMap = new HashMap(); + + if(memberName == null || hpno == null) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + try { + boolean result = service.certifNum(memberName, hpno); + resultMap.put("result" , result); + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); } + return ResponseEntity.ok().body(new SuccessResponse(resultMap)); + } + + //아이디 찾기 @GetMapping(value = "/find/findUserId") - public String findUserId(String memberName, String hpno) throws Exception{ - String result = service.findUserId(memberName,hpno); - - log.info("result>>>>>>>>>>>>>>>>>>>>>>>> {}",result); - - return result; + public ResponseEntity findUserId(String memberName, String hpno) { + AcntCrtfyhpRsModel model = new AcntCrtfyhpRsModel(); + + if(memberName == null || hpno == null) { + return ResponseEntity.status(HttpStatus.OK) + .body(new ErrorResponse(RSErrorCode.ER_PARAM)); + } + + try { + model.setUserId(service.findUserId(memberName, hpno)); + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); } + + return ResponseEntity.ok().body( new SuccessResponse<>(model)); + } + @GetMapping(value = "/find/sendForPw") public boolean certifNumPw(String userId, String hpno) throws Exception{ boolean result = service.certifPw(userId, hpno); diff --git a/src/main/java/com/palnet/biz/api/acnt/crtfyhp/model/AcntCrtfyhpRsModel.java b/src/main/java/com/palnet/biz/api/acnt/crtfyhp/model/AcntCrtfyhpRsModel.java new file mode 100644 index 0000000..d1d01fc --- /dev/null +++ b/src/main/java/com/palnet/biz/api/acnt/crtfyhp/model/AcntCrtfyhpRsModel.java @@ -0,0 +1,9 @@ +package com.palnet.biz.api.acnt.crtfyhp.model; + +import lombok.Data; + +@Data +public class AcntCrtfyhpRsModel { +// private int errCode; + private String userId; +} diff --git a/src/main/java/com/palnet/biz/api/acnt/crtfyhp/service/AcntCrtfyhpService.java b/src/main/java/com/palnet/biz/api/acnt/crtfyhp/service/AcntCrtfyhpService.java index 7d56657..dc9cac9 100644 --- a/src/main/java/com/palnet/biz/api/acnt/crtfyhp/service/AcntCrtfyhpService.java +++ b/src/main/java/com/palnet/biz/api/acnt/crtfyhp/service/AcntCrtfyhpService.java @@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; +import com.palnet.biz.api.acnt.crtfyhp.model.AcntCrtfyhpRsModel; import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRqModel; import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrRsModel; import com.palnet.biz.api.acnt.cstmr.model.AnctCstmrTermsModel; @@ -220,6 +221,7 @@ public class AcntCrtfyhpService { String name = EncryptUtils.encrypt(memberName); String phone = EncryptUtils.encrypt(hpno); String resultFindId = cstmrQuery.findUserId(name,phone); + return resultFindId; }