From 8472f7568af4e60df6bc8855413d0b6f64d96f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Thu, 3 Jul 2025 15:44:49 +0900 Subject: [PATCH] =?UTF-8?q?ocr=20=EB=93=B1=EB=A1=9D=20=EC=88=98=EC=9E=85?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/DailyExpenseService.java | 2 +- .../adapters/web/DailyReceiptController.java | 73 ++-- .../templates/record/expense/form.html | 335 ++++++++++-------- .../templates/record/expense/index.html | 234 ++++++++++++ .../templates/record/income/form.html | 4 +- .../templates/record/income/index.html | 6 +- 6 files changed, 483 insertions(+), 171 deletions(-) diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java index 4e95d946..e2feb309 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java @@ -110,7 +110,7 @@ public class DailyExpenseService implements DailyExpensePortIn { formVO.getEstimatedValue())); portOut.create(findCmd, command); - + formVO.setId(command.getId()); dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq()); } diff --git a/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/DailyReceiptController.java b/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/DailyReceiptController.java index ff47de19..ff389c02 100644 --- a/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/DailyReceiptController.java +++ b/front/src/main/java/app/module/front/usecase/daily/receipt/adapters/web/DailyReceiptController.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.receipt.adapters.web; +import app.module.core.config.application.enums.FileUploadType; import app.module.core.config.application.exception.NoRecordDataException; import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; @@ -8,6 +9,8 @@ import app.module.core.usecase.file.createFile.ports.application.domain.CreateFi import app.module.core.usecase.file.createFile.ports.application.domain.CreateFileCmd; import app.module.core.usecase.file.saveToStorage.ports.SaveToStoragePortIn; import app.module.core.usecase.file.saveToStorage.ports.application.domain.SaveToStorage; +import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpenseReqVO; +import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn; import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO; import app.module.front.usecase.daily.income.adapters.web.model.DailyInputType; import app.module.front.usecase.daily.income.ports.DailyIncomePortIn; @@ -16,11 +19,13 @@ import app.module.front.usecase.daily.receipt.ports.DailyReceiptPortIn; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.*; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; @@ -33,6 +38,7 @@ import java.util.List; @Slf4j @RestController @RequiredArgsConstructor +@RequestMapping(path = "/api/record/receipt") public class DailyReceiptController { private final DailyRecordPortIn dailyRecordPortIn; @@ -41,12 +47,12 @@ public class DailyReceiptController { private final CreateFilePortIn createFilePortIn; private final RestTemplate restTemplate; private final DailyReceiptPortIn dailyReceiptPortIn; - + private final DailyExpensePortIn dailyExpensePortIn; /** * 일계부 영수증 등록 */ - @PostMapping(path = "/api/record/receipt") + @PostMapping(path = "") ResponseEntity operate( @RequestPart(value = "file") MultipartFile file) throws IOException { // 파일 유효성 검사 if (file == null || file.isEmpty()) { @@ -106,9 +112,12 @@ public class DailyReceiptController { * @param id 수입 일련번호 * @param reqVOList 영수증 데이터 */ - @PostMapping(path = "/api/record/income/receipt/{searchMonth}/{groupNo}/form/{id}") - ResponseEntity createReceipt(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo - , @PathVariable("id") String id, + @PostMapping(path = "/{inputType}/{searchMonth}/{groupNo}/form/{id}") + ResponseEntity createReceipt( + @PathVariable("inputType") String inputType, + @PathVariable("searchMonth") String searchMonth, + @PathVariable("groupNo") String groupNo, + @PathVariable("id") String id, @RequestPart(value = "reqVO") List reqVOList, @RequestPart(value = "file") List files ) throws IOException { @@ -141,22 +150,46 @@ public class DailyReceiptController { // 1. 레코드 저장 for(ReceiptItem item : createReceiptFileReqVO.getOcr().getItems()){ - CreateDailyIncomeReqVO formVO = new CreateDailyIncomeReqVO(); - formVO.setSearchMonth(searchMonth); - formVO.setGroupNo(Integer.parseInt(groupNo)); - formVO.setId(Long.parseLong(id)); - formVO.setDailyRecordSeq(dailyRecord.getId()); - formVO.setInputType(DailyInputType.OCR); - formVO.setCredit(false); - formVO.setSourcePurpose(createReceiptFileReqVO.getOcr().getStoreName()); - formVO.setIncomeKind(item.getName()); - formVO.setQuantity((double) item.getQuantity()); - formVO.setPrice((long) item.getTotalPrice()); - log.debug("formVO: {}", formVO); - dailyIncomePortIn.create(formVO); + if("income".equals(inputType)) { + CreateDailyIncomeReqVO formVO = new CreateDailyIncomeReqVO(); + formVO.setSearchMonth(searchMonth); + formVO.setGroupNo(Integer.parseInt(groupNo)); + formVO.setId(Long.parseLong(id)); + formVO.setDailyRecordSeq(dailyRecord.getId()); + formVO.setInputType(DailyInputType.OCR); + formVO.setCredit(false); + formVO.setSourcePurpose(createReceiptFileReqVO.getOcr().getStoreName()); + formVO.setIncomeKind(item.getName()); + formVO.setQuantity((double) item.getQuantity()); + formVO.setPrice((long) item.getTotalPrice()); + log.debug("formVO: {}", formVO); + dailyIncomePortIn.create(formVO); + //has 파일에 매핑 시키기 + dailyReceiptPortIn.insertReceiptMappingFile(new CreateReceiptHasFileReqVO(FileUploadType.INCOME.getName(),formVO.getId(),createFile.getId())); + + }else if ("expense".equals(inputType)) { + + CreateDailyExpenseReqVO formVO = new CreateDailyExpenseReqVO(); + formVO.setSearchMonth(searchMonth); + formVO.setGroupNo(Integer.parseInt(groupNo)); + formVO.setId(Long.parseLong(id)); + formVO.setDailyRecordSeq(dailyRecord.getId()); + formVO.setInputType(DailyInputType.OCR); + + formVO.setCredit(false); + formVO.setSourcePurpose(createReceiptFileReqVO.getOcr().getStoreName()); + formVO.setExpenseKind(item.getName()); + formVO.setQuantity((double) item.getQuantity()); + formVO.setPrice((long) item.getTotalPrice()); + + log.debug("formVO: {}", formVO); + + dailyExpensePortIn.create(formVO); + + //has 파일에 매핑 시키기 + dailyReceiptPortIn.insertReceiptMappingFile(new CreateReceiptHasFileReqVO(FileUploadType.EXPENSE.getName(),formVO.getId(),createFile.getId())); + } - //has 파일에 매핑 시키기 - dailyReceiptPortIn.insertReceiptMappingFile(new CreateReceiptHasFileReqVO("INCOME",formVO.getId(),createFile.getId())); } } diff --git a/front/src/main/resources/templates/record/expense/form.html b/front/src/main/resources/templates/record/expense/form.html index b9d87fa9..cfa580d9 100644 --- a/front/src/main/resources/templates/record/expense/form.html +++ b/front/src/main/resources/templates/record/expense/form.html @@ -7,9 +7,8 @@
- - - + +
@@ -17,157 +16,199 @@
-
-
-

- 외상 또는 카드 구입 여부 -

-
-
-
- -
-
- -
-
-
- -
- -
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
- -
- -
-
-
- -
-
- -
-
    -
  • 예 : 2, 2.5
  • -
-
-
-
-

- 단위 -

-
-
- - -
-
-

단위

- + +
+
+
+

+ 외상 또는 카드 구입 여부 +

+
+
+
+
-
-
    -
  • +
    + +
    +
+
+ +
+ +
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
+
    +
  • 예 : 2, 2.5
  • +
+
+
+
+

+ 단위 +

+
+
+ + +
+
+

단위

+ +
+
+
    +
  • +
+
+
+
+
+
+ +
+
+
+
+ +
+ +
+
+
+ +
+
+ + 원 +
+
    +
  • 예 : 30000
  • +
+
+ +
+
+ +
+
+ + 원 +
+
    +
  • 예 : 30000
  • +
+
+
+ +
+
+ +
+
+
+ + + -
-
- +
+ +
+
+ +
- - -
- -
-
-
- -
-
- - 원 -
-
    -
  • 예 : 30000
  • -
-
- -
-
- -
-
- - 원 -
-
    -
  • 예 : 30000
  • -
-
-
- -
-
- -
-
+
diff --git a/front/src/main/resources/templates/record/expense/index.html b/front/src/main/resources/templates/record/expense/index.html index 95b8b5c9..e40c915b 100644 --- a/front/src/main/resources/templates/record/expense/index.html +++ b/front/src/main/resources/templates/record/expense/index.html @@ -147,6 +147,8 @@ create: /*[[|/api/record/expense/${reqVO.searchMonth}/${reqVO.groupNo}/form/{id}|]]*/'createUrl', remove: /*[[|/api/record/expense/${reqVO.searchMonth}/${reqVO.groupNo}/remove|]]*/'removeUrl', reset: /*[[|/api/record/expense/${reqVO.searchMonth}/${reqVO.groupNo}/reset|]]*/'resetUrl', + receipt: /*[[|/api/record/receipt|]]*/'receiptUrl', + receiptCreate: /*[[|/api/record/receipt/expense/${reqVO.searchMonth}/${reqVO.groupNo}/form/{id}|]]*/'receiptCreateUrl', }, modal: { // 등록 버튼 @@ -164,6 +166,7 @@ krip.daily.baseBindUI(); }, }; + let uploadedReceipt =[]; let modalControl = { _bindModelUI() { @@ -214,6 +217,19 @@ $input.val('').attr('disabled', true); $input.parent().parent().closest('.component-input').addClass('input-disabled'); }, + changeModal(type) { + if (type === 'self') { + $('#modelSelf').show(); + $('#btnSelf').addClass('active'); + $('#modelOcr').hide(); + $('#btnOcr').removeClass('active'); + } else { + $('#modelSelf').hide(); + $('#btnSelf').removeClass('active'); + $('#modelOcr').show(); + $('#btnOcr').addClass('active'); + } + }, createVaild() { modalControl.create(); }, @@ -231,6 +247,224 @@ }, ); }, + addFileInput() { + // 새로운 input type="file" 요소 생성 + const fileInput = document.createElement('input'); + fileInput.type = 'file'; + fileInput.accept = 'image/*'; + fileInput.style.display = 'none'; + fileInput.name = 'file'; + + // 파일 선택 시 이벤트 처리 + fileInput.addEventListener('change', (event) => { + const files = event.target.files; + const previewContainer = $('#file-upload-container'); + + if (files.length === 0) { + const para = document.createElement('p'); + para.textContent = '선택된 파일이 없습니다.'; + para.classList.add('error'); + previewContainer.append(para); + return; + } + + Array.from(files).forEach(file => { + if (!file.type.startsWith('image/')) { + const para = document.createElement('p'); + para.textContent = `파일 ${file.name}: 유효한 이미지 파일이 아닙니다.`; + para.classList.add('error'); + previewContainer.append(para); + return; + } + + let formData = new FormData(); + formData.append('file', file); + ajaxUtil._showWaiting(); + $.ajax({ + method: 'POST', + url: ENV.httpUrl.receipt, + data: formData, + contentType: false, + processData: false, + enctype: 'multipart/form-data', + beforeSend: function(xhr) { + xhr.setRequestHeader( + $("meta[name='_csrf_header']").attr("content"), + $("meta[name='_csrf']").attr("content") + ); + }, + success(res) { + // 썸네일 생성 + const imgSrc = URL.createObjectURL(file); + const fileItemId = `file-item-${Math.random().toString(36).substr(2, 9)}`; + const fileItem = $(` +
+ ${file.name} + +
+ `); + previewContainer.append(fileItem); + + // 파일 정보와 서버 응답 저장 + uploadedReceipt.push({ + fileId: fileItemId, + file: file, + receiptResVO: res + }); + + // 삭제 버튼 이벤트 추가 + fileItem.find('.btn-delete').on('click', function() { + modalControl.deleteFile(fileItemId); + fileItem.remove() + }); + ajaxUtil._hideWaiting(); + }, + error: function(xhr) { + const resJson = xhr.responseJSON || {}; + const errorMessage = resJson.error || `HTTP ${xhr.status}: 요청 처리 중 오류가 발생했습니다.`; + console.error('영수증 업로드 실패:', xhr, errorMessage); + + etUI.dialog.alert({ + title: '영수증 업로드 실패', + message: '정상적으로 인식되지 않은 사진이 있습니다. 정확한 사진을 첨부해주세요.', + type: 'alert', + callback: function () { + fileInput.value = ''; + }, + }); + ajaxUtil._hideWaiting(); + } + }); + }); + }); + + // 입력 필드 초기화 + fileInput.value = ''; + const container = document.getElementById('file-upload-container'); + container.appendChild(fileInput); + + // 파일 선택 창 열기 + fileInput.click(); + }, + deleteFile(fileItemId) { + const index = uploadedReceipt.findIndex(item => item.fileId === fileItemId); + if (index !== -1) { + URL.revokeObjectURL(uploadedReceipt[index].imgSrc); // 메모리 해제 + $(`#${fileItemId}`).remove(); + uploadedReceipt.splice(index, 1); + } + }, + onSubmitReceiptFile(){ + const receiptDataList = uploadedReceipt; + if (!receiptDataList.length) { + etUI.dialog.alert({ + title: '등록 실패', + message: '등록할 영수증 데이터가 없습니다.', + type: 'alert', + callback: function () { + }, + }); + return; + } + const f = document.reqModalForm; + + let formData = new FormData(); + + const reqVOList = receiptDataList.map(item => ({ + file: { name: item.file.name }, + fileUploadType: 'EXPENSE', + ocr: item.receiptResVO + })); + receiptDataList.forEach(item => { + formData.append('file', item.file); + }); + formData.append('reqVO', new Blob([JSON.stringify(reqVOList)], { type: 'application/json' })); + + ajaxUtil._showWaiting(); + + console.log("receiptDataList",receiptDataList); + + $.ajax({ + method: 'POST', + url: ENV.httpUrl.receiptCreate.replace('{id}', f.id.value ? f.id.value : '0'), + data: formData, + contentType: false, // * 중요 * + processData: false, // * 중요 * + enctype: 'multipart/form-data', // * 중요 * + beforeSend: function (xhr) { + xhr.setRequestHeader( + $("meta[name='_csrf_header']").attr("content"), + $("meta[name='_csrf']").attr("content")); + }, + success(res) { + etUI.dialog.alert({ + title: '등록', + message: '영수증이 성공적으로 등록되었습니다.', + type: 'alert', + callback: function () { + // 초기화 + uploadedReceipt.forEach(item => URL.revokeObjectURL(item.imgSrc)); + uploadedReceipt.length = 0; + $('#file-upload-container').empty(); + location.reload(); + }, + }); + }, + statusCode: { + 400: function (res) { + const resJson = res.responseJSON || {}; + const errorMessage = resJson.error || '잘못된 요청입니다.'; + etUI.dialog.alert({ + title: '등록 실패', + message: '영수증이 등록 실패하였습니다.', + type: 'alert', + callback: function () { + // 초기화 + uploadedReceipt.forEach(item => URL.revokeObjectURL(item.imgSrc)); + uploadedReceipt.length = 0; + $('#file-upload-container').empty(); + location.reload(); + }, + }); + }, + 500: function (res) { + const resJson = res.responseJSON || {}; + const errorMessage = resJson.error || '서버 오류가 발생했습니다.'; + console.log(`서버 오류: ${errorMessage}`); + etUI.dialog.alert({ + title: '등록 실패', + message: '영수증이 등록 실패하였습니다.', + type: 'alert', + callback: function () { + // 초기화 + uploadedReceipt.forEach(item => URL.revokeObjectURL(item.imgSrc)); + uploadedReceipt.length = 0; + $('#file-upload-container').empty(); + location.reload(); + }, + }); + }, + }, + error: function (xhr) { + const errorMessage = xhr.responseJSON?.error || `HTTP ${xhr.status}`; + console.log(`영수증 업로드 실패: ${errorMessage}`); + etUI.dialog.alert({ + title: '등록 실패', + message: '영수증이 등록 실패하였습니다.', + type: 'alert', + callback: function () { + // 초기화 + uploadedReceipt.forEach(item => URL.revokeObjectURL(item.imgSrc)); + uploadedReceipt.length = 0; + $('#file-upload-container').empty(); + location.reload(); + }, + }); + } + }); + + ajaxUtil._hideWaiting(); + }, }; diff --git a/front/src/main/resources/templates/record/income/form.html b/front/src/main/resources/templates/record/income/form.html index ca9da267..7db0fbb8 100644 --- a/front/src/main/resources/templates/record/income/form.html +++ b/front/src/main/resources/templates/record/income/form.html @@ -7,9 +7,9 @@
- + - +
diff --git a/front/src/main/resources/templates/record/income/index.html b/front/src/main/resources/templates/record/income/index.html index bc87605e..144b3418 100644 --- a/front/src/main/resources/templates/record/income/index.html +++ b/front/src/main/resources/templates/record/income/index.html @@ -163,7 +163,7 @@ remove: /*[[|/api/record/income/${reqVO.searchMonth}/${reqVO.groupNo}/remove|]]*/'removeUrl', reset: /*[[|/api/record/income/${reqVO.searchMonth}/${reqVO.groupNo}/reset|]]*/'resetUrl', receipt: /*[[|/api/record/receipt|]]*/'receiptUrl', - receiptCreate: /*[[|/api/record/income/receipt/${reqVO.searchMonth}/${reqVO.groupNo}/form/{id}|]]*/'receiptCreateUrl', + receiptCreate: /*[[|/api/record/receipt/income/${reqVO.searchMonth}/${reqVO.groupNo}/form/{id}|]]*/'receiptCreateUrl', }, modal: { // 등록 버튼 @@ -244,10 +244,14 @@ changeModal(type) { if (type === 'self') { $('#modelSelf').show(); + $('#btnSelf').addClass('active'); $('#modelOcr').hide(); + $('#btnOcr').removeClass('active'); } else { $('#modelSelf').hide(); + $('#btnSelf').removeClass('active'); $('#modelOcr').show(); + $('#btnOcr').addClass('active'); } }, createVaild() {