diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java b/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java index 75476c49..211724d9 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java @@ -93,7 +93,7 @@ public class XitLoginVO implements Serializable{ this.orgnztNm = vo.getOrgnztNm(); this.grpId = vo.getGrpId(); this.nsttCd = vo.getNsttCd(); - this.uniqId = vo.getEsntlId(); + this.uniqId = vo.getUserKey(); this.jobDataAuthor = vo.getJobDataAuthor(); this.userManageAuthor = vo.getUserManageAuthor(); this.elctrnsanctnUseYn = vo.getElctrnsanctnUseYn(); diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java b/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java index bc3673ef..40a800a1 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java @@ -37,7 +37,7 @@ public class XitUserInfoChangeDtlsVO extends BaseVO { protected String nstt_cd; //소속기관 코드 protected String stts; //사용자 상태 코드 - protected String esntl_id; //고유 id + protected String user_key; //고유 id public String getUser_id() { return user_id; @@ -144,11 +144,11 @@ public class XitUserInfoChangeDtlsVO extends BaseVO { public void setStts(String stts) { this.stts = stts; } - public String getEsntl_id() { - return esntl_id; + public String getUser_key() { + return user_key; } - public void setEsntl_id(String esntl_id) { - this.esntl_id = esntl_id; + public void setUser_key(String user_key) { + this.user_key = user_key; } diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java index 63389bb5..10002fa6 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java @@ -50,7 +50,7 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF * 필수값 설정 */ XitUserInfoVO vo = new XitUserInfoVO(); - vo.setEsntlId(uniqId); + vo.setUserKey(uniqId); /** * 사용자정보 조회 @@ -429,7 +429,7 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF */ Map param = new HashMap(); param.put("term", term); - param.put("esntl_id", uniqId); + param.put("user_key", uniqId); /** * 처리 diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitSessionMapping.java b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitSessionMapping.java index ea27e61e..71c26d23 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitSessionMapping.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitSessionMapping.java @@ -54,7 +54,7 @@ public class XitSessionMapping extends EgovUsersByUsernameMapping { String strGrpId = rs.getString("grp_id"); String strNsttCd = rs.getString("nstt_cd"); String strOrgnztNm = rs.getString("orgnzt_nm"); - String strUniqId = rs.getString("esntl_id"); + String strUniqId = rs.getString("user_key"); String strJobDataAuthor = rs.getString("job_data_author"); String strUserManageAuthor = rs.getString("user_manage_author"); String strElctrnsanctnUseYn = rs.getString("elctrnsanctn_use_yn"); diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java index 3f9ff13d..ea362911 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java @@ -46,7 +46,7 @@ public class XitUserInfoVO extends XitUserEtcOptionVO { protected String grpId; //그룹 id - 업무그룹(sgg_cd) protected String nsttCd; //소속기관 코드 - 시스템코드(sysSeCd) protected String stts; //사용자 상태 코드 - protected String esntlId; //고유 id + protected String userKey; //고유 id protected String crtfcDn; //인증 dn 값 protected String regDt; //가입 일 diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java index 5e58f820..1794bc05 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java @@ -72,13 +72,13 @@ public class UserMgtServiceBean extends AbstractServiceBean implements UserMgtSe } catch (Exception e) { throw BizRuntimeException.create(MessageKey.CUSTOM_MSG, String.format("비밀번호 암호화 실패:: %s", e.getMessage())); } - vo.setEsntlId(vo.getUniqId()); + vo.setUserKey(vo.getUniqId()); mapper.insertUserInfo(vo); // 사용자 권한 XitUserScrtySetupVO userScrtySetupVO = new XitUserScrtySetupVO(); - userScrtySetupVO.setScrtySetupTrgetId(vo.getEsntlId()); + userScrtySetupVO.setScrtySetupTrgetId(vo.getUserKey()); userScrtySetupVO.setMberTyCode("USR03"); userScrtySetupVO.setAuthorCode(this.getDefaultAuthorCode(vo.getGrpId())); mapper.insertUserScrtySetup(userScrtySetupVO); @@ -101,10 +101,10 @@ public class UserMgtServiceBean extends AbstractServiceBean implements UserMgtSe vo.setUserId(vo.getEmplyrId()); //사용자 id vo.setUserNm(vo.getEmplyrNm()); //사용자 명 - vo.setEsntlId(vo.getUniqId()); + vo.setUserKey(vo.getUniqId()); Map userInfoCheckMap = mapper.selectCheckUserInfo(vo.getUserId()); - if(Checks.isEmpty(userInfoCheckMap) || !Objects.equals(vo.getEsntlId(), userInfoCheckMap.get("esntl_id"))) + if(Checks.isEmpty(userInfoCheckMap) || !Objects.equals(vo.getUserKey(), userInfoCheckMap.get("user_key"))) throw BizRuntimeException.create(MessageKey.CUSTOM_MSG, "사용자 고유식별값이 일치하지 않습니다."); // 변경이력 등록 and 사용자 정보 변경 @@ -132,7 +132,7 @@ public class UserMgtServiceBean extends AbstractServiceBean implements UserMgtSe //업무사용자 삭제 if (userTy.equals("USR03")){ Map userInfoCheckMap = mapper.selectCheckUserInfo(userId); - String scrtySetupTrgetId = String.valueOf(userInfoCheckMap.get("esntl_id")); + String scrtySetupTrgetId = String.valueOf(userInfoCheckMap.get("user_key")); //사용자보안설정 삭제 if(Checks.isNotEmpty(mapper.selectUserScrtySetup(scrtySetupTrgetId))) { diff --git a/src/main/resources/spring/service/context-security.xml b/src/main/resources/spring/service/context-security.xml index c6bbeb7a..be755552 100644 --- a/src/main/resources/spring/service/context-security.xml +++ b/src/main/resources/spring/service/context-security.xml @@ -46,7 +46,7 @@ jdbcUsersByUsernameQuery=" /** 인증에 사용되는 사용자정보 조회 질의문 */ SELECT USER_ID - , ESNTL_ID AS PASSWD + , USER_KEY AS PASSWD , 1 ENABLED , USER_NM , ZIP @@ -54,7 +54,7 @@ , EML_ADRS , USER_SE , ORG_ID - , ESNTL_ID + , USER_KEY , GRP_ID , NSTT_CD , ORGNZT_NM @@ -69,7 +69,7 @@ SELECT A.SCRTY_SETUP_TRGET_ID AS USER_ID ,A.AUTHOR_CODE AS AUTHORITY FROM XIT_USER_SCRTY_SETUP A - INNER JOIN XIT_VW_USER_MASTR B ON A.SCRTY_SETUP_TRGET_ID = B.ESNTL_ID + INNER JOIN XIT_VW_USER_MASTR B ON A.SCRTY_SETUP_TRGET_ID = B.USER_KEY WHERE 1=1 AND B.USER_ID = ?" jdbcMapClass="kr.xit.fims.framework.biz.cmm.service.bean.XitSessionMapping" diff --git a/src/main/resources/sql/mapper/framework/cache/cacheboard-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cache/cacheboard-mysql-mapper.xml index b9adf6d2..6f24bd5f 100644 --- a/src/main/resources/sql/mapper/framework/cache/cacheboard-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cache/cacheboard-mysql-mapper.xml @@ -113,7 +113,7 @@ , XBM.BBS_NM FROM xit_bbs xb LEFT OUTER JOIN xit_vw_user_mastr VUM - ON XB.rgtr = VUM.esntl_id + ON XB.rgtr = VUM.user_key LEFT OUTER JOIN xit_bbs_mastr XBM ON XB.bbs_id = XBM.bbs_id WHERE XB.BBS_ID = #{bbsId} diff --git a/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml index 1aba78f6..4e9121a8 100644 --- a/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml @@ -2082,7 +2082,7 @@ ,EML_ADRS ,NSTT_CD ,STTS - ,ESNTL_ID + ,USER_KEY FROM XIT_USER_INFO_CHANGE_DTLS WHERE 1=1 AND USER_ID = #{user_id } @@ -2102,7 +2102,7 @@ AND EML_ADRS = #{eml_adrs } AND NSTT_CD = #{nstt_cd } AND STTS = #{stts } - AND ESNTL_ID = #{esntl_id } + AND USER_KEY = #{user_key } diff --git a/src/main/resources/sql/mapper/framework/cmm/cmm-ansTmpl-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cmm/cmm-ansTmpl-mysql-mapper.xml index ff2ab822..3c2cc3cf 100644 --- a/src/main/resources/sql/mapper/framework/cmm/cmm-ansTmpl-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cmm/cmm-ansTmpl-mysql-mapper.xml @@ -15,7 +15,7 @@ , tcat.tlface , tcat.reg_dt , tcat.rgtr - , (SELECT SA.user_nm FROM xit_vw_user_mastr SA WHERE SA.esntl_id = tcat.rgtr) AS rgtrNm + , (SELECT SA.user_nm FROM xit_vw_user_mastr SA WHERE SA.user_key = tcat.rgtr) AS rgtrNm , tcat.mdfcn_dt , tcat.mdfr , tcatd.answer_se_code diff --git a/src/main/resources/sql/mapper/framework/mng/admin/XitConectionLogMng-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/admin/XitConectionLogMng-mysql-mapper.xml index 09c7c856..4aab8d71 100644 --- a/src/main/resources/sql/mapper/framework/mng/admin/XitConectionLogMng-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/admin/XitConectionLogMng-mysql-mapper.xml @@ -22,7 +22,7 @@ FROM XIT_CONECT_LOG A - LEFT OUTER JOIN XIT_VW_USER_MASTR B ON A.CONECT_ID = B.ESNTL_ID + LEFT OUTER JOIN XIT_VW_USER_MASTR B ON A.CONECT_ID = B.USER_KEY diff --git a/src/main/resources/sql/mapper/framework/mng/auth/auth-by-user-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/auth/auth-by-user-mysql-mapper.xml index fc0a5ec9..df58a5c2 100644 --- a/src/main/resources/sql/mapper/framework/mng/auth/auth-by-user-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/auth/auth-by-user-mysql-mapper.xml @@ -13,15 +13,15 @@ , cdc.code_val AS mberTyNm , uss.author_code , IF(uss.scrty_setup_trget_id IS NULL, 'N', 'Y') AS regYn - , esntl_id AS uniqId + , user_key AS uniqId FROM ( SELECT user_id , user_nm user_nm , grp_id - , esntl_id + , user_key FROM xit_user_info ) xui LEFT OUTER JOIN xit_user_scrty_setup uss - ON xui.esntl_id = uss.scrty_setup_trget_id + ON xui.user_key = uss.scrty_setup_trget_id LEFT OUTER JOIN tb_cmn_code cdc ON cdc.grp_id = 'XIT012' AND uss.mber_ty_code = cdc.code diff --git a/src/main/resources/sql/mapper/framework/mng/bbs/XitBasicBbsMng-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/bbs/XitBasicBbsMng-mysql-mapper.xml index 6d9b8f03..b2a561c3 100644 --- a/src/main/resources/sql/mapper/framework/mng/bbs/XitBasicBbsMng-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/bbs/XitBasicBbsMng-mysql-mapper.xml @@ -41,7 +41,7 @@ FROM XIT_BBS A - LEFT OUTER JOIN XIT_VW_USER_MASTR B ON A.RGTR = B.ESNTL_ID + LEFT OUTER JOIN XIT_VW_USER_MASTR B ON A.RGTR = B.USER_KEY LEFT OUTER JOIN XIT_BBS_MASTR C ON A.BBS_ID = C.BBS_ID diff --git a/src/main/resources/sql/mapper/framework/mng/bbs/XitBbsCreateMng-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/bbs/XitBbsCreateMng-mysql-mapper.xml index adb068ac..3a86be11 100644 --- a/src/main/resources/sql/mapper/framework/mng/bbs/XitBbsCreateMng-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/bbs/XitBbsCreateMng-mysql-mapper.xml @@ -27,7 +27,7 @@ ,A.ATCH_POSBL_FILE_SIZE AS "posblAtchFileSize" ,A.REPLY_POSBL_YN AS "replyPosblYn" ,A.RGTR AS "rgtr" - ,(SELECT SA.USER_NM FROM XIT_VW_USER_MASTR SA WHERE SA.ESNTL_ID = A.RGTR) AS "frstRgtrNm" + ,(SELECT SA.USER_NM FROM XIT_VW_USER_MASTR SA WHERE SA.USER_KEY = A.RGTR) AS "frstRgtrNm" ,A.USE_YN AS "useYn" ,DATE_FORMAT(A.REG_DT, '%Y-%m-%d') AS "regDt" ,(SELECT IFNULL (SA.USE_YN, 'N') diff --git a/src/main/resources/sql/mapper/framework/mng/bbs/XitBbsTmplateMng-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/bbs/XitBbsTmplateMng-mysql-mapper.xml index d253b3c5..96fc668e 100644 --- a/src/main/resources/sql/mapper/framework/mng/bbs/XitBbsTmplateMng-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/bbs/XitBbsTmplateMng-mysql-mapper.xml @@ -23,8 +23,8 @@ ,A.MDFR AS "mdfr" ,A.MDFCN_DT AS "mdfcnDt" ,B.CODE_VAL AS "tmplatSeCodeNm" - ,(SELECT SA.USER_NM FROM XIT_VW_USER_MASTR SA WHERE SA.ESNTL_ID=A.RGTR) AS "frstRgtrNm" - ,(SELECT SA.USER_NM FROM XIT_VW_USER_MASTR SA WHERE SA.ESNTL_ID=A.MDFR) AS "lastMdfrNm" + ,(SELECT SA.USER_NM FROM XIT_VW_USER_MASTR SA WHERE SA.USER_KEY=A.RGTR) AS "frstRgtrNm" + ,(SELECT SA.USER_NM FROM XIT_VW_USER_MASTR SA WHERE SA.USER_KEY=A.MDFR) AS "lastMdfrNm" FROM XIT_TMPLAT_INFO A diff --git a/src/main/resources/sql/mapper/framework/mng/bbs/board-basic-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/bbs/board-basic-mysql-mapper.xml index 925e7079..a679d291 100644 --- a/src/main/resources/sql/mapper/framework/mng/bbs/board-basic-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/bbs/board-basic-mysql-mapper.xml @@ -40,7 +40,7 @@ FROM xit_bbs xb LEFT OUTER JOIN xit_vw_user_mastr xvum - ON xb.rgtr = xvum.esntl_id + ON xb.rgtr = xvum.user_key LEFT OUTER JOIN xit_bbs_mastr xbm ON xb.bbs_id = xbm.bbs_id diff --git a/src/main/resources/sql/mapper/framework/mng/bbs/board-mastr-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/bbs/board-mastr-mysql-mapper.xml index 73fccfc3..6307cafe 100644 --- a/src/main/resources/sql/mapper/framework/mng/bbs/board-mastr-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/bbs/board-mastr-mysql-mapper.xml @@ -24,7 +24,7 @@ , xbm.rgtr , (SELECT sa.user_nm FROM XIT_VW_USER_MASTR SA - WHERE sa.esntl_id = xbm.rgtr) AS frstRgtrNm + WHERE sa.user_key = xbm.rgtr) AS frstRgtrNm , xbm.use_yn AS useYn , DATE_FORMAT(xbm.reg_dt, '%Y-%m-%d') AS regDt , (SELECT IFNULL(sa.use_yn, 'N') diff --git a/src/main/resources/sql/mapper/framework/mng/bbs/board-tmpl-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/bbs/board-tmpl-mysql-mapper.xml index 22a0e099..3b09fc49 100644 --- a/src/main/resources/sql/mapper/framework/mng/bbs/board-tmpl-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/bbs/board-tmpl-mysql-mapper.xml @@ -17,8 +17,8 @@ , xti.mdfr , xti.mdfcn_dt , cdc.code_val AS tmplatSeCodeNm - , (SELECT SA.user_nm FROM xit_vw_user_mastr SA WHERE SA.esntl_id = xti.rgtr) AS frstRgtrNm - , (SELECT SA.user_nm FROM xit_vw_user_mastr SA WHERE SA.esntl_id = xti.mdfr) AS lastMdfrNm + , (SELECT SA.user_nm FROM xit_vw_user_mastr SA WHERE SA.user_key = xti.rgtr) AS frstRgtrNm + , (SELECT SA.user_nm FROM xit_vw_user_mastr SA WHERE SA.user_key = xti.mdfr) AS lastMdfrNm FROM xit_tmplat_info xti LEFT OUTER JOIN tb_cmn_code cdc ON xti.tmplat_se_code = cdc.code diff --git a/src/main/resources/sql/mapper/framework/mng/menu/menu-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/menu/menu-mysql-mapper.xml index 5c82dfc6..602c94c1 100644 --- a/src/main/resources/sql/mapper/framework/mng/menu/menu-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/menu/menu-mysql-mapper.xml @@ -159,7 +159,7 @@ SELECT AUTHOR_CODE AS "authorCode" FROM XIT_USER_SCRTY_SETUP WHERE SCRTY_SETUP_TRGET_ID = ( - SELECT ESNTL_ID + SELECT USER_KEY FROM XIT_VW_USER_MASTR WHERE USER_ID = #{searchKeyword} ) diff --git a/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml index 4f1dbfe6..874a83d2 100644 --- a/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml @@ -73,7 +73,7 @@ diff --git a/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml index 5a9a613c..09455dd1 100644 --- a/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml @@ -7,7 +7,7 @@ ************************************************************************************************************** --> /* user-mysql-mapper|selectUser-사용자 정보 조회|julim */ - SELECT esntl_id AS uniqId + SELECT user_key AS uniqId , 'USR03' AS userTy , user_id AS emplyrId , user_nm AS emplyrNm @@ -64,7 +64,7 @@ , REG_DT , crtfc_dn FROM xit_user_info - WHERE esntl_id = #{uniqId} + WHERE user_key = #{uniqId} @@ -92,7 +92,7 @@ , grp_id , nstt_cd , stts - , esntl_id + , user_key , crtfc_dn , REG_DT ) VALUES ( @@ -117,7 +117,7 @@ , #{grpId} , #{nsttCd} , #{stts} - , #{esntlId} + , #{userKey} , #{crtfcDn} , NOW() ) @@ -157,8 +157,8 @@