diff --git a/src/main/java/kcc/com/cmm/util/StringUtil2.java b/src/main/java/kcc/com/cmm/util/StringUtil2.java index 485d4898..39b6ecc3 100644 --- a/src/main/java/kcc/com/cmm/util/StringUtil2.java +++ b/src/main/java/kcc/com/cmm/util/StringUtil2.java @@ -577,5 +577,17 @@ public final class StringUtil2 { int fieldLength = 10; } + + public static String extractLogMethodNm( + String p_url + ) throws Exception{ + String[] s_arr = p_url.split("/"); + + if (s_arr.length>=3) { + return s_arr[s_arr.length-3]+"/"+s_arr[s_arr.length-2]+"/"+s_arr[s_arr.length-1]; + } + + return p_url; + } } 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 b6696825..794833b4 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 @@ -3,6 +3,8 @@ package kcc.let.sym.log.clg.service; import java.util.List; import java.util.Map; +import egovframework.rte.psl.dataaccess.util.EgovMap; + /** * 시스템 로그 생성을 위한 ASPECT 클래스 * @author 공통서비스개발팀 이삼섭 @@ -63,6 +65,8 @@ public interface EgovLoginLogService { public List selectLogMethodList(LoginLog loginLog) throws Exception; public LoginLog selectLogMethod(LoginLog loginLog) throws Exception; + + public EgovMap selectMethodEgov(LoginLog loginLog) throws Exception; public void updateLogMethod(LoginLog tempLoginLog) throws Exception; diff --git a/src/main/java/kcc/let/sym/log/clg/service/LoginLog.java b/src/main/java/kcc/let/sym/log/clg/service/LoginLog.java index 970a401a..16dcb6d7 100644 --- a/src/main/java/kcc/let/sym/log/clg/service/LoginLog.java +++ b/src/main/java/kcc/let/sym/log/clg/service/LoginLog.java @@ -146,6 +146,10 @@ public class LoginLog extends ComDefaultVO implements Serializable { private String totalLogCnt; + private String useYn; //통계 사용여부 + + private String sortNum; //통계 순서 + private List logDataList = new ArrayList() ; @@ -479,5 +483,21 @@ public class LoginLog extends ComDefaultVO implements Serializable { public void setTotalLogCnt(String totalLogCnt) { this.totalLogCnt = totalLogCnt; } + + public String getUseYn() { + return useYn; + } + + public void setUseYn(String useYn) { + this.useYn = useYn; + } + + public String getSortNum() { + return sortNum; + } + + public void setSortNum(String sortNum) { + this.sortNum = sortNum; + } } 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 43369f50..266a5705 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 @@ -10,6 +10,8 @@ import org.springframework.stereotype.Service; import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import egovframework.rte.psl.dataaccess.util.EgovMap; +import kcc.com.cmm.util.StringUtil2; import kcc.let.sym.log.clg.service.EgovLoginLogService; import kcc.let.sym.log.clg.service.LoginLog; @@ -69,9 +71,13 @@ public class EgovLoginLogServiceImpl extends EgovAbstractServiceImpl implements //method name 설정 //LETTNLOGINLOG_BAK 테이블을 위해서 추가됨 - String[] s_arr = loinLog.getUrl().split("/"); + //String[] s_arr = loinLog.getUrl().split("/"); + + //loinLog.setMethodNm(s_arr[s_arr.length-3]+"/"+s_arr[s_arr.length-2]+"/"+s_arr[s_arr.length-1]); + + loinLog.setMethodNm(StringUtil2.extractLogMethodNm(loinLog.getUrl())); + - loinLog.setMethodNm(s_arr[s_arr.length-2]+"/"+s_arr[s_arr.length-1]); System.out.println("loinLog.getMethodNm()"); System.out.println(loinLog.getMethodNm()); @@ -183,6 +189,10 @@ public class EgovLoginLogServiceImpl extends EgovAbstractServiceImpl implements return loginLogDAO.selectLogMethod(loginLog); } + public EgovMap selectMethodEgov(LoginLog loginLog) throws Exception { + return loginLogDAO.selectMethodEgov(loginLog); + } + @Override public void updateLogMethod(LoginLog loginLog) throws Exception { loginLogDAO.updateLogMethod(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 58c7db92..2a6a5797 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 @@ -5,6 +5,7 @@ import java.util.List; import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import egovframework.rte.psl.dataaccess.util.EgovMap; import kcc.let.sym.log.clg.service.LoginLog; /** @@ -112,9 +113,14 @@ public class LoginLogDAO extends EgovAbstractDAO { } public LoginLog selectLogMethod(LoginLog loginLog) throws Exception{ + System.out.println((LoginLog)select("LoginLogDAO.selectLogMethod", loginLog)); return (LoginLog)select("LoginLogDAO.selectLogMethod", loginLog); } + public EgovMap selectMethodEgov(LoginLog loginLog) throws Exception { + return (EgovMap) select("LoginLogDAO.selectMethodEgov", loginLog); + } + public void updateLogMethod(LoginLog loginLog) throws Exception{ update("LoginLogDAO.updateLogMethod", loginLog); } @@ -136,8 +142,8 @@ public class LoginLogDAO extends EgovAbstractDAO { } public int logInsertWebLoginLogNewStep1(LoginLog loinLog) throws Exception{ - update("LoginLogDAO.logInsertWebLoginLogNewStep1", loinLog); - return update("LoginLogDAO.logInsertWebLoginLogNewStep1_bak", loinLog); + return update("LoginLogDAO.logInsertWebLoginLogNewStep1", loinLog); + //return update("LoginLogDAO.logInsertWebLoginLogNewStep1_bak", loinLog); } public int logInsertWebLoginLogNewStep2(LoginLog loinLog) throws Exception{ diff --git a/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java b/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java index 2a0fd0c1..1648d2f2 100644 --- a/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java +++ b/src/main/java/kcc/let/sym/log/clg/web/EgovLoginLogController.java @@ -31,6 +31,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.fdl.property.EgovPropertyService; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; +import egovframework.rte.psl.dataaccess.util.EgovMap; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.EgovMessageSource; import kcc.com.cmm.LoginVO; @@ -106,7 +107,7 @@ public class EgovLoginLogController { loginLog.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); if("".equals(loginLog.getSearchSortCnd())){ //최초조회시 최신것 조회List - loginLog.setSearchSortCnd("logId"); + loginLog.setSearchSortCnd("b.ADMINLOG_ID"); loginLog.setSearchSortOrd("desc"); } @@ -401,11 +402,26 @@ public class EgovLoginLogController { System.out.println(loginLog.getAdmotId()); System.out.println(loginLog.getAdmotId()); + LoginLog loginLog2 = new LoginLog(); + EgovMap upDownNttid = null; + if("Modify".equals((String)commandMap.get("pageType"))){ //수정 + System.out.println("loginLog"); + System.out.println(loginLog); loginLog.setAdmotId(loginLog.getAdmotId().trim()); - loginLog = loginLogService.selectLogMethod(loginLog); + loginLog2 = loginLogService.selectLogMethod(loginLog); + //loginLog.setAdmotId("18"); + upDownNttid = loginLogService.selectMethodEgov(loginLog); } - model.addAttribute("loginLog", loginLog); + + System.out.println("loginLog"); + System.out.println(loginLog); + System.out.println(loginLog2); + System.out.println(upDownNttid); + + + model.addAttribute("loginLog", loginLog2); + model.addAttribute("searchFr", loginLog); return "sym/log/clg/ViewLogMethod"; } @@ -497,6 +513,7 @@ public class EgovLoginLogController { } List webMenuLogList = loginLogService.selectWebMenuLogList(loginLog); //사용자 매뉴 리스트 + /* List userMenuList = loginLogService.selectUserMenuList(loginLog); //사용자 매뉴(전체) for(LoginLog userMenuVO :userMenuList){ @@ -525,12 +542,16 @@ public class EgovLoginLogController { logVO.getLogDataList().add(tempLog); } + model.addAttribute("userMenuList", userMenuList); + */ + + model.addAttribute("webMenuLogList", webMenuLogList); /* paginationInfo.setTotalRecordCount( webLogList.size()> 0 ? ((LoginLog)webLogList.get(0)).getTotCnt() : 0); model.addAttribute("webLogList", webLogList);*/ - paginationInfo.setTotalRecordCount(userMenuList.size()); - model.addAttribute("paginationInfo", paginationInfo); + //paginationInfo.setTotalRecordCount(userMenuList.size()); + //model.addAttribute("paginationInfo", paginationInfo); return "sym/log/clg/SelectWebLogList"; } diff --git a/src/main/java/kcc/let/sym/log/lgm/service/EgovSysLogAspect.java b/src/main/java/kcc/let/sym/log/lgm/service/EgovSysLogAspect.java index 6e7c8229..cf2ee9b0 100644 --- a/src/main/java/kcc/let/sym/log/lgm/service/EgovSysLogAspect.java +++ b/src/main/java/kcc/let/sym/log/lgm/service/EgovSysLogAspect.java @@ -271,6 +271,7 @@ public class EgovSysLogAspect { */ public Object logAdminInsert(ProceedingJoinPoint joinPoint) throws Throwable { + System.out.println("logAdminInsert"); StopWatch stopWatch = new StopWatch(); try { @@ -337,6 +338,7 @@ public class EgovSysLogAspect { */ public Object logAdminUpdate(ProceedingJoinPoint joinPoint) throws Throwable { + System.out.println("logAdminUpdate"); StopWatch stopWatch = new StopWatch(); try { @@ -392,6 +394,7 @@ public class EgovSysLogAspect { */ public Object logAdminDelete(ProceedingJoinPoint joinPoint) throws Throwable { + System.out.println("logAdminDelete"); StopWatch stopWatch = new StopWatch(); try { @@ -446,6 +449,7 @@ public class EgovSysLogAspect { * @throws Exception */ public void logAdminSelect(JoinPoint joinPoint) throws Throwable { + System.out.println("logAdminSelect"); Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); if(isAuthenticated.booleanValue()) { SysLog sysLog = new SysLog(); diff --git a/src/main/java/kcc/let/sym/log/lgm/service/impl/EgovSysLogServiceImpl.java b/src/main/java/kcc/let/sym/log/lgm/service/impl/EgovSysLogServiceImpl.java index a914db5c..1aeb1e57 100644 --- a/src/main/java/kcc/let/sym/log/lgm/service/impl/EgovSysLogServiceImpl.java +++ b/src/main/java/kcc/let/sym/log/lgm/service/impl/EgovSysLogServiceImpl.java @@ -11,6 +11,7 @@ import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; import egovframework.rte.fdl.idgnr.EgovIdGnrService; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import kcc.com.cmm.LoginVO; +import kcc.com.cmm.util.StringUtil2; import kcc.let.sym.log.lgm.service.EgovSysLogService; import kcc.let.sym.log.lgm.service.SysLog; @@ -100,6 +101,9 @@ public class EgovSysLogServiceImpl extends EgovAbstractServiceImpl implements return _map; } + /* + * 관리자 로그 정보 이므로, method_cd='A' 이어야만 한다. + * */ @Override public void logInsertAdminSysLog(SysLog sysLog) throws Exception { String requstId = egovAdminLogIdGnrService.getNextStringId(); @@ -108,6 +112,10 @@ public class EgovSysLogServiceImpl extends EgovAbstractServiceImpl implements if(null != loginVO){ sysLog.setSiteId(loginVO.getSiteId()); } + + //고유값으로 만들기 + sysLog.setMethodNm(StringUtil2.extractLogMethodNm(sysLog.getUrl())); + //sysLogDAO.logInsertAdminSysLog(sysLog); int i = sysLogDAO.logInsertAdminSysLogNewStep1(sysLog); @@ -120,11 +128,17 @@ public class EgovSysLogServiceImpl extends EgovAbstractServiceImpl implements System.out.println("=====i====="+sysLog.getTrgetMenuNm()); System.out.println("=====i====="+sysLog.getSrvcNm()); + System.out.println("=====i====="+sysLog.getUrl()); + System.out.println("=====i====="+sysLog.getPageUnit()); + System.out.println("=====i====="+sysLog.getRqsterNm()); + + System.out.println("=====i====="+sysLog.getMethodNm()); + try { //저장이 안되었으면 LETTNADMINMETHOD 테이블에 추가하고 다시 저장해보기 if (i<=0) { - //LETTNADMINMETHOD 테이블에 추가하기 + //LETTNADMINMETHOD 테이블에 추가하기 i = sysLogDAO.logInsertAdminSysLogNewStep3(sysLog); //다시 로그 남기기 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 2eccbb8d..d5435ff3 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -609,7 +609,19 @@ public class EgovLoginController { throw new IllegalStateException("No AuthenticationProcessingFilter"); } + System.out.println("==18=1="); + springSecurity.doFilter(new RequestWrapperForSecurity(request, resultVO.getUserSe() + resultVO.getId(), resultVO.getUniqId()), response, null); + + try{ + System.out.println("==18=1="); + System.out.println("EgovUserDetailsHelper.isAuthenticated()"); + System.out.println(EgovUserDetailsHelper.isAuthenticated()); + }catch(Exception ex){ + ex.printStackTrace(); + } + + { // 관리자 로그인 log 저장 String uniqId = ""; String ip = ""; @@ -893,8 +905,18 @@ public class EgovLoginController { } else { throw new IllegalStateException("No AuthenticationProcessingFilter"); } - System.out.println("==14=="); + System.out.println("==14=1="); + springSecurity.doFilter(new RequestWrapperForSecurity(request, resultVO.getUserSe() + resultVO.getId(), resultVO.getUniqId()), response, null); + + try{ + System.out.println("==14=1="); + System.out.println("EgovUserDetailsHelper.isAuthenticated()"); + System.out.println(EgovUserDetailsHelper.isAuthenticated()); + }catch(Exception ex){ + ex.printStackTrace(); + } + { // 관리자 로그인 log 저장 String uniqId = ""; String ip = ""; @@ -943,7 +965,7 @@ public class EgovLoginController { loginLog.setProgrmFileNm("adminLogin"); loginLog.setMenuNm("관리자로그인"); loginLogService.logInsertLoginLog(loginLog); - System.out.println("==15=="); + System.out.println("==15=0="); } // session.setAttribute("beforeSiteUrl", request.getRequestURI()); @@ -957,7 +979,7 @@ public class EgovLoginController { request.getSession().setAttribute("registMessage", loginVO.getMessage()); } } - System.out.println("==16=="); + System.out.println("==16=0="); // 개인키 삭제 // 성공시 웹페이지 분기로 인해 session에 페이지 타입을 넣어준다. request.getSession().setAttribute("pageType", "web"); @@ -1144,7 +1166,18 @@ public class EgovLoginController { throw new IllegalStateException("No AuthenticationProcessingFilter"); } + System.out.println("==15=1="); + springSecurity.doFilter(new RequestWrapperForSecurity(request, resultVO.getUserSe() + resultVO.getId(), resultVO.getUniqId()), response, null); + + try{ + System.out.println("==15=1="); + System.out.println("EgovUserDetailsHelper.isAuthenticated()"); + System.out.println(EgovUserDetailsHelper.isAuthenticated()); + }catch(Exception ex){ + ex.printStackTrace(); + } + { // 관리자 로그인 log 저장 String uniqId = ""; String ip = ""; @@ -1355,7 +1388,19 @@ public class EgovLoginController { throw new IllegalStateException("No AuthenticationProcessingFilter"); } + System.out.println("==16=1="); + springSecurity.doFilter(new RequestWrapperForSecurity(request, resultVO.getUserSe() + resultVO.getId(), resultVO.getUniqId()), response, null); + + try{ + System.out.println("==16=1="); + System.out.println("EgovUserDetailsHelper.isAuthenticated()"); + System.out.println(EgovUserDetailsHelper.isAuthenticated()); + }catch(Exception ex){ + ex.printStackTrace(); + } + + { // 관리자 로그인 log 저장 String uniqId = ""; String ip = ""; @@ -1465,6 +1510,10 @@ public class EgovLoginController { // 1. Spring Security 사용자권한 처리 Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); + + System.out.println("===========isAuthenticated===========0"); + System.out.println(isAuthenticated); + if (!isAuthenticated) { // 로그인이 안되었을경우 if (session.getAttribute("pageType") != null) { // 사용자 로그인 추가 if ("web".equals((String) session.getAttribute("pageType"))) { @@ -1765,7 +1814,19 @@ public class EgovLoginController { } else { throw new IllegalStateException("No AuthenticationProcessingFilter"); } + + System.out.println("==17=1="); + springSecurity.doFilter(new RequestWrapperForSecurity(request, resultVO.getUserSe() + resultVO.getId(), resultVO.getUniqId()), response, null); + + try{ + System.out.println("==17=1="); + System.out.println("EgovUserDetailsHelper.isAuthenticated()"); + System.out.println(EgovUserDetailsHelper.isAuthenticated()); + }catch(Exception ex){ + ex.printStackTrace(); + } + return "blank"; // action.do 에서 일반사용자 분기처리 } else { model.addAttribute("message", egovMessageSource.getMessage("fail.common.login")); diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngVO.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngVO.java new file mode 100644 index 00000000..88643063 --- /dev/null +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngVO.java @@ -0,0 +1,225 @@ +package kcc.ve.adv.tngr.stngInfo.service; + +import java.io.Serializable; + +import kcc.com.cmm.ComDefaultVO; + + +public class VEAStngVO extends ComDefaultVO implements Serializable { + /* + * 과정온라인콘텐츠 + * */ + + private static final long serialVersionUID = 1L; + + //ve_prcs_onln_cntnt + private String prcsOrd; //과정순번 + private String prcsAplctPrdOrd; //과정신청기간순번 + private String prcsOnlnCntntOrd; //과정온라인콘텐츠순번 + private String[] prcsOnlnCntntOrdArr; //과정온라인콘텐츠순번 + private String[] prcsOrdArr; //과정순번 + private String onlnCntntDivCd; //온라인콘텐츠구분코드 + private String detailPrcsNm; //상세과정이름 + private String chasi; //차시 + private String useYn; //사용여부 + + private String frstRegistPnttm; // 등록일시 + private String frstRegisterId; // 등록자 + private String lastUpdtPnttm; // 수정일시 + private String lastUpdusrId; // 수정자 + + private String prcsNmTit; // 수정자 + + //ve_edu_aplct_onln + private String eduAplctOrd; //교육신청순번 + + //ve_prcs_cmplt_detail //과정이수상세 + + private String eduStrtDt; //교육시작일자 + private String eduEndDt; //교육마감일자 + private String eduPrsnl; //교육인원 + + private String sbmtYn; //제출여부 + private String sbmtPnttm; //제출일시 + private String sbmtId; //제출자 + + private String aprvlCd; //승인코드 + private String aprvlPnttm; //승인일시 + private String aprvlId; //승인자 + private String aprvlCn; //승인내용 + + private String prcsNm; //과정명 + + private String selectPagingListQuery; + private String orderByQuery; + public String getPrcsOrd() { + return prcsOrd; + } + public void setPrcsOrd(String prcsOrd) { + this.prcsOrd = prcsOrd; + } + public String getPrcsAplctPrdOrd() { + return prcsAplctPrdOrd; + } + public void setPrcsAplctPrdOrd(String prcsAplctPrdOrd) { + this.prcsAplctPrdOrd = prcsAplctPrdOrd; + } + public String getPrcsOnlnCntntOrd() { + return prcsOnlnCntntOrd; + } + public void setPrcsOnlnCntntOrd(String prcsOnlnCntntOrd) { + this.prcsOnlnCntntOrd = prcsOnlnCntntOrd; + } + public String[] getPrcsOnlnCntntOrdArr() { + return prcsOnlnCntntOrdArr; + } + public void setPrcsOnlnCntntOrdArr(String[] prcsOnlnCntntOrdArr) { + this.prcsOnlnCntntOrdArr = prcsOnlnCntntOrdArr; + } + public String[] getPrcsOrdArr() { + return prcsOrdArr; + } + public void setPrcsOrdArr(String[] prcsOrdArr) { + this.prcsOrdArr = prcsOrdArr; + } + public String getOnlnCntntDivCd() { + return onlnCntntDivCd; + } + public void setOnlnCntntDivCd(String onlnCntntDivCd) { + this.onlnCntntDivCd = onlnCntntDivCd; + } + public String getDetailPrcsNm() { + return detailPrcsNm; + } + public void setDetailPrcsNm(String detailPrcsNm) { + this.detailPrcsNm = detailPrcsNm; + } + public String getChasi() { + return chasi; + } + public void setChasi(String chasi) { + this.chasi = chasi; + } + public String getUseYn() { + return useYn; + } + public void setUseYn(String useYn) { + this.useYn = useYn; + } + public String getFrstRegistPnttm() { + return frstRegistPnttm; + } + public void setFrstRegistPnttm(String frstRegistPnttm) { + this.frstRegistPnttm = frstRegistPnttm; + } + public String getFrstRegisterId() { + return frstRegisterId; + } + public void setFrstRegisterId(String frstRegisterId) { + this.frstRegisterId = frstRegisterId; + } + public String getLastUpdtPnttm() { + return lastUpdtPnttm; + } + public void setLastUpdtPnttm(String lastUpdtPnttm) { + this.lastUpdtPnttm = lastUpdtPnttm; + } + public String getLastUpdusrId() { + return lastUpdusrId; + } + public void setLastUpdusrId(String lastUpdusrId) { + this.lastUpdusrId = lastUpdusrId; + } + public String getPrcsNmTit() { + return prcsNmTit; + } + public void setPrcsNmTit(String prcsNmTit) { + this.prcsNmTit = prcsNmTit; + } + public String getEduAplctOrd() { + return eduAplctOrd; + } + public void setEduAplctOrd(String eduAplctOrd) { + this.eduAplctOrd = eduAplctOrd; + } + public String getEduStrtDt() { + return eduStrtDt; + } + public void setEduStrtDt(String eduStrtDt) { + this.eduStrtDt = eduStrtDt; + } + public String getEduEndDt() { + return eduEndDt; + } + public void setEduEndDt(String eduEndDt) { + this.eduEndDt = eduEndDt; + } + public String getEduPrsnl() { + return eduPrsnl; + } + public void setEduPrsnl(String eduPrsnl) { + this.eduPrsnl = eduPrsnl; + } + public String getSbmtYn() { + return sbmtYn; + } + public void setSbmtYn(String sbmtYn) { + this.sbmtYn = sbmtYn; + } + public String getSbmtPnttm() { + return sbmtPnttm; + } + public void setSbmtPnttm(String sbmtPnttm) { + this.sbmtPnttm = sbmtPnttm; + } + public String getSbmtId() { + return sbmtId; + } + public void setSbmtId(String sbmtId) { + this.sbmtId = sbmtId; + } + public String getAprvlCd() { + return aprvlCd; + } + public void setAprvlCd(String aprvlCd) { + this.aprvlCd = aprvlCd; + } + public String getAprvlPnttm() { + return aprvlPnttm; + } + public void setAprvlPnttm(String aprvlPnttm) { + this.aprvlPnttm = aprvlPnttm; + } + public String getAprvlId() { + return aprvlId; + } + public void setAprvlId(String aprvlId) { + this.aprvlId = aprvlId; + } + public String getAprvlCn() { + return aprvlCn; + } + public void setAprvlCn(String aprvlCn) { + this.aprvlCn = aprvlCn; + } + public String getPrcsNm() { + return prcsNm; + } + public void setPrcsNm(String prcsNm) { + this.prcsNm = prcsNm; + } + public String getSelectPagingListQuery() { + return selectPagingListQuery; + } + public void setSelectPagingListQuery(String selectPagingListQuery) { + this.selectPagingListQuery = selectPagingListQuery; + } + public String getOrderByQuery() { + return orderByQuery; + } + public void setOrderByQuery(String orderByQuery) { + this.orderByQuery = orderByQuery; + } + + +} diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java new file mode 100644 index 00000000..81b48f13 --- /dev/null +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java @@ -0,0 +1,252 @@ +package kcc.ve.oprtn.tngrVisitEdu.areaLctrMng.web; + +import java.util.List; +import java.util.Properties; + +import javax.annotation.Resource; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; + +import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kcc.com.cmm.service.EgovCmmUseService; +import kcc.com.cmm.service.EgovFileMngService; +import kcc.com.cmm.service.EgovFileMngUtil; +import kcc.com.utl.user.service.CheckAdrProcessUtil; +import kcc.com.utl.user.service.CheckFileUtil; +import kcc.com.utl.user.service.CheckLoginUtil; +import kcc.kccadr.adjreqmgr.service.AdjReqMgrService; +import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; +import kcc.let.sym.ccm.cde.service.EgovCcmCmmnDetailCodeManageService; +import kcc.let.utl.fcc.service.EgovCryptoUtil; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduPnltyService; +import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEInstrFeeService; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctUnqIsuesService; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiService; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduCnfrmDsgnService; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; +import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrMixService; +import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrAreaMngService; +import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrDetailVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService; + +/** + * 교육신청관리(관리자-청소년찾아가는저작권교육)-고도화 + * 교육신청관리에 관한 controller 클래스를 정의한다. + * @author 조용준 + * @since 2021.12.16 + * @version 1.0 + * @see + * + * 
+ * << 개정이력(Modification Information) >>
+ *
+ *   수정일      수정자           수정내용
+ *  -------    --------    ---------------------------
+ *   2021.12.16  조용준          최초 생성
+ *
+ *
+ */ + +@Controller +//@RequestMapping("/kccadr/oprtn/tngrVisitEdu") +public class AdvAreaLctrMngTngrController { + + private static final Logger LOGGER = LoggerFactory.getLogger(AdvAreaLctrMngTngrController.class); + + //로그인 체크 util + @Resource(name = "checkLoginUtil") + private CheckLoginUtil checkLoginUtil; + + //과정 관리 + @Resource(name = "vEPrcsService") + private VEPrcsService vEPrcsService; + + //신청과정 관리 + @Resource(name = "vEEduMIXService") + private VEEduMIXService vEEduMIXService; + + //강의지역 관리 + @Resource(name = "vELctrAreaMngService") + private VELctrAreaMngService vELctrAreaMngService; + + + + //교육신청 + @Resource(name = "vEEduAplctService") + private VEEduAplctService vEEduAplctService; + + //교육과정신청 + @Resource(name = "vEPrcsMIXService") + private VEPrcsMIXService vEPrcsMIXService; + + //차시 + @Resource(name = "vEEduChasiService") + private VEEduChasiService vVEEduChasiService; + + + // 교육신청 서비스단 + @Resource(name = "AdjReqMgrService") + private AdjReqMgrService adjReqMgrService; + + // eGov 공통코드 + @Resource(name = "EgovCmmUseService") + private EgovCmmUseService cmmUseService; + + @Resource(name = "EgovFileMngService") + private EgovFileMngService fileService; + + // global 프로퍼티 + @Resource(name="globalSettings") + protected Properties propertiesService; + + //첨부파일 경로, realPath 설정 + @Resource(name="EgovFileMngUtil") + private EgovFileMngUtil fileUtil; + + // 첨부파일 정보 + @Resource(name="EgovFileMngService") + private EgovFileMngService fileMngService; + + //암복호화 유틸 + @Resource(name = "egovCryptoUtil") + EgovCryptoUtil egovCryptoUtil; + + + @Resource(name="KccadrMgrUdtService") + private KccadrMgrUdtService kccadrMgrUdtService; + + // 교육신청 서비스단 + @Resource(name = "checkAdrProcessUtil") + private CheckAdrProcessUtil checkAdrProcessUtil; + + // 강의배정정보 + @Resource(name = "vEAsgnmMIXService") + private VEAsgnmMIXService vEAsgnmMIXService; + + //파일 체크 util + @Resource(name = "checkFileUtil") + private CheckFileUtil checkFileUtil; + + //교육확정안 + @Resource(name = "vEEduCnfrmDsgnService") + private VEEduCnfrmDsgnService vEEduCnfrmDsgnService; + + // 교육패널티 + @Resource(name = "vEEduPnltyService") + private VEEduPnltyService vEEduPnltyService; + + // 특이사항 + @Resource(name = "vEEduAplctUnqIsuesService") + private VEEduAplctUnqIsuesService vEEduAplctUnqIsuesService; + + // 강사료 + @Resource(name = "vEInstrFeeService") + private VEInstrFeeService vEInstrFeeService; + + // 강사목록 + @Resource(name = "vEInstrMixService") + private VEInstrMixService vEInstrMixService; + + @Resource(name = "CmmnDetailCodeManageService") + private EgovCcmCmmnDetailCodeManageService cmmnDetailCodeManageService; + + /** + * 지역별 강의관리 목록 화면 + */ + @RequestMapping("/kccadr/oprtn/tngrVisitEdu/advAreaLctrMngList.do") + public String areaLctrMngList( + @ModelAttribute("vELctrDetailVO") VELctrDetailVO vELctrDetailVO + , ModelMap model + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + //String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); + //if (!"".equals(s_oprtnLoginCheckNInfo)) return s_oprtnLoginCheckNInfo; + + //로그인 처리==================================== + + //vEEduAplctVO.setLctrDivCd("30"); + vELctrDetailVO.setInstrDiv("10"); + + if (vELctrDetailVO.getStngYr()!=null && vELctrDetailVO.getPrdDivCd()!=null) { + List vELctrDetailVOList = vELctrAreaMngService.selectList(vELctrDetailVO); + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("list", vELctrDetailVOList); + + + VELctrDetailVO selectTimeSum = vELctrAreaMngService.selectTimeSum(vELctrDetailVO); + //대상 리스트, 페이징 정보 전달 + model.addAttribute("selectTimeSum", selectTimeSum); + + } + + + return "oprtn/tngrVisitEdu/advAreaLctrMngList"; + } + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // + // + // private function + // + // + + //페이징을 위한 처리 step1 - 페이징 기본 정보 설정 + private PaginationInfo setPagingStep1( + VEEduAplctVO p_vEEduAplctVO + )throws Exception{ + // pageing step1 + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(p_vEEduAplctVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(p_vEEduAplctVO.getPageUnit()); + paginationInfo.setPageSize(p_vEEduAplctVO.getPageSize()); + + return paginationInfo; + } + + + //페이징을 위한 처리 step2 - 게시물 리스트 수량 설정 및 검색 조건 초기화 + private VEEduAplctVO setPagingStep2( + VEEduAplctVO p_vEEduAplctVO + , PaginationInfo p_paginationInfo + )throws Exception{ + // pageing step2 + p_vEEduAplctVO.setFirstIndex(p_paginationInfo.getFirstRecordIndex()); + p_vEEduAplctVO.setLastIndex(p_paginationInfo.getLastRecordIndex()); + p_vEEduAplctVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage()); + + if("".equals(p_vEEduAplctVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + p_vEEduAplctVO.setSearchSortCnd("prcs_ord"); + p_vEEduAplctVO.setSearchSortOrd("desc"); + } + + return p_vEEduAplctVO; + } + + + //페이징을 위한 처리 step3 - 전체 게시물 수량 설정하기 + private PaginationInfo setPagingStep3( + List p_vEEduAplctVOList + + , PaginationInfo p_paginationInfo + )throws Exception{ + // pageing step3 + int totCnt = 0; + if(p_vEEduAplctVOList.size() > 0) totCnt = p_vEEduAplctVOList.get(0).getTotCnt(); + p_paginationInfo.setTotalRecordCount(totCnt); + + return p_paginationInfo; + } +} diff --git a/src/main/resources/egovframework/spring/com/context-idgen.xml b/src/main/resources/egovframework/spring/com/context-idgen.xml index 98a9bd13..208cee0a 100644 --- a/src/main/resources/egovframework/spring/com/context-idgen.xml +++ b/src/main/resources/egovframework/spring/com/context-idgen.xml @@ -2890,5 +2890,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml b/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml index 4a57b099..36f8b483 100644 --- a/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml +++ b/src/main/resources/egovframework/sqlmap/config/tibero/sql-map-config-tibero-ve.xml @@ -110,5 +110,11 @@ - + + + + + + + \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Tibero.xml index d45b54b2..6431a081 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Tibero.xml @@ -65,6 +65,7 @@ + /* LoginLogDAO.selectLoginLogInf */ - /* 임시.*NOT_SQL_LOG.* */ + /* 임시.*NOT_SQL_LOG.* LoginLogDAO.selectLoginUserLog */ - /* 임시.*NOT_SQL_LOG.* */ + /* 임시.*NOT_SQL_LOG.* LoginLogDAO.selectMainAmdinLogTotCnt */ SELECT COUNT(a.LOG_ID) FROM @@ -235,6 +237,67 @@ + + + - /* 임시.*NOT_SQL_LOG.* */ + /* 임시.*NOT_SQL_LOG.* LoginLogDAO.selectAmdinLogTotCnt */ SELECT COUNT(a.ADMINLOG_ID) FROM @@ -328,18 +391,20 @@ A.PARAM AS param, A.CREAT_DT AS tempSortNum, A.PRIVACY AS privacy, + A.USE_YN AS useYn, + A.SORT_NUM AS sortNum, A.method_cd as dateType FROM LETTNADMINMETHOD A WHERE 1=1 - ( A.MENU_NM LIKE CONCAT('%' , #searchKeyword#, '%') OR A.METHOD_NM LIKE CONCAT('%' , #searchKeyword#, '%') ) + ( A.MENU_NM LIKE '%'||#searchKeyword#||'%' OR A.METHOD_NM LIKE '%'||#searchKeyword#||'%' ) - A.MENU_NM LIKE CONCAT('%' , #searchKeyword#, '%') + A.MENU_NM LIKE '%'||#searchKeyword#||'%' - A.METHOD_NM LIKE CONCAT('%' , #searchKeyword#, '%') + A.METHOD_NM LIKE '%'||#searchKeyword#||'%' /* @@ -361,17 +426,24 @@ + + + /* 임시.*NOT_SQL_LOG.* */ @@ -393,6 +495,8 @@ , MENU_NM = #menuNm# , APPRO_NM = #approNm# , PRIVACY = #privacy# + , USE_YN = #useYn# + , sort_num = #sortNum# WHERE ADMOT_ID = #admotId# @@ -405,7 +509,9 @@ PARAM, MENU_NM, APPRO_NM, - PRIVACY + PRIVACY, + use_yn, + sort_num ) VALUES ( @@ -414,7 +520,9 @@ #param#, #menuNm#, #approNm#, - #privacy# + #privacy#, + #useYn#, + #sortNum# ) @@ -425,7 +533,7 @@ - /* 임시.*NOT_SQL_LOG.* */ + /* 임시.*NOT_SQL_LOG.* LoginLogDAO.selectWebLogList */ SELECT COUNT(A.MENU_NM) OVER() AS totCnt, COUNT(B.CREAT_DT) menuCnt, A.MENU_NM AS menuNm, @@ -656,12 +766,58 @@ $searchSortOrd$ LIMIT #recordCountPerPage# OFFSET #firstIndex# - - + + + + - /* 임시.*NOT_SQL_LOG.* */ + /* 임시.*NOT_SQL_LOG.* LoginLogDAO.selectDateLogList */ SELECT DATE_FORMAT(A.Dates, '%Y-%m-%d') AS creatDt FROM ( SELECT CURDATE() - INTERVAL (A.A + (10 * B.A) + (100 * C.A) + (1000 * D.A) ) DAY AS DATES @@ -865,7 +1021,7 @@ - /* 임시.*NOT_SQL_LOG.* */ + /* 임시.*NOT_SQL_LOG.* LoginLogDAO.selectLogCnt */ SELECT A.todayLogCnt , B.totalLogCnt from ( SELECT COUNT(*) todayLogCnt , 'TEMP' AS TEMP FROM LETTNLOGINLOG WHERE TO_CHAR(CREAT_DT, 'YYYY-MM-DD') = TO_CHAR(SYSDATE , 'YYYY-MM-DD') ) A diff --git a/src/main/resources/egovframework/sqlmap/let/sym/log/lgm/EgovSysLog_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/sym/log/lgm/EgovSysLog_SQL_Tibero.xml index ab14b246..f34a8410 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/log/lgm/EgovSysLog_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/log/lgm/EgovSysLog_SQL_Tibero.xml @@ -219,6 +219,7 @@ #url# FROM LETTNADMINMETHOD WHERE METHOD_NM = #methodNm# + AND method_cd='A' PARAM = #param# diff --git a/src/main/resources/egovframework/sqlmap/let/uss/ion/cnt/CntManage_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/uss/ion/cnt/CntManage_SQL_Tibero.xml index 3751e303..96bf16ac 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/ion/cnt/CntManage_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/ion/cnt/CntManage_SQL_Tibero.xml @@ -174,7 +174,7 @@ SELECT CNTDT_ID cntDtId, CNT_ID cntId, CNT_NAME cntName, - (SELECT CONCAT(MENU_NM , '>' , C.MENU_NM ) FROM LETTNMENUINFO + (SELECT MENU_NM||'>'||C.MENU_NM FROM LETTNMENUINFO WHERE MENU_NO = C.UPPER_MENU_NO ) menu_fullNm, '' as menuCours /*getMenuCours(C.MENU_NO) as menuCours*/ diff --git a/src/main/resources/egovframework/sqlmap/let/uss/pwm/PopupManage_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/uss/pwm/PopupManage_SQL_Tibero.xml index 6a365aa8..9298ca1c 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/pwm/PopupManage_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/pwm/PopupManage_SQL_Tibero.xml @@ -351,15 +351,15 @@ AND DEL = '0' - AND ( POZ_NM LIKE CONCAT ('%', #searchKeyword#,'%') - OR MLINK LIKE CONCAT ('%', #searchKeyword#,'%') + AND ( POZ_NM LIKE '%'||#searchKeyword#||'%' + OR MLINK LIKE '%'||#searchKeyword#||'%' ) - AND POZ_NM LIKE CONCAT ('%', #searchKeyword#,'%') + AND POZ_NM LIKE '%'||#searchKeyword#||'%' - AND MLINK LIKE CONCAT ('%', #searchKeyword#,'%') + AND MLINK LIKE '%'||#searchKeyword#||'%' @@ -396,7 +396,7 @@ MLINK, ISTARGET, REGDT, - DATE_FORMAT(MODDT, '%Y-%m-%d %h:%m:%s') MODDT , + TO_CHAR(MODDT, 'YYYY-MM-DD HH24:MI:SS') MODDT , DEL, SORT, POPUPZONE_IMAGE AS POPUPZONEIMAGE , diff --git a/src/main/resources/egovframework/sqlmap/ve/tngr/VEAAreaLctrStng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/tngr/VEAAreaLctrStng_SQL_Tibero.xml new file mode 100644 index 00000000..2e5d3efc --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEAAreaLctrStng_SQL_Tibero.xml @@ -0,0 +1,164 @@ + + + + + + + + + + ve_edu_aplct_onln + + + + + edu_aplct_ord, + prcs_ord, + + frst_regist_pnttm, + frst_register_id, + last_updt_pnttm, + last_updusr_id + + + + + + + a.edu_aplct_ord AS eduAplctOrd, + a.prcs_ord AS prcsOrd, + + DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d') AS frstRegistPnttm, + a.frst_register_id AS frstRegisterId, + DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d') AS lastUpdtPnttm, + a.last_updusr_id AS lastUpdusrId + + + + + + INSERT INTO ( + + )VALUES( + #eduAplctOrd#, + #prcsOrd#, + SYSDATE, + #frstRegisterId#, + SYSDATE, + #lastUpdusrId# + ) + + + + + + + + UPDATE + + SET + + LAST_UPDT_PNTTM = SYSDATE + ,LAST_UPDUSR_ID = #lastUpdusrId# + + WHERE + edu_aplct_ord = #eduAplctOrd# + AND prcs_ord = #prcsOrd# + + + + + INSERT INTO + ( + edu_aplct_ord, + prcs_ord, + + frst_regist_pnttm, + frst_register_id + + ) + SELECT #eduAplctOrd#,prcs_ord, SYSDATE,#lastUpdusrId# + FROM ve_prcs_onln_cntnt + WHERE prcs_ord=#prcsOrd# + AND use_yn='Y' + ON DUPLICATE KEY UPDATE + last_updt_pnttm=SYSDATE, + last_updusr_id=#lastUpdusrId# + + + + + + + DELETE FROM + + WHERE + edu_aplct_ord = #eduAplctOrd# + + AND prcs_ord = #prcsOrd# + + + + + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/ve/tngr/VEADtPsblTmQnttyStng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/tngr/VEADtPsblTmQnttyStng_SQL_Tibero.xml new file mode 100644 index 00000000..7136f905 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEADtPsblTmQnttyStng_SQL_Tibero.xml @@ -0,0 +1,164 @@ + + + + + + + + + + ve_edu_aplct_onln + + + + + edu_aplct_ord, + prcs_ord, + + frst_regist_pnttm, + frst_register_id, + last_updt_pnttm, + last_updusr_id + + + + + + + a.edu_aplct_ord AS eduAplctOrd, + a.prcs_ord AS prcsOrd, + + DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d') AS frstRegistPnttm, + a.frst_register_id AS frstRegisterId, + DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d') AS lastUpdtPnttm, + a.last_updusr_id AS lastUpdusrId + + + + + + INSERT INTO ( + + )VALUES( + #eduAplctOrd#, + #prcsOrd#, + SYSDATE, + #frstRegisterId#, + SYSDATE, + #lastUpdusrId# + ) + + + + + + + + UPDATE + + SET + + LAST_UPDT_PNTTM = SYSDATE + ,LAST_UPDUSR_ID = #lastUpdusrId# + + WHERE + edu_aplct_ord = #eduAplctOrd# + AND prcs_ord = #prcsOrd# + + + + + INSERT INTO + ( + edu_aplct_ord, + prcs_ord, + + frst_regist_pnttm, + frst_register_id + + ) + SELECT #eduAplctOrd#,prcs_ord, SYSDATE,#lastUpdusrId# + FROM ve_prcs_onln_cntnt + WHERE prcs_ord=#prcsOrd# + AND use_yn='Y' + ON DUPLICATE KEY UPDATE + last_updt_pnttm=SYSDATE, + last_updusr_id=#lastUpdusrId# + + + + + + + DELETE FROM + + WHERE + edu_aplct_ord = #eduAplctOrd# + + AND prcs_ord = #prcsOrd# + + + + + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrPsblPrdStng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrPsblPrdStng_SQL_Tibero.xml new file mode 100644 index 00000000..8ed0b287 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrPsblPrdStng_SQL_Tibero.xml @@ -0,0 +1,164 @@ + + + + + + + + + + ve_edu_aplct_onln + + + + + edu_aplct_ord, + prcs_ord, + + frst_regist_pnttm, + frst_register_id, + last_updt_pnttm, + last_updusr_id + + + + + + + a.edu_aplct_ord AS eduAplctOrd, + a.prcs_ord AS prcsOrd, + + DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d') AS frstRegistPnttm, + a.frst_register_id AS frstRegisterId, + DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d') AS lastUpdtPnttm, + a.last_updusr_id AS lastUpdusrId + + + + + + INSERT INTO ( + + )VALUES( + #eduAplctOrd#, + #prcsOrd#, + SYSDATE, + #frstRegisterId#, + SYSDATE, + #lastUpdusrId# + ) + + + + + + + + UPDATE + + SET + + LAST_UPDT_PNTTM = SYSDATE + ,LAST_UPDUSR_ID = #lastUpdusrId# + + WHERE + edu_aplct_ord = #eduAplctOrd# + AND prcs_ord = #prcsOrd# + + + + + INSERT INTO + ( + edu_aplct_ord, + prcs_ord, + + frst_regist_pnttm, + frst_register_id + + ) + SELECT #eduAplctOrd#,prcs_ord, SYSDATE,#lastUpdusrId# + FROM ve_prcs_onln_cntnt + WHERE prcs_ord=#prcsOrd# + AND use_yn='Y' + ON DUPLICATE KEY UPDATE + last_updt_pnttm=SYSDATE, + last_updusr_id=#lastUpdusrId# + + + + + + + DELETE FROM + + WHERE + edu_aplct_ord = #eduAplctOrd# + + AND prcs_ord = #prcsOrd# + + + + + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrRndsStng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrRndsStng_SQL_Tibero.xml new file mode 100644 index 00000000..f0090dac --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrRndsStng_SQL_Tibero.xml @@ -0,0 +1,164 @@ + + + + + + + + + + ve_edu_aplct_onln + + + + + edu_aplct_ord, + prcs_ord, + + frst_regist_pnttm, + frst_register_id, + last_updt_pnttm, + last_updusr_id + + + + + + + a.edu_aplct_ord AS eduAplctOrd, + a.prcs_ord AS prcsOrd, + + DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d') AS frstRegistPnttm, + a.frst_register_id AS frstRegisterId, + DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d') AS lastUpdtPnttm, + a.last_updusr_id AS lastUpdusrId + + + + + + INSERT INTO ( + + )VALUES( + #eduAplctOrd#, + #prcsOrd#, + SYSDATE, + #frstRegisterId#, + SYSDATE, + #lastUpdusrId# + ) + + + + + + + + UPDATE + + SET + + LAST_UPDT_PNTTM = SYSDATE + ,LAST_UPDUSR_ID = #lastUpdusrId# + + WHERE + edu_aplct_ord = #eduAplctOrd# + AND prcs_ord = #prcsOrd# + + + + + INSERT INTO + ( + edu_aplct_ord, + prcs_ord, + + frst_regist_pnttm, + frst_register_id + + ) + SELECT #eduAplctOrd#,prcs_ord, SYSDATE,#lastUpdusrId# + FROM ve_prcs_onln_cntnt + WHERE prcs_ord=#prcsOrd# + AND use_yn='Y' + ON DUPLICATE KEY UPDATE + last_updt_pnttm=SYSDATE, + last_updusr_id=#lastUpdusrId# + + + + + + + DELETE FROM + + WHERE + edu_aplct_ord = #eduAplctOrd# + + AND prcs_ord = #prcsOrd# + + + + + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrYrStng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrYrStng_SQL_Tibero.xml new file mode 100644 index 00000000..50938276 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrYrStng_SQL_Tibero.xml @@ -0,0 +1,164 @@ + + + + + + + + + + ve_edu_aplct_onln + + + + + edu_aplct_ord, + prcs_ord, + + frst_regist_pnttm, + frst_register_id, + last_updt_pnttm, + last_updusr_id + + + + + + + a.edu_aplct_ord AS eduAplctOrd, + a.prcs_ord AS prcsOrd, + + DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d') AS frstRegistPnttm, + a.frst_register_id AS frstRegisterId, + DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d') AS lastUpdtPnttm, + a.last_updusr_id AS lastUpdusrId + + + + + + INSERT INTO ( + + )VALUES( + #eduAplctOrd#, + #prcsOrd#, + SYSDATE, + #frstRegisterId#, + SYSDATE, + #lastUpdusrId# + ) + + + + + + + + UPDATE + + SET + + LAST_UPDT_PNTTM = SYSDATE + ,LAST_UPDUSR_ID = #lastUpdusrId# + + WHERE + edu_aplct_ord = #eduAplctOrd# + AND prcs_ord = #prcsOrd# + + + + + INSERT INTO + ( + edu_aplct_ord, + prcs_ord, + + frst_regist_pnttm, + frst_register_id + + ) + SELECT #eduAplctOrd#,prcs_ord, SYSDATE,#lastUpdusrId# + FROM ve_prcs_onln_cntnt + WHERE prcs_ord=#prcsOrd# + AND use_yn='Y' + ON DUPLICATE KEY UPDATE + last_updt_pnttm=SYSDATE, + last_updusr_id=#lastUpdusrId# + + + + + + + DELETE FROM + + WHERE + edu_aplct_ord = #eduAplctOrd# + + AND prcs_ord = #prcsOrd# + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp new file mode 100644 index 00000000..3098e80f --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp @@ -0,0 +1,686 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> + +<% + /** + * @Class Name : advAreaLctrMngList.jsp + * @Description : 지역별 강의관리 설정> 지역별 강의 설정 관리 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.12.14 조용준 최초 생성 + * @author 조용준 + * @since 2021.12.14 + * @version 1.0 + * @see + * + */ +%> + + + + + + 신청관리 + + +
+ + + + + +
+ + + " /> + " /> + + + +
+
+ + +
+

지역별 강의관리 설정

+
    +
    • +
  • +

    청소년 찾아가는 저작권 교육

    +
    • +
  • 지역별 강의관리
    • +
+
+ + +
+ +
+
+
+

구분1

+
+
+ +

   년도  

+ +

   지역  

+ + +
+
+
+
+

구분2

+
+
+

신청상태  

+ +

반기  

+ + +
+
+ + + +
+ + +
+
+
+
+ + + + +
+
+
+
+
+
+

접수일자

+
+
+
+ +
+

  09시  

+ ~ +
+ +
+

  24시  

+ +
+
+ +
+ + + + + + + + + + +
+ + + + + <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
지역신청상태강의가능시간강의가능기간등록자등록일지역별 총 접수시간(차시)지역별 신청현황
차시(신청)
+ + + + +

+ 		+

+ 		+ ~ + + ~ + + + + + + + + + + + () + + + + + + + + + () + + + + + + + +
+   + + 합계 : (차시) + + 합계 : () +
+
+ + + +
+
+
+
+ +
+
+ + + +
+
+
+ + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/sym/log/clg/EgovLoginLogList.jsp b/src/main/webapp/WEB-INF/jsp/sym/log/clg/EgovLoginLogList.jsp index 5cae5cf2..50e2e75c 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/log/clg/EgovLoginLogList.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/log/clg/EgovLoginLogList.jsp @@ -193,14 +193,14 @@ function fncReset(thisObj){
- + - + + + - - - + @@ -239,7 +239,7 @@ function fncReset(thisObj){ - + diff --git a/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectLogMethodList.jsp b/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectLogMethodList.jsp index 6245f8f8..a924690b 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectLogMethodList.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectLogMethodList.jsp @@ -228,7 +228,9 @@ function fnCheckAll(){ - + + + @@ -241,6 +243,8 @@ function fnCheckAll(){ + + @@ -267,6 +271,8 @@ function fnCheckAll(){ + + diff --git a/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectWebLogList.jsp b/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectWebLogList.jsp index e1adcacc..9a8fdfe9 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectWebLogList.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/log/clg/SelectWebLogList.jsp @@ -148,6 +148,23 @@ function webLogListExcelDownload(){ document.frm.action = ""; document.frm.submit(); } + +function fncReset(thisObj){ + var targetObj = $(thisObj).closest('.list_top').find('select,input'); + $.each(targetObj, function(){ + if($(this).prop('tagName') == 'SELECT'){ + if($(this).attr('name').indexOf('Month') != -1){ + $(this).val(new Date().getMonth()+1); + }else if($(this).attr('name').indexOf('Year') != -1){ + $(this).val(new Date().getFullYear()); + }else{ + $(this).prop("selectedIndex", 0); + } + }else{ + $(this).val(''); + } + }); +} @@ -218,22 +235,22 @@ function webLogListExcelDownload(){ -
-

총 건수 : 건

-
- - -
-
+ + + + + + @@ -244,35 +261,52 @@ function webLogListExcelDownload(){
개인정보여부 등록일자 사용자구분통계사용여부통계순서 관리
+ + + + + - - - - - - - - + + + + + + + + + +<%-- --%> + + +<%-- +<%-- end="${fn:length(userMenuList[0].logDataList)-2}" varStatus="status"> --%> + +<%-- --%> +<%-- ${fn:substring(result.creatDt,5,7)}
--%> +<%-- ${fn:substring(result.creatDt,8,10)} --%> +<%-- --%> +<%-- --%> +<%-- ${fn:substring(result.creatDt,0,4)}
--%> +<%-- ${fn:substring(result.creatDt,5,8)} --%> +<%-- --%> +<%-- --%> +<%-- ${fn:substring(result.creatDt,0,4)} --%> +<%-- --%> + +<%-- --%> + +<%-- --%> + + + - + + + + + - - - - + @@ -315,13 +358,13 @@ function webLogListExcelDownload(){ - -
-
    - -
-
- +<%-- --%> + + +<%-- --%> + + +<%-- --%> @@ -337,6 +380,6 @@ function webLogListExcelDownload(){ --> - +<%-- --%> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/sym/log/clg/ViewLogMethod.jsp b/src/main/webapp/WEB-INF/jsp/sym/log/clg/ViewLogMethod.jsp index e50ffc96..90e9d7c1 100644 --- a/src/main/webapp/WEB-INF/jsp/sym/log/clg/ViewLogMethod.jsp +++ b/src/main/webapp/WEB-INF/jsp/sym/log/clg/ViewLogMethod.jsp @@ -126,8 +126,8 @@ function fnCheckAll(){ /* pagination 페이지 링크 function */ function goList(){ - //document.searchForm.submit(); - location.href = ""; + document.searchForm.submit(); + //location.href = ""; } /* 등록시 값 확인 */ @@ -200,7 +200,8 @@ function fn_delete() { - + " /> + "/>
@@ -208,6 +209,7 @@ function fn_delete() {

관리자로그설정관리상세

+
  • @@ -236,48 +238,64 @@ function fn_delete() {
- - - - - - - + + + + + + + + + + + + - @@ -331,13 +349,13 @@ function fn_delete() { - + \ No newline at end of file
번호메뉴명 - - ${fn:substring(result.creatDt,5,7)}
- ${fn:substring(result.creatDt,8,10)} - - - ${fn:substring(result.creatDt,0,4)}
- ${fn:substring(result.creatDt,5,8)} - - - ${fn:substring(result.creatDt,0,4)} - - 		합계no메뉴명접근구분URL순서접속수
@@ -283,14 +317,23 @@ function webLogListExcelDownload(){ - + + + + + + + + + ${resultLogData.menuCnt}
메뉴명 - + +
메소드명 - + +
기능명 - + +
파라미터 - -
*기본값은 N 입니다. -
*N이 아닌 값을 사용할 경우는 url에 'logParam=파라미터값' 형식을 추가해야 적용됩니다. + 		+ +
*기본값은 N 입니다.     *N이 아닌 값을 사용할 경우는 url에 'logParam=파라미터값' 형식을 추가해야 적용됩니다.
privacy - -
*기본값은 N 입니다. -
N / Y *개인정보 포함 여부를 표시합니다. + 		+ +
*기본값은 N 입니다.     N / Y *개인정보 포함 여부를 표시합니다.
사용자구분${loginLog.dateType} -
U(사용자) / A(관리자) + 		${loginLog.dateType}     -     U(사용자) / A(관리자)
통계노출여부 + +
통계순서 + +
등록일자${loginLog.creatDt} + + ${loginLog.creatDt} <%-- --%>