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 e44aaa5c..1609ef50 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -511,7 +511,12 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements @Override public AdjReqMgrPastVO selectMemAss(AdjReqMgrPastVO adjReqMgrPastVO) { AdjReqMgrPastVO adjPastVO = adjReqMgrPastDAO.selectMemAss(adjReqMgrPastVO); - adjPastVO.setAssPstUsrNm(MagicDBAPIUtil.decryptOnlyOneString(adjPastVO.getAssPstUsrNm()) ); + try { + if(StringUtil.isNotEmpty(adjReqMgrPastVO.getAdrSeq())) + adjPastVO.setAssPstUsrNm(MagicDBAPIUtil.decryptOnlyOneString(adjPastVO.getAssPstUsrNm()) ); + } catch (Exception e) { + // TODO: handle exception + } return adjPastVO; } @@ -1103,6 +1108,97 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements // 기일조서 정보 List adrPrtclMgrInfoVO = adjReqMgrPastDAO.selectAdrPrtclMgrInfo(adjReqMgrPastVO); + // 조정 조사관 디크립트 + adjReqMgrPastMainVO.setAssPstUsrNm(MagicDBAPIUtil.decryptOnlyOneString(adjReqMgrPastMainVO.getAssPstUsrNm())); + + try { + // 복호화 + adrPrtclMgrInfoVO.forEach(t->{ + /* + System.out.println("t.getRpplNm() " +t.getRpplNm() ); // 신청인 + System.out.println("t.getDeRpplNm() " +t.getDeRpplNm()); // 대리인 + System.out.println("t.getReRpplNm() " +t.getReRpplNm()); // 피신청인 + System.out.println("t.getReDeRpplNm() " +t.getReDeRpplNm()); // 피신청 대리인 + + + System.out.println("t.getObRpplNm() " +t.getObRpplNm()); // 신-참관대리인 + System.out.println("t.getReObRpplNm() " +t.getReObRpplNm()); // 피-참관대리인 + System.out.println("t.getAddUsrNm0() " +t.getAddUsrNm0()); // 조정부장 + System.out.println("t.getAddUsrNm1() " +t.getAddUsrNm1()); // 조정위원 ','로 구분 최대 2명 + */ + + if(StringUtils.isNotEmpty(t.getRpplNm())) + { + + // 신청인 + t.setRpplNm(MagicDBAPIUtil.decryptOnlyOneString(t.getRpplNm().substring(0, t.getRpplNm().indexOf("=/")+1))+"["+t.getRpplNm().split("=/")[1]+"]"); // 신청인 + + + // 조정위원 ','로 구분 최대 2명 + if(t.getAddUsrNm1().indexOf(",") < 0) + { + t.setAddUsrNm1(MagicDBAPIUtil.decryptOnlyOneString(t.getAddUsrNm1())); + } else { + String[] addUsrNmArr = t.getAddUsrNm1().split(","); + String temp = ""; + for(String strNm : addUsrNmArr) + { + if("".equals(temp)) + temp = MagicDBAPIUtil.decryptOnlyOneString(strNm); + else + temp = temp+","+MagicDBAPIUtil.decryptOnlyOneString(strNm); + } + t.setAddUsrNm1(temp); + } + + // 피신청인 ','로 구분 최대 5명 + if(t.getReRpplNm().indexOf(",") < 0) + { + t.setReRpplNm(MagicDBAPIUtil.decryptOnlyOneString(t.getReRpplNm())); + } else { + String[] reRpplNmArr = t.getReRpplNm().split(","); + String temp = ""; + for(String strNm : reRpplNmArr) + { + if("".equals(temp)) + temp = MagicDBAPIUtil.decryptOnlyOneString(strNm.substring(0, strNm.indexOf("=/")+1))+"["+strNm.split("=/")[1]+"]"; + else + temp = temp+","+MagicDBAPIUtil.decryptOnlyOneString(strNm.substring(0, strNm.indexOf("=/")+1))+"["+strNm.split("=/")[1]+"]"; + } + t.setReRpplNm(temp); + } + + // 피신청 대리인 + if(StringUtils.isNotEmpty(t.getReDeRpplNm())) + t.setReDeRpplNm(MagicDBAPIUtil.decryptOnlyOneString(t.getReDeRpplNm().substring(0, t.getReDeRpplNm().indexOf("=/")+1))+"["+t.getReDeRpplNm().split("=/")[1]+"]"); // 피신청인 + + // 신청 대리인 + if(StringUtils.isNotEmpty(t.getDeRpplNm())) + t.setDeRpplNm(MagicDBAPIUtil.decryptOnlyOneString(t.getDeRpplNm().substring(0, t.getDeRpplNm().indexOf("=/")+1))+"["+t.getDeRpplNm().split("=/")[1]+"]"); // 대리인 + // 신-참관대리인 + if(StringUtils.isNotEmpty(t.getObRpplNm())) + t.setObRpplNm(MagicDBAPIUtil.decryptOnlyOneString(t.getObRpplNm())); + + // 피-참관대리인 + if(StringUtils.isNotEmpty(t.getReObRpplNm())) + t.setReObRpplNm(MagicDBAPIUtil.decryptOnlyOneString(t.getReObRpplNm())); // 피-참관대리인 + // 조정 부장 + t.setAddUsrNm0(MagicDBAPIUtil.decryptOnlyOneString(t.getAddUsrNm0())); // 조정부장 + } + + + +// t.setRpplNm(MagicDBAPIUtil.decryptOnlyOneString(t.getRpplNm())); +// t.setDeRpplNm(MagicDBAPIUtil.decryptOnlyOneString(t.getDeRpplNm())); +// t.setObRpplNm(MagicDBAPIUtil.decryptOnlyOneString(t.getObRpplNm())); + }); + + } catch (Exception e) { + e.printStackTrace(); + // TODO: handle exception + } + + decryptInfomation(adjReqMgrPastMainVO); map.put("adjReqMgrPastMainVO", adjReqMgrPastMainVO); map.put("adrPrtclMgrInfoVO", adrPrtclMgrInfoVO); diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 23b50ad6..bfb1d45b 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -24,6 +24,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import com.dreamsecurity.magicline.util.Log; + import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; @@ -119,7 +121,6 @@ public class AdjReqMgrPastController { */ @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastBasicRegist.do") public String adjReqMgrPastBasicRegist(@ModelAttribute("searchVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { - //TODO TEST // adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920"); @@ -128,12 +129,13 @@ public class AdjReqMgrPastController { LoginVO user = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; model.addAttribute("user", user); + // 공통코드 조회 List codeResult = cmmUseService.selectCmmCodeDetail("CC001"); model.addAttribute("CC001", codeResult); int reqPerTotCnt = 0; - + if(StringUtils.isNotBlank(adjReqMgrPastVO.getAdrSeq())) { //오프라인 조정 신청 정보 불러오기. @@ -148,14 +150,13 @@ public class AdjReqMgrPastController { model.addAttribute("adrVO", adjReqMgrPastVO); } - + model.addAttribute("prtclSize", adjReqMgrPastService.selectAdrPrtclMgrPastList(adjReqMgrPastVO).size()); // 조정부 / 조사관 정보 - model.addAttribute("memAss", adjReqMgrPastService.selectMemAss(adjReqMgrPastVO)); + model.addAttribute("memAss", adjReqMgrPastService.selectMemAss(adjReqMgrPastVO)); model.addAttribute("reqPerTotCnt", reqPerTotCnt); - return "kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist"; } diff --git a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java index b985aee1..22af4c2f 100644 --- a/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java +++ b/src/main/java/kcc/kccadr/certDoc/web/CertDocController.java @@ -132,9 +132,9 @@ public class CertDocController { String returnUrl = ""; - System.out.println("dlvinfoVO.getEmail() :: "+ dlvinfoVO.getEmail()); - System.out.println("encEmail :: "+ encEmail); - System.out.println("rpplVO.getRpplEmail() :: "+ rpplVO.getRpplEmail()); + System.out.println("+ 입력 Email :: "+ dlvinfoVO.getEmail()); + System.out.println("+ 입력 암호화 EmailencEmail :: "+ encEmail); + System.out.println("+ DB Email :: "+ rpplVO.getRpplEmail()); /* * dlvinfoVO.getEmail() :: hehihoho3@naver.com * encEmail :: Lxt7qHEUH1ibf5qrdTjfZzHDaSMb28cFTu/hzZuU3ys= diff --git a/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java b/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java index f00010ea..d49f996d 100644 --- a/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java +++ b/src/main/java/kcc/let/solr/search/impl/SearchServiceImpl.java @@ -36,6 +36,7 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Value; import org.springframework.ui.ModelMap; +import kcc.com.cmm.util.MagicDBAPIUtil; import kcc.let.solr.search.service.SearchService; import kcc.let.utl.fcc.service.EgovCryptoUtil; @@ -152,7 +153,7 @@ public class SearchServiceImpl implements InitializingBean, SearchService { } } - System.out.println("commandMap :: "+ commandMap.toString()); +// System.out.println("commandMap :: "+ commandMap.toString()); Map>> resultMap = new HashMap>>(); Map resultCntMap = new HashMap(); @@ -176,6 +177,9 @@ public class SearchServiceImpl implements InitializingBean, SearchService { } } + List> resultListMap = resultMap.get("kcc_adr_advc"); + + log.info("resultMap :: [{}]", resultMap.get("kcc_adr_advc")); model.addAttribute("resultMap", resultMap); model.addAttribute("resultCntMap", resultCntMap); @@ -233,11 +237,17 @@ public class SearchServiceImpl implements InitializingBean, SearchService { } finally { IOUtils.closeQuietly(client); } - -// resultList.forEach(t-> System.out.println(t.toString())); + + // SOLR 결과값 디크립트 부분 resultList.forEach(t-> { t.put("resPonDentNm", egovCryptoUtil.decrypt((String) t.get("resPonDentNm"))); t.put("appliCantNm", egovCryptoUtil.decrypt((String) t.get("appliCantNm"))); +// log.info("t.get(\"reqOlCd\") :: [{}]", t.get("reqOlCd")); + if("2".equals(t.get("reqOlCd"))) + { + t.put("adrAdmNm", MagicDBAPIUtil.decryptOnlyOneString((String) t.get("adrAdmNm"))); + } + }); 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 20702f6c..761909d9 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 @@ -1176,6 +1176,12 @@ , HSTRY_CN AS hstryCn , ATCH_FILE_ID AS atchFileId , TO_CHAR(FRST_REGIST_PNTTM, 'YYYY-MM-DD') AS frstRegistPnttm + , FRST_REGISTER_ID AS frstRegisterId + , TO_CHAR(LAST_UPDT_PNTTM, 'YYYY-MM-DD') AS lastUpdtPnttm + , LAST_UPDUSR_ID AS lastUpdusrId + FROM ADR_HSTRY + WHERE ADR_SEQ = #adrSeq# + AND ADR_SN = '1' diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp index 6e22031e..fbf7505d 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp @@ -223,6 +223,11 @@ function goToEntDetailNotice(){ +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> 신청인 diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp index b801f441..9bb86931 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjclsmgr/adjCloseMangeList.jsp @@ -127,7 +127,7 @@ --%>
  • -

    검색어

    "/> +

    검색어

    " onkeyup="if(window.event.keyCode==13){fncGoList()}"/>