From 51092eda49e6726d7bfd4b24cbd50f4203531850 Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 26 Sep 2022 16:49:51 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EA=B3=BC=EA=B1=B0=EC=82=AC?= =?UTF-8?q?=EA=B1=B4=EB=93=B1=EB=A1=9D=20=EC=9D=B4=EB=A0=A5=20=EC=A7=84?= =?UTF-8?q?=ED=96=89=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdjReqMgrPastService.java | 4 + .../service/AdjReqMgrPastVO.java | 97 +++++++++++++++++++ .../service/impl/AdjReqMgrPastDAO.java | 10 ++ .../impl/AdjReqMgrPastServiceImpl.java | 93 ++++++------------ .../web/AdjReqMgrPastController.java | 73 ++++++++++++-- .../adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml | 59 +++++++++++ 6 files changed, 265 insertions(+), 71 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index 58f2140d..63238907 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java @@ -30,5 +30,9 @@ public interface AdjReqMgrPastService { List selectAdrRpplPastList(AdjReqMgrPastVO adjReqMgrPastVO); AdjReqMgrPastVO findByIdAdrMgrMaster(AdjReqMgrPastVO adjPastVO); + + List findByAdrHstryId(AdjReqMgrPastVO adjReqMgrPastVO); + + ResponseEntity insertAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO); } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java index 9b9c885f..f5cfbd44 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastVO.java @@ -112,6 +112,7 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String addUsrId; /* ass.addUsrId | ass.assUsrTy | add_yn " */ private String addAgntList[]; /* ass.agntSeq | ass.assUsrTy | add_yn " */ + // 조정기일대리인 private String addUsrNmList[]; /* ass.agntSeq | ass.assUsrTy | add_yn " */ private String adrSn = ""; // 조정회차 @@ -190,6 +191,22 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { private String ccTyTx; private String appPlaceDetailTx; + + + /* 조정사건 이력 */ + private String adrHstrySeq; // 조정이력일련번호 + private String hstryDe; // 이력일시 + private String hstryCn; // 이력내용 + private String dlvrySeq; // 송달일련번호 + private String hstryDetailCn; // 이력비고내용 + private String refAdrSeq; // 참고용 조정 일련번호 + private String refAdrSn; // 참고용 조정회차 + private String refSeq1; // 참고용 일련번호 1 + private String refSeq2; // 참고용 일련번호 2 + + private String adrHstryList[]; + + public AdjReqMgrVO getAdrVO() { return adrVO; @@ -1238,6 +1255,86 @@ public class AdjReqMgrPastVO extends ComDefaultVO implements Serializable { public void setAppResultTx(String appResultTx) { this.appResultTx = appResultTx; } + + public String getAdrHstrySeq() { + return adrHstrySeq; + } + + public void setAdrHstrySeq(String adrHstrySeq) { + this.adrHstrySeq = adrHstrySeq; + } + + public String getHstryDe() { + return hstryDe; + } + + public void setHstryDe(String hstryDe) { + this.hstryDe = hstryDe; + } + + public String getHstryCn() { + return hstryCn; + } + + public void setHstryCn(String hstryCn) { + this.hstryCn = hstryCn; + } + + public String getDlvrySeq() { + return dlvrySeq; + } + + public void setDlvrySeq(String dlvrySeq) { + this.dlvrySeq = dlvrySeq; + } + + public String getHstryDetailCn() { + return hstryDetailCn; + } + + public void setHstryDetailCn(String hstryDetailCn) { + this.hstryDetailCn = hstryDetailCn; + } + + public String getRefAdrSeq() { + return refAdrSeq; + } + + public void setRefAdrSeq(String refAdrSeq) { + this.refAdrSeq = refAdrSeq; + } + + public String getRefAdrSn() { + return refAdrSn; + } + + public void setRefAdrSn(String refAdrSn) { + this.refAdrSn = refAdrSn; + } + + public String getRefSeq1() { + return refSeq1; + } + + public void setRefSeq1(String refSeq1) { + this.refSeq1 = refSeq1; + } + + public String getRefSeq2() { + return refSeq2; + } + + public void setRefSeq2(String refSeq2) { + this.refSeq2 = refSeq2; + } + + public String[] getAdrHstryList() { + return adrHstryList; + } + + public void setAdrHstryList(String[] adrHstryList) { + this.adrHstryList = adrHstryList; + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java index aafb8487..b361db7c 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -2,6 +2,7 @@ package kcc.kccadr.adjReqMgrPast.service.impl; import java.util.List; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; @@ -9,6 +10,7 @@ import kcc.kccadr.adjPgrMgr.drt.service.AssVO; import kcc.kccadr.adjReqMgrPast.service.AdjAssMgrPastVO; import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO; import kcc.kccadr.adjReqMgrPast.service.AdrMemDeptMgrPstVO; +import kcc.kccadr.cmm.RestResponse; @Repository("AdjReqMgrPastDAO") public class AdjReqMgrPastDAO extends EgovAbstractDAO { @@ -85,5 +87,13 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { public AdjReqMgrPastVO findByIdAdrMgrMaster(AdjReqMgrPastVO adjPastVO) { return (AdjReqMgrPastVO) select("adjReqMgrPastDAO.findByIdAdrMgrMaster", adjPastVO); } + + public List findByAdrHstryId(AdjReqMgrPastVO adjPastVO) { + return (List) list("adjReqMgrPastDAO.findByAdrHstryId", adjPastVO); + } + + public void insertAdjReqRecordAjax(AdjReqMgrPastVO adjPastVO) { + insert("adjReqMgrPastDAO.insertAdjReqRecordAjax", adjPastVO ); + } } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java index 478752c6..f57f7169 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -54,6 +54,10 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements @Resource(name = "egovPrtclManageGnrService") private EgovIdGnrService idgenPrtclSeqService; + // adr_hstry pk + @Resource(name="adrHstrySeqGnrService") + private EgovIdGnrService adrHstrySeqGnrService; + //암복호화 유틸 @Resource(name = "egovCryptoUtil") EgovCryptoUtil egovCryptoUtil; @@ -501,49 +505,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements @Override public ResponseEntity checkNInsertAprvlPastAjax(AdjReqMgrPastVO adjPastVO) throws Exception { - - // 공통 -// System.out.println(" 조정번호 :: "+adjPastVO.getAdrSeq()); -// System.out.println(" 조정차수 :: "+adjPastVO.getAdrSn()); -// -// // 기일정보 -// System.out.println(" 조정기일일 :: "+adjPastVO.getAppDeDay()); -// System.out.println(" 조정기일시 :: "+adjPastVO.getAppDeTime()); -// System.out.println(" 다음조정기일일 :: "+adjPastVO.getNextAppDeDay()); -// System.out.println(" 다음조정기일시 :: "+adjPastVO.getNextAppDeTime()); -// System.out.println(" 조정기일장소 :: "+adjPastVO.getAppPlaceTx()); -// System.out.println(" 기일조서내용 :: "+adjPastVO.getPrtclCn()); -// System.out.println(" 장소 Type :: "+adjPastVO.getAppPlaceTy()); -// System.out.println(" 장소 :: "+adjPastVO.getAppPlaceTx()); -// System.out.println(" 공개여부 :: "+adjPastVO.getOpenYn()); - /* - * TO_DATETIME('2015-08-10 16:04:56','YYYY-MM-DD HH24:MI:SS') - * 조정번호 :: ADR_0000000000002920 - * 조정차수 :: 1 - * 신청인 피신청인 정보 :: [신청|10|Y, 피신청|20|Y] - * 참관 대리인 정보 :: [35|참관대, 45|피찬관대] - * 조정기일일 :: 2022-09-01 - * 조정기일시 :: 14:00 - * 다음조정기일일 :: 2022-09-08 - * 다음조정기일시 :: 03:00 - * 조정기일장소 :: - * 조정부장 :: 222 - * 조정위원1 :: - * 조정위원2 :: - * 조서내용 :: 123123 - * */ - // add 정보 - - System.out.println(" 조정기일일 :: "+adjPastVO.getAppDeDay()); - System.out.println(" 조정기일시 :: "+adjPastVO.getAppDeTime()); - System.out.println(" 다음조정기일일 :: "+adjPastVO.getNextAppDeDay()); - System.out.println(" 다음조정기일시 :: "+adjPastVO.getNextAppDeTime()); - System.out.println(" 조정기일장소 :: "+adjPastVO.getAppPlaceTx()); - System.out.println(" 기일조서내용 :: "+adjPastVO.getPrtclCn()); - System.out.println(" 장소 Type :: "+adjPastVO.getAppPlaceTy()); - System.out.println(" 장소 :: "+adjPastVO.getAppPlaceTx()); - System.out.println(" 공개여부 :: "+adjPastVO.getOpenYn()); - this.insertAdjAssAndDataCleansing(adjPastVO); this.updateAdrPrtclMgrAndDataCleansing(adjPastVO); @@ -553,23 +514,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements @Override public ResponseEntity checkNUpdateAprvlPastAjax(AdjReqMgrPastVO adjPastVO) throws Exception { -// System.out.println(" 조정기일일 :: "+adjPastVO.getAppDeDay()); -// System.out.println(" 조정기일시 :: "+adjPastVO.getAppDeTime()); -// System.out.println(" 다음조정기일일 :: "+adjPastVO.getNextAppDeDay()); -// System.out.println(" 다음조정기일시 :: "+adjPastVO.getNextAppDeTime()); -// System.out.println(" 조정기일장소 :: "+adjPastVO.getAppPlaceTx()); -// System.out.println(" 기일조서내용 :: "+adjPastVO.getPrtclCn()); -// System.out.println(" 장소 Type :: "+adjPastVO.getAppPlaceTy()); -// System.out.println(" 장소 :: "+adjPastVO.getAppPlaceTx()); -// System.out.println(" 공개여부 :: "+adjPastVO.getOpenYn()); - - try { - this.updateAdjAssAndDataCleansing(adjPastVO); - - } catch (Exception e) { - e.printStackTrace(); - } - + this.updateAdjAssAndDataCleansing(adjPastVO); this.updateAdrPrtclMgrAndDataCleansing(adjPastVO); return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "기일조서 수정이 완료되었습니다.", LocalDateTime.now())); } @@ -690,7 +635,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO); } - for(String addusrList : adjPastVO.getAddAgntList()) { if(StringUtils.isNotEmpty(addusrList)) @@ -751,10 +695,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements @Override public List findAllAssPstInfo(AdjReqMgrPastVO adjReqMgrPastVO) { - -// List adjReqMgrPastListVO = adjReqMgrPastDAO.findAllAssPstInfo(adjReqMgrPastVO); -// List usrTyList = adjReqMgrPastListVO.stream().map(AdjReqMgrPastVO::getAssPstUsrTy).collect(Collectors.toList()); - return adjReqMgrPastDAO.findAllAssPstInfo(adjReqMgrPastVO); } @@ -764,6 +704,29 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements return adjReqMgrPastDAO.findByIdAdrMgrMaster(adjPastVO); } + + @Override + public List findByAdrHstryId(AdjReqMgrPastVO adjPastVO) { + return adjReqMgrPastDAO.findByAdrHstryId(adjPastVO); + } + + + @Override + public ResponseEntity insertAdjReqRecordAjax(AdjReqMgrPastVO adjPastVO) { + + + for(String adjHstry : adjPastVO.getAdrHstryList()) + { + //TODO 사건진행정보 반복문 + } + + + + + adjReqMgrPastDAO.insertAdjReqRecordAjax(adjPastVO); + return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "사건진행정보 등록이 완료되었습니다.", LocalDateTime.now())); + } + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 905d3a12..7675e854 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -305,8 +305,10 @@ public class AdjReqMgrPastController { //TODO 테스트로 인한 seq 코딩 adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920"); - System.out.println("adjReqMgrPastVO.getAdrSeq() !!! : "+ adjReqMgrPastVO.getAdrSeq()); + List adrHstryList = adjReqMgrPastService.findByAdrHstryId(adjReqMgrPastVO); + + model.addAttribute("adrHstryList", adrHstryList); model.addAttribute("adjReqMgrPastVO", adjReqMgrPastVO); @@ -327,8 +329,9 @@ public class AdjReqMgrPastController { * @return * @throws Exception */ - @RequestMapping(value = {"/kccadr/adjReqMgOff/insertAdjReqMgrPastAjax.do"}) - public ResponseEntity insertAdjReqMgrOffAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO + @RequestMapping(value = {"/kccadr/adjReqMgOff/insertAdjReqRecordAjax.do"}) +// public ResponseEntity insertAdjReqRecordAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO + public ResponseEntity insertAdjReqRecordAjax(AdjReqMgrPastVO adjReqMgrPastVO , RedirectAttributes redirectAttributes , HttpServletRequest request) throws Exception { @@ -341,6 +344,45 @@ public class AdjReqMgrPastController { return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); } + //사용자 유니크 아이디 받아오기 + adjReqMgrPastVO.setFrstRegisterId(userId); + + //조정신청, 대리인, 신청인 등록 처리 + return adjReqMgrPastService.insertAdjReqRecordAjax(adjReqMgrPastVO); + } + /* + * + */ + + /** + * @methodName : insertAdjReqMgrOffAjax + * @author : 이호영 + * @date : 2022.08.24 + * @description : 과거사건 기본정보등록 메서드 + * @param multiRequest + * @param adjReqMgrPastVO + * @param redirectAttributes + * @param request + * @return + * @throws Exception + */ + @RequestMapping(value = {"/kccadr/adjReqMgOff/insertAdjReqMgrPastAjax.do"}) + public ResponseEntity insertAdjReqMgrOffAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO + , RedirectAttributes redirectAttributes + , HttpServletRequest request) throws Exception { + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + if(userId.equals("")) { + // Unauthorized : 401, 권한 없음, 예를 들면, 로그인 페이지가 필요한 페이지를 로그인 없이 접속하려는 경우 반환되는 코드 (인증 실패) (Unauthorized) + return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); + } + //사용자 유니크 아이디 받아오기 adjReqMgrPastVO.setFrstRegisterId(userId); adjReqMgrPastVO.setLastUpdusrId(userId); @@ -350,6 +392,17 @@ public class AdjReqMgrPastController { } + /** + * @methodName : checkNInsertAprvlPastAjax + * @author : 이호영 + * @date : 2022.09.26 + * @description : 기일조서 insert + * @param adjReqMgrPastVO + * @param redirectAttributes + * @param request + * @return + * @throws Exception + */ @RequestMapping(value = {"/kccadr/adjReqMgOff/checkNInsertAprvlPastAjax.do"}) public ResponseEntity checkNInsertAprvlPastAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO , RedirectAttributes redirectAttributes @@ -372,9 +425,17 @@ public class AdjReqMgrPastController { return adjReqMgrPastService.checkNInsertAprvlPastAjax(adjReqMgrPastVO); } - - - + /** + * @methodName : checkNUpdateAprvlPastAjax + * @author : 이호영 + * @date : 2022.09.26 + * @description : 기일조서 update + * @param adjReqMgrPastVO + * @param redirectAttributes + * @param request + * @return + * @throws Exception + */ @RequestMapping(value = {"/kccadr/adjReqMgOff/checkNUpdateAprvlPastAjax.do"}) public ResponseEntity checkNUpdateAprvlPastAjax(@ModelAttribute("adrVO") AdjReqMgrPastVO adjReqMgrPastVO , RedirectAttributes redirectAttributes diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml index 44fbac9f..e5dd8258 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml @@ -557,4 +557,63 @@ + + + + + + + INSERT INTO ADR_ASS_MGR_PST ( + ADR_SEQ + , ADR_SN + , ASS_PST_SEQ + , ASS_PST_USR_TY + , ASS_PST_USR_NM + , ADD_YN + , ADD_CHG_YN + , FRST_REGIST_PNTTM + , FRST_REGISTER_ID + , LAST_UPDT_PNTTM + , LAST_UPDUSR_ID + ) VALUES + + ( + #[].adrSeq# + , #[].adrSn# + , #[].assPstSeq# + , #[].assPstUsrTy# + , #[].assPstUsrNm# + , #[].addYn# + , 'N' + , NOW() + , #[].frstRegisterId# + , NOW() + , #[].lastUpdusrId# + ) + + + \ No newline at end of file