Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/kcc_adr_advc_git

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";
 	}

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 업데이트

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
 	}
 
 	/**

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;
+
 
 }

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); // 전자조정 사용자 페이지의 로그인 로그(메뉴와별개)
+		
+	}
+
 }

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);
+	}
+
 }

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 호출 시

src/main/resources/egovframework/spring/com/context-idgen.xml

@@ -2851,4 +2851,14 @@
         <property name="cipers" value="13" />
         	<property name="fillChar" value="0" />
     </bean>          
+    <!-- 접속로그 ID Generation  Config-->
+    <bean name="egovUsrLoginLogIdGnrService"
+        class="egovframework.rte.fdl.idgnr.impl.EgovTableIdGnrServiceImpl"
+        destroy-method="destroy">
+        <property name="dataSource" ref="dataSource" />
+        <property name="strategy"   ref="loginLogStrategy" />
+        <property name="blockSize"  value="9"/>
+        <property name="table"      value="IDS"/>
+        <property name="tableName"  value="USRLOGIN_ID"/>
+    </bean>
 </beans>

src/main/resources/egovframework/spring/com/context-syslogaop.xml

@@ -9,7 +9,7 @@
 	<aop:config>
 		<aop:aspect id="logManageAspect" ref="logManage">
 		  <!--  로그인 Method -->
-	      <aop:before pointcut="execution(public * kcc.let.uat.uia.service.EgovLoginService.actionLogin(..))" method="logLogin" />
+	      <!-- <aop:before pointcut="execution(public * kcc.let.uat.uia.service.EgovLoginService.actionLogin(..))" method="logLogin" /> -->
 	      <!--  로그아웃 Method
 	      <aop:before pointcut="execution(public * kcc.let.uat.uia.web.EgovLoginController.actionLogout(..))" method="logLogout" />
 	       -->

src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml

@@ -21,7 +21,7 @@
 
 	<!-- 로그인 로그 등록 -->
 	<insert id="LoginLogDAO.logInsertLoginLog" parameterClass="loginLog">
-
+		/* 임시.*NOT_SQL_LOG.* */
 			INSERT INTO LETTNLOGINLOG
 				( LOG_ID
 				  , CONECT_MTHD
@@ -403,7 +403,6 @@
 
 	<!-- 사용자 접속 로그 등록(매뉴에 등록된 페이지만 )-->
 	<insert id="LoginLogDAO.logInsertWebLoginLog" parameterClass="loginLog">
-		/* 임시.*NOT_SQL_LOG.* */
 		INSERT INTO LETTNLOGINLOG
 		( LOG_ID
 		  , CONECT_ID
@@ -682,5 +681,20 @@
 			WHERE 1=1 )
 		B ON A.TEMP = B.TEMP
 	</select>
+	
+	<!-- 전자조정 사용자 페이지 로그인 로그 등록 -->
+	<insert id="LoginLogDAO.logInsertUsrLoginLog" parameterClass="loginLog">
+		INSERT INTO ADR_USR_LOGIN_LOG
+			( LOG_ID
+			  , CONNECT_ID
+			  , CONNECT_IP
+			  , CREAT_DT )
+		VALUES ( #logId#
+			  , #loginId#
+			  , #loginIp#
+			  , NOW()
+			  )
+	</insert>
+	
 </sqlMap>
 

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#)
 		<isNotEmpty prepend="AND" property="param">
 		    PARAM = #param#
 		</isNotEmpty>

src/main/webapp/WEB-INF/config/egovframework/springmvc/egov-com-servlet.xml

@@ -56,6 +56,11 @@
 			<aop:after pointcut="( execution(public * kcc..*Controller.select*(..)) ||
 			    execution(public * kcc..*Controller.insert*(..)) ||
 			    execution(public * kcc..*Controller.*List(..)) ||
+			    execution(public * kcc..*Controller.*Detail(..)) ||
+			    execution(public * kcc..*Controller.*Create(..)) ||
+			    execution(public * kcc..*Controller.*Regist(..)) ||
+			    execution(public * kcc..*Controller.*Prcs(..)) ||
+			    execution(public * kcc..*Controller.*Pop(..)) ||
 			    execution(public * kcc..*Controller.update*(..)) ||
 			    execution(public * kcc..*Controller.delete*(..)) )
 			    &amp;&amp;