From ae3652c85294779057bfddbd95eee9d717705027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Wed, 18 Jun 2025 16:44:21 +0900 Subject: [PATCH] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20=EB=8F=99?= =?UTF-8?q?=EB=A0=A5=20=EC=82=AC=EC=9A=A9=EC=8B=9C=EA=B0=84=20CRUD,=20?= =?UTF-8?q?=EC=9D=BC=EA=B3=84=EB=B6=80=20=EA=B3=B5=ED=86=B5=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/web/DailyIncomeUIController.java | 7 +- .../adapters/persistence/DailyPowerDao.java | 50 ++++ .../persistence/DailyPowerMapper.java | 50 ++++ .../persistence/model/DailyPowerDto.java | 22 ++ .../adapters/web/DailyPowerController.java | 131 +++++++++ .../adapters/web/DailyPowerUIController.java | 110 ++++++++ .../web/model/CreateDailyPowerReqVO.java | 35 +++ .../adapters/web/model/DailyPowerUIReqVO.java | 29 ++ .../web/model/RemoveDailyPowerReqVO.java | 22 ++ .../validator/CreateDailyPowerValidator.java | 32 +++ .../daily/power/ports/DailyPowerPortIn.java | 41 +++ .../daily/power/ports/DailyPowerPortOut.java | 35 +++ .../ports/application/DailyPowerService.java | 98 +++++++ .../domain/CreateDailyPowerCmd.java | 21 ++ .../application/domain/GetDailyPowerCmd.java | 27 ++ .../domain/RemoveDailyPowerCmd.java | 18 ++ .../persistence/model/DailyRecordDto.java | 4 - .../adapters/web/DailyRecordUIController.java | 20 +- .../mappers/daily/DailyPowerMapper.xml | 63 +++++ .../resources/static/ui/page/daily-record.js | 11 +- .../templates/record/daily/done.html | 144 ++++++++-- .../templates/record/daily/finish.html | 50 ---- .../templates/record/daily/index.html | 11 +- .../templates/record/expense/index.html | 4 +- .../templates/record/income/index.html | 4 +- .../templates/record/power/form.html | 77 ++++++ .../templates/record/power/index.html | 251 ++++++++++++++++++ 27 files changed, 1283 insertions(+), 84 deletions(-) create mode 100644 front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerDao.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerMapper.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerDto.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerController.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerUIController.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/CreateDailyPowerReqVO.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/DailyPowerUIReqVO.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/RemoveDailyPowerReqVO.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/power/adapters/web/validator/CreateDailyPowerValidator.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortIn.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortOut.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/power/ports/application/DailyPowerService.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/power/ports/application/domain/CreateDailyPowerCmd.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/power/ports/application/domain/GetDailyPowerCmd.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/power/ports/application/domain/RemoveDailyPowerCmd.java create mode 100644 front/src/main/resources/mappers/daily/DailyPowerMapper.xml create mode 100644 front/src/main/resources/templates/record/power/form.html create mode 100644 front/src/main/resources/templates/record/power/index.html diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeUIController.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeUIController.java index 120230f4..f61b80fc 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeUIController.java @@ -27,7 +27,7 @@ import java.util.List; @RequestMapping(path = "/record/income") public class DailyIncomeUIController { private final UICodeListPortIn uiCodeListPortIn; - private final DailyRecordPortIn dailyRecordService; + private final DailyRecordPortIn dailyRecordPortIn; private final DailyIncomePortIn dailyIncomePortIn; /** @@ -37,7 +37,6 @@ public class DailyIncomeUIController { * @param searchMonth 검색 월(yyyyMM) * @param groupNo 검색 그룹 * @param searchType 수정여부 - * @return */ @GetMapping(path = "/{searchMonth}/{groupNo}") public String index(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo @@ -66,7 +65,6 @@ public class DailyIncomeUIController { * @param searchMonth 검색 월(yyyyMM) * @param groupNo 검색 그룹 * @param id 수입 일련번호 - * @return */ @GetMapping(path = "/{searchMonth}/{groupNo}/form/{id}") public String formBySelf(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo @@ -102,13 +100,12 @@ public class DailyIncomeUIController { * * @param searchMonth 검색 월(yyyyMM) * @param groupNo 검색 그룹 - * @return */ private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo); log.debug("getRecordUIReq: {}", reqVO); - DailyRecordDto dailyRecord = dailyRecordService.detail(reqVO); + DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO); if (dailyRecord == null || dailyRecord.getId() == null) { throw new NoRecordDataException(); } diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerDao.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerDao.java new file mode 100644 index 00000000..e6a0f0aa --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerDao.java @@ -0,0 +1,50 @@ +package app.module.front.usecase.daily.power.adapters.persistence; + +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto; +import app.module.front.usecase.daily.power.ports.DailyPowerPortOut; +import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd; +import app.module.front.usecase.daily.power.ports.application.domain.GetDailyPowerCmd; +import app.module.front.usecase.daily.power.ports.application.domain.RemoveDailyPowerCmd; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Slf4j +@Service +@RequiredArgsConstructor +public class DailyPowerDao implements DailyPowerPortOut { + private final UICodeListPortIn uiCodeListPortIn; + private final DailyPowerMapper dailyPowerMapper; + + @Override + public List list(GetDailyPowerCmd command) { + return dailyPowerMapper.getDailyPowerList(command); + } + + @Override + public void create(GetDailyPowerCmd findCmd, CreateDailyPowerCmd command) { + Integer existCount = dailyPowerMapper.getRecordExistCount(findCmd); + if (existCount == 0) { + dailyPowerMapper.createDailyPower(command); + + log.debug("[CreateDailyPower] record={}", command); + } else { + dailyPowerMapper.updateDailyPower(command); + + log.debug("[UpdateDailyPower] record={}", command); + } + } + + @Override + public void remove(GetDailyPowerCmd findCmd, RemoveDailyPowerCmd command) { + Integer existCount = dailyPowerMapper.getRecordExistCount(findCmd); + if (existCount != 0) { + dailyPowerMapper.removeDailyPower(command); + + log.debug("[RemoveDailyPower] record={}", command); + } + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerMapper.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerMapper.java new file mode 100644 index 00000000..9aaf12f0 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerMapper.java @@ -0,0 +1,50 @@ +package app.module.front.usecase.daily.power.adapters.persistence; + +import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd; +import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto; +import app.module.front.usecase.daily.power.ports.application.domain.GetDailyPowerCmd; +import app.module.front.usecase.daily.power.ports.application.domain.RemoveDailyPowerCmd; +import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface DailyPowerMapper { + /** + * 일계부 동력 사용시간 목록 조회 + * + * @param command 검색 조건 + * @return 동력 사용시간 목록 + */ + List getDailyPowerList(GetDailyPowerCmd command); + + /** + * 일계부 동력 사용시간 데이터 존재 여부 + * + * @param command 검색 조건 + * @return 중복 개수 + */ + Integer getRecordExistCount(GetDailyPowerCmd command); + + /** + * 일계부 동력 사용시간 등록 + * + * @param command 등록 데이터 + */ + void createDailyPower(CreateDailyPowerCmd command); + + /** + * 일계부 동력 사용시간 수정 + * + * @param command 수정 데이터 + */ + void updateDailyPower(CreateDailyPowerCmd command); + + /** + * 일계부 동력 사용시간 삭제 + * + * @param command 삭제 데이터 + */ + void removeDailyPower(RemoveDailyPowerCmd command); +} diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerDto.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerDto.java new file mode 100644 index 00000000..f14234f2 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerDto.java @@ -0,0 +1,22 @@ +package app.module.front.usecase.daily.power.adapters.persistence.model; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class DailyPowerDto { + private Long id; + private Long dailyRecordSeq; + private String equipmentName; + private Integer ownedHours; + private Integer leasedHours; + + /** + * 수정 가능 여부 + * @return true=가능, false=불가능(등록 상태) + */ + public boolean isUpdated() { + return this.id != null && this.id != 0L; + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerController.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerController.java new file mode 100644 index 00000000..f1289345 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerController.java @@ -0,0 +1,131 @@ +package app.module.front.usecase.daily.power.adapters.web; + +import app.module.core.config.application.exception.NoRecordDataException; +import app.module.core.config.application.util.CoreUtil; +import app.module.front.usecase.daily.power.adapters.web.model.CreateDailyPowerReqVO; +import app.module.front.usecase.daily.power.adapters.web.model.RemoveDailyPowerReqVO; +import app.module.front.usecase.daily.power.adapters.web.validator.CreateDailyPowerValidator; +import app.module.front.usecase.daily.power.ports.DailyPowerPortIn; +import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; +import app.module.front.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/record/power") +public class DailyPowerController { + private final CoreUtil coreUtil; + private final DailyRecordPortIn dailyRecordService; + private final DailyPowerPortIn dailyPowerService; + private final CreateDailyPowerValidator createDailyPowerValidator; + + /** + * 일계부 동력 사용시간 등록 처리 + * + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param id 수입 일련번호 + * @param formVO 입력 데이터 + * @param bindingResult BindingResult + */ + @PostMapping(path = "/{searchMonth}/{groupNo}/form/{id}") + ResponseEntity create(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo + , @PathVariable("id") String id + , @Valid @RequestBody CreateDailyPowerReqVO formVO, BindingResult bindingResult) { + + createDailyPowerValidator.validate(formVO, bindingResult); + if (bindingResult.hasErrors()) { + return coreUtil.getErrorInfo(bindingResult); + } + + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + + formVO.setSearchMonth(searchMonth); + formVO.setGroupNo(Integer.parseInt(groupNo)); + formVO.setId(Long.parseLong(id)); + formVO.setDailyRecordSeq(dailyRecord.getId()); + log.debug("formVO: {}", formVO); + + dailyPowerService.create(formVO); + + return ResponseEntity.status(HttpStatus.OK).body(formVO); + } + + /** + * 일계부 동력 사용시간 삭제 처리 + * + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param formVO 입력 데이터 + * @param bindingResult BindingResult + */ + @PostMapping(path = "/{searchMonth}/{groupNo}/remove") + ResponseEntity remove(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo + , @Valid @RequestBody RemoveDailyPowerReqVO formVO, BindingResult bindingResult) { + + log.debug("before formVO: {}", formVO); + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + + formVO.setSearchMonth(dailyRecord.getRecordMonth()); + formVO.setGroupNo(dailyRecord.getGroupNo()); + formVO.setDailyRecordSeq(dailyRecord.getId()); + log.debug("formVO: {}", formVO); + + dailyPowerService.remove(formVO); + + return ResponseEntity.status(HttpStatus.OK).body(formVO); + } + + /** + * 일계부 동력 사용시간 전체 삭제 처리 + * + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + */ + @PostMapping(path = "/{searchMonth}/{groupNo}/reset") + ResponseEntity removeAll(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo) { + + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + + RemoveDailyPowerReqVO formVO = new RemoveDailyPowerReqVO(); + formVO.setSearchMonth(dailyRecord.getRecordMonth()); + formVO.setGroupNo(dailyRecord.getGroupNo()); + formVO.setDailyRecordSeq(dailyRecord.getId()); + log.debug("formVO: {}", formVO); + + dailyPowerService.remove(formVO); + + return ResponseEntity.status(HttpStatus.OK).body(formVO); + } + + /** + * 일계부 유효성 체크 및 데이터 조회 + * + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + */ + private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { + DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo); + log.debug("getRecordUIReq: {}", reqVO); + + DailyRecordDto dailyRecord = dailyRecordService.detail(reqVO); + if (dailyRecord == null || dailyRecord.getId() == null) { + throw new NoRecordDataException(); + } + + return dailyRecord; + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerUIController.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerUIController.java new file mode 100644 index 00000000..1caba5f3 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerUIController.java @@ -0,0 +1,110 @@ +package app.module.front.usecase.daily.power.adapters.web; + +import app.module.core.config.application.exception.NoRecordDataException; +import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto; +import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO; +import app.module.front.usecase.daily.power.ports.DailyPowerPortIn; +import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.front.usecase.daily.record.adapters.web.model.DailySort; +import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; +import app.module.front.usecase.daily.record.ports.DailyRecordPortIn; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.thymeleaf.util.StringUtils; + +import java.util.List; + +@Slf4j +@Controller +@RequiredArgsConstructor +@RequestMapping(path = "/record/power") +public class DailyPowerUIController { + private final DailyRecordPortIn dailyRecordPortIn; + private final DailyPowerPortIn dailyPowerPortIn; + + /** + * 일계부 동력 사용시간 목록 화면 + * + * @param model Model + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param searchType 수정여부 + */ + @GetMapping(path = "/{searchMonth}/{groupNo}") + public String index(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo + , @RequestParam(name = "type", required = false) String searchType) { + + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + + DailyPowerUIReqVO reqVO = new DailyPowerUIReqVO(searchMonth, groupNo); + log.debug("reqVO: {}", reqVO); + + List powerList = dailyPowerPortIn.list(reqVO); + + model.addAttribute("reqVO", reqVO); + model.addAttribute("dailyRecord", dailyRecord); + model.addAttribute("powerList", powerList); + model.addAttribute("moveStep", !"update".equals(searchType)); + model.addAttribute("nextStep", dailyRecord.getNextStep(DailySort.POWER)); + + return "record/power/index"; + } + + /** + * 일계부 동력 사용시간 등록 화면 + * + * @param model Model + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param id 수입 일련번호 + */ + @GetMapping(path = "/{searchMonth}/{groupNo}/form/{id}") + public String formBySelf(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo + , @PathVariable("id") String id) { + + DailyPowerUIReqVO reqVO = new DailyPowerUIReqVO(searchMonth, groupNo); + if (StringUtils.isEmpty(id)) { + reqVO.setId(0L); + } else { + reqVO.setId(Long.parseLong(id)); + } + log.debug("reqVO: {}", reqVO); + + DailyPowerDto detail = new DailyPowerDto(); + if (reqVO.getId() != 0L) { + detail = dailyPowerPortIn.detail(reqVO); + if (detail == null || !detail.isUpdated()) { + throw new NoRecordDataException(); + } + } + + model.addAttribute("reqVO", reqVO); + model.addAttribute("detail", detail); + + return "record/power/form"; + } + + /** + * 일계부 유효성 체크 및 데이터 조회 + * + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + */ + private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { + DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo); + log.debug("getRecordUIReq: {}", reqVO); + + DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO); + if (dailyRecord == null || dailyRecord.getId() == null) { + throw new NoRecordDataException(); + } + + return dailyRecord; + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/CreateDailyPowerReqVO.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/CreateDailyPowerReqVO.java new file mode 100644 index 00000000..dc2286e1 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/CreateDailyPowerReqVO.java @@ -0,0 +1,35 @@ +package app.module.front.usecase.daily.power.adapters.web.model; + +import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString(callSuper = true) +public class CreateDailyPowerReqVO extends DailyUIReqVO { + /** + * 동력 사용시간 일련번호 + */ + private Long id; + /** + * 일계부 일련번호 + */ + private Long dailyRecordSeq; + + /** + * 명칭 + */ + @NotBlank(message = "사용 기계 이름을 입력해 주세요.") + private String equipmentName; + /** + * 자가 사용시간 + */ + private Integer ownedHours; + /** + * 임차 사용시간 + */ + private Integer leasedHours; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/DailyPowerUIReqVO.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/DailyPowerUIReqVO.java new file mode 100644 index 00000000..40a3b905 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/DailyPowerUIReqVO.java @@ -0,0 +1,29 @@ +package app.module.front.usecase.daily.power.adapters.web.model; + +import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import org.apache.tika.utils.StringUtils; + +@Getter +@Setter +@ToString(callSuper = true) +public class DailyPowerUIReqVO extends DailyUIReqVO { + public DailyPowerUIReqVO(String month, String no) { + setSearchMonth(month); + if (!StringUtils.isBlank(no)) { + setGroupNo(Integer.parseInt(no)); + } + } + + public DailyPowerUIReqVO(String month, Integer no) { + setSearchMonth(month); + setGroupNo(no); + } + + /** + * 수입 일련번호 + */ + private Long id; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/RemoveDailyPowerReqVO.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/RemoveDailyPowerReqVO.java new file mode 100644 index 00000000..9b6ca369 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/RemoveDailyPowerReqVO.java @@ -0,0 +1,22 @@ +package app.module.front.usecase.daily.power.adapters.web.model; + +import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString(callSuper = true) +public class RemoveDailyPowerReqVO extends DailyUIReqVO { + /** + * 수입 일련번호 + */ + @NotBlank(message = "{valid.common.required}") + private String id; + /** + * 일계부 일련번호 + */ + private Long dailyRecordSeq; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/validator/CreateDailyPowerValidator.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/validator/CreateDailyPowerValidator.java new file mode 100644 index 00000000..f5f0cdac --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/validator/CreateDailyPowerValidator.java @@ -0,0 +1,32 @@ +package app.module.front.usecase.daily.power.adapters.web.validator; + +import app.module.front.usecase.daily.power.adapters.web.model.CreateDailyPowerReqVO; +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 CreateDailyPowerValidator implements Validator { + + @Override + public boolean supports(Class clazz) { + return CreateDailyPowerReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + CreateDailyPowerReqVO vo = (CreateDailyPowerReqVO) target; + + if (vo.getOwnedHours() == null && vo.getLeasedHours() == null) { + errors.rejectValue( + "ownedHours", "valid.common.required", + "자가 또는 임차 사용시간을 입력 해주세요."); + errors.rejectValue( + "leasedHours", "valid.common.required", + "자가 또는 임차 사용시간을 입력 해주세요."); + } + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortIn.java b/front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortIn.java new file mode 100644 index 00000000..081a2d00 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortIn.java @@ -0,0 +1,41 @@ +package app.module.front.usecase.daily.power.ports; + + +import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto; +import app.module.front.usecase.daily.power.adapters.web.model.CreateDailyPowerReqVO; +import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO; +import app.module.front.usecase.daily.power.adapters.web.model.RemoveDailyPowerReqVO; + +import java.util.List; + +public interface DailyPowerPortIn { + /** + * 일계부 동력 사용시간 조회 + * + * @param reqVO 검색 조건 + * @return 동력 사용시간 목록 + */ + List list(DailyPowerUIReqVO reqVO); + + /** + * 일계부 동력 사용시간 조회 + * + * @param reqVO 검색 조건 + * @return 동력 사용시간 상세 + */ + DailyPowerDto detail(DailyPowerUIReqVO reqVO); + + /** + * 일계부 동력 사용시간 등록 + * + * @param formVO 입력 데이터 + */ + void create(CreateDailyPowerReqVO formVO); + + /** + * 일계부 동력 사용시간 삭제 + * + * @param formVO 삭제 검색 조건 + */ + void remove(RemoveDailyPowerReqVO formVO); +} diff --git a/front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortOut.java b/front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortOut.java new file mode 100644 index 00000000..1aa38876 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortOut.java @@ -0,0 +1,35 @@ +package app.module.front.usecase.daily.power.ports; + + +import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto; +import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd; +import app.module.front.usecase.daily.power.ports.application.domain.GetDailyPowerCmd; +import app.module.front.usecase.daily.power.ports.application.domain.RemoveDailyPowerCmd; + +import java.util.List; + +public interface DailyPowerPortOut { + /** + * 일계부 동력 사용시간 조회 + * + * @param command 검색 조건 + * @return 동력 사용시간 목록 + */ + List list(GetDailyPowerCmd command); + + /** + * 일계부 동력 사용시간 등록 + * + * @param findCmd 검색 조건 + * @param command 입력 데이터 + */ + void create(GetDailyPowerCmd findCmd, CreateDailyPowerCmd command); + + /** + * 일계부 동력 사용시간 삭제 + * + * @param findCmd 검색 조건 + * @param command 삭제 검색 조건 + */ + void remove(GetDailyPowerCmd findCmd, RemoveDailyPowerCmd command); +} diff --git a/front/src/main/java/app/module/front/usecase/daily/power/ports/application/DailyPowerService.java b/front/src/main/java/app/module/front/usecase/daily/power/ports/application/DailyPowerService.java new file mode 100644 index 00000000..675ebf12 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/power/ports/application/DailyPowerService.java @@ -0,0 +1,98 @@ +package app.module.front.usecase.daily.power.ports.application; + +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; +import app.module.front.config.application.util.AuditUtil; +import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import app.module.front.usecase.daily.income.ports.application.domain.CreateDailyIncomeCmd; +import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; +import app.module.front.usecase.daily.income.ports.application.domain.RemoveDailyIncomeCmd; +import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto; +import app.module.front.usecase.daily.power.adapters.web.model.CreateDailyPowerReqVO; +import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO; +import app.module.front.usecase.daily.power.adapters.web.model.RemoveDailyPowerReqVO; +import app.module.front.usecase.daily.power.ports.DailyPowerPortIn; +import app.module.front.usecase.daily.power.ports.DailyPowerPortOut; +import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd; +import app.module.front.usecase.daily.power.ports.application.domain.GetDailyPowerCmd; +import app.module.front.usecase.daily.power.ports.application.domain.RemoveDailyPowerCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class DailyPowerService implements DailyPowerPortIn { + private final DailyPowerPortOut portOut; + private final UICodeListPortIn uiCodeListPortIn; + + @Override + public List list(DailyPowerUIReqVO reqVO) { + return this.getRefineList(reqVO); + } + + @Override + public DailyPowerDto detail(DailyPowerUIReqVO reqVO) { + List list = this.getRefineList(reqVO); + if (list.isEmpty()) { + return null; + } + + return list.get(0); + } + + /** + * 목록 데이터 조회 + * + * @param reqVO 검색 조건 + * @return 공통 처리된 목록 + */ + private List getRefineList(DailyPowerUIReqVO reqVO) { + return portOut.list(new GetDailyPowerCmd(reqVO.getSearchMonth(), + reqVO.getGroupNo(), + reqVO.getHouseholdSeq(), + reqVO.getId())); + } + + @Override + public void create(CreateDailyPowerReqVO formVO) { + GetDailyPowerCmd findCmd = new GetDailyPowerCmd( + formVO.getSearchMonth(), + formVO.getGroupNo(), + formVO.getHouseholdSeq(), + formVO.getId()); + + CreateDailyPowerCmd command = AuditUtil.create( + new CreateDailyPowerCmd( + formVO.getId(), + formVO.getDailyRecordSeq(), + null, + null, + formVO.getEquipmentName(), + formVO.getOwnedHours(), + formVO.getLeasedHours())); + + portOut.create(findCmd, command); + } + + @Override + public void remove(RemoveDailyPowerReqVO formVO) { + Long id = formVO.getId() != null ? Long.parseLong(formVO.getId()) : null; + + GetDailyPowerCmd findCmd = new GetDailyPowerCmd( + formVO.getSearchMonth(), + formVO.getGroupNo(), + formVO.getHouseholdSeq(), + id); + + RemoveDailyPowerCmd command = AuditUtil.delete( + new RemoveDailyPowerCmd( + formVO.getSearchMonth(), + formVO.getGroupNo(), + id, + formVO.getDailyRecordSeq())); + + portOut.remove(findCmd, command); + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/power/ports/application/domain/CreateDailyPowerCmd.java b/front/src/main/java/app/module/front/usecase/daily/power/ports/application/domain/CreateDailyPowerCmd.java new file mode 100644 index 00000000..7b26ea8d --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/power/ports/application/domain/CreateDailyPowerCmd.java @@ -0,0 +1,21 @@ +package app.module.front.usecase.daily.power.ports.application.domain; + +import app.module.front.config.adapters.persistence.component.FrontAuditCommand; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@AllArgsConstructor +@ToString +public class CreateDailyPowerCmd extends FrontAuditCommand { + private Long id; + private Long dailyRecordSeq; + private String incomeMark; + private String expenseMark; + private String equipmentName; + private Integer ownedHours; + private Integer leasedHours; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/power/ports/application/domain/GetDailyPowerCmd.java b/front/src/main/java/app/module/front/usecase/daily/power/ports/application/domain/GetDailyPowerCmd.java new file mode 100644 index 00000000..8e6ad2e4 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/power/ports/application/domain/GetDailyPowerCmd.java @@ -0,0 +1,27 @@ +package app.module.front.usecase.daily.power.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; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/power/ports/application/domain/RemoveDailyPowerCmd.java b/front/src/main/java/app/module/front/usecase/daily/power/ports/application/domain/RemoveDailyPowerCmd.java new file mode 100644 index 00000000..b80d66cc --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/power/ports/application/domain/RemoveDailyPowerCmd.java @@ -0,0 +1,18 @@ +package app.module.front.usecase.daily.power.ports.application.domain; + +import app.module.front.config.adapters.persistence.component.FrontAuditCommand; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@AllArgsConstructor +@ToString +public class RemoveDailyPowerCmd extends FrontAuditCommand { + private String searchMonth; + private Integer groupNo; + private Long id; + private Long dailyRecordSeq; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java index 377328b3..3897917d 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java @@ -52,10 +52,6 @@ public class DailyRecordDto { } } - if (returnValue == null) { - returnValue = "LAST"; - } - return returnValue; } } diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java index 548327fb..4ad78434 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java @@ -1,6 +1,13 @@ package app.module.front.usecase.daily.record.adapters.web; import app.module.core.config.application.exception.NoMatchingURIException; +import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO; +import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn; +import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO; +import app.module.front.usecase.daily.income.ports.DailyIncomePortIn; +import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO; +import app.module.front.usecase.daily.power.ports.DailyPowerPortIn; import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; @@ -14,13 +21,17 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; +import java.util.List; + @Slf4j @Controller @RequiredArgsConstructor @RequestMapping(path = "/record/daily") public class DailyRecordUIController { private final DailyRecordPortIn dailyRecordPortIn; - private final CreateDailyRecordValidator createDailyRecordValidator; + private final DailyIncomePortIn dailyIncomePortIn; + private final DailyExpensePortIn dailyExpensePortIn; + private final DailyPowerPortIn dailyPowerPortIn; /** * 일계부 항목 등록 화면 @@ -69,6 +80,13 @@ public class DailyRecordUIController { String modelAndView = "record/daily/done"; if (DailyStatus.TODAY_NONE.equals(dailyRecord.getAllStatus())) { modelAndView = "record/daily/finish"; + } else { + model.addAttribute("incomeList", dailyIncomePortIn.list(new DailyIncomeUIReqVO(searchMonth, groupNo))); + model.addAttribute("expenseList", dailyExpensePortIn.list(new DailyExpenseUIReqVO(searchMonth, groupNo))); + model.addAttribute("workList", null); // TODO + model.addAttribute("powerList", dailyPowerPortIn.list(new DailyPowerUIReqVO(searchMonth, groupNo))); + model.addAttribute("forestryList", null); // TODO + model.addAttribute("farmingList", null); // TODO } model.addAttribute("reqVO", reqVO); diff --git a/front/src/main/resources/mappers/daily/DailyPowerMapper.xml b/front/src/main/resources/mappers/daily/DailyPowerMapper.xml new file mode 100644 index 00000000..415bacfe --- /dev/null +++ b/front/src/main/resources/mappers/daily/DailyPowerMapper.xml @@ -0,0 +1,63 @@ + + + + + + + + + + insert into daily_power ( + daily_record_seq + , equipment_name, owned_hours, leased_hours + , is_deleted + , + ) values ( + #{dailyRecordSeq} + , #{equipmentName}, #{ownedHours}, #{leasedHours} + , false + , + ) + + + + update daily_power set + , equipment_name = #{equipmentName} + , owned_hours = #{ownedHours} + , leased_hours = #{leasedHours} + where is_deleted = false + and daily_record_seq = #{dailyRecordSeq} + and id = #{id} + + + + update daily_power set + + where is_deleted = false + and daily_record_seq = #{dailyRecordSeq} + + and id = #{id} + + + + diff --git a/front/src/main/resources/static/ui/page/daily-record.js b/front/src/main/resources/static/ui/page/daily-record.js index bf650bc6..8bef7178 100644 --- a/front/src/main/resources/static/ui/page/daily-record.js +++ b/front/src/main/resources/static/ui/page/daily-record.js @@ -28,6 +28,15 @@ krip.daily.goToPrev = function() { * @param groupNo */ krip.daily.goToNext = function(target, searchMonth, groupNo) { + if (target == null) { + if ($('._nextStep').data('last')) { + target = 'LAST'; + } else { + krip.daily.goToDone(searchMonth, groupNo); + return; + } + } + if (target === 'LAST') { // 임가 건의사항 팝업 const commentModal = document.querySelector('.commentModal').ui; @@ -231,7 +240,7 @@ krip.daily.createComment = function(month, groupNo) { const f = document.commentReqForm; const obj = $(f).serializeObject(); - console.log(obj) + console.log(obj, month, groupNo) if (f.content.value === '') { krip.daily.goToDone(month, groupNo); return; diff --git a/front/src/main/resources/templates/record/daily/done.html b/front/src/main/resources/templates/record/daily/done.html index 1df1a0a6..4f904048 100644 --- a/front/src/main/resources/templates/record/daily/done.html +++ b/front/src/main/resources/templates/record/daily/done.html @@ -12,26 +12,140 @@
- 일계부 등록이 - 모두 완료 되었습니다. +
+
+ +

+ 일계부 등록이
+ 모두 완료 되었습니다. +

+

+ 입력하신 내용은 자동으로 등록되었습니다.
+ 항목에 대한 '추가/수정/삭제'는 일계부에서 가능합니다. +

+
+ +
+
+
+
+

[[${item.desc}]]

+
+ +
    + +
  • +

    없음

    +
  • +
    + +
  • +

    [[${child.categorySelf}]]

    + 302,000원 + 302,000원 +
  • +
    +
+ +
    + +
  • +

    없음

    +
  • +
    + +
  • +

    [[${child.categorySelf}]]

    + 302,000원 + 302,000원 +
  • +
    +
+ + + +
    + +
  • +

    없음

    +
  • +
    + +
  • +

    [[${child.equipmentName}]]

    + 총8시간 + 총8시간 +
  • +
    +
+ + +
+
+
+ +
+ +
+
+ +
+
-
\ No newline at end of file diff --git a/front/src/main/resources/templates/record/daily/finish.html b/front/src/main/resources/templates/record/daily/finish.html index b4f5c035..e6ec3c08 100644 --- a/front/src/main/resources/templates/record/daily/finish.html +++ b/front/src/main/resources/templates/record/daily/finish.html @@ -30,56 +30,6 @@ -
-
-

임업노동 투입

-
-
    -
  • -

    없음

    -
  • -
-
-
-
-

지출

-
-
    -
  • -

    없음

    -
  • -
-
-
-
-

동력 사용시간

-
-
    -
  • -

    없음

    -
  • -
-
-
-
-

임업생산물 중 자가소비량

-
-
    -
  • -

    없음

    -
  • -
-
-
-
-

농업생산물 중 자가소비량

-
-
    -
  • -

    없음

    -
  • -
-
diff --git a/front/src/main/resources/templates/record/daily/index.html b/front/src/main/resources/templates/record/daily/index.html index 821b10e7..a82fb67e 100644 --- a/front/src/main/resources/templates/record/daily/index.html +++ b/front/src/main/resources/templates/record/daily/index.html @@ -60,7 +60,7 @@ -
-
+