diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsDao.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsDao.java deleted file mode 100644 index 6b236410..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsDao.java +++ /dev/null @@ -1,24 +0,0 @@ -package app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.persistence; - -import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferExpenseRecords; -import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferIncomeRecords; -import java.util.Collections; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords; -import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; -import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortOut; -import java.util.List; -import org.springframework.stereotype.Repository; - -@Repository -@RequiredArgsConstructor -class GetBankAutoTransferRecordsDao implements GetBankAutoTransferRecordsPortOut { - private final GetBankAutoTransferRecordsMapper mapper; - - @Override - public GetBankAutoTransferRecords operate(GetBankAutoTransferRecordsCmd cmd) { - return new GetBankAutoTransferRecords( - mapper.getBankAutoTransferIncomeRecords(cmd), // 수입 - mapper.getBankAutoTransferExpenseRecords(cmd)); // 지출 - } -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsMapper.java deleted file mode 100644 index 55e8cb25..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.persistence; - -import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferExpenseRecords; -import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferIncomeRecords; -import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface GetBankAutoTransferRecordsMapper { - // 은행자동이체 수입 - List getBankAutoTransferIncomeRecords( - GetBankAutoTransferRecordsCmd cmd); - // 은행자동이체 지출 - List getBankAutoTransferExpenseRecords( - GetBankAutoTransferRecordsCmd cmd); -} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortIn.java deleted file mode 100644 index 201dc71b..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortIn.java +++ /dev/null @@ -1,9 +0,0 @@ -package app.module.admin.usecase.household.getBankAutoTransferRecords.ports; - -import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords; -import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; -import java.util.List; - -public interface GetBankAutoTransferRecordsPortIn { - GetBankAutoTransferRecords operate(GetBankAutoTransferRecordsCmd cmd); -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortOut.java deleted file mode 100644 index f9d467b9..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortOut.java +++ /dev/null @@ -1,9 +0,0 @@ -package app.module.admin.usecase.household.getBankAutoTransferRecords.ports; - -import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords; -import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; -import java.util.List; - -public interface GetBankAutoTransferRecordsPortOut { - GetBankAutoTransferRecords operate(GetBankAutoTransferRecordsCmd cmd); -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/GetBankAutoTransferRecordsService.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/GetBankAutoTransferRecordsService.java deleted file mode 100644 index c93dcda7..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/GetBankAutoTransferRecordsService.java +++ /dev/null @@ -1,20 +0,0 @@ -package app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application; - -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords; -import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; -import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortIn; -import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortOut; -import java.util.List; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -class GetBankAutoTransferRecordsService implements GetBankAutoTransferRecordsPortIn { - private final GetBankAutoTransferRecordsPortOut portOut; - - @Override - public GetBankAutoTransferRecords operate(GetBankAutoTransferRecordsCmd cmd) { - return portOut.operate(cmd); - } -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java deleted file mode 100644 index 82070bbf..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java +++ /dev/null @@ -1,38 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordStatusDetail.adapters.persistence; - -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyExpenseRecords; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyFarmingRecords; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyForestryRecords; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyIncomeRecords; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyPowerRecords; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatus; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyWorkRecords; -import java.util.List; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortOut; -import java.util.Optional; -import org.springframework.stereotype.Repository; - -@Repository -@RequiredArgsConstructor -class GetDailyRecordStatusDetailDao implements GetDailyRecordStatusDetailPortOut { - private final GetDailyRecordStatusDetailMapper mapper; - - @Override - public Optional operate(GetDailyRecordStatusCmd cmd) { - - GetDailyRecordStatus status = mapper.getDailyRecordStatus(cmd); - List incomes = mapper.getDailyIncomeRecords(cmd); - List works = mapper.getDailyWorkRecords(cmd); - List expenses = mapper.getDailyExpenseRecords(cmd); - List powers = mapper.getDailyPowerRecords(cmd); - List forestries = mapper.getDailyForestryRecords(cmd); - List farmings = mapper.getDailyFarmingRecords(cmd); - - return Optional.of( - new GetDailyRecordStatusDetail(status, incomes, works, expenses, powers, forestries, - farmings)); - } -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailMapper.java deleted file mode 100644 index 4fdf0365..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordStatusDetail.adapters.persistence; - -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyExpenseRecords; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyFarmingRecords; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyForestryRecords; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyIncomeRecords; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyPowerRecords; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatus; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyWorkRecords; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface GetDailyRecordStatusDetailMapper { - GetDailyRecordStatus getDailyRecordStatus(GetDailyRecordStatusCmd cmd); - List getDailyIncomeRecords(GetDailyRecordStatusCmd cmd); - List getDailyWorkRecords(GetDailyRecordStatusCmd cmd); - List getDailyExpenseRecords(GetDailyRecordStatusCmd cmd); - List getDailyPowerRecords(GetDailyRecordStatusCmd cmd); - List getDailyForestryRecords(GetDailyRecordStatusCmd cmd); - List getDailyFarmingRecords(GetDailyRecordStatusCmd cmd); -} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailResVO.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailResVO.java deleted file mode 100644 index 831a0251..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailResVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordStatusDetail.adapters.web.model; - -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyExpenseRecords; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyIncomeRecords; -import java.util.List; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class GetDailyRecordStatusDetailResVO { - List incomes; // 수입 - List expenses; // 지출 -} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortIn.java deleted file mode 100644 index 7286776e..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortIn.java +++ /dev/null @@ -1,9 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports; - -import java.util.Optional; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; - -public interface GetDailyRecordStatusDetailPortIn { - Optional operate(GetDailyRecordStatusCmd cmd); -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortOut.java deleted file mode 100644 index 87da659f..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortOut.java +++ /dev/null @@ -1,9 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports; - -import java.util.Optional; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; - -public interface GetDailyRecordStatusDetailPortOut { - Optional operate(GetDailyRecordStatusCmd cmd); -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/GetDailyRecordStatusDetailService.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/GetDailyRecordStatusDetailService.java deleted file mode 100644 index 52d137d6..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/GetDailyRecordStatusDetailService.java +++ /dev/null @@ -1,20 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application; - -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortIn; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortOut; -import java.util.Optional; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -class GetDailyRecordStatusDetailService implements GetDailyRecordStatusDetailPortIn { - private final GetDailyRecordStatusDetailPortOut portOut; - - @Override - public Optional operate(GetDailyRecordStatusCmd cmd) { - return portOut.operate(cmd); - } -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountDao.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountDao.java deleted file mode 100644 index aa3a6a36..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountDao.java +++ /dev/null @@ -1,19 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordsCount.adapters.persistence; - -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; -import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; -import app.module.admin.usecase.household.getDailyRecordsCount.ports.GetDailyRecordsCountPortOut; -import java.util.Optional; -import org.springframework.stereotype.Repository; - -@Repository -@RequiredArgsConstructor -class GetDailyRecordsCountDao implements GetDailyRecordsCountPortOut { - private final GetDailyRecordsCountMapper mapper; - - @Override - public Optional operate(GetDailyRecordsCountCmd cmd) { - return mapper.getDailyRecordsCount(cmd); - } -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountMapper.java deleted file mode 100644 index 108bad32..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordsCount.adapters.persistence; - -import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; -import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; -import java.util.Optional; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface GetDailyRecordsCountMapper { - Optional getDailyRecordsCount(GetDailyRecordsCountCmd cmd); -} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/GetDailyRecordsCountPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/GetDailyRecordsCountPortIn.java deleted file mode 100644 index 2652da4b..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/GetDailyRecordsCountPortIn.java +++ /dev/null @@ -1,9 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordsCount.ports; - -import java.util.Optional; -import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; -import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; - -public interface GetDailyRecordsCountPortIn { - Optional operate(GetDailyRecordsCountCmd cmd); -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/GetDailyRecordsCountPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/GetDailyRecordsCountPortOut.java deleted file mode 100644 index fc8b7a53..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/GetDailyRecordsCountPortOut.java +++ /dev/null @@ -1,9 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordsCount.ports; - -import java.util.Optional; -import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; -import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; - -public interface GetDailyRecordsCountPortOut { - Optional operate(GetDailyRecordsCountCmd cmd); -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/GetDailyRecordsCountService.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/GetDailyRecordsCountService.java deleted file mode 100644 index 23c963bd..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/GetDailyRecordsCountService.java +++ /dev/null @@ -1,20 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordsCount.ports.application; - -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; -import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; -import app.module.admin.usecase.household.getDailyRecordsCount.ports.GetDailyRecordsCountPortIn; -import app.module.admin.usecase.household.getDailyRecordsCount.ports.GetDailyRecordsCountPortOut; -import java.util.Optional; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -class GetDailyRecordsCountService implements GetDailyRecordsCountPortIn { - private final GetDailyRecordsCountPortOut portOut; - - @Override - public Optional operate(GetDailyRecordsCountCmd cmd) { - return portOut.operate(cmd); - } -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusDao.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusDao.java deleted file mode 100644 index 70b9d972..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusDao.java +++ /dev/null @@ -1,19 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordsStatus.adapters.persistence; - -import app.module.admin.usecase.household.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortOut; -import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; -import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; -import java.util.List; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -@Repository -@RequiredArgsConstructor -class GetDailyRecordsStatusDao implements GetDailyRecordsStatusPortOut { - private final GetDailyRecordsStatusMapper mapper; - - @Override - public List operate(GetDailyRecordsStatusCmd cmd) { - return mapper.getDailyRecordsStatus(cmd); - } -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusMapper.java deleted file mode 100644 index 10a0401e..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordsStatus.adapters.persistence; - -import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; -import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface GetDailyRecordsStatusMapper { - List getDailyRecordsStatus(GetDailyRecordsStatusCmd cmd); -} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortIn.java deleted file mode 100644 index a50bc45b..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortIn.java +++ /dev/null @@ -1,9 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordsStatus.ports; - -import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; -import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; -import java.util.List; - -public interface GetDailyRecordsStatusPortIn { - List operate(GetDailyRecordsStatusCmd cmd); -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortOut.java deleted file mode 100644 index 1cd05ace..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortOut.java +++ /dev/null @@ -1,9 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordsStatus.ports; - -import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; -import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; -import java.util.List; - -public interface GetDailyRecordsStatusPortOut { - List operate(GetDailyRecordsStatusCmd cmd); -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/GetDailyRecordsStatusService.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/GetDailyRecordsStatusService.java deleted file mode 100644 index a885484f..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/GetDailyRecordsStatusService.java +++ /dev/null @@ -1,20 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordsStatus.ports.application; - -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; -import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; -import app.module.admin.usecase.household.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortIn; -import app.module.admin.usecase.household.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortOut; -import java.util.List; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -class GetDailyRecordsStatusService implements GetDailyRecordsStatusPortIn { - private final GetDailyRecordsStatusPortOut portOut; - - @Override - public List operate(GetDailyRecordsStatusCmd cmd) { - return portOut.operate(cmd); - } -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/persistence/GetForestProductsStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/persistence/GetForestProductsStatusMapper.java deleted file mode 100644 index 7189b658..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/persistence/GetForestProductsStatusMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package app.module.admin.usecase.household.getForestProductsStatus.adapters.persistence; - -import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus; -import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface GetForestProductsStatusMapper { - String getMonthlyStatus(GetForestProductsStatusCmd cmd); - List getForestProductsStatus(GetForestProductsStatusCmd cmd); -} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/GetForestProductsStatusController.java b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/GetForestProductsStatusController.java deleted file mode 100644 index f3c33691..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/GetForestProductsStatusController.java +++ /dev/null @@ -1,28 +0,0 @@ -package app.module.admin.usecase.household.getForestProductsStatus.adapters.web; - -import app.module.admin.usecase.household.getForestProductsStatus.ports.GetForestProductsStatusPortIn; -import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus; -import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; -import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult; -import java.util.List; -import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.bind.annotation.GetMapping; -import app.module.admin.usecase.household.getForestProductsStatus.adapters.web.model.GetForestProductsStatusReqVO; -import app.module.admin.usecase.household.getForestProductsStatus.adapters.web.model.GetForestProductsStatusResVO; - -@RestController -@RequiredArgsConstructor -class GetForestProductsStatusController { - private final GetForestProductsStatusPortIn portIn; - - @GetMapping(path = "/api/household/forestProducts") - ResponseEntity operate( - GetForestProductsStatusReqVO reqVO) { - return ResponseEntity.status(HttpStatus.OK) - .body(portIn.operate( - new GetForestProductsStatusCmd(reqVO.getHouseholdSeq(), reqVO.getRecordMonth()))); - } -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/GetForestProductsStatusPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/GetForestProductsStatusPortIn.java deleted file mode 100644 index 8e9058f5..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/GetForestProductsStatusPortIn.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.admin.usecase.household.getForestProductsStatus.ports; - -import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; -import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult; - -public interface GetForestProductsStatusPortIn { - GetForestProductsStatusResult operate(GetForestProductsStatusCmd cmd); -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/GetForestProductsStatusPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/GetForestProductsStatusPortOut.java deleted file mode 100644 index ef691dad..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/GetForestProductsStatusPortOut.java +++ /dev/null @@ -1,8 +0,0 @@ -package app.module.admin.usecase.household.getForestProductsStatus.ports; - -import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; -import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult; - -public interface GetForestProductsStatusPortOut { - GetForestProductsStatusResult operate(GetForestProductsStatusCmd cmd); -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/GetForestProductsStatusService.java b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/GetForestProductsStatusService.java deleted file mode 100644 index e98f6369..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/GetForestProductsStatusService.java +++ /dev/null @@ -1,19 +0,0 @@ -package app.module.admin.usecase.household.getForestProductsStatus.ports.application; - -import app.module.admin.usecase.household.getForestProductsStatus.ports.GetForestProductsStatusPortIn; -import app.module.admin.usecase.household.getForestProductsStatus.ports.GetForestProductsStatusPortOut; -import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; -import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -class GetForestProductsStatusService implements GetForestProductsStatusPortIn { - private final GetForestProductsStatusPortOut portOut; - - @Override - public GetForestProductsStatusResult operate(GetForestProductsStatusCmd cmd) { - return portOut.operate(cmd); - } -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java index 7284114a..78a80f56 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java @@ -1,10 +1,7 @@ package app.module.admin.usecase.household.getHouseholdStatusUI; +import app.module.admin.config.application.util.AdminUtil; import app.module.admin.config.application.util.DateUiUtil; -import app.module.admin.usecase.household.getDailyRecordsCount.ports.GetDailyRecordsCountPortIn; -import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; -import app.module.admin.usecase.household.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortIn; -import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortIn; import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd; import lombok.RequiredArgsConstructor; @@ -14,6 +11,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import app.module.admin.usecase.household.getHouseholdStatusUI.model.GetHouseholdStatusUIReqVO; +import org.springframework.web.bind.annotation.RequestParam; @Controller @RequiredArgsConstructor @@ -23,12 +21,14 @@ class GetHouseholdStatusUIController { @GetMapping(path = "/household/households/{seq}") String operate( @PathVariable Long seq, + @RequestParam(required = false) String recordMonth, Model model, @ModelAttribute("reqVO") GetHouseholdStatusUIReqVO reqVO) { model.addAttribute("seq", seq); model.addAttribute("monthList", DateUiUtil.getRecentMonths(13)); - model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue()); + model.addAttribute("recordMonth", recordMonth); + model.addAttribute("userRole", AdminUtil.getLoginUserRole()); // 임가 상세 정보 model.addAttribute("householdInfo", diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosDao.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosDao.java deleted file mode 100644 index a9b688a0..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosDao.java +++ /dev/null @@ -1,20 +0,0 @@ -package app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.persistence; - -import java.util.Collections; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; -import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; -import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortOut; -import java.util.List; -import org.springframework.stereotype.Repository; - -@Repository -@RequiredArgsConstructor -class GetHouseholdVisitInfosDao implements GetHouseholdVisitInfosPortOut { - private final GetHouseholdVisitInfosMapper mapper; - - @Override - public List operate(GetHouseholdVisitInfosCmd cmd) { - return mapper.getHouseholdVisitInfos(cmd); - } -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosMapper.java deleted file mode 100644 index 42a5d79d..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.persistence; - -import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; -import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface GetHouseholdVisitInfosMapper { - List getHouseholdVisitInfos(GetHouseholdVisitInfosCmd cmd); -} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortIn.java deleted file mode 100644 index 641d6e5e..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortIn.java +++ /dev/null @@ -1,9 +0,0 @@ -package app.module.admin.usecase.household.getHouseholdVisitInfos.ports; - -import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; -import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; -import java.util.List; - -public interface GetHouseholdVisitInfosPortIn { - List operate(GetHouseholdVisitInfosCmd cmd); -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortOut.java deleted file mode 100644 index 5abe4f21..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortOut.java +++ /dev/null @@ -1,9 +0,0 @@ -package app.module.admin.usecase.household.getHouseholdVisitInfos.ports; - -import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; -import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; -import java.util.List; - -public interface GetHouseholdVisitInfosPortOut { - List operate(GetHouseholdVisitInfosCmd cmd); -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/GetHouseholdVisitInfosService.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/GetHouseholdVisitInfosService.java deleted file mode 100644 index af7ae630..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/GetHouseholdVisitInfosService.java +++ /dev/null @@ -1,20 +0,0 @@ -package app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application; - -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; -import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; -import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortIn; -import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortOut; -import java.util.List; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -class GetHouseholdVisitInfosService implements GetHouseholdVisitInfosPortIn { - private final GetHouseholdVisitInfosPortOut portOut; - - @Override - public List operate(GetHouseholdVisitInfosCmd cmd) { - return portOut.operate(cmd); - } -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsDao.java new file mode 100644 index 00000000..a2f861d9 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsDao.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.adapters.persistence; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortOut; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class GetBankAutoTransferRecordsDao implements GetBankAutoTransferRecordsPortOut { + private final GetBankAutoTransferRecordsMapper mapper; + + @Override + public GetBankAutoTransferRecords operate(GetBankAutoTransferRecordsCmd cmd) { + return new GetBankAutoTransferRecords( + mapper.getBankAutoTransferIncomeRecords(cmd), // 수입 + mapper.getBankAutoTransferExpenseRecords(cmd)); // 지출 + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsMapper.java new file mode 100644 index 00000000..674aa611 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsMapper.java @@ -0,0 +1,17 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.adapters.persistence; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferExpenseRecords; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferIncomeRecords; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface GetBankAutoTransferRecordsMapper { + // 은행자동이체 수입 + List getBankAutoTransferIncomeRecords( + GetBankAutoTransferRecordsCmd cmd); + // 은행자동이체 지출 + List getBankAutoTransferExpenseRecords( + GetBankAutoTransferRecordsCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/GetBankAutoTransferRecordsController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/web/GetBankAutoTransferRecordsController.java similarity index 51% rename from admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/GetBankAutoTransferRecordsController.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/web/GetBankAutoTransferRecordsController.java index c697da7a..7742f24e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/GetBankAutoTransferRecordsController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/web/GetBankAutoTransferRecordsController.java @@ -1,15 +1,14 @@ -package app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.web; +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.adapters.web; -import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortIn; -import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords; -import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortIn; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.GetMapping; -import app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.web.model.GetAutoTransferRecordsReqVO; -import app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.web.model.GetAutoTransferRecordsResVO; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.adapters.web.model.GetAutoTransferRecordsReqVO; @RestController @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsReqVO.java similarity index 71% rename from admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsReqVO.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsReqVO.java index fcbf5de6..8ee9e08e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsReqVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.web.model; +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.adapters.web.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsResVO.java similarity index 65% rename from admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsResVO.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsResVO.java index de30ca1e..bb598215 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsResVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsResVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.web.model; +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.adapters.web.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortIn.java new file mode 100644 index 00000000..5e619e31 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortIn.java @@ -0,0 +1,8 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; + +public interface GetBankAutoTransferRecordsPortIn { + GetBankAutoTransferRecords operate(GetBankAutoTransferRecordsCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortOut.java new file mode 100644 index 00000000..0f807bfd --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortOut.java @@ -0,0 +1,8 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports; + +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; + +public interface GetBankAutoTransferRecordsPortOut { + GetBankAutoTransferRecords operate(GetBankAutoTransferRecordsCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/GetBankAutoTransferRecordsService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/GetBankAutoTransferRecordsService.java new file mode 100644 index 00000000..2f8dee19 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/GetBankAutoTransferRecordsService.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortIn; +import app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortOut; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetBankAutoTransferRecordsService implements GetBankAutoTransferRecordsPortIn { + private final GetBankAutoTransferRecordsPortOut portOut; + + @Override + public GetBankAutoTransferRecords operate(GetBankAutoTransferRecordsCmd cmd) { + return portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java similarity index 76% rename from admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java index 47ac71e4..a1a64984 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain; +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java similarity index 79% rename from admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java index e049e6fa..2ba5b126 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain; +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecords.java similarity index 74% rename from admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecords.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecords.java index 9413ac76..924fd500 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecords.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain; +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain; import java.util.List; import lombok.AllArgsConstructor; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecordsCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecordsCmd.java similarity index 70% rename from admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecordsCmd.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecordsCmd.java index bec51c4a..b7115131 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecordsCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecordsCmd.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain; +package app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.ports.application.domain; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java new file mode 100644 index 00000000..7669cbe5 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java @@ -0,0 +1,38 @@ +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyExpenseRecords; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyFarmingRecords; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyForestryRecords; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyIncomeRecords; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyPowerRecords; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatus; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyWorkRecords; +import java.util.List; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortOut; +import java.util.Optional; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class GetDailyRecordStatusDetailDao implements GetDailyRecordStatusDetailPortOut { + private final GetDailyRecordStatusDetailMapper mapper; + + @Override + public Optional operate(GetDailyRecordStatusCmd cmd) { + + GetDailyRecordStatus status = mapper.getDailyRecordStatus(cmd); + List incomes = mapper.getDailyIncomeRecords(cmd); + List works = mapper.getDailyWorkRecords(cmd); + List expenses = mapper.getDailyExpenseRecords(cmd); + List powers = mapper.getDailyPowerRecords(cmd); + List forestries = mapper.getDailyForestryRecords(cmd); + List farmings = mapper.getDailyFarmingRecords(cmd); + + return Optional.of( + new GetDailyRecordStatusDetail(status, incomes, works, expenses, powers, forestries, + farmings)); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailMapper.java new file mode 100644 index 00000000..2e5160e5 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailMapper.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyExpenseRecords; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyFarmingRecords; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyForestryRecords; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyIncomeRecords; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyPowerRecords; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatus; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyWorkRecords; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface GetDailyRecordStatusDetailMapper { + GetDailyRecordStatus getDailyRecordStatus(GetDailyRecordStatusCmd cmd); + List getDailyIncomeRecords(GetDailyRecordStatusCmd cmd); + List getDailyWorkRecords(GetDailyRecordStatusCmd cmd); + List getDailyExpenseRecords(GetDailyRecordStatusCmd cmd); + List getDailyPowerRecords(GetDailyRecordStatusCmd cmd); + List getDailyForestryRecords(GetDailyRecordStatusCmd cmd); + List getDailyFarmingRecords(GetDailyRecordStatusCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java similarity index 54% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java index 895f7782..95f60122 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java @@ -1,9 +1,9 @@ -package app.module.admin.usecase.household.getDailyRecordStatusDetail.adapters.web; +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.adapters.web; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.adapters.web.model.GetDailyRecordStatusDetailReqVO; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortIn; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; -import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.adapters.web.model.GetDailyRecordStatusDetailReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortIn; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailReqVO.java similarity index 69% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailReqVO.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailReqVO.java index 9e73e63d..5a3809b1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailReqVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordStatusDetail.adapters.web.model; +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.adapters.web.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailResVO.java new file mode 100644 index 00000000..badeeaee --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailResVO.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.adapters.web.model; + +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyExpenseRecords; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyIncomeRecords; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetDailyRecordStatusDetailResVO { + List incomes; // 수입 + List expenses; // 지출 +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortIn.java new file mode 100644 index 00000000..fb0557d2 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports; + +import java.util.Optional; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; + +public interface GetDailyRecordStatusDetailPortIn { + Optional operate(GetDailyRecordStatusCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortOut.java new file mode 100644 index 00000000..fc9d00e8 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports; + +import java.util.Optional; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; + +public interface GetDailyRecordStatusDetailPortOut { + Optional operate(GetDailyRecordStatusCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/GetDailyRecordStatusDetailService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/GetDailyRecordStatusDetailService.java new file mode 100644 index 00000000..0a834d55 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/GetDailyRecordStatusDetailService.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortIn; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortOut; +import java.util.Optional; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetDailyRecordStatusDetailService implements GetDailyRecordStatusDetailPortIn { + private final GetDailyRecordStatusDetailPortOut portOut; + + @Override + public Optional operate(GetDailyRecordStatusCmd cmd) { + return portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java similarity index 73% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java index 99606a0d..5ea5110a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java @@ -1,6 +1,5 @@ -package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain; +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain; -import java.math.BigDecimal; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -14,9 +13,9 @@ public class GetDailyExpenseRecords { private Long id; private String inputType; private Boolean isCredit; - private String categorySelf; + private String expenseKind; private String sourcePurpose; - private BigDecimal quantity; + private String quantity; private String unitCode; private String unitText; private String unitSelf; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java similarity index 81% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java index bffbbd7c..d7593e43 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain; +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain; import java.math.BigDecimal; import lombok.AllArgsConstructor; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyForestryRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyForestryRecords.java similarity index 81% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyForestryRecords.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyForestryRecords.java index 82fb54f3..3cb305b2 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyForestryRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyForestryRecords.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain; +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain; import java.math.BigDecimal; import lombok.AllArgsConstructor; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java similarity index 81% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java index a829dd41..9f4a99c8 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain; +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain; import java.math.BigDecimal; import lombok.AllArgsConstructor; @@ -16,7 +16,7 @@ public class GetDailyIncomeRecords { private Boolean isCredit; private String cropCode; private String cropText; - private String categorySelf; + private String incomeKind; private String sourcePurpose; private BigDecimal quantity; private String unitCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyPowerRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyPowerRecords.java similarity index 76% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyPowerRecords.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyPowerRecords.java index 207c21bc..3e1e86ca 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyPowerRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyPowerRecords.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain; +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain; import java.math.BigDecimal; import lombok.AllArgsConstructor; @@ -12,7 +12,6 @@ import lombok.Setter; @EqualsAndHashCode public class GetDailyPowerRecords { private Long id; - private String powerStatus; private String equipmentName; private BigDecimal ownedHours; private BigDecimal leasedHours; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatus.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatus.java similarity index 78% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatus.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatus.java index 73ea6952..026e5d31 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatus.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatus.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain; +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusCmd.java similarity index 67% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusCmd.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusCmd.java index 2f4bce20..eba425bf 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusCmd.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain; +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusDetail.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusDetail.java similarity index 84% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusDetail.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusDetail.java index 9cfdd596..f3f43cc4 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusDetail.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusDetail.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain; +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain; import java.util.List; import lombok.AllArgsConstructor; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java similarity index 68% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java index eaed0fe9..e057b165 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain; +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; @@ -11,12 +11,14 @@ import lombok.Setter; @EqualsAndHashCode public class GetDailyWorkRecords { private Long id; - private String itemCode; - private String workCode; + private String itemName; + private String workName; private String workLandArea; + private String areaUnitCodeText; + private String areaUnitSelf; private String harvestQuantity; - private String unitCode; - private String cropText; + private String harvestUnitCodeText; + private String harvestUnitSelf; private String ownerTime; private String spouseTime; private String familyMHours; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountDao.java new file mode 100644 index 00000000..9560db4e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountDao.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.adapters.persistence; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.GetDailyRecordsCountPortOut; +import java.util.Optional; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class GetDailyRecordsCountDao implements GetDailyRecordsCountPortOut { + private final GetDailyRecordsCountMapper mapper; + + @Override + public Optional operate(GetDailyRecordsCountCmd cmd) { + return mapper.getDailyRecordsCount(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountMapper.java new file mode 100644 index 00000000..7e824c03 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/adapters/persistence/GetDailyRecordsCountMapper.java @@ -0,0 +1,11 @@ +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; +import java.util.Optional; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface GetDailyRecordsCountMapper { + Optional getDailyRecordsCount(GetDailyRecordsCountCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/GetDailyRecordsCountPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/GetDailyRecordsCountPortIn.java new file mode 100644 index 00000000..6ba13bfb --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/GetDailyRecordsCountPortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports; + +import java.util.Optional; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; + +public interface GetDailyRecordsCountPortIn { + Optional operate(GetDailyRecordsCountCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/GetDailyRecordsCountPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/GetDailyRecordsCountPortOut.java new file mode 100644 index 00000000..f587844a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/GetDailyRecordsCountPortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports; + +import java.util.Optional; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; + +public interface GetDailyRecordsCountPortOut { + Optional operate(GetDailyRecordsCountCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/application/GetDailyRecordsCountService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/application/GetDailyRecordsCountService.java new file mode 100644 index 00000000..c5a296b3 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/application/GetDailyRecordsCountService.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.GetDailyRecordsCountPortIn; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.GetDailyRecordsCountPortOut; +import java.util.Optional; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetDailyRecordsCountService implements GetDailyRecordsCountPortIn { + private final GetDailyRecordsCountPortOut portOut; + + @Override + public Optional operate(GetDailyRecordsCountCmd cmd) { + return portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCount.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCount.java similarity index 78% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCount.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCount.java index 56ecc94e..e1775c26 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCount.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCount.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain; +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCountCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCountCmd.java similarity index 71% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCountCmd.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCountCmd.java index d3a55163..5682cad3 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCountCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsCount/ports/application/domain/GetDailyRecordsCountCmd.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain; +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusDao.java new file mode 100644 index 00000000..f8eaa8e4 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusDao.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortOut; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class GetDailyRecordsStatusDao implements GetDailyRecordsStatusPortOut { + private final GetDailyRecordsStatusMapper mapper; + + @Override + public List operate(GetDailyRecordsStatusCmd cmd) { + return mapper.getDailyRecordsStatus(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusMapper.java new file mode 100644 index 00000000..802d95db --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/persistence/GetDailyRecordsStatusMapper.java @@ -0,0 +1,11 @@ +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface GetDailyRecordsStatusMapper { + List getDailyRecordsStatus(GetDailyRecordsStatusCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/GetDailyRecordsStatusController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/web/GetDailyRecordsStatusController.java similarity index 50% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/GetDailyRecordsStatusController.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/web/GetDailyRecordsStatusController.java index 7d4321f2..510efaa1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/GetDailyRecordsStatusController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/web/GetDailyRecordsStatusController.java @@ -1,19 +1,19 @@ -package app.module.admin.usecase.household.getDailyRecordsStatus.adapters.web; +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.adapters.web; -import app.module.admin.usecase.household.getDailyRecordsCount.ports.GetDailyRecordsCountPortIn; -import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; -import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; -import app.module.admin.usecase.household.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortIn; -import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; -import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.GetDailyRecordsCountPortIn; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortIn; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.GetMapping; -import app.module.admin.usecase.household.getDailyRecordsStatus.adapters.web.model.GetDailyRecordsStatusReqVO; -import app.module.admin.usecase.household.getDailyRecordsStatus.adapters.web.model.GetDailyRecordsStatusResVO; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.adapters.web.model.GetDailyRecordsStatusReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.adapters.web.model.GetDailyRecordsStatusResVO; @RestController @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusReqVO.java similarity index 73% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusReqVO.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusReqVO.java index 80d83feb..e263e96f 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusReqVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordsStatus.adapters.web.model; +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.adapters.web.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusResVO.java similarity index 51% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusResVO.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusResVO.java index 29f8c4fb..92c62b51 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusResVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusResVO.java @@ -1,7 +1,7 @@ -package app.module.admin.usecase.household.getDailyRecordsStatus.adapters.web.model; +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.adapters.web.model; -import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; -import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortIn.java new file mode 100644 index 00000000..cbdbad7b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports; + +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; +import java.util.List; + +public interface GetDailyRecordsStatusPortIn { + List operate(GetDailyRecordsStatusCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortOut.java new file mode 100644 index 00000000..63943050 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/GetDailyRecordsStatusPortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports; + +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; +import java.util.List; + +public interface GetDailyRecordsStatusPortOut { + List operate(GetDailyRecordsStatusCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/GetDailyRecordsStatusService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/GetDailyRecordsStatusService.java new file mode 100644 index 00000000..aae12d87 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/GetDailyRecordsStatusService.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortIn; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortOut; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetDailyRecordsStatusService implements GetDailyRecordsStatusPortIn { + private final GetDailyRecordsStatusPortOut portOut; + + @Override + public List operate(GetDailyRecordsStatusCmd cmd) { + return portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatus.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatus.java similarity index 82% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatus.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatus.java index 6e67d5d4..4ca9f925 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatus.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatus.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain; +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatusCmd.java similarity index 71% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatusCmd.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatusCmd.java index 07720a87..bb481d35 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatusCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatusCmd.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain; +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/RecordStatusType.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/domain/RecordStatusType.java similarity index 71% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/RecordStatusType.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/domain/RecordStatusType.java index ccfdb005..c47975dd 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/RecordStatusType.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/domain/RecordStatusType.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain; +package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java similarity index 51% rename from admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java index c445a507..5f327c74 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java @@ -1,9 +1,9 @@ -package app.module.admin.usecase.household.getForestProductsStatus.adapters.persistence; +package app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.adapters.persistence; -import app.module.admin.usecase.household.getForestProductsStatus.ports.GetForestProductsStatusPortOut; -import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus; -import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; -import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult; +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.GetForestProductsStatusPortOut; +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatus; +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusMapper.java new file mode 100644 index 00000000..87fb4f25 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/persistence/GetForestProductsStatusMapper.java @@ -0,0 +1,12 @@ +package app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.adapters.persistence; + +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatus; +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface GetForestProductsStatusMapper { + String getMonthlyStatus(GetForestProductsStatusCmd cmd); + List getForestProductsStatus(GetForestProductsStatusCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/web/GetForestProductsStatusController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/web/GetForestProductsStatusController.java new file mode 100644 index 00000000..d09b5293 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/web/GetForestProductsStatusController.java @@ -0,0 +1,25 @@ +package app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.adapters.web; + +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.GetForestProductsStatusPortIn; +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.GetMapping; +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.adapters.web.model.GetForestProductsStatusReqVO; + +@RestController +@RequiredArgsConstructor +class GetForestProductsStatusController { + private final GetForestProductsStatusPortIn portIn; + + @GetMapping(path = "/api/household/forestProducts") + ResponseEntity operate( + GetForestProductsStatusReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK) + .body(portIn.operate( + new GetForestProductsStatusCmd(reqVO.getHouseholdSeq(), reqVO.getRecordMonth()))); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/model/GetForestProductsStatusReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/web/model/GetForestProductsStatusReqVO.java similarity index 72% rename from admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/model/GetForestProductsStatusReqVO.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/web/model/GetForestProductsStatusReqVO.java index 80a70f6e..a4eaa04c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/model/GetForestProductsStatusReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/web/model/GetForestProductsStatusReqVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getForestProductsStatus.adapters.web.model; +package app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.adapters.web.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/model/GetForestProductsStatusResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/web/model/GetForestProductsStatusResVO.java similarity index 67% rename from admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/model/GetForestProductsStatusResVO.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/web/model/GetForestProductsStatusResVO.java index aa750ffc..5fd29f78 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/model/GetForestProductsStatusResVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/adapters/web/model/GetForestProductsStatusResVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getForestProductsStatus.adapters.web.model; +package app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.adapters.web.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/GetForestProductsStatusPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/GetForestProductsStatusPortIn.java new file mode 100644 index 00000000..ac5f161b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/GetForestProductsStatusPortIn.java @@ -0,0 +1,8 @@ +package app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports; + +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult; + +public interface GetForestProductsStatusPortIn { + GetForestProductsStatusResult operate(GetForestProductsStatusCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/GetForestProductsStatusPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/GetForestProductsStatusPortOut.java new file mode 100644 index 00000000..feeb9167 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/GetForestProductsStatusPortOut.java @@ -0,0 +1,8 @@ +package app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports; + +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult; + +public interface GetForestProductsStatusPortOut { + GetForestProductsStatusResult operate(GetForestProductsStatusCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/GetForestProductsStatusService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/GetForestProductsStatusService.java new file mode 100644 index 00000000..9d0ead59 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/GetForestProductsStatusService.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application; + +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.GetForestProductsStatusPortIn; +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.GetForestProductsStatusPortOut; +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; +import app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetForestProductsStatusService implements GetForestProductsStatusPortIn { + private final GetForestProductsStatusPortOut portOut; + + @Override + public GetForestProductsStatusResult operate(GetForestProductsStatusCmd cmd) { + return portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatus.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetForestProductsStatus.java similarity index 86% rename from admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatus.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetForestProductsStatus.java index c23d71f7..07d7c35e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatus.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetForestProductsStatus.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain; +package app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetForestProductsStatusCmd.java similarity index 71% rename from admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatusCmd.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetForestProductsStatusCmd.java index be0efd7c..8147dd21 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatusCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetForestProductsStatusCmd.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain; +package app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatusResult.java b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetForestProductsStatusResult.java similarity index 74% rename from admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatusResult.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetForestProductsStatusResult.java index fca2b04c..873bc0ff 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatusResult.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/forestProduct/getForestProductsStatus/ports/application/domain/GetForestProductsStatusResult.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain; +package app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.ports.application.domain; import java.util.List; import lombok.AllArgsConstructor; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosDao.java new file mode 100644 index 00000000..fe31ac74 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosDao.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.adapters.persistence; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortOut; +import java.util.List; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class GetHouseholdVisitInfosDao implements GetHouseholdVisitInfosPortOut { + private final GetHouseholdVisitInfosMapper mapper; + + @Override + public List operate(GetHouseholdVisitInfosCmd cmd) { + return mapper.getHouseholdVisitInfos(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosMapper.java new file mode 100644 index 00000000..8fd1ee2e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosMapper.java @@ -0,0 +1,11 @@ +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.adapters.persistence; + +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface GetHouseholdVisitInfosMapper { + List getHouseholdVisitInfos(GetHouseholdVisitInfosCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/GetHouseholdVisitInfosController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/web/GetHouseholdVisitInfosController.java similarity index 53% rename from admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/GetHouseholdVisitInfosController.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/web/GetHouseholdVisitInfosController.java index e5539dd3..958a7df0 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/GetHouseholdVisitInfosController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/web/GetHouseholdVisitInfosController.java @@ -1,16 +1,15 @@ -package app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.web; +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.adapters.web; -import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortIn; -import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; -import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortIn; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.GetMapping; -import app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.web.model.GetHouseholdVisitInfosReqVO; -import app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.web.model.GetHouseholdVisitInfosResVO; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.adapters.web.model.GetHouseholdVisitInfosReqVO; @RestController @RequiredArgsConstructor diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosReqVO.java similarity index 72% rename from admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosReqVO.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosReqVO.java index 2f599c9b..6b6222e7 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosReqVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.web.model; +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.adapters.web.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosResVO.java similarity index 66% rename from admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosResVO.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosResVO.java index 08aac2e9..66507f21 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosResVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosResVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.web.model; +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.adapters.web.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortIn.java new file mode 100644 index 00000000..58106c25 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports; + +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; +import java.util.List; + +public interface GetHouseholdVisitInfosPortIn { + List operate(GetHouseholdVisitInfosCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortOut.java new file mode 100644 index 00000000..d6bf449c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports; + +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; +import java.util.List; + +public interface GetHouseholdVisitInfosPortOut { + List operate(GetHouseholdVisitInfosCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/application/GetHouseholdVisitInfosService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/application/GetHouseholdVisitInfosService.java new file mode 100644 index 00000000..9126568c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/application/GetHouseholdVisitInfosService.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortIn; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortOut; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetHouseholdVisitInfosService implements GetHouseholdVisitInfosPortIn { + private final GetHouseholdVisitInfosPortOut portOut; + + @Override + public List operate(GetHouseholdVisitInfosCmd cmd) { + return portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfos.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfos.java similarity index 78% rename from admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfos.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfos.java index 046a1fab..f9e548c9 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfos.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfos.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain; +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfosCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfosCmd.java similarity index 71% rename from admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfosCmd.java rename to admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfosCmd.java index e7672dad..5892c576 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfosCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfosCmd.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain; +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java new file mode 100644 index 00000000..9d2704ea --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java @@ -0,0 +1,47 @@ +package app.module.admin.usecase.household.updateHouseholdStatusUI.adapters.web; + +import app.module.admin.config.application.util.DateUiUtil; +import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortIn; +import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import app.module.admin.usecase.household.updateHouseholdStatusUI.adapters.web.model.UpdateHouseholdStatusUIReqVO; + +@Controller +@RequiredArgsConstructor +class UpdateHouseholdStatusUIController { + private final GetHouseholdStatusPortIn getHouseholdStatusPortIn; + private final UICodeListPortIn uiCodeListPortIn; + + @GetMapping(path = "/household/households/update/{seq}") + String operate( + @PathVariable Long seq, + Model model, + @ModelAttribute("reqVO") UpdateHouseholdStatusUIReqVO reqVO) { + + model.addAttribute("seq", seq); + model.addAttribute("monthList", DateUiUtil.getRecentMonths(13)); + + // 실사 + model.addAttribute("regionMainList", uiCodeListPortIn.connect("code.region.main")); + // 지역 + model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub")); + // 세부지역 + model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail")); + // 업종 대분류 + model.addAttribute("industryLargeList", uiCodeListPortIn.connect("code.industry.large")); + // 업종 중분류1 + model.addAttribute("industryMiddleList", uiCodeListPortIn.connect("code.industry.middle")); + + // 임가 상세 정보 + model.addAttribute("householdInfo", + getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null)); + + return "household/households/update/{seq}"; + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/model/UpdateHouseholdStatusUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/model/UpdateHouseholdStatusUIReqVO.java new file mode 100644 index 00000000..ffaf638a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/model/UpdateHouseholdStatusUIReqVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.updateHouseholdStatusUI.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class UpdateHouseholdStatusUIReqVO { +} diff --git a/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml index 7111192a..325b8ea5 100644 --- a/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml +++ b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml @@ -2,9 +2,9 @@ + namespace="app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferRecords.adapters.persistence.GetBankAutoTransferRecordsMapper"> - /* getDailyRecordStatus : 일계부 등록 상태 조회 */ + resultType="app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatus"> + /* getDailyRecordStatus : 일계부 등록 상태 조회 */ SELECT income_status, work_status, expense_status, @@ -19,14 +19,14 @@ \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml index 1cc62f89..ab557c69 100644 --- a/admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml +++ b/admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml @@ -2,9 +2,9 @@ + namespace="app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsCount.adapters.persistence.GetDailyRecordsCountMapper"> + resultType="app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus"> /* getDailyRecordsStatus : 일계부 등록 현황 리스트 조회 */ WITH data_counts AS ( SELECT diff --git a/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml index 58c22ef0..e13f5cca 100644 --- a/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml @@ -2,7 +2,7 @@ + namespace="app.module.admin.usecase.household.tab.forestProduct.getForestProductsStatus.adapters.persistence.GetForestProductsStatusMapper"> + resultType="app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos"> /* getHouseholdVisitInfos : 임가방문정보 리스트 조회 */ SELECT hv.id, hv.visit_date, diff --git a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml index bc6564c7..7c7dff51 100644 --- a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml @@ -7,7 +7,10 @@ SELECT - a.seq AS adminSeq, + a.seq AS adminSeq, a.name, a.phone, - u.code_text AS regionMainName, + u.code_text AS regionMainName, COUNT(DISTINCT rhh.household_seq) AS householdCount, COUNT(*) OVER() AS total FROM admin a - JOIN admin_has_role ahr - ON a.seq = ahr.admin_seq - AND ahr.role_id = 'ROLE_RESEARCHER' - AND ahr.is_deleted = false - LEFT JOIN uicode u - ON u.parent_id = 'code.region.main' - AND u.id = a.region_main_code - LEFT JOIN researcher_has_household rhh - ON rhh.admin_seq = a.seq - AND rhh.is_deleted = false + JOIN admin_has_role ahr + ON a.seq = ahr.admin_seq + AND ahr.role_id = 'ROLE_RESEARCHER' + AND ahr.is_deleted = false + LEFT JOIN uicode u + ON u.parent_id = 'code.region.main' + AND u.id = a.region_main_code + LEFT JOIN researcher_has_household rhh + ON rhh.admin_seq = a.seq + AND rhh.is_deleted = false WHERE a.is_deleted = false AND a.account_disabled = false diff --git a/admin/src/main/resources/messages/uri.properties b/admin/src/main/resources/messages/uri.properties index 335c3132..2c61728c 100644 --- a/admin/src/main/resources/messages/uri.properties +++ b/admin/src/main/resources/messages/uri.properties @@ -31,6 +31,7 @@ uri.admin.addons.email.create=Email \uBC1C\uC1A1\uD3FC uri.admin.household=\uC784\uAC00 \uD604\uD669 uri.admin.household.households=\uC784\uAC00 \uD604\uD669 uri.admin.household.households.create=\uC784\uAC00 \uB4F1\uB85D +uri.admin.household.households.update.{{pathVar}}=\uC784\uAC00 \uC218\uC815 uri.admin.household.households.view.{{pathVar}}=\uC784\uAC00 \uC0C1\uC138 uri.admin.researcher=\uC870\uC0AC\uC6D0 \uD604\uD669 diff --git a/admin/src/main/resources/static/ui/uiUtil.js b/admin/src/main/resources/static/ui/uiUtil.js index 1a3cb59b..01e3e488 100644 --- a/admin/src/main/resources/static/ui/uiUtil.js +++ b/admin/src/main/resources/static/ui/uiUtil.js @@ -51,12 +51,12 @@ let uiUtil = {
+ +
@@ -792,7 +795,7 @@ ${item.isCredit ? "Y" : "N"} ${ifNullHyphen(item.cropText)} - ${ifNullHyphen(item.categorySelf)} + ${ifNullHyphen(item.incomeKind)} ${ifNullHyphen(item.sourcePurpose)} ${ifNullHyphen(item.quantity)} ${item.unitSelf != null && item.unitSelf !== '' ? item.unitSelf : ifNullHyphen(item.unitText)} @@ -832,11 +835,12 @@ - ${ifNullHyphen(item.itemCode)} - ${ifNullHyphen(item.workCode)} - ${ifNullHyphen(item.workLandArea)} - ${ifNullHyphen(item.harvestQuantity)} - ${ifNullHyphen(item.cropText)} + ${ifNullHyphen(item.itemName)} + ${ifNullHyphen(item.workName)} + ${ifNullHyphen(item.workLandArea)} + ${ifNullHyphen(item.areaUnitSelf != null ? item.areaUnitSelf : item.areaUnitCodeText)} + ${ifNullHyphen(item.harvestQuantity)} + ${ifNullHyphen(item.harvestUnitSelf != null ? item.harvestUnitSelf : item.harvestUnitCodeText)} ${ifNullHyphen(item.ownerTime)} ${ifNullHyphen(item.spouseTime)} ${ifNullHyphen(item.familyMHours)} @@ -882,9 +886,9 @@ ${item.isCredit ? "Y" : "N"} - ${ifNullHyphen(item.categorySelf)} + ${ifNullHyphen(item.expenseKind)} ${ifNullHyphen(item.sourcePurpose)} - ${ifNullHyphen(item.quantity)} + ${ifNullHyphen(item.quantity)} ${item.unitSelf != null && item.unitSelf !== '' ? item.unitSelf : ifNullHyphen(item.unitText)} ${formatNumberWithComma(item.price)} ${formatNumberWithComma(item.estimatedValue)} @@ -1159,6 +1163,7 @@ ); } + // 은행자동이체내역 수입 테이블 그리기 const gridBankIncomeTable = (data) => { const tbody = $('#table-bank-income tbody'); tbody.empty(); @@ -1185,7 +1190,7 @@ ${ifNullHyphen(item.categoryText)} ${ifNullHyphen(item.target)} ${ifNullHyphen(item.sourcePurpose)} - ${ifNullHyphen(item.count)} + ${ifNullHyphen(item.count)} ${ifNullHyphen(item.unitText)} ${formatNumberWithComma(item.price)} @@ -1195,6 +1200,7 @@ tbody.append(tmpl); } + // 은행자동이체내역 수출 테이블 그리기 const gridBankExpenseTable = (data) => { const tbody = $('#table-bank-expense tbody'); tbody.empty(); @@ -1219,7 +1225,7 @@ ${ifNullHyphen(item.categoryText)} ${ifNullHyphen(item.sourcePurpose)} - ${ifNullHyphen(item.count)} + ${ifNullHyphen(item.count)} ${ifNullHyphen(item.unitText)} ${formatNumberWithComma(item.price)} @@ -1230,6 +1236,46 @@ } + + + +