diff --git a/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java b/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java index 992210f7..d96f4f22 100644 --- a/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java +++ b/src/main/java/kcc/kccadr/adjclsmgr/web/AdjClsMgrController.java @@ -116,7 +116,7 @@ public class AdjClsMgrController { } @RequestMapping(value = "/kccadr/adjclsmgr/adjCloseMangeDetail.do") - public String adjCloseManageDetail(@ModelAttribute("info") PgrCmmVO cmmVO, ModelMap model) throws Exception { + public String adjCloseMangeDetail(@ModelAttribute("info") PgrCmmVO cmmVO, ModelMap model) throws Exception { return "/kccadr/adjclsmgr/adjCloseMangeDetail"; } diff --git a/src/main/java/kcc/kccadr/advcSttst/web/AdvcSttstController.java b/src/main/java/kcc/kccadr/advcSttst/web/AdvcSttstController.java index e3097663..32043448 100644 --- a/src/main/java/kcc/kccadr/advcSttst/web/AdvcSttstController.java +++ b/src/main/java/kcc/kccadr/advcSttst/web/AdvcSttstController.java @@ -429,7 +429,7 @@ public class AdvcSttstController { * date : 2021.09.111 */ @RequestMapping("/kccadr/advcSttst/memSttstList.do") - public String adjReqMgrOffList(@ModelAttribute("adjReqMgrOffLineVO") AdjReqMgrOffLineVO adjReqMgrOffLineVO, ModelMap model) throws Exception { + public String memSttstList(@ModelAttribute("adjReqMgrOffLineVO") AdjReqMgrOffLineVO adjReqMgrOffLineVO, ModelMap model) throws Exception { // 제출 시 // adr_mgr_master 테이블 stat_cd 제출 완료(ADR_REQ_COMP, 101010)로, lastupdtPnttm, lastupdtId 업데이트 diff --git a/src/main/java/kcc/let/sym/log/clg/service/EgovLoginLogAspect.java b/src/main/java/kcc/let/sym/log/clg/service/EgovLoginLogAspect.java index 1c1563f1..3b2bb44c 100644 --- a/src/main/java/kcc/let/sym/log/clg/service/EgovLoginLogAspect.java +++ b/src/main/java/kcc/let/sym/log/clg/service/EgovLoginLogAspect.java @@ -57,8 +57,9 @@ public class EgovLoginLogAspect { loginLog.setErrOccrrAt("N"); loginLog.setErrorCode(""); loginLog.setProgrmFileNm(null); - loginLogService.logInsertLoginLog(loginLog); +// loginLogService.logInsertLoginLog(loginLog); //사용자 페이지의 로그만 남김(메뉴에 등록된 페이지만 남김) + loginLogService.logInsertUsrLoginLog(loginLog); // 전자조정 사용자 페이지의 로그인 로그(메뉴와별개) table : adr_usr_login_log } /** diff --git a/src/main/java/kcc/let/sym/log/clg/service/EgovLoginLogService.java b/src/main/java/kcc/let/sym/log/clg/service/EgovLoginLogService.java index 1701c617..3581f900 100644 --- a/src/main/java/kcc/let/sym/log/clg/service/EgovLoginLogService.java +++ b/src/main/java/kcc/let/sym/log/clg/service/EgovLoginLogService.java @@ -80,5 +80,7 @@ public interface EgovLoginLogService { public LoginLog selectLogCnt(LoginLog footerLog) throws Exception; + public void logInsertUsrLoginLog(LoginLog loginLog) throws Exception; + } diff --git a/src/main/java/kcc/let/sym/log/clg/service/impl/EgovLoginLogServiceImpl.java b/src/main/java/kcc/let/sym/log/clg/service/impl/EgovLoginLogServiceImpl.java index a96a707b..0e54a85b 100644 --- a/src/main/java/kcc/let/sym/log/clg/service/impl/EgovLoginLogServiceImpl.java +++ b/src/main/java/kcc/let/sym/log/clg/service/impl/EgovLoginLogServiceImpl.java @@ -42,6 +42,10 @@ public class EgovLoginLogServiceImpl extends EgovAbstractServiceImpl implements @Resource(name="egovLoginLogIdGnrService") private EgovIdGnrService egovLoginLogIdGnrService; + /** ID Generation */ + @Resource(name="egovUsrLoginLogIdGnrService") + private EgovIdGnrService egovUsrLoginLogIdGnrService; + /** Admin ID Generation */ @Resource(name="egovAdminLogIdGnrService") @@ -179,4 +183,14 @@ public class EgovLoginLogServiceImpl extends EgovAbstractServiceImpl implements return loginLogDAO.selectLogCnt(loginLog); } + @Override + public void logInsertUsrLoginLog(LoginLog loginLog) throws Exception { + String logId = egovLoginLogIdGnrService.getNextStringId(); + loginLog.setLogId(logId); + + //loginLogDAO.logInsertLoginLog(loinLog); //사용자 페이지의 로그만 남김(메뉴에 등록된 페이지만 남김) + loginLogDAO.logInsertUsrLoginLog(loginLog); // 전자조정 사용자 페이지의 로그인 로그(메뉴와별개) + + } + } diff --git a/src/main/java/kcc/let/sym/log/clg/service/impl/LoginLogDAO.java b/src/main/java/kcc/let/sym/log/clg/service/impl/LoginLogDAO.java index 79ea7533..705605d9 100644 --- a/src/main/java/kcc/let/sym/log/clg/service/impl/LoginLogDAO.java +++ b/src/main/java/kcc/let/sym/log/clg/service/impl/LoginLogDAO.java @@ -159,4 +159,8 @@ public class LoginLogDAO extends EgovAbstractDAO { return (LoginLog)select("LoginLogDAO.selectLogCnt", loginLog); } + public void logInsertUsrLoginLog(LoginLog loginLog) throws Exception{ + insert("LoginLogDAO.logInsertUsrLoginLog", loginLog); + } + } diff --git a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java index ef23dfdc..8a9bccae 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -1010,7 +1010,9 @@ public class EgovLoginController { loginLog.setDeviceType("P"); // PC loginLog.setProgrmFileNm("adminLogin"); loginLog.setMenuNm("관리자로그인"); - loginLogService.logInsertLoginLog(loginLog); + //loginLogService.logInsertLoginLog(loginLog); //사용자 페이지의 로그만 남김(메뉴에 등록된 페이지만 남김) + loginLogService.logInsertUsrLoginLog(loginLog); // 전자조정 사용자 페이지의 로그인 로그(메뉴와별개) table : adr_usr_login_log + } // 로그인 전 URL 호출 시 diff --git a/src/main/resources/egovframework/spring/com/context-idgen.xml b/src/main/resources/egovframework/spring/com/context-idgen.xml index 70aa3f9f..dcb1e449 100644 --- a/src/main/resources/egovframework/spring/com/context-idgen.xml +++ b/src/main/resources/egovframework/spring/com/context-idgen.xml @@ -2851,4 +2851,14 @@ + + + + + + + + diff --git a/src/main/resources/egovframework/spring/com/context-syslogaop.xml b/src/main/resources/egovframework/spring/com/context-syslogaop.xml index 6be96440..0820cd24 100644 --- a/src/main/resources/egovframework/spring/com/context-syslogaop.xml +++ b/src/main/resources/egovframework/spring/com/context-syslogaop.xml @@ -9,7 +9,7 @@ - + diff --git a/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml index cdfda4c9..574de3ac 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml @@ -21,7 +21,7 @@ - + /* 임시.*NOT_SQL_LOG.* */ INSERT INTO LETTNLOGINLOG ( LOG_ID , CONECT_MTHD @@ -403,7 +403,6 @@ - /* 임시.*NOT_SQL_LOG.* */ INSERT INTO LETTNLOGINLOG ( LOG_ID , CONECT_ID @@ -682,5 +681,20 @@ WHERE 1=1 ) B ON A.TEMP = B.TEMP + + + + INSERT INTO ADR_USR_LOGIN_LOG + ( LOG_ID + , CONNECT_ID + , CONNECT_IP + , CREAT_DT ) + VALUES ( #logId# + , #loginId# + , #loginIp# + , NOW() + ) + + diff --git a/src/main/resources/egovframework/sqlmap/let/sym/log/lgm/EgovSysLog_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/log/lgm/EgovSysLog_SQL_Mysql.xml index 518b1650..e30f4ca8 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/log/lgm/EgovSysLog_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/log/lgm/EgovSysLog_SQL_Mysql.xml @@ -183,7 +183,7 @@ APPRO_NM , #url# FROM LETTNADMINMETHOD - WHERE METHOD_NM = #methodNm# + WHERE LCASE(METHOD_NM) = LCASE(#methodNm#) PARAM = #param# diff --git a/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-servlet.xml b/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-servlet.xml index cf95b451..7e647a16 100644 --- a/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-servlet.xml +++ b/src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-servlet.xml @@ -56,6 +56,11 @@