Merge branch 'hylee'
This commit is contained in:
commit
e04e8496c2
@ -32,12 +32,13 @@ public final class MagicDBAPIUtil {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static String encryptOnlyOneString(String stringVal) {
|
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) {
|
public static String decryptOnlyOneString(String stringVal) {
|
||||||
// log.info(" stringVal :: [{}]", stringVal);
|
// return MagicDBAPI.decrypt(POLICY_NAME, stringVal);
|
||||||
return MagicDBAPI.decrypt(POLICY_NAME, stringVal);
|
return stringVal;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -217,5 +217,10 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void deleteAdrAssMgrPstRows(AdjReqMgrPastVO adjReqMgrPastVO) {
|
||||||
|
delete("adjReqMgrPastDAO.deleteAdrAssMgrPstRows", adjReqMgrPastVO );
|
||||||
|
// delete("adjReqMgrPastDAO.deleteAdrPrtclMgrRow", adjReqMgrPastVO );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -648,7 +648,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
|
|||||||
adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO);
|
adjAssMgrPastVO = new AdjAssMgrPastVO(adjPastVO);
|
||||||
adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]);
|
adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]);
|
||||||
adjAssMgrPastVO.setAddYn(addusrList.split("\\|")[1]);
|
adjAssMgrPastVO.setAddYn(addusrList.split("\\|")[1]);
|
||||||
|
adjAssMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjAssMgrPastVO.getAssPstUsrNm()));
|
||||||
adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO);
|
adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -660,6 +660,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
|
|||||||
adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]);
|
adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]);
|
||||||
adjAssMgrPastVO.setAssPstUsrNm(addusrList.split("\\|")[1]);
|
adjAssMgrPastVO.setAssPstUsrNm(addusrList.split("\\|")[1]);
|
||||||
adjAssMgrPastVO.setAddYn("Y");
|
adjAssMgrPastVO.setAddYn("Y");
|
||||||
|
adjAssMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjAssMgrPastVO.getAssPstUsrNm()));
|
||||||
adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO);
|
adjReqMgrPastDAO.updateAdjAss(adjAssMgrPastVO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -673,9 +674,9 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
|
|||||||
adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]);
|
adjAssMgrPastVO.setAssPstSeq(addusrList.split("\\|")[0]);
|
||||||
adjAssMgrPastVO.setAssPstUsrTy(addusrList.split("\\|")[1]);
|
adjAssMgrPastVO.setAssPstUsrTy(addusrList.split("\\|")[1]);
|
||||||
adjAssMgrPastVO.setAssPstUsrNm(addusrList.split("\\|")[2]);
|
adjAssMgrPastVO.setAssPstUsrNm(addusrList.split("\\|")[2]);
|
||||||
|
adjAssMgrPastVO.setAssPstUsrNm(MagicDBAPIUtil.encryptOnlyOneString(adjAssMgrPastVO.getAssPstUsrNm()));
|
||||||
adjAssMgrPastVO.setAddYn("Y");
|
adjAssMgrPastVO.setAddYn("Y");
|
||||||
|
|
||||||
System.out.println(" adjAssMgrPastVO.getFrstRegisterId() :: "+adjAssMgrPastVO.getFrstRegisterId());
|
|
||||||
if(StringUtils.isEmpty(adjAssMgrPastVO.getAssPstSeq())){
|
if(StringUtils.isEmpty(adjAssMgrPastVO.getAssPstSeq())){
|
||||||
adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId());
|
adjAssMgrPastVO.setAssPstSeq(adrAssMgrPstGnrService.getNextStringId());
|
||||||
adjAssMgrPastVO.setAddYn("Y");
|
adjAssMgrPastVO.setAddYn("Y");
|
||||||
@ -726,7 +727,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
|
|||||||
// 이름이 key값이면 rppl 테이블에서 가져와 기존 암호화 로직을 태운다.
|
// 이름이 key값이면 rppl 테이블에서 가져와 기존 암호화 로직을 태운다.
|
||||||
if(t.getAssPstUsrNm().indexOf("RPP") < 0)
|
if(t.getAssPstUsrNm().indexOf("RPP") < 0)
|
||||||
{
|
{
|
||||||
System.out.println("???");
|
System.out.println("t.getAssPstUsrNm() : "+ t.getAssPstUsrNm());
|
||||||
t.setAssPstUsrNm(MagicDBAPIUtil.decryptOnlyOneString(t.getAssPstUsrNm()));
|
t.setAssPstUsrNm(MagicDBAPIUtil.decryptOnlyOneString(t.getAssPstUsrNm()));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -946,7 +947,10 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
|
|||||||
if("Y".equals(adjReqMgrPastVO.getAdrSnChgYn()))
|
if("Y".equals(adjReqMgrPastVO.getAdrSnChgYn()))
|
||||||
{
|
{
|
||||||
if(prtclRowList.size() > 0)
|
if(prtclRowList.size() > 0)
|
||||||
|
{
|
||||||
adjReqMgrPastDAO.deleteAdrPrtclMgrRow(prtclRowList.get(0));
|
adjReqMgrPastDAO.deleteAdrPrtclMgrRow(prtclRowList.get(0));
|
||||||
|
adjReqMgrPastDAO.deleteAdrAssMgrPstRows(prtclRowList.get(0));
|
||||||
|
}
|
||||||
int adrSn = Integer.parseInt(prmtrAdrSn);
|
int adrSn = Integer.parseInt(prmtrAdrSn);
|
||||||
int cnt = 1;
|
int cnt = 1;
|
||||||
logger.info(" ++ cnt : [{}] / adrSn : [{}] ", cnt, adrSn);
|
logger.info(" ++ cnt : [{}] / adrSn : [{}] ", cnt, adrSn);
|
||||||
@ -1211,7 +1215,7 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
|
|||||||
resultList.forEach(t->{
|
resultList.forEach(t->{
|
||||||
if(!t.getAssPstUsrNm().startsWith("["))
|
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() :: "+ t.getAssPstUsrNm());
|
||||||
System.out.println("t.getAssPstUsrNm().startsWith(\"[\") :: "+ t.getAssPstUsrNm().startsWith("["));
|
System.out.println("t.getAssPstUsrNm().startsWith(\"[\") :: "+ t.getAssPstUsrNm().startsWith("["));
|
||||||
|
|||||||
@ -883,7 +883,11 @@
|
|||||||
<delete id="adjReqMgrPastDAO.deleteAdrPrtclMgrRow" parameterClass="AdjReqPastVO">
|
<delete id="adjReqMgrPastDAO.deleteAdrPrtclMgrRow" parameterClass="AdjReqPastVO">
|
||||||
DELETE FROM ADR_PRTCL_MGR
|
DELETE FROM ADR_PRTCL_MGR
|
||||||
WHERE ADR_SEQ = #adrSeq#
|
WHERE ADR_SEQ = #adrSeq#
|
||||||
<!-- AND PRTCL_SEQ = #prtclSeq# -->
|
</delete>
|
||||||
|
|
||||||
|
<delete id="adjReqMgrPastDAO.deleteAdrAssMgrPstRows" parameterClass="AdjReqPastVO">
|
||||||
|
DELETE FROM ADR_ASS_MGR_PST
|
||||||
|
WHERE ADR_SEQ = #adrSeq#
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<update id="adjReqMgrPastDAO.updateBasicInfo" parameterClass="AdjReqPastVO">
|
<update id="adjReqMgrPastDAO.updateBasicInfo" parameterClass="AdjReqPastVO">
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user