tolag3/kcc_adr_advc_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

이준호전자조정시스템 커밋

Browse Source 
- 홈페이지 속도 개선
 - ocr 요청사항 추가
This commit is contained in:
leejunho 2023-11-15 18:16:02 +09:00
parent b07167388f
commit e2f1607af4
8 changed files with 63 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
src/main/java/kcc/let/main/web/EgovMainController.java
View File

@ -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<MenuManageJTreeVO> 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<MenuManageJTreeVO> quickList = menuCreateManageService.selectQuickListIncTop(menuManageJTreeVO) ;
// model.addAttribute("quickList", quickList);
// }
return "main/inc/EgovIncTopnav"; // 내부업무의 상단메뉴 화면
}
@ -627,25 +627,25 @@ public class EgovMainController {
@RequestParam Map<String, Object> 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"; // 내부업무의 상단메뉴 화면

2
src/main/resources/egovframework/sqlmap/kccadr/textsense/TextSense_SQL_Mysql.xml
View File

@ -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/')

5
src/main/webapp/WEB-INF/jsp/kccadr/textSense/EgovTextSenseDetail.jsp
View File

@ -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(){
<tr>
<th>처리 결과</th>
<td colspan="3">
<pre id="fileContents"><c:out value="${textSenseVO.fileContents}"/></pre>
<pre id="fileContents" style="white-space:pre-wrap;"><c:out value="${textSenseVO.fileContents}"/></pre>
</td>
</tr>
<tr>

5
src/main/webapp/WEB-INF/jsp/kccadr/textSense/pop/EgovTextSenseDetailPop.jsp
View File

@ -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 @@
<input type="hidden" id="fileName" name="fileName" value="<c:out value='${textSenseVO.fileName}'/>"/>
<div class="area_popup supm_popup" style="width: 800px;">
<div class="area_popup supm_popup" style="width: 100%;">
<div class="cont_popup">
<p class="tb_tit">OCR 처리 결과 편집</p>
<table class="pop_tbType01">
@ -63,7 +64,7 @@
<tbody>
<tr>
<td>
<p><pre><textarea rows="80" cols="30" name="fileContentsModify" id="fileContentsModify" style="height: 320px;">${textSenseVO.fileContentsModify}</textarea></pre></p>
<p><pre><textarea rows="150" cols="150" name="fileContentsModify" id="fileContentsModify" style="width:100%;height:80vh;">${textSenseVO.fileContentsModify}</textarea></pre></p>
</td>
</tr>
</tbody>

21
src/main/webapp/WEB-INF/jsp/layout/adminLayout.jsp
View File

@ -24,33 +24,12 @@
<script src="<c:url value='/js/ncms_common.js' />"></script><%-- 전자조정 --%>
<!-- <script src="//t1.daumcdn.net/mapjsapi/bundle/postcode/prod/postcode.v2.js"></script> -->
<script src="/kccadrPb/adm/script/postcode.js"></script>
<script src="<c:url value='/js/kccadr/kccadrCom.js' />"></script>
<%-- <script src="<c:url value='/js/kccadr/kccadrConstants.js' />"></script> --%>
<script src="<c:url value='/js/antdatepicker/moment.min.js'/>"></script>
<script>
<%--
$( document ).ready(function() {
labelSet();
});
function labelSet(){//Ajax load를 위해 메소드로 구현
$("input[type='checkBox'],input[type=radio]").each(function(index, item){
$(this).after("<label for='"+$(this).attr('id')+"'></label>") ;
});
}
// 페이지 뒤로 가기 시 이벤트 발생
window.onpageshow = function(event) {
// 뒤로 가기, 새로고침 등 캐시 복원 시
if ( event.persisted || (window.performance && window.performance.navigation.type == 2)) {
} else { // 새 페이지 열릴 시
<c:if test="${!empty message}">alert("${message}");</c:if>
}
}
--%>
</script>
</head>

4
src/main/webapp/WEB-INF/jsp/main/inc/EgovIncFooter.jsp
View File

@ -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" %>
<script type="text/javaScript" language="javascript" defer="defer">
<%--<script type="text/javaScript" language="javascript" defer="defer">
$( document ).ready(function() { //상단 cnt_cate_list 에 글 세팅
var tempText = "";
tempText = "<a href=\"/uat/uia/actionMain.do\">";
@ -97,4 +97,4 @@ function deleteLodingBar(){
}
}
</script>
--%>

66
src/main/webapp/WEB-INF/jsp/main/inc/EgovIncLeftmenu.jsp
View File

@ -116,78 +116,12 @@ $( document).ready(function() {
</c:forEach>
</c:otherwise>
</c:choose>
<!-- <li class="depth01">
<button class="menu_tit" title="하위메뉴 닫기">
</button>
</li>
<li class="depth01">
<button class="menu_tit" title="하위메뉴 닫기">
대국민 관리자 메뉴(추후 분리 예정)
</button>
</li> -->
<!-- <li class="depth01">
<button class="menu_tit" title="하위메뉴 닫기">
오프라인 조정관리
</button>
<ul class="depth02 " style="display: block;">
<li id="top_href_99914000" value="조정신청목록" onclick="javascript:goMenuPage('99914000', '/kccadr/adjReqMgOff/adjReqMgrOffList.do')">
<a href="#">조정신청목록</a>
</li>
</ul>
</li> -->
</ul>
</nav>
</div>
<!-- //leftmenu -->
<!-- 전자조정 메뉴 시작 -->
<%--
<nav class="leftMenu">
<ul>
<c:forEach var="result" items="${list_headmenu}" varStatus="status">
<li>
<img src="/pb/img/common/leftMenu${result.menuOrdr}.png" alt="${result.menuNm}메뉴 아이콘">
<p>${result.menuNm}</p>
<input type="button" class="goBtn">
<ul class="subMenu">
<c:forEach var="resultSub" items="${list_menulist}" varStatus="statusSub">
<c:if test="${result.menuNo eq resultSub.upperMenuId}">
<li onclick="javascript:goMenuPage('<c:out value="${resultSub.menuNo}"/>', '${resultSub.chkURL}')"
id="top_href_${resultSub.menuNo}" value='${resultSub.menuNm}'>
<a href="#">${resultSub.menuNm}</a>
</li>
</c:if>
</c:forEach>
</ul>
</li>
</c:forEach>
</ul>
<div class="btnWrap">
<ul>
<!-- <li><button>
<a href="/cmm/fms/FileDown.do?atchFileId=FILE_000000000008311&amp;fileSn=0">
<p>관리자 <span>매뉴얼</span> </p><img src="/pb/img/common/leftBtnIcon1.png" alt="관리자 매뉴얼 아이콘">
</button>
</a>
</li> -->
<li><a href="/web/main/mainPage.do" target="_blank"><button>
<p>홈페이지<span>바로가기</span></p><img src="/pb/img/common/leftBtnIcon2.png" alt="홈페이지바로가기 아이콘">
</button>
</a>
</li>
</ul>
</div>
<span class="leftBtm">KoFons</span>
</nav>
--%>
<!-- 전자조정 메뉴 끝 -->
<form name="menuListForm" action="" method="post">

6
src/main/webapp/WEB-INF/jsp/main/inc/EgovIncTopnav.jsp
View File

@ -104,9 +104,9 @@ function modifyMem(uniqId){
<li class="time_out"><i></i>
<p>로그인 타임아웃 : </p><span id="ViewTimer"></span>
</li>
<li class="final_date"><i></i>
<p>최종접속일시 : </p><span><c:out value="${beforeLoginDate}" /></span>
</li>
<!-- <li class="final_date"><i></i> -->
<%-- <p>최종접속일시 : </p><span><c:out value="${beforeLoginDate}" /></span> --%>
<!-- </li> -->
</ul>
</div>
<!-- //top_utill -->