From 1a753eb5c1fb60c7a8e042e3d9a76f0c79de1072 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 23 Jun 2025 13:59:07 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EC=9E=84=EA=B0=80=ED=98=84=ED=99=A9=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=20=EC=A4=91=20-=20url=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/CheckHouseholdNumController.java | 2 +- .../web/CreateHouseholdController.java | 2 +- .../web/CreateHouseholdUIController.java | 6 +- .../GetHouseholdStatusUIController.java | 4 +- .../web/GetHouseholdsStatusController.java | 2 +- .../GetHouseholdsStatusUIController.java | 5 +- .../persistence/GetHouseholdVisitInfoDao.java | 19 +++ .../GetHouseholdVisitInfoMapper.java | 11 ++ .../web/GetHouseholdVisitInfoController.java | 26 +++ .../web/model/GetHouseholdVisitInfoReqVO.java | 13 ++ .../web/model/GetHouseholdVisitInfoResVO.java | 13 ++ .../ports/GetHouseholdVisitInfoPortIn.java | 9 + .../ports/GetHouseholdVisitInfoPortOut.java | 9 + .../GetHouseholdVisitInfoService.java | 20 +++ .../domain/GetHouseholdVisitInfo.java | 22 +++ .../domain/GetHouseholdVisitInfoCmd.java | 14 ++ .../web/UpdateHouseholdController.java | 2 +- .../UpdateHouseholdStatusUIController.java | 6 +- .../household/GetHouseholdVisitInfoMapper.xml | 19 +++ .../communication/notice/create.html | 2 +- .../{household => }/households/create.html | 8 +- .../{household => households}/households.html | 15 +- .../households/modal/modal-visit-info.html | 159 ++++++++++++++++++ .../households/update/{seq}.html | 6 +- .../{household => }/households/{seq}.html | 19 ++- .../initData/InitUriAdminData.java | 6 +- 26 files changed, 377 insertions(+), 42 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/persistence/GetHouseholdVisitInfoDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/persistence/GetHouseholdVisitInfoMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/web/GetHouseholdVisitInfoController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/web/model/GetHouseholdVisitInfoReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/web/model/GetHouseholdVisitInfoResVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/GetHouseholdVisitInfoPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/GetHouseholdVisitInfoPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/GetHouseholdVisitInfoService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/domain/GetHouseholdVisitInfo.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/domain/GetHouseholdVisitInfoCmd.java create mode 100644 admin/src/main/resources/mappers/household/GetHouseholdVisitInfoMapper.xml rename admin/src/main/resources/templates/{household => }/households/create.html (98%) rename admin/src/main/resources/templates/{household => households}/households.html (97%) create mode 100644 admin/src/main/resources/templates/households/modal/modal-visit-info.html rename admin/src/main/resources/templates/{household => }/households/update/{seq}.html (99%) rename admin/src/main/resources/templates/{household => }/households/{seq}.html (99%) diff --git a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/CheckHouseholdNumController.java b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/CheckHouseholdNumController.java index e5768afd..d666820f 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/CheckHouseholdNumController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/web/CheckHouseholdNumController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; class CheckHouseholdNumController { private final CheckHouseholdNumPortIn portIn; - @GetMapping(path = "/api/household/households/check") + @GetMapping(path = "/api/households/check") ResponseEntity operate( @Valid CheckHouseholdNumReqVO reqVO) { diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java index a1c3ee7b..f5bdc35e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java @@ -21,7 +21,7 @@ class CreateHouseholdController { private final CreateHouseholdValidator validator; private final CreateHouseholdPortIn createHouseholdPortIn; - @PostMapping(path = "/api/household/households/create") + @PostMapping(path = "/api/households/create") ResponseEntity operate( @Valid @RequestBody CreateHouseholdReqVO reqVO, BindingResult bindingResult) { validator.validate(reqVO, bindingResult); diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java b/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java index a2d36554..c005301c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHouseholdUI/adapters/web/CreateHouseholdUIController.java @@ -16,14 +16,14 @@ class CreateHouseholdUIController { private final UICodeListPortIn uiCodeListPortIn; - @GetMapping(path = "/household/households/create") + @GetMapping(path = "/households/create") String operate(Model model, @ModelAttribute("reqVO") CreateHouseholdUIReqVO reqVO, RedirectAttributes redirectAttributes) { // 임가 등록 페이지는 관리자만 접근 가능 if (!AdminUtil.getLoginUserRole().equals("ROLE_ADMIN")) { redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다."); - return "redirect:/household/households"; + return "redirect:/households"; } // 실사 @@ -37,6 +37,6 @@ class CreateHouseholdUIController { // 업종 중분류1 model.addAttribute("industryMiddleList", uiCodeListPortIn.connect("code.industry.middle")); - return "household/households/create"; + return "households/create"; } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java index 78a80f56..ab8937bb 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam; class GetHouseholdStatusUIController { private final GetHouseholdStatusPortIn getHouseholdStatusPortIn; - @GetMapping(path = "/household/households/{seq}") + @GetMapping(path = "/households/{seq}") String operate( @PathVariable Long seq, @RequestParam(required = false) String recordMonth, @@ -34,6 +34,6 @@ class GetHouseholdStatusUIController { model.addAttribute("householdInfo", getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null)); - return "household/households/{seq}"; + return "households/{seq}"; } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java index 682b4ec6..495a3195 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java @@ -20,7 +20,7 @@ import app.module.admin.usecase.household.getHouseholdsStatus.adapters.web.model class GetHouseholdsStatusController { private final GetHouseholdsStatusPortIn portIn; - @GetMapping(path = "/api/household/households") + @GetMapping(path = "/api/households") ResponseEntity> operate( @PageableDefault(size = 10) Pageable pageable, GetHouseholdsStatusReqVO reqVO) { diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/GetHouseholdsStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/GetHouseholdsStatusUIController.java index bbbfe387..c7449fb4 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/GetHouseholdsStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatusUI/GetHouseholdsStatusUIController.java @@ -3,7 +3,6 @@ package app.module.admin.usecase.household.getHouseholdsStatusUI; import app.module.admin.config.application.util.AdminUtil; import app.module.admin.config.application.util.DateUiUtil; import app.module.admin.usecase.household.getHouseholdsStatusUI.model.GetHouseholdsUIReqVO; -import app.module.core.config.adapters.persistence.entity.Admin; import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import app.module.core.usecase.admin.view.ports.application.domain.AdminView; @@ -20,7 +19,7 @@ class GetHouseholdsStatusUIController { private final UICodeListPortIn uiCodeListPortIn; private final AdminViewPortIn adminViewPortIn; - @GetMapping(path = "/household/households") + @GetMapping(path = "/households") String operate( Model model, @ModelAttribute("reqVO") GetHouseholdsUIReqVO reqVO) { @@ -56,6 +55,6 @@ class GetHouseholdsStatusUIController { model.addAttribute("monthList", DateUiUtil.getRecentMonths(13)); model.addAttribute("currentMonth", DateUiUtil.getCurrentMonthValue()); - return "household/households"; + return "households/households"; } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/persistence/GetHouseholdVisitInfoDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/persistence/GetHouseholdVisitInfoDao.java new file mode 100644 index 00000000..357be894 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/persistence/GetHouseholdVisitInfoDao.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.persistence; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortOut; +import java.util.Optional; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class GetHouseholdVisitInfoDao implements GetHouseholdVisitInfoPortOut { + private final GetHouseholdVisitInfoMapper mapper; + + @Override + public Optional operate(GetHouseholdVisitInfoCmd cmd) { + return mapper.getHouseholdVisitInfo(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/persistence/GetHouseholdVisitInfoMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/persistence/GetHouseholdVisitInfoMapper.java new file mode 100644 index 00000000..2812dcde --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/persistence/GetHouseholdVisitInfoMapper.java @@ -0,0 +1,11 @@ +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.persistence; + +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd; +import java.util.Optional; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface GetHouseholdVisitInfoMapper { + Optional getHouseholdVisitInfo(GetHouseholdVisitInfoCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/web/GetHouseholdVisitInfoController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/web/GetHouseholdVisitInfoController.java new file mode 100644 index 00000000..58d1b64e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/web/GetHouseholdVisitInfoController.java @@ -0,0 +1,26 @@ +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web; + +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortIn; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd; +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 org.springframework.web.bind.annotation.PathVariable; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web.model.GetHouseholdVisitInfoReqVO; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web.model.GetHouseholdVisitInfoResVO; + +@RestController +@RequiredArgsConstructor +class GetHouseholdVisitInfoController { + private final GetHouseholdVisitInfoPortIn portIn; + + @GetMapping(path = "/api/visitInfo/{id}") + ResponseEntity operate( + @PathVariable Long id, + GetHouseholdVisitInfoReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK) + .body(portIn.operate(new GetHouseholdVisitInfoCmd(id)).orElse(null)); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/web/model/GetHouseholdVisitInfoReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/web/model/GetHouseholdVisitInfoReqVO.java new file mode 100644 index 00000000..bcb8d29e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/web/model/GetHouseholdVisitInfoReqVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetHouseholdVisitInfoReqVO { +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/web/model/GetHouseholdVisitInfoResVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/web/model/GetHouseholdVisitInfoResVO.java new file mode 100644 index 00000000..b6e84e60 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/adapters/web/model/GetHouseholdVisitInfoResVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetHouseholdVisitInfoResVO { +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/GetHouseholdVisitInfoPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/GetHouseholdVisitInfoPortIn.java new file mode 100644 index 00000000..4f4a86dc --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/GetHouseholdVisitInfoPortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports; + +import java.util.Optional; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd; + +public interface GetHouseholdVisitInfoPortIn { + Optional operate(GetHouseholdVisitInfoCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/GetHouseholdVisitInfoPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/GetHouseholdVisitInfoPortOut.java new file mode 100644 index 00000000..a05f925a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/GetHouseholdVisitInfoPortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports; + +import java.util.Optional; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd; + +public interface GetHouseholdVisitInfoPortOut { + Optional operate(GetHouseholdVisitInfoCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/GetHouseholdVisitInfoService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/GetHouseholdVisitInfoService.java new file mode 100644 index 00000000..68139138 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/GetHouseholdVisitInfoService.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfo; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain.GetHouseholdVisitInfoCmd; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortIn; +import app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.GetHouseholdVisitInfoPortOut; +import java.util.Optional; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetHouseholdVisitInfoService implements GetHouseholdVisitInfoPortIn { + private final GetHouseholdVisitInfoPortOut portOut; + + @Override + public Optional operate(GetHouseholdVisitInfoCmd cmd) { + return portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/domain/GetHouseholdVisitInfo.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/domain/GetHouseholdVisitInfo.java new file mode 100644 index 00000000..d3d7475e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/domain/GetHouseholdVisitInfo.java @@ -0,0 +1,22 @@ +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain; + +import app.module.admin.config.application.enums.ManagementType; +import java.time.LocalDateTime; +import java.util.Date; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetHouseholdVisitInfo { + private Long id; + private Long householdSeq; + private Date visitDate; + private ManagementType managementType; + private String content; + private Boolean isGiftSent; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/domain/GetHouseholdVisitInfoCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/domain/GetHouseholdVisitInfoCmd.java new file mode 100644 index 00000000..586e3094 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/householdVisit/getHouseholdVisitInfo/ports/application/domain/GetHouseholdVisitInfoCmd.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.tab.householdVisit.getHouseholdVisitInfo.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetHouseholdVisitInfoCmd { + private Long id; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java index b121097a..61b44814 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java @@ -20,7 +20,7 @@ class UpdateHouseholdController { private final UpdateHouseholdValidator validator; private final UpdateHouseholdPortIn updateHouseholdPortIn; - @PutMapping(path = "/api/household/households/update") + @PutMapping(path = "/api/households/update") ResponseEntity operate( @Valid @RequestBody UpdateHouseholdReqVO reqVO, BindingResult bindingResult) { validator.validate(reqVO, bindingResult); diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java index 9bb3c419..d041fb7a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java @@ -23,7 +23,7 @@ class UpdateHouseholdStatusUIController { private final GetHouseholdStatusPortIn getHouseholdStatusPortIn; private final UICodeListPortIn uiCodeListPortIn; - @GetMapping(path = "/household/households/update/{seq}") + @GetMapping(path = "/households/update/{seq}") String operate(@PathVariable Long seq, Model model, @ModelAttribute("reqVO") UpdateHouseholdStatusUIReqVO reqVO, RedirectAttributes redirectAttributes) { @@ -31,7 +31,7 @@ class UpdateHouseholdStatusUIController { // 임가 수정 페이지는 관리자만 접근 가능 if (!AdminUtil.getLoginUserRole().equals("ROLE_ADMIN")) { redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다."); - return "redirect:/household/households"; + return "redirect:/households"; } model.addAttribute("seq", seq); @@ -80,6 +80,6 @@ class UpdateHouseholdStatusUIController { result.getResearcherPhone() )); - return "household/households/update/{seq}"; + return "households/update/{seq}"; } } \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetHouseholdVisitInfoMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdVisitInfoMapper.xml new file mode 100644 index 00000000..1a4a5d3a --- /dev/null +++ b/admin/src/main/resources/mappers/household/GetHouseholdVisitInfoMapper.xml @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/templates/communication/notice/create.html b/admin/src/main/resources/templates/communication/notice/create.html index 520cc0cf..024b86a1 100644 --- a/admin/src/main/resources/templates/communication/notice/create.html +++ b/admin/src/main/resources/templates/communication/notice/create.html @@ -81,7 +81,7 @@
- @@ -314,7 +314,7 @@ let dataOj = $(f).serializeObject(); ajaxUtil._ajaxMethod( - '/api/household/households', + '/api/households', dataOj, function(response) { // 성공 console.log("response", response); @@ -335,8 +335,8 @@
- ${ct.householdNum} - ${ct.householdName} + ${ct.householdNum} + ${ct.householdName} ${ct.householdPhone} ${ct.regionMainName} ${ct.regionSubName} @@ -351,6 +351,7 @@ ); }); + // ` // // @@ -360,8 +361,8 @@ // //
// - // ${ct.householdNum} - // ${ct.householdName} + // ${ct.householdNum} + // ${ct.householdName} // ${ct.householdPhone} // ${ct.regionMainName} // ${ct.regionSubName} diff --git a/admin/src/main/resources/templates/households/modal/modal-visit-info.html b/admin/src/main/resources/templates/households/modal/modal-visit-info.html new file mode 100644 index 00000000..aa6e7e38 --- /dev/null +++ b/admin/src/main/resources/templates/households/modal/modal-visit-info.html @@ -0,0 +1,159 @@ + + + +
+ + + + + + + + + + +
+ \ No newline at end of file diff --git a/admin/src/main/resources/templates/household/households/update/{seq}.html b/admin/src/main/resources/templates/households/update/{seq}.html similarity index 99% rename from admin/src/main/resources/templates/household/households/update/{seq}.html rename to admin/src/main/resources/templates/households/update/{seq}.html index 4ef04010..53c5778a 100644 --- a/admin/src/main/resources/templates/household/households/update/{seq}.html +++ b/admin/src/main/resources/templates/households/update/{seq}.html @@ -273,7 +273,7 @@
- -
@@ -595,7 +595,7 @@
-
@@ -613,7 +613,12 @@
+
+ + +
+
@@ -667,19 +672,15 @@ const getTabData = (tabType) => { switch (tabType) { case 'daily-record': // 일계부 등록 현황 - console.log("일계부 등록 현황"); getDailyRecords(); break; case 'forest-product': // 임산물 현황 - console.log("임산물 현황"); getForestProductsStatus(); break; case 'bank-auto-transfer': // 은행자동이체내역 - console.log("은행자동이체내역"); getBankAutoTransfer(); break; case 'household-visit': // 임가방문정보 - console.log("임가방문정보"); getVisitInfo(); break; } @@ -1090,7 +1091,7 @@ diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriAdminData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriAdminData.java index e8397951..b46a817a 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriAdminData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriAdminData.java @@ -190,7 +190,7 @@ public class InitUriAdminData implements ApplicationRunner { ADMIN_HOUSEHOLD, ADMIN_HOUSEHOLD_STATUS, "임가 현황", - "/household/households", + "/households", true, Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER")); @@ -199,7 +199,7 @@ public class InitUriAdminData implements ApplicationRunner { ADMIN_HOUSEHOLD, ADMIN_HOUSEHOLD_STATUS_CREATE, "임가 등록", - "/household/households/create", + "/households/create", false, Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER")); @@ -208,7 +208,7 @@ public class InitUriAdminData implements ApplicationRunner { ADMIN_HOUSEHOLD, ADMIN_HOUSEHOLD_STATUS_VIEW, "임가 상세", - "/household/households/{{pathVar}}", + "/households/{{pathVar}}", false, Set.of("ROLE_ADMIN", "ROLE_LOCAL_INSPECTION", "ROLE_RESEARCHER"));