[BO] 일계부 농업생산물 등록, 수정 [FO] 농업생산물 수입/지출부호 Util 로 변경
This commit is contained in:
@@ -0,0 +1,40 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.SaveDailyFarmingMapper;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal.GetDailyFarmingDto;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.SaveDailyFarmingPortOut;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.GetDailyFarmingCmd;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.SaveDailyFarmingCmd;
|
||||
import app.module.core.config.application.annotation.CreateCommand;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class SaveDailyFarmingDao implements SaveDailyFarmingPortOut {
|
||||
private final SaveDailyFarmingMapper DailyFarmingMapper;
|
||||
|
||||
@Override
|
||||
public GetDailyFarmingDto detail(GetDailyFarmingCmd command) {
|
||||
|
||||
return DailyFarmingMapper.getDailyFarming(command);
|
||||
}
|
||||
|
||||
@CreateCommand
|
||||
@Override
|
||||
public void create(GetDailyFarmingCmd findCmd, SaveDailyFarmingCmd command) {
|
||||
Integer existCount = DailyFarmingMapper.getRecordExistCount(findCmd);
|
||||
if (existCount == 0) {
|
||||
DailyFarmingMapper.createDailyFarming(command);
|
||||
|
||||
log.debug("[CreateDailyFarming] command={}", command);
|
||||
} else {
|
||||
DailyFarmingMapper.updateDailyFarming(command);
|
||||
|
||||
log.debug("[UpdateDailyFarming] command={}", command);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal.GetDailyFarmingDto;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.GetDailyFarmingCmd;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.SaveDailyFarmingCmd;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface SaveDailyFarmingMapper {
|
||||
/**
|
||||
* 일계부 농업생산 데이터 조회
|
||||
*
|
||||
* @param command 검색 조건
|
||||
* @return 농업생산 데이터
|
||||
*/
|
||||
GetDailyFarmingDto getDailyFarming(GetDailyFarmingCmd command);
|
||||
|
||||
/**
|
||||
* 일계부 농업생산 데이터 존재 여부
|
||||
*
|
||||
* @param command 검색 조건
|
||||
* @return 중복 개수
|
||||
*/
|
||||
Integer getRecordExistCount(GetDailyFarmingCmd command);
|
||||
|
||||
/**
|
||||
* 일계부 농업생산 등록
|
||||
*
|
||||
* @param command 등록 데이터
|
||||
*/
|
||||
void createDailyFarming(SaveDailyFarmingCmd command);
|
||||
|
||||
/**
|
||||
* 일계부 농업생산 수정
|
||||
*
|
||||
* @param command 수정 데이터
|
||||
*/
|
||||
void updateDailyFarming(SaveDailyFarmingCmd command);
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class GetDailyFarmingDto {
|
||||
private Long id;
|
||||
private Long dailyRecordSeq;
|
||||
private String productCode;
|
||||
private String productLabel;
|
||||
private String productSelf;
|
||||
private String usage;
|
||||
private String quantity;
|
||||
private String unitCode;
|
||||
private String unitLabel;
|
||||
private String unitSelf;
|
||||
private Long estimatedValue;
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web;
|
||||
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal.GetDailyFarmingDto;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.DailyFarmingUIReqVO;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.SaveDailyFarmingReqVO;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.validator.SaveDailyFarmingValidator;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.SaveDailyFarmingPortIn;
|
||||
import app.module.core.config.application.exception.NoRecordDataException;
|
||||
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
|
||||
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping(path = "/api/household/daily/farming")
|
||||
public class SaveDailyFarmingController {
|
||||
private final DailyRecordPortIn dailyRecordPortIn;
|
||||
private final SaveDailyFarmingPortIn DailyFarmingPortIn;
|
||||
private final SaveDailyFarmingValidator DailyFarmingValidator;
|
||||
|
||||
/**
|
||||
* 일계부 농업생산 조회
|
||||
*
|
||||
* @param id 농업생산 일련번호
|
||||
* @param reqVO 검색 조건
|
||||
*/
|
||||
@GetMapping(path = "/{id}")
|
||||
ResponseEntity<?> detail(@PathVariable("id") String id, @ModelAttribute DailyFarmingUIReqVO reqVO) {
|
||||
|
||||
reqVO.setId(Long.parseLong(id));
|
||||
|
||||
GetDailyFarmingDto detail = DailyFarmingPortIn.detail(reqVO);
|
||||
if (detail == null) {
|
||||
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
|
||||
}
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(detail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 일계부 농업생산 등록 처리
|
||||
*
|
||||
* @param formVO 입력 데이터
|
||||
* @param bindingResult BindingResult
|
||||
*/
|
||||
@PostMapping(path = "/save")
|
||||
ResponseEntity<?> create(@Valid @RequestBody SaveDailyFarmingReqVO formVO, BindingResult bindingResult) {
|
||||
|
||||
DailyFarmingValidator.validate(formVO, bindingResult);
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
|
||||
.body(bindingResult.getFieldErrors());
|
||||
}
|
||||
|
||||
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(formVO.getDailyId());
|
||||
|
||||
formVO.setSearchMonth(dailyRecord.getRecordMonth());
|
||||
formVO.setGroupNo(dailyRecord.getGroupNo());
|
||||
formVO.setDailyId(dailyRecord.getId());
|
||||
log.debug("formVO: {}", formVO);
|
||||
|
||||
DailyFarmingPortIn.create(formVO);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(formVO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 일계부 유효성 체크 및 데이터 조회
|
||||
*
|
||||
* @param dailyRecordSeq 항목 일련번호
|
||||
*/
|
||||
private DailyRecordDto vaildGetDailyRecord(Long dailyRecordSeq) {
|
||||
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(dailyRecordSeq);
|
||||
if (dailyRecord == null || dailyRecord.getId() == null) {
|
||||
throw new NoRecordDataException();
|
||||
}
|
||||
|
||||
return dailyRecord;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class DailyFarmingUIReqVO {
|
||||
/**
|
||||
* 검색 월(yyyyMM)
|
||||
*/
|
||||
private String searchMonth;
|
||||
/**
|
||||
* 검색 그룸번호
|
||||
*/
|
||||
private Integer groupNo;
|
||||
/**
|
||||
* 임가 일련번호
|
||||
*/
|
||||
private Long householdSeq;
|
||||
|
||||
/**
|
||||
* 일계부 항목 일련번호
|
||||
*/
|
||||
private Long dailyId;
|
||||
/**
|
||||
* 농업생산 일련번호
|
||||
*/
|
||||
private Long id;
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model;
|
||||
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.DailyFarmingUIReqVO;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString(callSuper = true)
|
||||
public class SaveDailyFarmingReqVO extends DailyFarmingUIReqVO {
|
||||
/**
|
||||
* 생산물
|
||||
*/
|
||||
@NotBlank(message = "생산물을 선택해 주세요.")
|
||||
private String productCode;
|
||||
/**
|
||||
* 생산물 직접 입력
|
||||
*/
|
||||
private String productSelf;
|
||||
/**
|
||||
* 용도
|
||||
*/
|
||||
private String usage;
|
||||
/**
|
||||
* 수량
|
||||
*/
|
||||
private Double quantity;
|
||||
/**
|
||||
* 단위 코드
|
||||
*/
|
||||
private String unitCode;
|
||||
/**
|
||||
* 단위 직접 입력
|
||||
*/
|
||||
private String unitSelf;
|
||||
/**
|
||||
* 현물평가액
|
||||
*/
|
||||
private Long estimatedValue;
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.validator;
|
||||
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.SaveDailyFarmingReqVO;
|
||||
import app.module.core.config.constants.CommonConstants;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.apache.tika.utils.StringUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.validation.Errors;
|
||||
import org.springframework.validation.Validator;
|
||||
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class SaveDailyFarmingValidator implements Validator {
|
||||
@Override
|
||||
public boolean supports(Class<?> clazz) {
|
||||
return SaveDailyFarmingReqVO.class.equals(clazz);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void validate(Object target, Errors errors) {
|
||||
SaveDailyFarmingReqVO vo = (SaveDailyFarmingReqVO) target;
|
||||
|
||||
if ("code.record.farming.self".equals(vo.getProductCode()) && StringUtils.isBlank(vo.getProductSelf())) {
|
||||
errors.rejectValue(
|
||||
"productSelf", "valid.common.required",
|
||||
"생산물을 입력해 주세요.");
|
||||
}
|
||||
|
||||
if (vo.getQuantity() == null && !StringUtils.isBlank(vo.getUnitCode())) {
|
||||
errors.rejectValue(
|
||||
"quantity", "valid.common.required",
|
||||
"수량을 입력해 주세요.");
|
||||
}
|
||||
|
||||
if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) {
|
||||
errors.rejectValue(
|
||||
"unitCode", "valid.common.required",
|
||||
"단위를 선택해 주세요.");
|
||||
}
|
||||
|
||||
if (CommonConstants.UNIT_CODE_SELF.equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) {
|
||||
errors.rejectValue(
|
||||
"unitSelf", "valid.common.required",
|
||||
"단위를 입력해 주세요.");
|
||||
}
|
||||
|
||||
if (vo.getEstimatedValue() == null) {
|
||||
errors.rejectValue(
|
||||
"estimatedValue", "valid.common.required",
|
||||
"현물평가액을 입력해 주세요.");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports;
|
||||
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal.GetDailyFarmingDto;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.DailyFarmingUIReqVO;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.SaveDailyFarmingReqVO;
|
||||
|
||||
public interface SaveDailyFarmingPortIn {
|
||||
/**
|
||||
* 일계부 농업생산 조회
|
||||
*
|
||||
* @param reqVO 검색 조건
|
||||
* @return 농업생산 상세
|
||||
*/
|
||||
GetDailyFarmingDto detail(DailyFarmingUIReqVO reqVO);
|
||||
|
||||
/**
|
||||
* 일계부 농업생산 등록
|
||||
*
|
||||
* @param formVO 입력 데이터
|
||||
*/
|
||||
void create(SaveDailyFarmingReqVO formVO);
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports;
|
||||
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal.GetDailyFarmingDto;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.GetDailyFarmingCmd;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.SaveDailyFarmingCmd;
|
||||
|
||||
public interface SaveDailyFarmingPortOut {
|
||||
/**
|
||||
* 일계부 농업생산 조회
|
||||
*
|
||||
* @param command 검색 조건
|
||||
* @return 농업생산 상세
|
||||
*/
|
||||
GetDailyFarmingDto detail(GetDailyFarmingCmd command);
|
||||
|
||||
/**
|
||||
* 일계부 농업생산 등록
|
||||
*
|
||||
* @param findCmd 검색 조건
|
||||
* @param command 입력 데이터
|
||||
*/
|
||||
void create(GetDailyFarmingCmd findCmd, SaveDailyFarmingCmd command);
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application;
|
||||
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal.GetDailyFarmingDto;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.DailyFarmingUIReqVO;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.SaveDailyFarmingReqVO;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.SaveDailyFarmingPortIn;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.SaveDailyFarmingPortOut;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.GetDailyFarmingCmd;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.SaveDailyFarmingCmd;
|
||||
import app.module.core.config.application.util.DailyUtil;
|
||||
import app.module.core.config.constants.DailyRecordConstants;
|
||||
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class SaveDailyFarmingService implements SaveDailyFarmingPortIn {
|
||||
private final SaveDailyFarmingPortOut portOut;
|
||||
private final DailyRecordPortIn dailyRecordPortIn;
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
private final DailyUtil dailyUtil;
|
||||
|
||||
@Override
|
||||
public GetDailyFarmingDto detail(DailyFarmingUIReqVO reqVO) {
|
||||
GetDailyFarmingCmd findCmd = new GetDailyFarmingCmd(
|
||||
reqVO.getSearchMonth(),
|
||||
reqVO.getGroupNo(),
|
||||
reqVO.getHouseholdSeq(),
|
||||
reqVO.getId());
|
||||
|
||||
return portOut.detail(findCmd);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void create(SaveDailyFarmingReqVO formVO) {
|
||||
GetDailyFarmingCmd findCmd = new GetDailyFarmingCmd(
|
||||
formVO.getSearchMonth(),
|
||||
formVO.getGroupNo(),
|
||||
formVO.getHouseholdSeq(),
|
||||
formVO.getId());
|
||||
|
||||
HashMap<String, String> markMap = dailyUtil.getMarkByFarming(uiCodeListPortIn.connect("code.record.farming"), formVO.getProductCode());
|
||||
|
||||
SaveDailyFarmingCmd command =
|
||||
new SaveDailyFarmingCmd(
|
||||
formVO.getId(),
|
||||
formVO.getDailyId(),
|
||||
markMap.get("incomeMark"),
|
||||
markMap.get("expenseMark"),
|
||||
formVO.getProductCode(),
|
||||
formVO.getProductSelf(),
|
||||
formVO.getUsage(),
|
||||
formVO.getQuantity(),
|
||||
formVO.getUnitCode(),
|
||||
formVO.getUnitSelf(),
|
||||
formVO.getEstimatedValue());
|
||||
|
||||
portOut.create(findCmd, command);
|
||||
|
||||
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
public class GetDailyFarmingCmd {
|
||||
/**
|
||||
* 검색 월(yyyyMM)
|
||||
*/
|
||||
private String searchMonth;
|
||||
/**
|
||||
* 검색 그룸번호
|
||||
*/
|
||||
private Integer groupNo;
|
||||
/**
|
||||
* 임가 일련번호
|
||||
*/
|
||||
private Long householdSeq;
|
||||
/**
|
||||
* 농업생산 일련번호
|
||||
*/
|
||||
private Long id;
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain;
|
||||
|
||||
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@ToString
|
||||
public class SaveDailyFarmingCmd extends AuditCommand {
|
||||
private Long id;
|
||||
private Long dailyRecordSeq;
|
||||
private String incomeMark;
|
||||
private String expenseMark;
|
||||
private String productCode;
|
||||
private String productSelf;
|
||||
private String usage;
|
||||
private Double quantity;
|
||||
private String unitCode;
|
||||
private String unitSelf;
|
||||
private Long estimatedValue;
|
||||
}
|
||||
Reference in New Issue
Block a user