From 529903cea0ea2d74bd713597b37b5912d364cd15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Thu, 26 Jun 2025 18:08:49 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=ED=98=84=ED=99=A9=EC=9D=98=20=EC=82=AD=EC=A0=9C=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/persistence/RemoveDailyDao.java | 39 ++++++++++++ .../persistence/RemoveDailyMapper.java | 43 +++++++++++++ .../adapters/web/RemoveDailyController.java | 28 +++++++++ .../adapters/web/modal/RemoveDailyReqVO.java | 22 +++++++ .../removeDaily/ports/RemoveDailyPortIn.java | 7 +++ .../removeDaily/ports/RemoveDailyPortOut.java | 7 +++ .../ports/application/RemoveDailyService.java | 26 ++++++++ .../application/domain/RemoveDailyCmd.java | 26 ++++++++ .../persistence/UpdateDailyNoneDao.java | 2 +- .../mappers/household/RemoveDailyMapper.xml | 62 +++++++++++++++++++ .../households/tab/daily-record.html | 38 +++++++++++- .../templates/common/components.html | 2 +- 12 files changed, 297 insertions(+), 5 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/web/RemoveDailyController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/web/modal/RemoveDailyReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/RemoveDailyPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/RemoveDailyPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/RemoveDailyService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/domain/RemoveDailyCmd.java create mode 100644 admin/src/main/resources/mappers/household/RemoveDailyMapper.xml diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java new file mode 100644 index 00000000..87d7284e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java @@ -0,0 +1,39 @@ +package app.module.admin.usecase.household.tab.dailyRecord.removeDaily.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.RemoveDailyPortOut; +import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.application.domain.RemoveDailyCmd; +import app.module.core.config.application.enums.DailySort; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Repository; + +@Slf4j +@Repository +@RequiredArgsConstructor +public class RemoveDailyDao implements RemoveDailyPortOut { + private final RemoveDailyMapper mapper; + + @Override + public void operate(RemoveDailyCmd command) { + if (command.getCurrentStep() != null) { + log.error("[RemoveDaily] cmd: {}", command); + + if (DailySort.INCOME.equals(command.getCurrentStep())) { + mapper.removeDailyIncome(command); + } else if (DailySort.WORK.equals(command.getCurrentStep())) { + mapper.removeDailyWork(command); + } else if (DailySort.EXPENSE.equals(command.getCurrentStep())) { + mapper.removeDailyExpense(command); + } else if (DailySort.POWER.equals(command.getCurrentStep())) { + mapper.removeDailyPower(command); + } else if (DailySort.FORESTRY.equals(command.getCurrentStep())) { + mapper.removeDailyForestry(command); + } else if (DailySort.FARMING.equals(command.getCurrentStep())) { + mapper.removeDailyFarming(command); + } + + } else { + log.error("[RemoveDaily] Current step is null. cmd: {}", command); + } + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyMapper.java new file mode 100644 index 00000000..5de04c22 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyMapper.java @@ -0,0 +1,43 @@ +package app.module.admin.usecase.household.tab.dailyRecord.removeDaily.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.application.domain.RemoveDailyCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface RemoveDailyMapper { + /** + * 특정일의 수입 전체 삭제 + * @param command 검색 조건 + */ + void removeDailyIncome(RemoveDailyCmd command); + + /** + * 특정일의 임업노동 투입 전체 삭제 + * @param command 검색 조건 + */ + void removeDailyWork(RemoveDailyCmd command); + + /** + * 특정일의 지출 전체 삭제 + * @param command 검색 조건 + */ + void removeDailyExpense(RemoveDailyCmd command); + + /** + * 동력 사용시간 전체 삭제 + * @param command 검색 조건 + */ + void removeDailyPower(RemoveDailyCmd command); + + /** + * 자가임업 생산물 중 자가소비량 전체 삭제 + * @param command 검색 조건 + */ + void removeDailyForestry(RemoveDailyCmd command); + + /** + * 자가농업 생산물 중 자가소비량 전체 삭제 + * @param command 검색 조건 + */ + void removeDailyFarming(RemoveDailyCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/web/RemoveDailyController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/web/RemoveDailyController.java new file mode 100644 index 00000000..b4691dfb --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/web/RemoveDailyController.java @@ -0,0 +1,28 @@ +package app.module.admin.usecase.household.tab.dailyRecord.removeDaily.adapters.web; + +import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.adapters.web.modal.RemoveDailyReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.RemoveDailyPortIn; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@Slf4j +@RestController +@RequiredArgsConstructor +class RemoveDailyController { + private final RemoveDailyPortIn removeDailyNonePortIn; + + @PostMapping(path = "/api/household/daily/remove") + ResponseEntity remove(@RequestBody RemoveDailyReqVO reqVO) { + log.debug("reqVO: {}", reqVO); + + if (!reqVO.getSelectedIds().isEmpty()) { + removeDailyNonePortIn.operate(reqVO); + } + return ResponseEntity.status(HttpStatus.OK).body(reqVO); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/web/modal/RemoveDailyReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/web/modal/RemoveDailyReqVO.java new file mode 100644 index 00000000..4848c41d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/web/modal/RemoveDailyReqVO.java @@ -0,0 +1,22 @@ +package app.module.admin.usecase.household.tab.dailyRecord.removeDaily.adapters.web.modal; + +import app.module.core.config.application.enums.DailySort; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.util.Set; + +@Getter +@Setter +@ToString +public class RemoveDailyReqVO { + /** + * 항목 일련번호 + */ + private Set selectedIds; + /** + * 현재 단계 + */ + private DailySort currentStep; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/RemoveDailyPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/RemoveDailyPortIn.java new file mode 100644 index 00000000..12d29912 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/RemoveDailyPortIn.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports; + +import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.adapters.web.modal.RemoveDailyReqVO; + +public interface RemoveDailyPortIn { + void operate(RemoveDailyReqVO reqVO); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/RemoveDailyPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/RemoveDailyPortOut.java new file mode 100644 index 00000000..4cd1d147 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/RemoveDailyPortOut.java @@ -0,0 +1,7 @@ +package app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports; + +import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.application.domain.RemoveDailyCmd; + +public interface RemoveDailyPortOut { + void operate(RemoveDailyCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/RemoveDailyService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/RemoveDailyService.java new file mode 100644 index 00000000..2a2a1337 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/RemoveDailyService.java @@ -0,0 +1,26 @@ +package app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.application; + +import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.adapters.web.modal.RemoveDailyReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.RemoveDailyPortIn; +import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.RemoveDailyPortOut; +import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.application.domain.RemoveDailyCmd; +import app.module.core.config.application.util.AuditUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class RemoveDailyService implements RemoveDailyPortIn { + private final RemoveDailyPortOut portOut; + + @Override + public void operate(RemoveDailyReqVO reqVO) { + RemoveDailyCmd command = AuditUtil.update( + new RemoveDailyCmd( + reqVO.getSelectedIds(), + reqVO.getCurrentStep()) + ); + + portOut.operate(command); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/domain/RemoveDailyCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/domain/RemoveDailyCmd.java new file mode 100644 index 00000000..ba12d13d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/domain/RemoveDailyCmd.java @@ -0,0 +1,26 @@ +package app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import app.module.core.config.application.enums.DailySort; +import app.module.core.config.application.enums.DailyTargetStatus; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.util.Set; + +@Getter +@Setter +@ToString +@AllArgsConstructor +public class RemoveDailyCmd extends AuditCommand { + /** + * 항목 일련번호 + */ + private Set removeIds; + /** + * 현재 단계 + */ + private DailySort currentStep; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneDao.java index 3a3fc5c5..4eccef83 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneDao.java @@ -41,7 +41,7 @@ class UpdateDailyNoneDao implements UpdateDailyNonePortOut { dailyRecordPortIn.updateByStatus(command.getSearchMonth(), command.getGroupNo(), command.getHouseholdSeq(), command.getCurrentStep().name(), command.getCurrentStatus().name()); } else { - log.error("[CreateDailyNone] Current step is null. cmd:{}", command); + log.error("[UpdateDailyNone] Current step is null. cmd: {}", command); } } } \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/RemoveDailyMapper.xml b/admin/src/main/resources/mappers/household/RemoveDailyMapper.xml new file mode 100644 index 00000000..43415611 --- /dev/null +++ b/admin/src/main/resources/mappers/household/RemoveDailyMapper.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/tab/daily-record.html b/admin/src/main/resources/templates/households/tab/daily-record.html index faf8afe0..1bacad11 100644 --- a/admin/src/main/resources/templates/households/tab/daily-record.html +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -502,7 +502,7 @@
@@ -510,7 +510,7 @@ ${ifNullHyphen(item.cropText)} ${ifNullHyphen(item.incomeKind)} ${ifNullHyphen(item.sourcePurpose)} - ${ifNullHyphen(item.quantity)} + ${formatNumberWithComma(item.quantity)} ${ifNullHyphen(item.unitText)} ${formatNumberWithComma(item.price)} ${formatNumberWithComma(item.estimatedValue)} @@ -817,7 +817,39 @@ const currentListId = $(el).data('listId'); console.log('removeDaily', currentStep, currentListId); - alert('TODO : 삭제') + if ($('#'+currentListId).find('input[type="checkbox"]:checked').length === 0) { + alert('삭제내용은 최소 1건은 선택해야 합니다.'); + return; + } else if ($('#'+currentListId).find('input[type="checkbox"]').length === $('#'+currentListId).find('input[type="checkbox"]:checked').length) { + alert('등록내용은 최소 1건이 남아 있어야 합니다.'); + return; + } + + const selectedValues = []; + $('#'+currentListId).find('input[type="checkbox"]:checked').each((idx, item) => { + selectedValues.push($(item).val()); + }); + + const obj = {}; + obj.selectedIds = selectedValues; + obj.currentStep = currentStep; + console.log(obj) + + etUI.dialog.confirm({ + title: '삭제 안내', + message: '선택하신 항목을 삭제하시겠습니까?
삭제한 항목은 복구할 수 없습니다.', + positiveCallback: function () { + ajaxUtil._ajaxAsyncNoWaiting( + '/api/household/daily/remove', + obj, + function () { + alert('데이터 삭제가 완료되었습니다.'); + + getDailyRecordsView(f.dailyId.value, f.groupNo.value, f.dayGroupText.value); + }, + ); + }, + }); } diff --git a/front/src/main/resources/templates/common/components.html b/front/src/main/resources/templates/common/components.html index 63072c51..3198b6d7 100644 --- a/front/src/main/resources/templates/common/components.html +++ b/front/src/main/resources/templates/common/components.html @@ -34,7 +34,7 @@ - +