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-10-31 14:07:51 +09:00
parent 5b558719d8
commit c90dcb0072
4 changed files with 99 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/kcc/kccadr/textsense/web/TextSenseController.java
View File

@ -116,8 +116,6 @@ public class TextSenseController {
@RequestMapping(value="/kccadr/textsence/selectTextSenseDetail.do") @RequestMapping(value="/kccadr/textsence/selectTextSenseDetail.do")
public String selectTextSenseDetail(@ModelAttribute("searchVO")TextSenseVO textSenseVO, ModelMap model) throws Exception{ public String selectTextSenseDetail(@ModelAttribute("searchVO")TextSenseVO textSenseVO, ModelMap model) throws Exception{
System.out.println("++++++++++++++++++++"+textSenseVO.getId());
LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
if(user == null) { if(user == null) {
@ -174,7 +172,6 @@ public class TextSenseController {
extList.add("pdf"); extList.add("pdf");
extList.add("bmp"); extList.add("bmp");
//알림톡 템플릿에 이미지가 포함되어 있는 경우 처리
if (!files.isEmpty()){ if (!files.isEmpty()){
if ("".equals(atchFileId)) { if ("".equals(atchFileId)) {

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

@ -38,11 +38,14 @@ function fnListPage(){
</script> </script>
<style> <style>
.tbType02 .radio_wrap input[type=radio] + label {margin-right:15px;} .tbType02 .radio_wrap input[type=radio] + label {margin-right:15px;}
.hide {display:none;}
</style> </style>
</head> </head>
<body> <body>
<form id="textSenseVO" name="textSenseVO" method="post"> <form id="textSenseVO" name="textSenseVO" method="post">
<input type="hidden" name="pageIndex" value="1"/> <input type="hidden" name="pageIndex" value="${searchVO.pageIndex}"/>
<input type="hidden" name="searchKeyword" value="${searchVO.searchKeyword}"/>
<input type="hidden" name="searchCondition" value="${searchVO.searchCondition}"/>
<!-- cont --> <!-- cont -->
<div class="cont_wrap"> <div class="cont_wrap">
@ -71,66 +74,13 @@ function fnListPage(){
</colgroup> </colgroup>
<tbody> <tbody>
<tr> <tr>
<th><span class="reqArea">OCR ID</span></th> <th><span class="reqArea">작업명</span></th>
<td colspan="3">
<c:out value="${textSenseVO.id}"/>
</td>
</tr>
<tr>
<th><span class="reqArea">Task Name</span></th>
<td colspan="3"> <td colspan="3">
<c:out value="${textSenseVO.taskName}"/> <c:out value="${textSenseVO.taskName}"/>
</td> </td>
</tr> </tr>
<tr>
<th><span class="reqArea">Input URI</span></th>
<td colspan="3">
<c:out value="${textSenseVO.inputUri}"/>
</td>
</tr>
<tr>
<th>Output URI</th>
<td colspan="3">
<c:out value="${textSenseVO.outputUri}"/>
</td>
</tr>
<tr>
<th>Callback URI</th>
<td colspan="3">
<c:out value="${textSenseVO.callbackUri}"/>
</td>
</tr>
<tr>
<th>Input 파일 길이</th>
<td colspan="3">
<c:choose>
<c:when test="${not empty textSenseVO.inputFileLength}">
<c:out value="${textSenseVO.inputFileLength}"/>
</c:when>
<c:otherwise>
-
</c:otherwise>
</c:choose>
</td>
</tr>
<tr>
<th>Output 파일 길이</th>
<td colspan="3">
<c:choose>
<c:when test="${not empty textSenseVO.outputFileLength}">
<c:out value="${textSenseVO.outputFileLength}"/>
</c:when>
<c:otherwise>
-
</c:otherwise>
</c:choose>
</td>
</tr>
<tr> <tr>
<th>진행상태</th> <th>진행상태</th>
<td colspan="3"> <td colspan="3">
@ -148,6 +98,71 @@ function fnListPage(){
</td> </td>
</tr> </tr>
<tr> <tr>
<th>처리 결과</th>
<td colspan="3">
test
</td>
</tr>
<tr>
<th>등록일자</th>
<td colspan="3">
<c:out value="${textSenseVO.frstRegistPnttm}"/>
</td>
</tr>
<tr class="hide">
<th><span class="reqArea">OCR ID</span></th>
<td colspan="3">
<c:out value="${textSenseVO.id}"/>
</td>
</tr>
<tr class="hide">
<th><span class="reqArea">Input URI</span></th>
<td colspan="3">
<c:out value="${textSenseVO.inputUri}"/>
</td>
</tr>
<tr class="hide">
<th>Output URI</th>
<td colspan="3">
<c:out value="${textSenseVO.outputUri}"/>
</td>
</tr>
<tr class="hide">
<th>Callback URI</th>
<td colspan="3">
<c:out value="${textSenseVO.callbackUri}"/>
</td>
</tr>
<tr class="hide">
<th>Input 파일 길이</th>
<td colspan="3">
<c:choose>
<c:when test="${not empty textSenseVO.inputFileLength}">
<c:out value="${textSenseVO.inputFileLength}"/>
</c:when>
<c:otherwise>
-
</c:otherwise>
</c:choose>
</td>
</tr>
<tr class="hide">
<th>Output 파일 길이</th>
<td colspan="3">
<c:choose>
<c:when test="${not empty textSenseVO.outputFileLength}">
<c:out value="${textSenseVO.outputFileLength}"/>
</c:when>
<c:otherwise>
-
</c:otherwise>
</c:choose>
</td>
</tr>
<tr class="hide">
<th>요청 작업 생성 시간</th> <th>요청 작업 생성 시간</th>
<td colspan="3"> <td colspan="3">
<c:choose> <c:choose>
@ -160,7 +175,7 @@ function fnListPage(){
</c:choose> </c:choose>
</td> </td>
</tr> </tr>
<tr> <tr class="hide">
<th>대기상태로 변경된 시간</th> <th>대기상태로 변경된 시간</th>
<td colspan="3"> <td colspan="3">
<c:choose> <c:choose>
@ -173,7 +188,7 @@ function fnListPage(){
</c:choose> </c:choose>
</td> </td>
</tr> </tr>
<tr> <tr class="hide">
<th>변환작업 시작 시간</th> <th>변환작업 시작 시간</th>
<td colspan="3"> <td colspan="3">
<c:choose> <c:choose>
@ -186,7 +201,7 @@ function fnListPage(){
</c:choose> </c:choose>
</td> </td>
</tr> </tr>
<tr> <tr class="hide">
<th>변환작업 완료 시간</th> <th>변환작업 완료 시간</th>
<td colspan="3"> <td colspan="3">
<c:choose> <c:choose>
@ -199,7 +214,7 @@ function fnListPage(){
</c:choose> </c:choose>
</td> </td>
</tr> </tr>
<tr> <tr class="hide">
<th>변환작업 재시도 횟수</th> <th>변환작업 재시도 횟수</th>
<td colspan="3"> <td colspan="3">
<c:choose> <c:choose>
@ -212,12 +227,6 @@ function fnListPage(){
</c:choose> </c:choose>
</td> </td>
</tr> </tr>
<tr>
<th>등록일자</th>
<td colspan="3">
<c:out value="${textSenseVO.frstRegistPnttm}"/>
</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>

4
src/main/webapp/WEB-INF/jsp/kccadr/textSense/EgovTextSenseList.jsp
View File

@ -153,7 +153,7 @@ function fncTextSenseStatus(id){
<li> <li>
<p class="tit_text">구분</p> <p class="tit_text">구분</p>
<select name="searchCondition" id="searchCondition"> <select name="searchCondition" id="searchCondition">
<option value="1" ${searchVO.searchCondition eq '1' ? 'selected' : '' }>TaskName</option> <option value="1" ${searchVO.searchCondition eq '1' ? 'selected' : '' }>작업명</option>
</select> </select>
<input type="text" id="searchKeyword" name="searchKeyword" class="search_input" placeholder="검색어를 입력하세요" value="<c:out value='${searchVO.searchKeyword}'/>"> <input type="text" id="searchKeyword" name="searchKeyword" class="search_input" placeholder="검색어를 입력하세요" value="<c:out value='${searchVO.searchKeyword}'/>">
<button class="btn_search" onclick="fncGoList(); return false;">검색</button> <button class="btn_search" onclick="fncGoList(); return false;">검색</button>
@ -177,7 +177,7 @@ function fncTextSenseStatus(id){
<thead> <thead>
<tr> <tr>
<th>번호<button class="sort btn_sort" id="sort_id"></button></th> <th>번호<button class="sort btn_sort" id="sort_id"></button></th>
<th>TaskName<button type="button" class="sort sortBtn" id="sort_taskName"></button></th> <th>작업명<button type="button" class="sort sortBtn" id="sort_taskName"></button></th>
<!-- <th>상태확인</th> --> <!-- <th>상태확인</th> -->
<th>처리상태<button type="button" class="sort sortBtn" id="sort_status"></button></th> <th>처리상태<button type="button" class="sort sortBtn" id="sort_status"></button></th>
<th>등록일자<button type="button" class="sort sortBtn" id="sort_frstRegistPnttm"></button></th> <th>등록일자<button type="button" class="sort sortBtn" id="sort_frstRegistPnttm"></button></th>

32
src/main/webapp/WEB-INF/jsp/kccadr/textSense/EgovTextSenseRegist.jsp
View File

@ -31,18 +31,18 @@ $( document ).ready(function() {
$(function () { $(function () {
//화면 로딩시 제목 자동 생성 //화면 로딩시 제목 자동 생성
var today = new Date(); // var today = new Date();
var year = today.getFullYear(); // 년도 // var year = today.getFullYear(); // 년도
var month = today.getMonth() + 1; // 월 // var month = today.getMonth() + 1; // 월
var date = today.getDate(); // 날짜 // var date = today.getDate(); // 날짜
var hours = today.getHours(); // 시 // var hours = today.getHours(); // 시
var minutes = today.getMinutes(); // 분 // var minutes = today.getMinutes(); // 분
var milliseconds = today.getMilliseconds(); // 밀리초 // var milliseconds = today.getMilliseconds(); // 밀리초
var tkName = "TaskOcr_"+year.toString() + month.toString() + date.toString() + hours.toString() + minutes.toString() + milliseconds.toString(); // var tkName = "TaskOcr_"+year.toString() + month.toString() + date.toString() + hours.toString() + minutes.toString() + milliseconds.toString();
$('#taskName').val(tkName); // $('#taskName').val(tkName);
$('#filebutton').click(function (e) { $('#filebutton').click(function (e) {
@ -60,6 +60,14 @@ function goTextSenseList() {
location.href="/kccadr/textsence/selectTextSenseList.do"; location.href="/kccadr/textsence/selectTextSenseList.do";
} }
function validation(){
if($('#taskName').val() == ''){
alert('작업명을 입력해 주세요.');
return false;
}
}
function fn_egov_regist() { function fn_egov_regist() {
@ -70,6 +78,10 @@ function fn_egov_regist() {
if (obj) data.append("file"+idx, obj.fileObj); if (obj) data.append("file"+idx, obj.fileObj);
}); });
if(!validation()){
return false;
}
if(!confirm("OCR 처리 요청을 진행하시겠습니까?")) return false; if(!confirm("OCR 처리 요청을 진행하시겠습니까?")) return false;
$.ajax({ $.ajax({
@ -196,7 +208,7 @@ function fn_egov_regist_preview() {
<!-- <th> <!-- <th>
<input type="checkbox" id="all_check"><label for="all_check"></label> <input type="checkbox" id="all_check"><label for="all_check"></label>
</th> --> </th> -->
<th>파일 명</th> <th>작업명</th>
<th>종류</th> <th>종류</th>
<th>크기</th> <th>크기</th>
<th>삭제</th> <th>삭제</th>