From ce36a2914da1f79a1f4e3f618d83001186efa17d Mon Sep 17 00:00:00 2001 From: HeHelee Date: Mon, 15 Sep 2025 12:01:50 +0900 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=EC=8A=A4=ED=83=80=EC=9D=BC?= =?UTF-8?q?=EB=A7=81=20=EC=88=98=EC=A0=95=20(#16)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../snapshot/qure/config/SecurityConfig.java | 17 +--- .../controller/InspectorsController.java | 16 +++- .../WEB-INF/assets/css/inspectorsList.css | 52 +++++++++-- .../webapp/WEB-INF/assets/images/plus.svg | 4 +- .../webapp/WEB-INF/assets/images/trash.svg | 6 +- .../WEB-INF/assets/js/inspectorsList.js | 90 +++++++++---------- .../views/inspectors/inspectorsList.jsp | 45 +++++----- 7 files changed, 133 insertions(+), 97 deletions(-) diff --git a/src/main/java/app/snapshot/qure/config/SecurityConfig.java b/src/main/java/app/snapshot/qure/config/SecurityConfig.java index d7dacec..4c68294 100644 --- a/src/main/java/app/snapshot/qure/config/SecurityConfig.java +++ b/src/main/java/app/snapshot/qure/config/SecurityConfig.java @@ -44,25 +44,13 @@ public SecurityConfig(KakaoOAuth2UserService kakaoOAuth2UserService, this.kakaoOAuth2UserService = kakaoOAuth2UserService; this.managerService = managerService; } - @Bean public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { http .authorizeHttpRequests(auth -> auth - .requestMatchers( - AntPathRequestMatcher.antMatcher("/"), - AntPathRequestMatcher.antMatcher("/assets/**"), - AntPathRequestMatcher.antMatcher("/css/**"), - AntPathRequestMatcher.antMatcher("/js/**"), - AntPathRequestMatcher.antMatcher("/images/**"), - AntPathRequestMatcher.antMatcher("/webjars/**"), - AntPathRequestMatcher.antMatcher("/favicon.*"), - AntPathRequestMatcher.antMatcher("/oauth2/**"), - AntPathRequestMatcher.antMatcher("/login/oauth2/**"), - AntPathRequestMatcher.antMatcher("/error") - ).permitAll() - .anyRequest().authenticated() + .anyRequest().permitAll() ) + .csrf(csrf -> csrf.disable()) // 세션 관리 설정 .sessionManagement(session -> session @@ -95,7 +83,6 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { return http.build(); } - @Bean public PasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); diff --git a/src/main/java/app/snapshot/qure/inspectors/controller/InspectorsController.java b/src/main/java/app/snapshot/qure/inspectors/controller/InspectorsController.java index a8df35d..22bbc34 100644 --- a/src/main/java/app/snapshot/qure/inspectors/controller/InspectorsController.java +++ b/src/main/java/app/snapshot/qure/inspectors/controller/InspectorsController.java @@ -19,17 +19,27 @@ public InspectorsController(InspectorsService inspectorsService) { @GetMapping("/inspectors/inspectorsList") public String showInspectorList(@RequestParam(defaultValue = "1") int page, - Model model - ) { - int size = 15; + Model model) { + int size = 15; // 한 페이지 데이터 수 List inspectors = inspectorsService.getPagedInspectors(page, size); int totalCount = inspectorsService.getTotalCount(); int totalPages = (int) Math.ceil((double) totalCount / size); + int pageBlock = 3; + int currentBlock = (int) Math.ceil((double) page / pageBlock); + + int startPage = (currentBlock - 1) * pageBlock + 1; + int endPage = startPage + pageBlock - 1; + if (endPage > totalPages) { + endPage = totalPages; + } model.addAttribute("inspectors", inspectors); model.addAttribute("currentPage", page); model.addAttribute("totalPages", totalPages); model.addAttribute("totalCount", totalCount); + model.addAttribute("startPage", startPage); + model.addAttribute("endPage", endPage); + return "inspectors/inspectorsList"; } } \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/assets/css/inspectorsList.css b/src/main/webapp/WEB-INF/assets/css/inspectorsList.css index 1b05b21..c682d22 100644 --- a/src/main/webapp/WEB-INF/assets/css/inspectorsList.css +++ b/src/main/webapp/WEB-INF/assets/css/inspectorsList.css @@ -54,7 +54,7 @@ body{ display:flex;justify-content:space-between;align-items:center; background:#ffffff; border-radius:30px; - padding:12px 16px; + padding:12px 16x; } .subTitle{ color:#5a4a21; @@ -86,8 +86,15 @@ button:hover{background:#fafafa} /* “전체 n명” 라벨 */ .totalTitle{color:#474D56;font-size:16px;font-weight:700;margin-right:6px} -.highlight{color:#5a4a21;background:#fff8d1;border:1px solid #eacb6a; - padding:2px 8px;border-radius:999px;font-weight:800} +.highlight{ + color:#5a4a21; + background:#fff8d1; + border:1px solid #eacb6a; + padding:2px 8px; + border-radius:999px; + font-weight:800; + +} /* ===== 표: 행마다 보더 박스 ===== */ .inspectorTable{ @@ -97,6 +104,7 @@ button:hover{background:#fafafa} background: transparent; table-layout: fixed; font-size: 15px; + margin-top: 16px; } /* 헤더 */ @@ -152,9 +160,11 @@ input[type="checkbox"]:checked::after{ a{color:inherit;text-decoration:none} /* ===== 페이지네이션: facilities 원형 버튼 스타일 ===== */ -.pagination{ - display:flex;justify-content:center;align-items:center;gap:12px; - margin-top:8px; +.pagination { + display: flex; + justify-content: center; + gap: 8px; + margin-top: 16px; } .circle-btn{ @@ -169,6 +179,36 @@ a{color:inherit;text-decoration:none} } .circle-btn.disabled{pointer-events:none;opacity:.45} +.page-btn { + display: flex; + justify-content: center; + align-items: center; + width: 36px; + height: 36px; + border: 1px solid #f2c65b; + border-radius: 6px; + font-size: 15px; + font-weight: 600; + color: #3c3c3c; + text-decoration: none; + background: #fff; + cursor: pointer; +} + +.page-btn:hover { + background: #fff9e6; +} + +.page-btn.active { + background: #FFE59A; + font-weight: 800; +} + +.page-btn.disabled { + pointer-events: none; + opacity: 0.4; +} + /* ===== 모달: facilities 카드 톤 매칭 ===== */ .modal{ display:none;position:fixed;z-index:1000;left:0;top:0;width:100%;height:100%; diff --git a/src/main/webapp/WEB-INF/assets/images/plus.svg b/src/main/webapp/WEB-INF/assets/images/plus.svg index edffae5..5e7774b 100644 --- a/src/main/webapp/WEB-INF/assets/images/plus.svg +++ b/src/main/webapp/WEB-INF/assets/images/plus.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/main/webapp/WEB-INF/assets/images/trash.svg b/src/main/webapp/WEB-INF/assets/images/trash.svg index 011a91e..a9e69f7 100644 --- a/src/main/webapp/WEB-INF/assets/images/trash.svg +++ b/src/main/webapp/WEB-INF/assets/images/trash.svg @@ -1,3 +1,5 @@ - - + + + + diff --git a/src/main/webapp/WEB-INF/assets/js/inspectorsList.js b/src/main/webapp/WEB-INF/assets/js/inspectorsList.js index 626bc0b..2db43aa 100644 --- a/src/main/webapp/WEB-INF/assets/js/inspectorsList.js +++ b/src/main/webapp/WEB-INF/assets/js/inspectorsList.js @@ -1,4 +1,3 @@ -// inspectorsList.js function onlyNumber(el) { el.value = el.value.replace(/[^0-9]/g, ''); @@ -9,12 +8,13 @@ function onlyNumber(el) { document.getElementById("phone").value = (p1 && p2 && p3) ? `${p1}-${p2}-${p3}` : ""; } + +document.addEventListener("DOMContentLoaded", function () { const modal = document.getElementById("inspectorModal"); const openModalBtn = document.querySelector(".register"); const cancelBtn = document.querySelector(".btn.cancel"); const form = modal ? modal.querySelector("form") : null; - // 모달 열기 if (openModalBtn) { openModalBtn.addEventListener("click", (e) => { e.preventDefault(); @@ -22,17 +22,15 @@ function onlyNumber(el) { }); } - // 취소 버튼 눌렀을 때 닫기 + reset if (cancelBtn) { cancelBtn.addEventListener("click", (e) => { e.preventDefault(); if (form) form.reset(); - document.getElementById("phone").value = ""; // hidden 필드도 초기화 + document.getElementById("phone").value = ""; modal.style.display = "none"; }); } - // 바깥 클릭 시 닫기 if (modal) { modal.addEventListener("click", (e) => { if (e.target === modal) { @@ -80,49 +78,49 @@ function onlyNumber(el) { }); } - if (form) { - form.addEventListener("submit", function () { - const p1 = document.getElementById("phone1").value; - const p2 = document.getElementById("phone2").value; - const p3 = document.getElementById("phone3").value; - - document.getElementById("phone").value = - (p1 && p2 && p3) ? `${p1}-${p2}-${p3}` : ""; - }); - } - - const deleteBtn = document.getElementById("deleteBtn"); - const deleteModal = document.getElementById("deleteModal"); - const deleteCancel = document.getElementById("deleteCancel"); - const selectedIdsInput = document.getElementById("selectedIdsInput"); - - if (deleteBtn) { - deleteBtn.addEventListener("click", () => { - const checkedBoxes = document.querySelectorAll("input[name='selectedIds']:checked"); - if (checkedBoxes.length === 0) { - alert("삭제할 작업자를 선택하세요."); - return; - } - - // 선택된 ID들을 hidden input에 담기 - const ids = Array.from(checkedBoxes).map(cb => cb.value); - selectedIdsInput.value = ids.join(","); - - deleteModal.style.display = "flex"; - }); - } + if (form) { + form.addEventListener("submit", function () { + const p1 = document.getElementById("phone1").value; + const p2 = document.getElementById("phone2").value; + const p3 = document.getElementById("phone3").value; - if (deleteCancel) { - deleteCancel.addEventListener("click", () => { - deleteModal.style.display = "none"; - }); + document.getElementById("phone").value = + (p1 && p2 && p3) ? `${p1}-${p2}-${p3}` : ""; + }); + } + + // 삭제 모달 + const deleteBtn = document.getElementById("deleteBtn"); + const deleteModal = document.getElementById("deleteModal"); + const deleteCancel = document.getElementById("deleteCancel"); + const selectedIdsInput = document.getElementById("selectedIdsInput"); + + if (deleteBtn) { + deleteBtn.addEventListener("click", () => { + const checkedBoxes = document.querySelectorAll("input[name='selectedIds']:checked"); + if (checkedBoxes.length === 0) { + alert("삭제할 작업자를 선택하세요."); + return; } - if (deleteModal) { - deleteModal.addEventListener("click", (e) => { - if (e.target === deleteModal) { - deleteModal.style.display = "none"; - } - }); + const ids = Array.from(checkedBoxes).map(cb => cb.value); + selectedIdsInput.value = ids.join(","); + + deleteModal.style.display = "flex"; + }); + } + + if (deleteCancel) { + deleteCancel.addEventListener("click", () => { + deleteModal.style.display = "none"; + }); + } + + if (deleteModal) { + deleteModal.addEventListener("click", (e) => { + if (e.target === deleteModal) { + deleteModal.style.display = "none"; } + }); + } }); diff --git a/src/main/webapp/WEB-INF/views/inspectors/inspectorsList.jsp b/src/main/webapp/WEB-INF/views/inspectors/inspectorsList.jsp index 6af9fc9..7002c33 100644 --- a/src/main/webapp/WEB-INF/views/inspectors/inspectorsList.jsp +++ b/src/main/webapp/WEB-INF/views/inspectors/inspectorsList.jsp @@ -22,10 +22,7 @@
-
+
작업자 현황
@@ -34,7 +31,7 @@ 작업자 등록
@@ -70,25 +67,30 @@ - ${currentPage} - - -
-
-
- - -
- -
- - -
From ea30fad343cae997deb29699d1fc99cd3ef77eea Mon Sep 17 00:00:00 2001 From: HeHelee Date: Mon, 15 Sep 2025 14:46:44 +0900 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=EA=B8=B0=EB=8A=A5=20=EC=88=98?= =?UTF-8?q?=EC=A0=95(#16)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qure/facilities/dto/FacilityRegisterDTO.java | 10 ---------- .../repository/FacilitiesRegisterMapper.java | 9 --------- .../controller/InspectorRegisterController.java | 6 ++---- .../inspectors/service/InspectorRegisterService.java | 8 +------- .../resources/mappers/FacilitiesRegisterMapper.xml | 12 ------------ 5 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 src/main/java/app/snapshot/qure/facilities/dto/FacilityRegisterDTO.java delete mode 100644 src/main/java/app/snapshot/qure/facilities/repository/FacilitiesRegisterMapper.java delete mode 100644 src/main/resources/mappers/FacilitiesRegisterMapper.xml diff --git a/src/main/java/app/snapshot/qure/facilities/dto/FacilityRegisterDTO.java b/src/main/java/app/snapshot/qure/facilities/dto/FacilityRegisterDTO.java deleted file mode 100644 index 5cbf4ce..0000000 --- a/src/main/java/app/snapshot/qure/facilities/dto/FacilityRegisterDTO.java +++ /dev/null @@ -1,10 +0,0 @@ -package app.snapshot.qure.facilities.dto; - -import lombok.Data; - -@Data -public class FacilityRegisterDTO { - private String domain; // 소속 - private String equipment; // 설비명 - private int inspectorId; // FK -} diff --git a/src/main/java/app/snapshot/qure/facilities/repository/FacilitiesRegisterMapper.java b/src/main/java/app/snapshot/qure/facilities/repository/FacilitiesRegisterMapper.java deleted file mode 100644 index 32bfd4f..0000000 --- a/src/main/java/app/snapshot/qure/facilities/repository/FacilitiesRegisterMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package app.snapshot.qure.facilities.repository; - -import app.snapshot.qure.facilities.dto.FacilityRegisterDTO; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface FacilitiesRegisterMapper { - void insertFacility(FacilityRegisterDTO dto); -} diff --git a/src/main/java/app/snapshot/qure/inspectors/controller/InspectorRegisterController.java b/src/main/java/app/snapshot/qure/inspectors/controller/InspectorRegisterController.java index 3bf864a..8d1e881 100644 --- a/src/main/java/app/snapshot/qure/inspectors/controller/InspectorRegisterController.java +++ b/src/main/java/app/snapshot/qure/inspectors/controller/InspectorRegisterController.java @@ -1,7 +1,6 @@ package app.snapshot.qure.inspectors.controller; import app.snapshot.qure.inspectors.dto.InspectorRegisterDTO; -import app.snapshot.qure.facilities.dto.FacilityRegisterDTO; import app.snapshot.qure.inspectors.service.InspectorRegisterService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; @@ -16,10 +15,9 @@ public class InspectorRegisterController { @PostMapping("/inspectors/register") public String registerInspectorWithFacility( - @ModelAttribute InspectorRegisterDTO inspectorDto, - @ModelAttribute FacilityRegisterDTO facilityDto) { + @ModelAttribute InspectorRegisterDTO inspectorDto) { - inspectorRegisterService.registerInspectorWithFacility(inspectorDto, facilityDto); + inspectorRegisterService.registerInspectorWithFacility(inspectorDto); return "redirect:/inspectors/inspectorsList"; } } diff --git a/src/main/java/app/snapshot/qure/inspectors/service/InspectorRegisterService.java b/src/main/java/app/snapshot/qure/inspectors/service/InspectorRegisterService.java index 712551f..9858889 100644 --- a/src/main/java/app/snapshot/qure/inspectors/service/InspectorRegisterService.java +++ b/src/main/java/app/snapshot/qure/inspectors/service/InspectorRegisterService.java @@ -1,9 +1,7 @@ package app.snapshot.qure.inspectors.service; import app.snapshot.qure.inspectors.dto.InspectorRegisterDTO; -import app.snapshot.qure.facilities.dto.FacilityRegisterDTO; import app.snapshot.qure.inspectors.repository.InspectorsRegisterMapper; -import app.snapshot.qure.facilities.repository.FacilitiesRegisterMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -13,10 +11,9 @@ public class InspectorRegisterService { private final InspectorsRegisterMapper inspectorsRegisterMapper; - private final FacilitiesRegisterMapper facilitiesRegisterMapper; @Transactional - public void registerInspectorWithFacility(InspectorRegisterDTO inspectorDto, FacilityRegisterDTO facilityDto) { + public void registerInspectorWithFacility(InspectorRegisterDTO inspectorDto) { // 1. 이미 존재하는 작업자인지 확인 Integer existingId = inspectorsRegisterMapper.findInspectorIdByNameAndPhone(inspectorDto.getName(), inspectorDto.getPhone()); @@ -28,9 +25,6 @@ public void registerInspectorWithFacility(InspectorRegisterDTO inspectorDto, Fac inspectorId = inspectorsRegisterMapper.getLastInsertedId(); } - // 2. 설비 등록 - facilityDto.setInspectorId(inspectorId); - facilitiesRegisterMapper.insertFacility(facilityDto); } } diff --git a/src/main/resources/mappers/FacilitiesRegisterMapper.xml b/src/main/resources/mappers/FacilitiesRegisterMapper.xml deleted file mode 100644 index 691c13f..0000000 --- a/src/main/resources/mappers/FacilitiesRegisterMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - INSERT INTO facilities (facility_id, domain, name, inspector_id) - VALUES (facility_seq.NEXTVAL, #{domain}, #{equipment}, #{inspectorId}) - - - From 8a7c373488968e946b7ce79cab0b296c6e4b8ee4 Mon Sep 17 00:00:00 2001 From: HeHelee Date: Mon, 15 Sep 2025 16:17:08 +0900 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=EA=B4=80=EB=A6=AC=EC=9E=90?= =?UTF-8?q?=EC=97=90=20=ED=95=B4=EB=8B=B9=ED=95=98=EB=8A=94=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=EC=9E=90=EB=A7=8C=20=EB=82=98=EC=98=A4=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95(#16)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../snapshot/qure/config/SecurityConfig.java | 3 +- .../controller/InspectorDetailController.java | 5 +-- .../InspectorRegisterController.java | 18 ++++++++--- .../controller/InspectorsController.java | 14 ++++++-- .../qure/inspectors/dto/InspectorDTO.java | 1 + .../inspectors/dto/InspectorDetailDTO.java | 5 +-- .../inspectors/dto/InspectorRegisterDTO.java | 1 + .../repository/InspectorsMapper.java | 10 +++--- .../repository/InspectorsRegisterMapper.java | 2 +- .../service/InspectorRegisterService.java | 23 +++++++------ .../inspectors/service/InspectorsService.java | 22 +++++++++---- .../OAuth2AuthenticationSuccessHandler.java | 4 ++- .../snapshot/qure/login/util/SessionUtil.java | 4 +-- .../mappers/InsepctorRegisterMapper.xml | 4 +-- .../mappers/InspectorsDetailMapper.xml | 14 ++++---- .../resources/mappers/InspectorsMapper.xml | 25 ++++++++++----- .../views/inspectors/inspectorDetail.jsp | 32 ++++++++++++++----- 17 files changed, 127 insertions(+), 60 deletions(-) diff --git a/src/main/java/app/snapshot/qure/config/SecurityConfig.java b/src/main/java/app/snapshot/qure/config/SecurityConfig.java index 4c68294..56da050 100644 --- a/src/main/java/app/snapshot/qure/config/SecurityConfig.java +++ b/src/main/java/app/snapshot/qure/config/SecurityConfig.java @@ -54,9 +54,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // 세션 관리 설정 .sessionManagement(session -> session - .sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED) + .sessionCreationPolicy(SessionCreationPolicy.ALWAYS) ) - .oauth2Login(oauth -> oauth .loginPage("/") .successHandler((request, response, authentication) -> { diff --git a/src/main/java/app/snapshot/qure/inspectors/controller/InspectorDetailController.java b/src/main/java/app/snapshot/qure/inspectors/controller/InspectorDetailController.java index 4f65309..4aa6456 100644 --- a/src/main/java/app/snapshot/qure/inspectors/controller/InspectorDetailController.java +++ b/src/main/java/app/snapshot/qure/inspectors/controller/InspectorDetailController.java @@ -24,8 +24,9 @@ public String inspectorDetail(@PathVariable("id") int id, Model model) { List details = inspectorDetailService.getInspectorDetail(id); if (!details.isEmpty()) { - model.addAttribute("inspector", details.get(0)); // 이름/연락처 - model.addAttribute("facilities", details); // 시설 리스트 + model.addAttribute("inspectorName", details.get(0).getInspectorName()); + model.addAttribute("phone", details.get(0).getPhone()); + model.addAttribute("facilities", details); } return "inspectors/inspectorDetail"; diff --git a/src/main/java/app/snapshot/qure/inspectors/controller/InspectorRegisterController.java b/src/main/java/app/snapshot/qure/inspectors/controller/InspectorRegisterController.java index 8d1e881..f11e89b 100644 --- a/src/main/java/app/snapshot/qure/inspectors/controller/InspectorRegisterController.java +++ b/src/main/java/app/snapshot/qure/inspectors/controller/InspectorRegisterController.java @@ -2,10 +2,12 @@ import app.snapshot.qure.inspectors.dto.InspectorRegisterDTO; import app.snapshot.qure.inspectors.service.InspectorRegisterService; +import app.snapshot.qure.login.util.SessionUtil; +import jakarta.servlet.http.HttpSession; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; @Controller @RequiredArgsConstructor @@ -14,10 +16,18 @@ public class InspectorRegisterController { private final InspectorRegisterService inspectorRegisterService; @PostMapping("/inspectors/register") - public String registerInspectorWithFacility( - @ModelAttribute InspectorRegisterDTO inspectorDto) { + public String registerInspector( + @ModelAttribute InspectorRegisterDTO inspectorDto, + HttpSession session) { + + Long managerId = SessionUtil.getManagerId(session); + if (managerId == null) { + return "redirect:/dashboard"; // 로그인 안된 경우 + } + + inspectorDto.setManagerId(managerId); - inspectorRegisterService.registerInspectorWithFacility(inspectorDto); + inspectorRegisterService.registerInspector(inspectorDto); return "redirect:/inspectors/inspectorsList"; } } diff --git a/src/main/java/app/snapshot/qure/inspectors/controller/InspectorsController.java b/src/main/java/app/snapshot/qure/inspectors/controller/InspectorsController.java index 22bbc34..3c238b9 100644 --- a/src/main/java/app/snapshot/qure/inspectors/controller/InspectorsController.java +++ b/src/main/java/app/snapshot/qure/inspectors/controller/InspectorsController.java @@ -1,6 +1,8 @@ package app.snapshot.qure.inspectors.controller; import app.snapshot.qure.inspectors.dto.InspectorDTO; import app.snapshot.qure.inspectors.service.InspectorsService; +import app.snapshot.qure.login.util.SessionUtil; +import jakarta.servlet.http.HttpSession; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; @@ -19,10 +21,16 @@ public InspectorsController(InspectorsService inspectorsService) { @GetMapping("/inspectors/inspectorsList") public String showInspectorList(@RequestParam(defaultValue = "1") int page, - Model model) { + Model model, HttpSession session) { int size = 15; // 한 페이지 데이터 수 - List inspectors = inspectorsService.getPagedInspectors(page, size); - int totalCount = inspectorsService.getTotalCount(); + Long managersId = SessionUtil.getManagerId(session); + System.out.println("세션 managersId: " + managersId); + if (managersId == null) { + return "redirect:/dashboard"; + } + + List inspectors = inspectorsService.getPagedInspectors(page, size,managersId); + int totalCount = inspectorsService.getTotalCount(Math.toIntExact(managersId)); int totalPages = (int) Math.ceil((double) totalCount / size); int pageBlock = 3; int currentBlock = (int) Math.ceil((double) page / pageBlock); diff --git a/src/main/java/app/snapshot/qure/inspectors/dto/InspectorDTO.java b/src/main/java/app/snapshot/qure/inspectors/dto/InspectorDTO.java index 7cd554f..d53bad7 100644 --- a/src/main/java/app/snapshot/qure/inspectors/dto/InspectorDTO.java +++ b/src/main/java/app/snapshot/qure/inspectors/dto/InspectorDTO.java @@ -11,4 +11,5 @@ public class InspectorDTO { private int inspectorId; private String phone; private String name; + private Long managerId; } diff --git a/src/main/java/app/snapshot/qure/inspectors/dto/InspectorDetailDTO.java b/src/main/java/app/snapshot/qure/inspectors/dto/InspectorDetailDTO.java index 38edee6..6cc4c41 100644 --- a/src/main/java/app/snapshot/qure/inspectors/dto/InspectorDetailDTO.java +++ b/src/main/java/app/snapshot/qure/inspectors/dto/InspectorDetailDTO.java @@ -5,8 +5,9 @@ @Data public class InspectorDetailDTO { private int inspectorId; - private String name; + private String inspectorName; // ip.name → inspectorName private String phone; private String domain; - private String facility; + private String facility; // f.name → facility } + diff --git a/src/main/java/app/snapshot/qure/inspectors/dto/InspectorRegisterDTO.java b/src/main/java/app/snapshot/qure/inspectors/dto/InspectorRegisterDTO.java index 33942b4..6cc1f49 100644 --- a/src/main/java/app/snapshot/qure/inspectors/dto/InspectorRegisterDTO.java +++ b/src/main/java/app/snapshot/qure/inspectors/dto/InspectorRegisterDTO.java @@ -7,4 +7,5 @@ public class InspectorRegisterDTO { private Integer inspectorId; private String name; private String phone; + private Long managerId; } diff --git a/src/main/java/app/snapshot/qure/inspectors/repository/InspectorsMapper.java b/src/main/java/app/snapshot/qure/inspectors/repository/InspectorsMapper.java index c9c870c..b9d48ca 100644 --- a/src/main/java/app/snapshot/qure/inspectors/repository/InspectorsMapper.java +++ b/src/main/java/app/snapshot/qure/inspectors/repository/InspectorsMapper.java @@ -2,13 +2,15 @@ import app.snapshot.qure.inspectors.dto.InspectorDTO; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.security.core.parameters.P; import java.util.List; +import java.util.Map; @Mapper public interface InspectorsMapper { - List findPaged(@Param("startRow") int startRow, @Param("endRow") int endRow); - int countAll(); + // 특정 매니저의 작업자 목록 페이징 조회 + List findPagedByManager(Map params); + + // 특정 매니저의 작업자 총 수 카운트 + int countByManager(long managersId); } diff --git a/src/main/java/app/snapshot/qure/inspectors/repository/InspectorsRegisterMapper.java b/src/main/java/app/snapshot/qure/inspectors/repository/InspectorsRegisterMapper.java index bd3c0d8..9ed5e94 100644 --- a/src/main/java/app/snapshot/qure/inspectors/repository/InspectorsRegisterMapper.java +++ b/src/main/java/app/snapshot/qure/inspectors/repository/InspectorsRegisterMapper.java @@ -2,12 +2,12 @@ import app.snapshot.qure.inspectors.dto.InspectorRegisterDTO; import org.apache.ibatis.annotations.Mapper; - import org.apache.ibatis.annotations.Param; @Mapper public interface InspectorsRegisterMapper { void insertInspector(InspectorRegisterDTO dto); + int getLastInsertedId(); // 시퀀스 currval 가져오기용 Integer findInspectorIdByNameAndPhone( diff --git a/src/main/java/app/snapshot/qure/inspectors/service/InspectorRegisterService.java b/src/main/java/app/snapshot/qure/inspectors/service/InspectorRegisterService.java index 9858889..4fb1054 100644 --- a/src/main/java/app/snapshot/qure/inspectors/service/InspectorRegisterService.java +++ b/src/main/java/app/snapshot/qure/inspectors/service/InspectorRegisterService.java @@ -12,19 +12,24 @@ public class InspectorRegisterService { private final InspectorsRegisterMapper inspectorsRegisterMapper; + /** + * 점검자 등록 + * - 이름, 전화번호로 중복 체크 + * - 없으면 새로 등록, 있으면 무시 + */ @Transactional - public void registerInspectorWithFacility(InspectorRegisterDTO inspectorDto) { - // 1. 이미 존재하는 작업자인지 확인 - Integer existingId = inspectorsRegisterMapper.findInspectorIdByNameAndPhone(inspectorDto.getName(), inspectorDto.getPhone()); + public void registerInspector(InspectorRegisterDTO inspectorDto) { + // 이미 존재하는 작업자인지 확인 + Integer existingId = inspectorsRegisterMapper + .findInspectorIdByNameAndPhone(inspectorDto.getName(), inspectorDto.getPhone()); - int inspectorId; if (existingId != null) { - inspectorId = existingId; // 기존 inspector 재사용 - } else { - inspectorsRegisterMapper.insertInspector(inspectorDto); - inspectorId = inspectorsRegisterMapper.getLastInsertedId(); + System.out.println("이미 존재하는 점검자 → id=" + existingId); + return; } + inspectorsRegisterMapper.insertInspector(inspectorDto); + int newId = inspectorsRegisterMapper.getLastInsertedId(); + System.out.println("새 점검자 등록 완료 → id=" + newId); } - } diff --git a/src/main/java/app/snapshot/qure/inspectors/service/InspectorsService.java b/src/main/java/app/snapshot/qure/inspectors/service/InspectorsService.java index b2ebfae..0b51456 100644 --- a/src/main/java/app/snapshot/qure/inspectors/service/InspectorsService.java +++ b/src/main/java/app/snapshot/qure/inspectors/service/InspectorsService.java @@ -4,7 +4,9 @@ import app.snapshot.qure.inspectors.repository.InspectorsMapper; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Service public class InspectorsService { @@ -15,13 +17,21 @@ public InspectorsService(InspectorsMapper inspectorMapper) { this.inspectorsMapper = inspectorMapper; } - public List getPagedInspectors(int page, int size) { - int startRow = (page-1) * size+1; + public List getPagedInspectors(int page, int size, long managersId) { + int startRow = (page - 1) * size + 1; int endRow = page * size; - return inspectorsMapper.findPaged(startRow, endRow); + + Map params = new HashMap<>(); + params.put("startRow", startRow); + params.put("endRow", endRow); + params.put("managersId", managersId); + + return inspectorsMapper.findPagedByManager(params); } - public int getTotalCount() { - return inspectorsMapper.countAll(); - }; + public int getTotalCount(int managersId) { + return inspectorsMapper.countByManager(managersId); + } + + } diff --git a/src/main/java/app/snapshot/qure/login/handler/OAuth2AuthenticationSuccessHandler.java b/src/main/java/app/snapshot/qure/login/handler/OAuth2AuthenticationSuccessHandler.java index b90a8d2..197ad2e 100644 --- a/src/main/java/app/snapshot/qure/login/handler/OAuth2AuthenticationSuccessHandler.java +++ b/src/main/java/app/snapshot/qure/login/handler/OAuth2AuthenticationSuccessHandler.java @@ -42,6 +42,8 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo // 세션에 카카오 로그인 정보 저장 (유틸리티 사용) HttpSession session = request.getSession(true); // 세션이 없으면 생성 SessionUtil.setManagerSession(session, manager.getManagersId(), email, name); + System.out.println("세션 저장 완료: managerId=" + manager.getManagersId() + + ", sessionId=" + session.getId()); // 세션 설정 추가 session.setMaxInactiveInterval(60 * 60 * 24); // 24시간 @@ -51,6 +53,6 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo ", sessionId=" + session.getId()); // 홈 페이지로 리다이렉트 - response.sendRedirect("/manager/home"); + response.sendRedirect("/dashboard"); } } \ No newline at end of file diff --git a/src/main/java/app/snapshot/qure/login/util/SessionUtil.java b/src/main/java/app/snapshot/qure/login/util/SessionUtil.java index 4330e6d..ddd918f 100644 --- a/src/main/java/app/snapshot/qure/login/util/SessionUtil.java +++ b/src/main/java/app/snapshot/qure/login/util/SessionUtil.java @@ -9,8 +9,8 @@ public class SessionUtil { public static final String KAKAO_NAME = "KAKAO_NAME"; // 세션에 매니저 정보 저장 - public static void setManagerSession(HttpSession session, Long managerId, String email, String name) { - session.setAttribute(LOGIN_MANAGER_ID, managerId); + public static void setManagerSession(HttpSession session, Long managersId, String email, String name) { + session.setAttribute(LOGIN_MANAGER_ID, managersId); session.setAttribute(KAKAO_EMAIL, email); session.setAttribute(KAKAO_NAME, name); } diff --git a/src/main/resources/mappers/InsepctorRegisterMapper.xml b/src/main/resources/mappers/InsepctorRegisterMapper.xml index 7fbb947..21390dd 100644 --- a/src/main/resources/mappers/InsepctorRegisterMapper.xml +++ b/src/main/resources/mappers/InsepctorRegisterMapper.xml @@ -6,8 +6,8 @@ - INSERT INTO inspector_profile (inspector_id, name, phone) - VALUES (inspector_seq.NEXTVAL, #{name}, #{phone}) + INSERT INTO inspector_profile (inspector_id, name, phone, manager_id) + VALUES (inspector_seq.NEXTVAL, #{name}, #{phone}, #{managerId}) - SELECT ip.inspector_id, - ip.name AS name, -- DTO의 name 필드랑 맞춤 - ip.phone, - f.domain, - f.name AS facility + SELECT + ip.inspector_id AS inspectorId, + ip.name AS inspectorName, + ip.phone AS phone, + f.domain AS domain, + f.name AS facility FROM inspector_profile ip - JOIN facilities f ON ip.inspector_id = f.inspector_id + LEFT JOIN facilities f + ON ip.inspector_id = f.inspector_id WHERE ip.inspector_id = #{inspectorId} diff --git a/src/main/resources/mappers/InspectorsMapper.xml b/src/main/resources/mappers/InspectorsMapper.xml index cac5cc2..0f22ebb 100644 --- a/src/main/resources/mappers/InspectorsMapper.xml +++ b/src/main/resources/mappers/InspectorsMapper.xml @@ -5,20 +5,29 @@ - + SELECT inspector_id AS inspectorId, + phone, + name, + manager_id AS managerId FROM ( - SELECT ROW_NUMBER() OVER (ORDER BY inspector_id) AS rn, - inspector_id, - name, - phone + SELECT ROW_NUMBER() OVER (ORDER BY inspector_id DESC) AS rn, + inspector_id, + phone, + name, + manager_id FROM inspector_profile + WHERE manager_id = #{managersId} ) WHERE rn BETWEEN #{startRow} AND #{endRow} - + SELECT COUNT(*) + FROM inspector_profile + WHERE manager_id = #{managersId} diff --git a/src/main/webapp/WEB-INF/views/inspectors/inspectorDetail.jsp b/src/main/webapp/WEB-INF/views/inspectors/inspectorDetail.jsp index 0f9ce2e..fea9dcb 100644 --- a/src/main/webapp/WEB-INF/views/inspectors/inspectorDetail.jsp +++ b/src/main/webapp/WEB-INF/views/inspectors/inspectorDetail.jsp @@ -25,11 +25,11 @@
이름 - ${inspector.name} + ${inspectorName}
연락처 - ${inspector.phone} + ${phone}
@@ -41,19 +41,35 @@
담당 구역
- - ${f.domain} - + + + + ${f.domain} + + + + 없음 + +
+
담당 시설
- - ${f.facility} - + + + + ${f.facility} + + + + 없음 + +
+
From 994ee5353fed02ba060e9f56761da1d25be8c78d Mon Sep 17 00:00:00 2001 From: HeHelee Date: Mon, 15 Sep 2025 16:31:14 +0900 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=EC=8B=9C=ED=81=90=EB=A6=AC?= =?UTF-8?q?=ED=8B=B0=20=EC=84=A4=EC=A0=95=20=EB=B3=80=EA=B2=BD=20(#16)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../snapshot/qure/config/SecurityConfig.java | 30 +++++++++++----- .../WEB-INF/assets/js/inspectorsList.js | 36 ------------------- 2 files changed, 22 insertions(+), 44 deletions(-) diff --git a/src/main/java/app/snapshot/qure/config/SecurityConfig.java b/src/main/java/app/snapshot/qure/config/SecurityConfig.java index 56da050..a42c769 100644 --- a/src/main/java/app/snapshot/qure/config/SecurityConfig.java +++ b/src/main/java/app/snapshot/qure/config/SecurityConfig.java @@ -48,14 +48,33 @@ public SecurityConfig(KakaoOAuth2UserService kakaoOAuth2UserService, public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { http .authorizeHttpRequests(auth -> auth - .anyRequest().permitAll() + .requestMatchers( + AntPathRequestMatcher.antMatcher("/"), + AntPathRequestMatcher.antMatcher("/mobile/**"), + AntPathRequestMatcher.antMatcher("/popup/**"), + AntPathRequestMatcher.antMatcher("/assets/**"), + AntPathRequestMatcher.antMatcher("/css/**"), + AntPathRequestMatcher.antMatcher("/js/**"), + AntPathRequestMatcher.antMatcher("/images/**"), + AntPathRequestMatcher.antMatcher("/webjars/**"), + AntPathRequestMatcher.antMatcher("/favicon.*"), + AntPathRequestMatcher.antMatcher("/oauth2/**"), + AntPathRequestMatcher.antMatcher("/login/oauth2/**"), + AntPathRequestMatcher.antMatcher("/error") + ).permitAll() + .anyRequest().authenticated() ) - .csrf(csrf -> csrf.disable()) + + .csrf(csrf -> csrf.ignoringRequestMatchers( + new AntPathRequestMatcher("/mobile/**", "POST"), + new AntPathRequestMatcher("/popup/**", "POST") + )) // 세션 관리 설정 .sessionManagement(session -> session - .sessionCreationPolicy(SessionCreationPolicy.ALWAYS) + .sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED) ) + .oauth2Login(oauth -> oauth .loginPage("/") .successHandler((request, response, authentication) -> { @@ -64,17 +83,12 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { (Map) principal.getAttributes().get("kakao_account"); Map profile = (Map) kakaoAccount.get("profile"); - String email = (String) kakaoAccount.get("email"); String nickname = (String) profile.get("nickname"); - ManagerDTO manager = managerService.processLogin(email, nickname); - HttpSession session = request.getSession(); SessionUtil.setManagerSession(session, manager.getManagersId(), email, nickname); - System.out.println("로그인 성공: " + nickname + " (" + email + ")"); - response.sendRedirect(request.getContextPath() + "/dashboard"); }) .userInfoEndpoint(userInfo -> userInfo.userService(kakaoOAuth2UserService)) diff --git a/src/main/webapp/WEB-INF/assets/js/inspectorsList.js b/src/main/webapp/WEB-INF/assets/js/inspectorsList.js index 2db43aa..07240ec 100644 --- a/src/main/webapp/WEB-INF/assets/js/inspectorsList.js +++ b/src/main/webapp/WEB-INF/assets/js/inspectorsList.js @@ -41,42 +41,6 @@ document.addEventListener("DOMContentLoaded", function () { }); } - // 소속-설비 매핑 - const equipmentOptions = { - "소방": ["스프링쿨러", "소화기", "화재경보기"], - "순찰": ["CCTV", "비상벨", "출입통제"], - "청결": ["분리수거함", "화장실", "소독기"], - }; - - const domainSelect = document.getElementById("domain"); - const equipmentSelect = document.getElementById("equipment"); - - if (domainSelect && equipmentSelect) { - domainSelect.addEventListener("change", function () { - const selectDomain = this.value; - - equipmentSelect.innerHTML = ""; - - if (selectDomain && equipmentOptions[selectDomain]) { - const defaultOption = document.createElement("option"); - defaultOption.value = ""; - defaultOption.textContent = "설비를 선택하세요"; - equipmentSelect.appendChild(defaultOption); - - equipmentOptions[selectDomain].forEach((equip) => { - const option = document.createElement("option"); - option.value = equip; - option.textContent = equip; - equipmentSelect.appendChild(option); - }); - } else { - const option = document.createElement("option"); - option.value = ""; - option.textContent = "소속을 먼저 선택하세요."; - equipmentSelect.appendChild(option); - } - }); - } if (form) { form.addEventListener("submit", function () {