[BO] 일계부 동력 사용시간등록, 수정

This commit is contained in:
김현주
2025-07-01 13:59:53 +09:00
parent f540b842f4
commit 15dd6a4798
16 changed files with 639 additions and 1 deletions

View File

@@ -0,0 +1,39 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence.modal.GetDailyPowerDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.SaveDailyPowerPortOut;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain.GetDailyPowerCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain.SaveDailyPowerCmd;
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 SaveDailyPowerDao implements SaveDailyPowerPortOut {
private final SaveDailyPowerMapper dailyPowerMapper;
@Override
public GetDailyPowerDto detail(GetDailyPowerCmd command) {
return dailyPowerMapper.getDailyPower(command);
}
@CreateCommand
@Override
public void create(GetDailyPowerCmd findCmd, SaveDailyPowerCmd command) {
Integer existCount = dailyPowerMapper.getRecordExistCount(findCmd);
if (existCount == 0) {
dailyPowerMapper.createDailyPower(command);
log.debug("[CreateDailyPower] command={}", command);
} else {
dailyPowerMapper.updateDailyPower(command);
log.debug("[UpdateDailyPower] command={}", command);
}
}
}

View File

@@ -0,0 +1,39 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence.modal.GetDailyPowerDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain.GetDailyPowerCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain.SaveDailyPowerCmd;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface SaveDailyPowerMapper {
/**
* 일계부 동력 사용시간 데이터 조회
*
* @param command 검색 조건
* @return 동력 사용시간 데이터
*/
GetDailyPowerDto getDailyPower(GetDailyPowerCmd command);
/**
* 일계부 동력 사용시간 데이터 존재 여부
*
* @param command 검색 조건
* @return 중복 개수
*/
Integer getRecordExistCount(GetDailyPowerCmd command);
/**
* 일계부 동력 사용시간 등록
*
* @param command 등록 데이터
*/
void createDailyPower(SaveDailyPowerCmd command);
/**
* 일계부 동력 사용시간 수정
*
* @param command 수정 데이터
*/
void updateDailyPower(SaveDailyPowerCmd command);
}

View File

@@ -0,0 +1,14 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence.modal;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class GetDailyPowerDto {
private Long id;
private Long dailyRecordSeq;
private String equipmentName;
private String ownedHours;
private String leasedHours;
}

View File

@@ -0,0 +1,87 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence.modal.GetDailyPowerDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.DailyPowerUIReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.SaveDailyPowerReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.validator.SaveDailyPowerValidator;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.SaveDailyPowerPortIn;
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/power")
public class SaveDailyPowerController {
private final DailyRecordPortIn dailyRecordPortIn;
private final SaveDailyPowerPortIn dailyPowerPortIn;
private final SaveDailyPowerValidator dailyPowerValidator;
/**
* 일계부 동력 사용시간 조회
*
* @param id 동력 사용시간 일련번호
* @param reqVO 검색 조건
*/
@GetMapping(path = "/{id}")
ResponseEntity<?> detail(@PathVariable("id") String id, @ModelAttribute DailyPowerUIReqVO reqVO) {
reqVO.setId(Long.parseLong(id));
GetDailyPowerDto detail = dailyPowerPortIn.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 SaveDailyPowerReqVO formVO, BindingResult bindingResult) {
dailyPowerValidator.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);
dailyPowerPortIn.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;
}
}

View File

@@ -0,0 +1,30 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class DailyPowerUIReqVO {
/**
* 검색 월(yyyyMM)
*/
private String searchMonth;
/**
* 검색 그룸번호
*/
private Integer groupNo;
/**
* 임가 일련번호
*/
private Long householdSeq;
/**
* 일계부 항목 일련번호
*/
private Long dailyId;
/**
* 동력 사용시간 일련번호
*/
private Long id;
}

View File

@@ -0,0 +1,26 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.DailyPowerUIReqVO;
import jakarta.validation.constraints.NotBlank;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@ToString(callSuper = true)
public class SaveDailyPowerReqVO extends DailyPowerUIReqVO {
/**
* 명칭
*/
@NotBlank(message = "명칭을 입력해 주세요.")
private String equipmentName;
/**
* 자가 사용시간
*/
private Double ownedHours;
/**
* 임차 사용시간
*/
private Double leasedHours;
}

View File

@@ -0,0 +1,32 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.validator;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.SaveDailyPowerReqVO;
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 SaveDailyPowerValidator implements Validator {
@Override
public boolean supports(Class<?> clazz) {
return SaveDailyPowerReqVO.class.equals(clazz);
}
@Override
public void validate(Object target, Errors errors) {
SaveDailyPowerReqVO vo = (SaveDailyPowerReqVO) target;
if (vo.getOwnedHours() == null && vo.getLeasedHours() == null) {
errors.rejectValue(
"ownedHours", "valid.common.required",
"자가 사용시간 또는 임차 사용시간을 입력해 주세요.");
errors.rejectValue(
"leasedHours", "valid.common.required",
"자가 사용시간 또는 임차 사용시간을 입력해 주세요.");
}
}
}

View File

@@ -0,0 +1,22 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence.modal.GetDailyPowerDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.DailyPowerUIReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.SaveDailyPowerReqVO;
public interface SaveDailyPowerPortIn {
/**
* 일계부 동력 사용시간 조회
*
* @param reqVO 검색 조건
* @return 동력 사용시간 상세
*/
GetDailyPowerDto detail(DailyPowerUIReqVO reqVO);
/**
* 일계부 동력 사용시간 등록
*
* @param formVO 입력 데이터
*/
void create(SaveDailyPowerReqVO formVO);
}

View File

@@ -0,0 +1,23 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence.modal.GetDailyPowerDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain.GetDailyPowerCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain.SaveDailyPowerCmd;
public interface SaveDailyPowerPortOut {
/**
* 일계부 동력 사용시간 조회
*
* @param command 검색 조건
* @return 동력 사용시간 상세
*/
GetDailyPowerDto detail(GetDailyPowerCmd command);
/**
* 일계부 동력 사용시간 등록
*
* @param findCmd 검색 조건
* @param command 입력 데이터
*/
void create(GetDailyPowerCmd findCmd, SaveDailyPowerCmd command);
}

View File

@@ -0,0 +1,51 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence.modal.GetDailyPowerDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.DailyPowerUIReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.SaveDailyPowerReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.SaveDailyPowerPortIn;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.SaveDailyPowerPortOut;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain.GetDailyPowerCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain.SaveDailyPowerCmd;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
public class SaveDailyPowerService implements SaveDailyPowerPortIn {
private final SaveDailyPowerPortOut portOut;
private final DailyRecordPortIn dailyRecordPortIn;
@Override
public GetDailyPowerDto detail(DailyPowerUIReqVO reqVO) {
GetDailyPowerCmd findCmd = new GetDailyPowerCmd(
reqVO.getSearchMonth(),
reqVO.getGroupNo(),
reqVO.getHouseholdSeq(),
reqVO.getId());
return portOut.detail(findCmd);
}
@Override
public void create(SaveDailyPowerReqVO formVO) {
GetDailyPowerCmd findCmd = new GetDailyPowerCmd(
formVO.getSearchMonth(),
formVO.getGroupNo(),
formVO.getHouseholdSeq(),
formVO.getId());
SaveDailyPowerCmd command =
new SaveDailyPowerCmd(
formVO.getId(),
formVO.getDailyId(),
formVO.getEquipmentName(),
formVO.getOwnedHours(),
formVO.getLeasedHours());
portOut.create(findCmd, command);
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
}

View File

@@ -0,0 +1,27 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
public class GetDailyPowerCmd {
/**
* 검색 월(yyyyMM)
*/
private String searchMonth;
/**
* 검색 그룸번호
*/
private Integer groupNo;
/**
* 임가 일련번호
*/
private Long householdSeq;
/**
* 동력 사용시간 일련번호
*/
private Long id;
}

View File

@@ -0,0 +1,19 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.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 SaveDailyPowerCmd extends AuditCommand {
private Long id;
private Long dailyRecordSeq;
private String equipmentName;
private Double ownedHours;
private Double leasedHours;
}

View File

@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence.SaveDailyPowerMapper">
<select id="getDailyPower"
resultType="app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence.modal.GetDailyPowerDto">
select ds.id, ds.daily_record_seq
, ds.equipment_name, ds.owned_hours, ds.leased_hours
from daily_power ds
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
where ds.is_deleted = false
and ds.id = #{id}
</select>
<select id="getRecordExistCount" resultType="int">
select count(1)
from daily_power ds
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
where ds.is_deleted = false
<if test="id != null and id != '0'">
and ds.id = #{id}
</if>
</select>
<insert id="createDailyPower" useGeneratedKeys="true" keyProperty="id">
insert into daily_power (
daily_record_seq
, equipment_name, owned_hours, leased_hours
, is_deleted
, <include refid="common.fields.CreateUpdateBaseColumns"/>
) values (
#{dailyRecordSeq}
, #{equipmentName}, #{ownedHours}, #{leasedHours}
, false
, <include refid="common.fields.CreateUpdateBaseValues"/>
)
</insert>
<update id="updateDailyPower">
update daily_power set <include refid="common.fields.UpdateBaseSet"/>
, equipment_name = #{equipmentName}
, owned_hours = #{ownedHours}
, leased_hours = #{leasedHours}
where is_deleted = false
and daily_record_seq = #{dailyRecordSeq}
and id = #{id}
</update>
</mapper>

View File

@@ -0,0 +1,177 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
layout:decorate="~{layout/layout}">
<div class="layer-wrap" th:fragment="modalFragment">
<form autocomplete="off" method="get" name="reqPowerForm" data-modal-id=".modal-daily-power">
<input type="hidden" name="householdSeq" th:value="${seq}">
<input type="hidden" name="searchMonth">
<input type="hidden" name="groupNo">
<input type="hidden" name="id">
<input type="hidden" name="dailyId">
<div class="component-modal mypage-wrap modal01 modal-daily-power" data-props-dimm-click="true" data-state="close">
<div class="modal-dimm"></div>
<div class="modal-frame">
<div class="modal-container">
<div class="modal-header">
<h3 class="modal-tit">
일계부 동력 사용시간 등록
</h3>
</div>
<div class="modal-content">
<div class="modal-content-inner">
<table class="type-form confirm">
<colgroup>
<col width="8%" />
<col width="25.3%" />
<col width="8%" />
<col width="25.3%" />
<col width="8%" />
<col width="25.3%" />
</colgroup>
<tbody>
<tr>
<th>명칭<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td colspan="4">
<div class="component-input">
<div class="input-field">
<input type="text" id="equipmentName" name="equipmentName" maxlength="30">
</div>
</div>
</td>
</tr>
<tr>
<th>자가 사용시간<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td>
<div class="component-input">
<div class="input-field">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="ownedHours" name="ownedHours" min="1" max="9999999999"
maxlength="10" oninput="limitMaxLength(this); priceDisabled(this, this.form.leasedHours)">
</div>
</div>
</td>
<th>임차 사용시간<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td>
<div class="component-input">
<div class="input-field">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="leasedHours" name="leasedHours" min="1" max="9999999999"
maxlength="10" oninput="limitMaxLength(this); priceDisabled(this, this.form.ownedHours)">
</div>
</div>
</td>
</tr>
</tbody>
</table>
<div class="component-btns bottom-btn-group">
<div class="btns-row align-right">
<button type="button" class="btn btn-primary" onclick="saveDailyPower();">
<span class="btn-txt">등록</span>
</button>
</div>
</div>
</div>
</div>
<button type="button" class="modal-close"></button>
</div>
</div>
</div>
</form>
<script th:inline="javascript">
// form 초기화
const resetDailyPowerForm = () => {
const form = document.reqPowerForm;
if (!form) return;
form.equipmentName.value = '';
form.ownedHours.value = '';
form.leasedHours.value = '';
priceDisabledReset(form.ownedHours, form.leasedHours);
}
// 일계부 상세 값 set
const setDailyPowerFormData = (data) => {
const form = document.reqPowerForm;
if (!form) return;
// 폼에 값 세팅
form.equipmentName.value = data.equipmentName || '';
form.ownedHours.value = data.ownedHours || '';
form.leasedHours.value = data.leasedHours || '';
// 기타 UI 처리
if (form.ownedHours.value !== '') {
priceDisabled(form.ownedHours, form.leasedHours)
} else {
priceDisabled(form.leasedHours, form.ownedHours)
}
}
</script>
<script th:inline="javascript">
// 일계부 등록 모달창 띄우기
const showDailyPowerModal = (id) => {
const mf = document.reqPowerForm;
mf.searchMonth.value = document.reqForm.recordMonth.value;
mf.groupNo.value = document.reqForm.groupNo.value;
mf.dailyId.value = document.reqForm.dailyId.value;
mf.id.value = (id === undefined) ? '' : id;
resetDailyPowerForm();
if (id !== null && id !== undefined) {
const obj = $(f).serializeObject();
obj.id = mf.id.value;
obj.searchMonth = obj.recordMonth;
ajaxUtil._ajaxAsyncMethod(
`/api/household/daily/power/${id}`,
obj,
function (rstData, status) {
setDailyPowerFormData(rstData);
document.querySelector($(mf).data('modalId')).ui.open();
},
function () {
console.error('Do nothing error.')
},
'get'
);
} else {
document.querySelector($(mf).data('modalId')).ui.open();
}
}
const saveDailyPower = () => {
const mf = document.reqPowerForm;
let obj = $(mf).serializeObject();
obj.inputType = 'SELF';
obj.id = (obj.id === '' ? '0' : obj.id);
ajaxUtil._ajaxAsyncNoWaiting(
'/api/household/daily/power/save',
obj,
function () {
alert('등록이 완료되었습니다.');
document.querySelector($(mf).data('modalId')).ui.close();
getDailyRecordsView(f.dailyId.value, f.groupNo.value, f.dayGroupText.value);
},
function (code, rstData) {
console.error('Do nothing. code: '+ code, rstData);
},
);
}
</script>
</div>
</html>

View File

@@ -639,7 +639,7 @@
</label>
</div>
</td>
<td class="underline">${ifNullHyphen(item.equipmentName)}</td> <!-- 명칭 -->
<td class="underline"><a href="javascript:void(0);" onclick="showDailyPowerModal(${item.id});">${ifNullHyphen(item.equipmentName)}</a></td> <!-- 명칭 -->
<td>${ifNullHyphen(item.ownedHours)}</td><!-- 자가 사용시간 -->
<td>${ifNullHyphen(item.leasedHours)}</td><!-- 임가 사용시간 -->
<td>
@@ -814,6 +814,8 @@
showDailyWorkModal();
} else if (currentStep === 'EXPENSE') {
showDailyExpenseModal();
} else if (currentStep === 'POWER') {
showDailyPowerModal();
} else {
alert('TODO : 추가');
}

View File

@@ -179,6 +179,7 @@
<th:block th:replace="households/modal/modal-daily-income :: modalFragment"/>
<th:block th:replace="households/modal/modal-daily-work :: modalFragment"/>
<th:block th:replace="households/modal/modal-daily-expense :: modalFragment"/>
<th:block th:replace="households/modal/modal-daily-power :: modalFragment"/>
<!-- 조사원 매핑 모달 -->
<th:block th:replace="common/modal-researcher-mapping :: modalFragment"/>