diff --git a/src/main/java/kcc/let/main/web/EgovMainController.java b/src/main/java/kcc/let/main/web/EgovMainController.java index cf02632e..ea2ad869 100644 --- a/src/main/java/kcc/let/main/web/EgovMainController.java +++ b/src/main/java/kcc/let/main/web/EgovMainController.java @@ -299,38 +299,38 @@ public class EgovMainController { EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; if(EgovUserDetailsHelper.isAuthenticated() && user!=null){ - menuManageVO.setTmp_Id(user.getId()); - menuManageVO.setTmp_Password(user.getPassword()); - menuManageVO.setTmp_UserSe(user.getUserSe()); - menuManageVO.setTmp_Name(user.getName()); - menuManageVO.setTmp_Email(user.getEmail()); - menuManageVO.setTmp_OrgnztId(user.getOrgnztId()); - menuManageVO.setTmp_UniqId(user.getUniqId()); +// menuManageVO.setTmp_Id(user.getId()); +// menuManageVO.setTmp_Password(user.getPassword()); +// menuManageVO.setTmp_UserSe(user.getUserSe()); +// menuManageVO.setTmp_Name(user.getName()); +// menuManageVO.setTmp_Email(user.getEmail()); +// menuManageVO.setTmp_OrgnztId(user.getOrgnztId()); +// menuManageVO.setTmp_UniqId(user.getUniqId()); //menuManageVO.setMenuUserType("A"); //관리자만 조회 - List list_headmenu = menuManageService.selectMainMenuHead(menuManageVO) ; - model.addAttribute("list_headmenu", list_headmenu); - List list_menulist = menuManageService.selectMainMenuLeft(menuManageVO); - model.addAttribute("list_menulist", list_menulist); - model.addAttribute("adminUserName", user.getName()); - model.addAttribute("uniqId", user.getUniqId()); +// List list_headmenu = menuManageService.selectMainMenuHead(menuManageVO) ; +// model.addAttribute("list_headmenu", list_headmenu); +// List list_menulist = menuManageService.selectMainMenuLeft(menuManageVO); +// model.addAttribute("list_menulist", list_menulist); +// model.addAttribute("adminUserName", user.getName()); +// model.addAttribute("uniqId", user.getUniqId()); //이전접속정보 - LoginLog loginLog = new LoginLog(); - loginLog.setConectId(user.getUniqId()); - loginLog = loginLogService.selectBeforeAmdinLog(loginLog); //이전접속 시간 - if(loginLog !=null) { - model.addAttribute("beforeLoginDate", loginLog.getCreatDt()); - }else { - model.addAttribute("beforeLoginDate", ""); - } +// LoginLog loginLog = new LoginLog(); +// loginLog.setConectId(user.getUniqId()); +// loginLog = loginLogService.selectBeforeAmdinLog(loginLog); //이전접속 시간 +// if(loginLog !=null) { +// model.addAttribute("beforeLoginDate", loginLog.getCreatDt()); +// }else { +// model.addAttribute("beforeLoginDate", ""); +// } }else{ //model.addAttribute("list_headmenu", menuManageService.selectMainMenuHeadAnonymous(menuManageVO)); //model.addAttribute("list_menulist", menuManageService.selectMainMenuLeftAnonymous(menuManageVO)); } - if(commandMap.get("before") !=null ){ - return "main/inc/EgovIncTopnav1"; // 내부업무의 상단메뉴 이전 화면 - } +// if(commandMap.get("before") !=null ){ +// return "main/inc/EgovIncTopnav1"; // 내부업무의 상단메뉴 이전 화면 +// } //세션타임 설정 SiteManagerVO siteManagerVO = new SiteManagerVO(); @@ -340,14 +340,14 @@ public class EgovMainController { //즐겨찾기매뉴 - if(null != user){ - MenuManageJTreeVO menuManageJTreeVO = new MenuManageJTreeVO(); - menuManageJTreeVO.setSiteId(user.getSiteId()); - menuManageJTreeVO.setAuthorCode("ROLE_ADMIN") ; //관리자 페이지 - menuManageJTreeVO.setUserId(user.getId()); - List quickList = menuCreateManageService.selectQuickListIncTop(menuManageJTreeVO) ; - model.addAttribute("quickList", quickList); - } +// if(null != user){ +// MenuManageJTreeVO menuManageJTreeVO = new MenuManageJTreeVO(); +// menuManageJTreeVO.setSiteId(user.getSiteId()); +// menuManageJTreeVO.setAuthorCode("ROLE_ADMIN") ; //관리자 페이지 +// menuManageJTreeVO.setUserId(user.getId()); +// List quickList = menuCreateManageService.selectQuickListIncTop(menuManageJTreeVO) ; +// model.addAttribute("quickList", quickList); +// } return "main/inc/EgovIncTopnav"; // 내부업무의 상단메뉴 화면 } @@ -627,25 +627,25 @@ public class EgovMainController { @RequestParam Map commandMap ,ModelMap model) throws Exception { - SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat ( "yyyyMMdd", Locale.KOREA ); - Date currentTime = new Date (); - String mTime = mSimpleDateFormat.format ( currentTime ); - HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest(); - String ip = req.getHeader("X-FORWARDED-FOR"); - if (ip == null){ ip = req.getRemoteAddr();} - LoginLog loginLog = new LoginLog(); - loginLog.setLoginIp(ip); - loginLog.setCreatDt(mTime); - loginLog.setLoginMthd("I"); // 로그인:I, 로그아웃:O - loginLog.setErrOccrrAt("N"); - loginLog.setErrorCode(""); - loginLog.setUserAt("A"); //관리자 - loginLog.setLoginId(""); //connnect_id - loginLog.setUrl(req.getRequestURI()); - if(EgovUserDetailsHelper.isAuthenticated()){ - LoginVO user = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); - loginLog.setLoginId(user.getUniqId()); - } +// SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat ( "yyyyMMdd", Locale.KOREA ); +// Date currentTime = new Date (); +// String mTime = mSimpleDateFormat.format ( currentTime ); +// HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest(); +// String ip = req.getHeader("X-FORWARDED-FOR"); +// if (ip == null){ ip = req.getRemoteAddr();} +// LoginLog loginLog = new LoginLog(); +// loginLog.setLoginIp(ip); +// loginLog.setCreatDt(mTime); +// loginLog.setLoginMthd("I"); // 로그인:I, 로그아웃:O +// loginLog.setErrOccrrAt("N"); +// loginLog.setErrorCode(""); +// loginLog.setUserAt("A"); //관리자 +// loginLog.setLoginId(""); //connnect_id +// loginLog.setUrl(req.getRequestURI()); +// if(EgovUserDetailsHelper.isAuthenticated()){ +// LoginVO user = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); +// loginLog.setLoginId(user.getUniqId()); +// } //loginLogService.logInsertAdminLoginLog(loginLog); return "main/inc/EgovIncFooter"; // 내부업무의 상단메뉴 화면 diff --git a/src/main/resources/egovframework/sqlmap/kccadr/textsense/TextSense_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/textsense/TextSense_SQL_Mysql.xml index 08de282a..04a247e6 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/textsense/TextSense_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/textsense/TextSense_SQL_Mysql.xml @@ -104,7 +104,7 @@ A.EXTERNAL_ID AS externalId, A.FRST_REGISTER_ID AS frstRegisterId, DATE_FORMAT(A.FRST_REGIST_PNTTM,'%Y-%m-%d %T') AS frstRegistPnttm, - B.filecontents AS fileContents + decode(B.filecontents_modify, null, B.filecontents, B.filecontents_modify) AS fileContents FROM ADR_TEXTSENSE_OCR A LEFT JOIN ADR_TEXTSENSE_OCR_TEXTDATA B ON B.filename = LTRIM(A.OUTPUT_URI, 'file:/home/kcc_adr_ocr_dir/') diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/textSense/EgovTextSenseDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/textSense/EgovTextSenseDetail.jsp index edac4eea..04aec6d1 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/textSense/EgovTextSenseDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/textSense/EgovTextSenseDetail.jsp @@ -43,7 +43,8 @@ function fnListPage(){ function fnModifyPop(){ var pop = document.pop; - commonPopWindowopenForm("/kccadr/textsence/popup/modifyTextSenseResultPop.do", '820', '500', "textSensePop", $('#pop')); +// commonPopWindowopenForm("/kccadr/textsence/popup/modifyTextSenseResultPop.do", '820', '500', "textSensePop", $('#pop')); + commonPopWindowopenForm("/kccadr/textsence/popup/modifyTextSenseResultPop.do", '999999', '999999', "textSensePop", $('#pop')); } function fnDelete(){ @@ -146,7 +147,7 @@ function fnDelete(){ 처리 결과 -
+
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/textSense/pop/EgovTextSenseDetailPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/textSense/pop/EgovTextSenseDetailPop.jsp index faf87b44..eb4edf41 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/textSense/pop/EgovTextSenseDetailPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/textSense/pop/EgovTextSenseDetailPop.jsp @@ -36,6 +36,7 @@ console.log(returnData.result); if(returnData.result == 'SUCCESS'){ alert("저장되었습니다."); + window.opener.parent.location.reload(); }else{ alert(returnData.message); } @@ -52,7 +53,7 @@ -
+

OCR 처리 결과 편집

@@ -63,7 +64,7 @@ diff --git a/src/main/webapp/WEB-INF/jsp/layout/adminLayout.jsp b/src/main/webapp/WEB-INF/jsp/layout/adminLayout.jsp index 36f77f51..7fecdf8d 100644 --- a/src/main/webapp/WEB-INF/jsp/layout/adminLayout.jsp +++ b/src/main/webapp/WEB-INF/jsp/layout/adminLayout.jsp @@ -24,33 +24,12 @@ <%-- 전자조정 --%> - -<%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncFooter.jsp b/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncFooter.jsp index 0bb1deb6..6e6dc648 100644 --- a/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncFooter.jsp +++ b/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncFooter.jsp @@ -13,7 +13,7 @@ <%@ 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="spring" uri="http://www.springframework.org/tags" %> - - \ No newline at end of file + --%> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp b/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp index 915eb573..2b6a2dfd 100644 --- a/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp +++ b/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp @@ -116,78 +116,12 @@ $( document).ready(function() { - - - - - - - - -<%-- - ---%> diff --git a/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncTopnav.jsp b/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncTopnav.jsp index 56ffb3c0..612224f8 100644 --- a/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncTopnav.jsp +++ b/src/main/webapp/WEB-INF/jsp/main/inc/EgovIncTopnav.jsp @@ -104,9 +104,9 @@ function modifyMem(uniqId){

  • 로그인 타임아웃 :

    • -
  • -

    최종접속일시 :

    -
    • + +<%--

    최종접속일시 :

    --%> +
    -

    +