diff --git a/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java b/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java index 31c42ef1..8e40d377 100644 --- a/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java +++ b/src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java @@ -32,12 +32,13 @@ public final class MagicDBAPIUtil { } public static String encryptOnlyOneString(String stringVal) { - return MagicDBAPI.encrypt(POLICY_NAME, stringVal); +// return MagicDBAPI.encrypt(POLICY_NAME, stringVal); + return stringVal; } public static String decryptOnlyOneString(String stringVal) { -// log.info(" stringVal :: [{}]", stringVal); - return MagicDBAPI.decrypt(POLICY_NAME, stringVal); +// return MagicDBAPI.decrypt(POLICY_NAME, stringVal); + return stringVal; } } 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 2a3d8a16..aefeac43 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -217,5 +217,10 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { } + public void deleteAdrAssMgrPstRows(AdjReqMgrPastVO adjReqMgrPastVO) { + delete("adjReqMgrPastDAO.deleteAdrAssMgrPstRows", adjReqMgrPastVO ); +// delete("adjReqMgrPastDAO.deleteAdrPrtclMgrRow", adjReqMgrPastVO ); + } + } 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 83fa7fb6..e44aaa5c 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -648,7 +648,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO); adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]); adjAssMgrPastVO.setAddYn(addusrList.split("\\|")[1]); - + adjAssMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjAssMgrPastVO.getAssPstUsrNm())); adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO); } @@ -660,6 +660,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]); adjAssMgrPastVO.setAssPstUsrNm(addusrList.split("\\|")[1]); adjAssMgrPastVO.setAddYn("Y"); + adjAssMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjAssMgrPastVO.getAssPstUsrNm())); adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO); } } @@ -673,9 +674,9 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]); adjAssMgrPastVO.setAssPstUsrTy(addusrList.split("\\|")[1]); adjAssMgrPastVO.setAssPstUsrNm(addusrList.split("\\|")[2]); + adjAssMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjAssMgrPastVO.getAssPstUsrNm())); adjAssMgrPastVO.setAddYn("Y"); - System.out.println(" adjAssMgrPastVO.getFrstRegisterId() :: "+adjAssMgrPastVO.getFrstRegisterId()); if(StringUtils.isEmpty(adjAssMgrPastVO.getAssPstSeq())){ adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId()); adjAssMgrPastVO.setAddYn("Y"); @@ -726,7 +727,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements // 이름이 key값이면 rppl 테이블에서 가져와 기존 암호화 로직을 태운다. if(t.getAssPstUsrNm().indexOf("RPP") < 0) { - System.out.println("???"); + System.out.println("t.getAssPstUsrNm() : "+ t.getAssPstUsrNm()); t.setAssPstUsrNm(MagicDBAPIUtil.decryptOnlyOneString(t.getAssPstUsrNm())); } else @@ -946,7 +947,10 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements if("Y".equals(adjReqMgrPastVO.getAdrSnChgYn())) { if(prtclRowList.size() > 0) + { adjReqMgrPastDAO.deleteAdrPrtclMgrRow(prtclRowList.get(0)); + adjReqMgrPastDAO.deleteAdrAssMgrPstRows(prtclRowList.get(0)); + } int adrSn = Integer.parseInt(prmtrAdrSn); int cnt = 1; logger.info(" ++ cnt : [{}] / adrSn : [{}] ", cnt, adrSn); @@ -1211,7 +1215,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements resultList.forEach(t->{ if(!t.getAssPstUsrNm().startsWith("[")) { - if(t.getAssPstUsrNm().indexOf("RPP") < 0) + if(t.getAssPstUsrNm().indexOf("RPP") < 0 && StringUtils.isNotEmpty(t.getAssPstUsrNm())) { System.out.println("t.getAssPstUsrNm() :: "+ t.getAssPstUsrNm()); System.out.println("t.getAssPstUsrNm().startsWith(\"[\") :: "+ t.getAssPstUsrNm().startsWith("[")); 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 b0abb4bd..20702f6c 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 @@ -883,7 +883,11 @@ DELETE FROM ADR_PRTCL_MGR WHERE ADR_SEQ = #adrSeq# - + + + + DELETE FROM ADR_ASS_MGR_PST + WHERE ADR_SEQ = #adrSeq#