Merge branch 'kangsun' into 'dev'

Kangsun

See merge request korea-research/korea-research!12
This commit is contained in:
이강선 매니저/ST
2025-06-16 09:40:08 +00:00
34 changed files with 862 additions and 406 deletions

View File

@@ -1,30 +0,0 @@
package app.module.admin.usecase.household.getDailyRecordStatus.adapters.persistence;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyExpenseRecords;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyForestryRecords;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyIncomeRecords;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyPowerRecords;
import java.util.List;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatus;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatusCmd;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.GetDailyRecordStatusPortOut;
import java.util.Optional;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class GetDailyRecordStatusDao implements GetDailyRecordStatusPortOut {
private final GetDailyRecordStatusMapper mapper;
@Override
public Optional<GetDailyRecordStatus> operate(GetDailyRecordStatusCmd cmd) {
List<GetDailyIncomeRecords> incomes = mapper.getDailyIncomeRecords(cmd);
List<GetDailyExpenseRecords> expenses = mapper.getDailyExpenseRecords(cmd);
List<GetDailyPowerRecords> powers = mapper.getDailyPowerRecords(cmd);
List<GetDailyForestryRecords> forestries = mapper.getDailyForestryRecords(cmd);
return Optional.of(new GetDailyRecordStatus(incomes, expenses, powers, forestries));
}
}

View File

@@ -1,17 +0,0 @@
package app.module.admin.usecase.household.getDailyRecordStatus.adapters.persistence;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyExpenseRecords;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyForestryRecords;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyIncomeRecords;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyPowerRecords;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatusCmd;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface GetDailyRecordStatusMapper {
List<GetDailyIncomeRecords> getDailyIncomeRecords(GetDailyRecordStatusCmd cmd);
List<GetDailyExpenseRecords> getDailyExpenseRecords(GetDailyRecordStatusCmd cmd);
List<GetDailyPowerRecords> getDailyPowerRecords(GetDailyRecordStatusCmd cmd);
List<GetDailyForestryRecords> getDailyForestryRecords(GetDailyRecordStatusCmd cmd);
}

View File

@@ -1,28 +0,0 @@
package app.module.admin.usecase.household.getDailyRecordStatus.adapters.web;
import app.module.admin.usecase.household.getDailyRecordStatus.adapters.web.model.GetDailyRecordStatusReqVO;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.GetDailyRecordStatusPortIn;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatus;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatusCmd;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequiredArgsConstructor
class GetDailyRecordStatusController {
private final GetDailyRecordStatusPortIn portIn;
@GetMapping(path = "/api/household/dailyRecordStatus")
ResponseEntity<GetDailyRecordStatus> operate(
GetDailyRecordStatusReqVO reqVO) {
GetDailyRecordStatus recordView =
portIn.operate(new GetDailyRecordStatusCmd(reqVO.getHouseholdSeq(), reqVO.getRecordSeq(),
reqVO.getRecordMonth())).orElse(null);
return ResponseEntity.status(HttpStatus.OK).body(recordView);
}
}

View File

@@ -1,18 +0,0 @@
package app.module.admin.usecase.household.getDailyRecordStatus.adapters.web.model;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyExpenseRecords;
import app.module.admin.usecase.household.getDailyRecordStatus.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 GetDailyRecordStatusResVO {
List<GetDailyIncomeRecords> incomes; // 수입
List<GetDailyExpenseRecords> expenses; // 지출
}

View File

@@ -1,9 +0,0 @@
package app.module.admin.usecase.household.getDailyRecordStatus.ports;
import java.util.Optional;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatus;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatusCmd;
public interface GetDailyRecordStatusPortIn {
Optional<GetDailyRecordStatus> operate(GetDailyRecordStatusCmd cmd);
}

View File

@@ -1,9 +0,0 @@
package app.module.admin.usecase.household.getDailyRecordStatus.ports;
import java.util.Optional;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatus;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatusCmd;
public interface GetDailyRecordStatusPortOut {
Optional<GetDailyRecordStatus> operate(GetDailyRecordStatusCmd cmd);
}

View File

@@ -1,20 +0,0 @@
package app.module.admin.usecase.household.getDailyRecordStatus.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatus;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatusCmd;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.GetDailyRecordStatusPortIn;
import app.module.admin.usecase.household.getDailyRecordStatus.ports.GetDailyRecordStatusPortOut;
import java.util.Optional;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class GetDailyRecordStatusService implements GetDailyRecordStatusPortIn {
private final GetDailyRecordStatusPortOut portOut;
@Override
public Optional<GetDailyRecordStatus> operate(GetDailyRecordStatusCmd cmd) {
return portOut.operate(cmd);
}
}

View File

@@ -0,0 +1,38 @@
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<GetDailyRecordStatusDetail> operate(GetDailyRecordStatusCmd cmd) {
GetDailyRecordStatus status = mapper.getDailyRecordStatus(cmd);
List<GetDailyIncomeRecords> incomes = mapper.getDailyIncomeRecords(cmd);
List<GetDailyWorkRecords> works = mapper.getDailyWorkRecords(cmd);
List<GetDailyExpenseRecords> expenses = mapper.getDailyExpenseRecords(cmd);
List<GetDailyPowerRecords> powers = mapper.getDailyPowerRecords(cmd);
List<GetDailyForestryRecords> forestries = mapper.getDailyForestryRecords(cmd);
List<GetDailyFarmingRecords> farmings = mapper.getDailyFarmingRecords(cmd);
return Optional.of(
new GetDailyRecordStatusDetail(status, incomes, works, expenses, powers, forestries,
farmings));
}
}

View File

@@ -0,0 +1,23 @@
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> getDailyIncomeRecords(GetDailyRecordStatusCmd cmd);
List<GetDailyWorkRecords> getDailyWorkRecords(GetDailyRecordStatusCmd cmd);
List<GetDailyExpenseRecords> getDailyExpenseRecords(GetDailyRecordStatusCmd cmd);
List<GetDailyPowerRecords> getDailyPowerRecords(GetDailyRecordStatusCmd cmd);
List<GetDailyForestryRecords> getDailyForestryRecords(GetDailyRecordStatusCmd cmd);
List<GetDailyFarmingRecords> getDailyFarmingRecords(GetDailyRecordStatusCmd cmd);
}

View File

@@ -0,0 +1,27 @@
package app.module.admin.usecase.household.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 lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequiredArgsConstructor
class GetDailyRecordStatusDetailController {
private final GetDailyRecordStatusDetailPortIn portIn;
@GetMapping(path = "/api/household/dailyRecordStatus")
ResponseEntity<GetDailyRecordStatusDetail> operate(
GetDailyRecordStatusDetailReqVO reqVO) {
GetDailyRecordStatusDetail recordView =
portIn.operate(new GetDailyRecordStatusCmd(reqVO.getRecordSeq())).orElse(null);
return ResponseEntity.status(HttpStatus.OK).body(recordView);
}
}

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.household.getDailyRecordStatus.adapters.web.model;
package app.module.admin.usecase.household.getDailyRecordStatusDetail.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
@@ -9,8 +9,6 @@ import lombok.Setter;
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetDailyRecordStatusReqVO {
private Long householdSeq;
public class GetDailyRecordStatusDetailReqVO {
private Long recordSeq;
private String recordMonth;
}

View File

@@ -0,0 +1,18 @@
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<GetDailyIncomeRecords> incomes; // 수입
List<GetDailyExpenseRecords> expenses; // 지출
}

View File

@@ -0,0 +1,9 @@
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<GetDailyRecordStatusDetail> operate(GetDailyRecordStatusCmd cmd);
}

View File

@@ -0,0 +1,9 @@
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<GetDailyRecordStatusDetail> operate(GetDailyRecordStatusCmd cmd);
}

View File

@@ -0,0 +1,20 @@
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<GetDailyRecordStatusDetail> operate(GetDailyRecordStatusCmd cmd) {
return portOut.operate(cmd);
}
}

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain;
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain;
import java.math.BigDecimal;
import lombok.AllArgsConstructor;
@@ -19,6 +19,7 @@ public class GetDailyExpenseRecords {
private String sourcePurpose;
private BigDecimal quantity;
private String unitCode;
private String unitText;
private String price;
private String estimatedValue;
private String updatedBy;

View File

@@ -0,0 +1,23 @@
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain;
import java.math.BigDecimal;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetDailyFarmingRecords {
private Long id;
private String productName;
private String usage;
private BigDecimal quantity;
private String unitCode;
private String unitText;
private String estimatedValue;
private String updatedBy;
private String updatedAt;
}

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain;
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain;
import java.math.BigDecimal;
import lombok.AllArgsConstructor;
@@ -15,6 +15,8 @@ public class GetDailyForestryRecords {
private String productName;
private String usage;
private BigDecimal quantity;
private String unitCode;
private String unitText;
private String estimatedValue;
private String updatedBy;
private String updatedAt;

View File

@@ -1,12 +1,10 @@
package app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain;
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.joda.time.DateTime;
@Getter
@Setter
@@ -17,11 +15,13 @@ public class GetDailyIncomeRecords {
private String inputType;
private Boolean isCredit;
private String cropCode;
private String cropText;
private String categoryCode;
private String categorySelf;
private String sourcePurpose;
private BigDecimal quantity;
private String unitCode;
private String unitText;
private String price;
private String estimatedValue;
private String updatedBy;

View File

@@ -1,7 +1,6 @@
package app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain;
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
@@ -13,6 +12,7 @@ import lombok.Setter;
@EqualsAndHashCode
public class GetDailyPowerRecords {
private Long id;
private String powerStatus;
private String equipmentName;
private BigDecimal ownedHours;
private BigDecimal leasedHours;

View File

@@ -0,0 +1,19 @@
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetDailyRecordStatus {
private String incomeStatus;
private String workStatus;
private String expenseStatus;
private String powerStatus;
private String forestryStatus;
private String farmingStatus;
}

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain;
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
@@ -10,7 +10,5 @@ import lombok.Setter;
@AllArgsConstructor
@EqualsAndHashCode
public class GetDailyRecordStatusCmd {
private Long householdSeq;
private Long recordSeq;
private String recordMonth;
}

View File

@@ -1,4 +1,4 @@
package app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain;
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain;
import java.util.List;
import lombok.AllArgsConstructor;
@@ -10,9 +10,12 @@ import lombok.Setter;
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetDailyRecordStatus {
public class GetDailyRecordStatusDetail {
GetDailyRecordStatus status;
List<GetDailyIncomeRecords> incomes; // 수입
List<GetDailyWorkRecords> works; // 임업노동
List<GetDailyExpenseRecords> expenses; // 지출
List<GetDailyPowerRecords> powers; // 동력사용시간
List<GetDailyForestryRecords> forestries; // 자가임업
List<GetDailyFarmingRecords> farmings; // 자가농업
}

View File

@@ -0,0 +1,32 @@
package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetDailyWorkRecords {
private Long id;
private String itemCode;
private String workCode;
private String workLandArea;
private String harvestQuantity;
private String unitCode;
private String cropText;
private String ownerTime;
private String spouseTime;
private String familyMHours;
private String familyFHours;
private String hiredMHours;
private String hiredFHours;
private String sharedMHours;
private String sharedFHours;
private String volunteerMHours;
private String volunteerFHours;
private String updatedBy;
private String updatedAt;
}

View File

@@ -18,4 +18,5 @@ public class GetDailyRecordsStatus {
private String expenseStatus;
private String powerStatus;
private String forestryStatus;
private String farmingStatus;
}