diff --git a/src/main/java/kcc/com/cmm/service/impl/EgovCmmUseServiceImpl.java b/src/main/java/kcc/com/cmm/service/impl/EgovCmmUseServiceImpl.java index 96e27afe..7dd642a4 100644 --- a/src/main/java/kcc/com/cmm/service/impl/EgovCmmUseServiceImpl.java +++ b/src/main/java/kcc/com/cmm/service/impl/EgovCmmUseServiceImpl.java @@ -116,7 +116,7 @@ public class EgovCmmUseServiceImpl extends EgovAbstractServiceImpl implements Eg @Override public String selectCmmCodeDetailCode(ComDefaultCodeVO vo) { String resultCodeNm = ""; - if(StringUtils.isNotBlank(vo.getCodeId()) && StringUtils.isNotBlank(vo.getCode())){ + if(StringUtils.isNotBlank(vo.getCodeId())){ CmmnDetailCode code = cmmUseDAO.selectCmmCodeDetailValue(vo); if(code != null){ resultCodeNm = code.getCode(); diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java index 4b72d175..83ec9994 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java @@ -25,6 +25,8 @@ public interface CndtnTrgtMngService { List selectDuplChk(CndtnTrgtMngVO cndtnTrgtInfoMngVO); + void bulkInsert(List trgtExcelVOList); + diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java index 3d66d052..958bb33b 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java @@ -258,6 +258,7 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable { @Override public String toString() { return "\n CndtnTrgtMngVO => \n" + + " sspnIdtmtTrgtOrd=[" + sspnIdtmtTrgtOrd + "] // pk\n" + " reqPnttm=[" + reqPnttm + "] // 요청 점수 시간\n" + ", vntYear=[" + vntYear + "] // 사건 년도\n" + ", vntNmbr=[" + vntNmbr + "] // 사건 번호\n" diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java index 62d88c8c..b58fe0ca 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java @@ -145,5 +145,9 @@ public class CndtnTrgtMngDAO extends EgovAbstractDAO { return (List) list("cndtnTrgtInfoMngDAO.selectDuplChk", cndtnTrgtInfoMngVO); } + public void bulkInsert(List trgtExcelVOList) { + insert("cndtnTrgtInfoMngDAO.bulkInsert", trgtExcelVOList); + } + } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java index a9a24f0a..610d6f1c 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java @@ -74,4 +74,9 @@ public class CndtnTrgtMngServiceImpl implements CndtnTrgtMngService { return cndtnTrgtInfoMngDAO.selectDuplChk(cndtnTrgtInfoMngVO); } + @Override + public void bulkInsert(List trgtExcelVOList) { + cndtnTrgtInfoMngDAO.bulkInsert(trgtExcelVOList); + } + } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java index 51d06c58..92203bdc 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java @@ -23,6 +23,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import egovframework.rte.fdl.cmmn.exception.FdlException; import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.ComDefaultCodeVO; @@ -579,6 +580,7 @@ public class CndtnTrgtMngController { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); + modelAndView.addObject("result", "success"); //로그인 처리==================================== //로그인 정보 가져오기 @@ -608,33 +610,76 @@ public class CndtnTrgtMngController { List fileList = fileService.selectFileInfs(fileVO); if(fileList.size() > 0) { - System.out.println(fileList.get(0).toString()); + LOGGER.info(" ++ SAVE FILE INFO :: [{}] ", fileList.get(0).toString()); FileVO fileInfoVO = fileList.get(0); -// String filePathAndNm = fileInfoVO.getFileStreCours() + fileInfoVO.getStreFileNm()+"."+fileInfoVO.getFileExtsn(); + // 파일경로 + 파일명 생성 String filePathAndNm = fileInfoVO.getFileStreCours() + fileInfoVO.getStreFileNm(); - - - LOGGER.info(" ++ filePathAndNm :: [{}]", filePathAndNm); - TrgtExcelReader reader = new TrgtExcelReader(filePathAndNm); + TrgtExcelReader excelReader = new TrgtExcelReader(filePathAndNm); try { - long startTime = System.currentTimeMillis(); - List trgtExcelVOList = reader.readExcelFile(); - - long endTime = System.currentTimeMillis(); - double duration = (endTime - startTime) / 1000.0; // 밀리초를 초로 변환 + LOGGER.info(" ++ Excel Read Start"); + // 엑셀 Read + List trgtExcelVOList = excelReader.readExcelFile(); + LOGGER.info(" ++ Excel Read End Total :: [{}]", trgtExcelVOList.size()); - System.out.println("Execution time: " + duration + " milliseconds"); - LOGGER.info("trgtExcelVOList.size() :: [{}]", trgtExcelVOList.size()); - LOGGER.info("trgtExcelVOList.get(0).toString() :: [{}]", trgtExcelVOList.get(0).toString()); + + int i = 0 ; + for(CndtnTrgtMngVO cndtnTrgtMngVO : trgtExcelVOList) + { + cndtnTrgtMngVO.setSspnIdtmtTrgtOrd(trgtOrdService.getNextStringId()); + cndtnTrgtMngVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id + // 의뢰 상태코드 + ComDefaultCodeVO comDefaultReqCodeVO = new ComDefaultCodeVO(); + comDefaultReqCodeVO.setCodeId("VEA005"); + comDefaultReqCodeVO.setCodeDc(cndtnTrgtMngVO.getReqStateCd()); + cndtnTrgtMngVO.setReqStateCd( egovCmmUseService.selectCmmCodeDetailCode(comDefaultReqCodeVO) ); + + // 교육상태코드 + ComDefaultCodeVO comDefaultEduCodeVO = new ComDefaultCodeVO(); + comDefaultEduCodeVO.setCodeId("VEA002"); + comDefaultEduCodeVO.setCodeDc(cndtnTrgtMngVO.getEduStateCd()); + cndtnTrgtMngVO.setEduStateCd( egovCmmUseService.selectCmmCodeDetailCode(comDefaultEduCodeVO) ); + + // 교육상태코드 + // 설별 + ComDefaultCodeVO comDefaultSexCodeVO = new ComDefaultCodeVO(); + comDefaultSexCodeVO.setCodeId("COM014"); + comDefaultSexCodeVO.setCodeDc(cndtnTrgtMngVO.getSex()); + cndtnTrgtMngVO.setSex( egovCmmUseService.selectCmmCodeDetailCode(comDefaultSexCodeVO) ); + + + cndtnTrgtMngVO = egovCryptoUtil.encryptCndtnTrgtMngVOInfo(cndtnTrgtMngVO); + + LOGGER.info(cndtnTrgtMngVO.toString()); + + + // 이수 상태일 경우 vea_aplct_detail_info TB에 INSERT 해야함 +// if("20".equals(cndtnTrgtMngVO.getEduStateCd())) +// { +// CndtnTrgtMngVO veaAplctDetailInfoVO = new CndtnTrgtMngVO(); +// +// } + + + + // TEST +// i++; +// if(i==10) +// break; + + } + + LOGGER.info(" 엑셀 insert :: [{}]건", trgtExcelVOList.size()); + cndtnTrgtInfoMngService.bulkInsert(trgtExcelVOList); } catch (Exception e) { // TODO: handle exception + modelAndView.addObject("result", "fail"); e.printStackTrace(); } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java index 41bb9b55..97679314 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -990,16 +990,14 @@ public class CndtnPrcsInfoMngController { SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 -// System.out.println("vEEduAplctVO.getPrcsAplctPrdOrd() : "+ vEEduAplctVO.getPrcsAplctPrdOrd()); - System.out.println("vEEduAplctVO.getEduAplctOrd() : "+ vEEduAplctVO.getEduAplctOrd()); - // 이수 상태라면 + // 이수 상태라면 이수번호 생성 if("20".equals(vEEduAplctVO.getAplctStateCd())) { vEEduAplctVO.setEduCmpltCrtfcNmbr(this.cmpltChkAndMakeNmber(vEEduAplctVO.getLctrDivCd())); }else if("10".equals(vEEduAplctVO.getAplctStateCd())) { vEEduAplctVO.setEduCmpltCrtfcNmbr("DEL"); } - // 신청상세정보 상태값 update + // 신청상세정보 상태값 update vEEduAplctVO.setLastUpdusrId(loginVO.getUniqId()); vEEduMIXService.updateAplctStateCd(vEEduAplctVO); @@ -1008,6 +1006,8 @@ public class CndtnPrcsInfoMngController { vEEduMIXService.updateEduStateCd(vEEduAplctVO); + // 알림 영역 + // 알림 영역 // 알림 영역 List eduAplctOrdList = new ArrayList(); eduAplctOrdList.add(vEEduAplctVO.getEduAplctOrd()); diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml index 117ecfaf..0e48fac7 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml @@ -39,6 +39,7 @@ , prcs_aplct_prd_ord_cmplt , edu_aplct_ord + , rmrks @@ -103,7 +104,45 @@ , #reqStateCd# , #atchFileId# , '' - , '' + , '' + , #rmrks# + ) + + + + + + INSERT INTO ( + + )VALUES( + + #[]sspnIdtmtTrgtOrd# + , #[]userId# + , '' + , SYSDATE + , #[]frstRegisterId# + , '' + , '' + , #[]trgtNm# + , #[]clphone# + , #[]dBirth# + , #[]addr# + , #[]addrDetail# + , #[]post# + , #[]email# + , #[]reqPnttm# + , #[]vntYear# + , #[]vntNmbr# + , #[]cmptntAthrt# + , #[]sex# + , #[]reqNmbr# + , #[]prsctrNm# + , #[]reqStateCd# + , #[]atchFileId# + , '' + , '' + , #[]rmrks# + )