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/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java new file mode 100644 index 00000000..d50a44ce --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.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 java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class GetForestProductsStatusDao implements GetForestProductsStatusPortOut { + private final GetForestProductsStatusMapper mapper; + + @Override + public List operate(GetForestProductsStatusCmd cmd) { + return mapper.getForestProductsStatus(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 new file mode 100644 index 00000000..4a326b5e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/persistence/GetForestProductsStatusMapper.java @@ -0,0 +1,11 @@ +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 { + 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 new file mode 100644 index 00000000..013b79d7 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/GetForestProductsStatusController.java @@ -0,0 +1,27 @@ +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 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.getMonth()))); + } +} \ 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/getForestProductsStatus/adapters/web/model/GetForestProductsStatusReqVO.java new file mode 100644 index 00000000..0ddf5c24 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/model/GetForestProductsStatusReqVO.java @@ -0,0 +1,15 @@ +package app.module.admin.usecase.household.getForestProductsStatus.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetForestProductsStatusReqVO { + private Long householdSeq; + private String month; +} 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/getForestProductsStatus/adapters/web/model/GetForestProductsStatusResVO.java new file mode 100644 index 00000000..aa750ffc --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/model/GetForestProductsStatusResVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.getForestProductsStatus.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetForestProductsStatusResVO { +} 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 new file mode 100644 index 00000000..b9aa1d7d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/GetForestProductsStatusPortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.getForestProductsStatus.ports; + +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; + +public interface GetForestProductsStatusPortIn { + List 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 new file mode 100644 index 00000000..969a386f --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/GetForestProductsStatusPortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.getForestProductsStatus.ports; + +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; + +public interface GetForestProductsStatusPortOut { + List 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 new file mode 100644 index 00000000..de7f3a01 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/GetForestProductsStatusService.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.getForestProductsStatus.ports.application; + +import lombok.RequiredArgsConstructor; +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.GetForestProductsStatusPortIn; +import app.module.admin.usecase.household.getForestProductsStatus.ports.GetForestProductsStatusPortOut; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetForestProductsStatusService implements GetForestProductsStatusPortIn { + private final GetForestProductsStatusPortOut portOut; + + @Override + public List 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/getForestProductsStatus/ports/application/domain/GetForestProductsStatus.java new file mode 100644 index 00000000..520230a1 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatus.java @@ -0,0 +1,28 @@ +package app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetForestProductsStatus { + private Long id; + private String streetNum; + private String landType; + private String town; + private String availableArea; + private String cropName; + private String landArea; + private String mainYield; + private String mainYieldText; + private String mainSaleAmount; + private String mainSaleAmountText; + private String subYield; + private String subYieldText; + private String subSaleAmount; + private String subSaleAmountText; +} 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/getForestProductsStatus/ports/application/domain/GetForestProductsStatusCmd.java new file mode 100644 index 00000000..873f5576 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatusCmd.java @@ -0,0 +1,15 @@ +package app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetForestProductsStatusCmd { + private Long householdSeq; + private String month; +} diff --git a/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml new file mode 100644 index 00000000..ac3fa2e3 --- /dev/null +++ b/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml @@ -0,0 +1,34 @@ + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/templates/household/households/{seq}.html b/admin/src/main/resources/templates/household/households/{seq}.html index f9dedfde..4a142096 100644 --- a/admin/src/main/resources/templates/household/households/{seq}.html +++ b/admin/src/main/resources/templates/household/households/{seq}.html @@ -423,8 +423,55 @@ -
+
+
+
+

+
+
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
주생산물부생산물
선택지번지목읍면동가능면적(평)재배작물명면적(평)수확량단위판매량단위수확량단위판매량단위
+
@@ -512,7 +559,7 @@ break; case 'forest-product': // 임산물 현황 console.log("임산물 현황"); - // getForestProductStatus(); + getForestProductsStatus(); break; case 'bank-auto-transfer': // 은행자동이체내역 console.log("은행자동이체내역"); @@ -866,7 +913,66 @@ tbody.append(tmpl); } + + + +