[BO] 임가현황 리스트, 상세 작업 중 (4)

This commit is contained in:
kangsunlee
2025-06-14 20:51:10 +09:00
parent 418ea600fc
commit 866ec501f5
28 changed files with 1369 additions and 316 deletions

View File

@@ -0,0 +1,30 @@
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

@@ -0,0 +1,17 @@
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

@@ -0,0 +1,28 @@
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

@@ -0,0 +1,16 @@
package app.module.admin.usecase.household.getDailyRecordStatus.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetDailyRecordStatusReqVO {
private Long householdSeq;
private Long recordSeq;
private String recordMonth;
}

View File

@@ -0,0 +1,18 @@
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

@@ -0,0 +1,9 @@
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

@@ -0,0 +1,9 @@
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

@@ -0,0 +1,20 @@
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,26 @@
package app.module.admin.usecase.household.getDailyRecordStatus.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 GetDailyExpenseRecords {
private Long id;
private String inputType;
private Boolean isCredit;
private String categoryCode;
private String categorySelf;
private String sourcePurpose;
private BigDecimal quantity;
private String unitCode;
private String price;
private String estimatedValue;
private String updatedBy;
private String updatedAt;
}

View File

@@ -0,0 +1,21 @@
package app.module.admin.usecase.household.getDailyRecordStatus.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 GetDailyForestryRecords {
private Long id;
private String productName;
private String usage;
private BigDecimal quantity;
private String estimatedValue;
private String updatedBy;
private String updatedAt;
}

View File

@@ -0,0 +1,29 @@
package app.module.admin.usecase.household.getDailyRecordStatus.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
@AllArgsConstructor
@EqualsAndHashCode
public class GetDailyIncomeRecords {
private Long id;
private String inputType;
private Boolean isCredit;
private String cropCode;
private String categoryCode;
private String categorySelf;
private String sourcePurpose;
private BigDecimal quantity;
private String unitCode;
private String price;
private String estimatedValue;
private String updatedBy;
private String updatedAt;
}

View File

@@ -0,0 +1,21 @@
package app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetDailyPowerRecords {
private Long id;
private String equipmentName;
private BigDecimal ownedHours;
private BigDecimal leasedHours;
private String updatedBy;
private String updatedAt;
}

View File

@@ -0,0 +1,18 @@
package app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetDailyRecordStatus {
List<GetDailyIncomeRecords> incomes; // 수입
List<GetDailyExpenseRecords> expenses; // 지출
List<GetDailyPowerRecords> powers; // 동력사용시간
List<GetDailyForestryRecords> forestries; // 자가임업
}

View File

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

View File

@@ -0,0 +1,39 @@
package app.module.admin.usecase.household.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 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;
@RestController
@RequiredArgsConstructor
class GetDailyRecordsStatusController {
private final GetDailyRecordsStatusPortIn getDailyRecordsStatusPortIn;
private final GetDailyRecordsCountPortIn getDailyRecordsCountPortIn;
@GetMapping(path = "/api/household/dailyRecordsStatus")
ResponseEntity<?> operate(
GetDailyRecordsStatusReqVO reqVO) {
List<GetDailyRecordsStatus> dailyRecords =
getDailyRecordsStatusPortIn.operate(
new GetDailyRecordsStatusCmd(reqVO.getHouseholdSeq(), reqVO.getRecordMonth()));
GetDailyRecordsCount summary =
getDailyRecordsCountPortIn.operate(
new GetDailyRecordsCountCmd(reqVO.getHouseholdSeq(), reqVO.getRecordMonth())).orElse(null);
return ResponseEntity.status(HttpStatus.OK)
.body(new GetDailyRecordsStatusResVO(summary, dailyRecords));
}
}

View File

@@ -0,0 +1,15 @@
package app.module.admin.usecase.household.getDailyRecordsStatus.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetDailyRecordsStatusReqVO {
private Long householdSeq;
private String recordMonth;
}

View File

@@ -0,0 +1,18 @@
package app.module.admin.usecase.household.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 java.util.List;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetDailyRecordsStatusResVO {
private GetDailyRecordsCount summary; // 등록 현황 요약
private List<GetDailyRecordsStatus> dailyRecords; // 일계부 등록 현황
}

View File

@@ -10,6 +10,7 @@ import lombok.Setter;
@AllArgsConstructor
@EqualsAndHashCode
public class GetDailyRecordsStatus {
private Long id;
private String dayGroup;
private RecordStatusType allStatusType;
private String incomeStatus;

View File

@@ -9,7 +9,6 @@ public enum RecordStatusType {
WAITING("대기"),
DONE("작성완료"),
INCOMPLETE("미완료"),
NONE("등록없음"),
EMPTY("미작성");
private final String desc;

View File

@@ -41,7 +41,7 @@ public class GetHouseholdStatus {
// 유지여부
private Boolean isPanel;
// 비고
private Double memo;
private String memo;
// 조사원
private String researcherName;
// 조사원 연락처

View File

@@ -19,8 +19,6 @@ import app.module.admin.usecase.household.getHouseholdStatusUI.model.GetHousehol
@RequiredArgsConstructor
class GetHouseholdStatusUIController {
private final GetHouseholdStatusPortIn getHouseholdStatusPortIn;
private final GetDailyRecordsStatusPortIn getDailyRecordsStatusPortIn;
private final GetDailyRecordsCountPortIn getDailyRecordsCountPortIn;
@GetMapping(path = "/household/households/{seq}")
String operate(
@@ -35,13 +33,6 @@ class GetHouseholdStatusUIController {
// 임가 상세 정보
model.addAttribute("householdInfo",
getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null));
// TODO : 비동기호출로 변경하기
// model.addAttribute("dailyRecords",
// getDailyRecordsStatusPortIn.operate(new GetDailyRecordsStatusCmd(seq, "202506")));
// model.addAttribute("dailyRecordsCount",
// getDailyRecordsCountPortIn.operate(new GetDailyRecordsCountCmd(seq, "202506"))
// .orElse(null));
return "household/households/{seq}";
}