diff --git a/apps/sn/app/(map-layout)/map/SearchModal.tsx b/apps/sn/app/(map-layout)/map/SearchModal.tsx index 35c5a445a..82e1485fc 100644 --- a/apps/sn/app/(map-layout)/map/SearchModal.tsx +++ b/apps/sn/app/(map-layout)/map/SearchModal.tsx @@ -11,7 +11,7 @@ import { SidoSigunguSelectBox } from '@/components/ui/SidoSigunguSelectBox'; import { MsSwagePplCol2, SwtrmtFcltCol2, SwtrmtPrcsZoneCol2, MsSwageMhlCol2, ExclnSewagePumpCol2, stofcbrCol2 } from './components/common/table'; import LoadingOverlay from '@/components/ui/LoadingBar'; //import { useDcTree, flattenFolders, useSggCd, useCityCd } from './components/searchModalReportApi'; -import { getDcTree,useDcTree,flattenFolders, useSggCd, useCityCd } from './components/searchModalReportApi'; +import { getDcTree,useDcTree,flattenFolders, useSggCd, useCityCd,getDcFile } from './components/searchModalReportApi'; import { useCityCdStore, type SelectDataType } from './commonStore'; const API_URL = `${process.env.NEXT_PUBLIC_SEWERAGE_API_URL}`; @@ -180,14 +180,17 @@ const SearchModal: React.FC = ({ } }; - const handleCtpvCdChange = (val: string|number) => { + const handleCtpvCdChange = (val: string|number) => { // 하수도정비기본계획.시도 const sidoOption = sidos.find((n) => n.val === val); setCtpvCd(String(val)); - if (val !== '0' && sidoOption) { - const filterSiguns = siguns.filter(item => item.sido === sidoOption.text); + if (val !== '0') { + const filterSiguns = siguns.filter(item => item.sido === sidoOption?.text); filterSiguns.unshift({ val: '0', text: '전체', sido: '0' }); setFilteredSiguns(filterSiguns); } + setSigungu("0"); + setGubun(""); + setYearFilter({시작: "",종료: "",}); } useEffect(() => { @@ -259,15 +262,15 @@ const SearchModal: React.FC = ({ //const reportOriginData = await getDcTree('경기도'); const reportData = flattenFolders(reportOriginData); let filterReportData = reportData; - if (ctpvCd !== "0") { + if (ctpvCd !== "0") { // 시도검색 const sidoOption = sidos.find((n) => n.val === ctpvCd); filterReportData = filterReportData.filter(item => item.sido === sidoOption?.text); } - if (sigungu !== "0") { + if (sigungu !== "0") { // 시군구검색 const sigunguOption = filteredSiguns.find((n) => n.val === sigungu); filterReportData = filterReportData.filter(item => item.sigungu === sigunguOption?.text); } - if (yearFilter.시작 != "" && yearFilter.종료 == "") + if (yearFilter.시작 != "" && yearFilter.종료 == "") //승인년도검색 filterReportData = filterReportData.filter(item => (item.approvalYear)? item.approvalYear >= yearFilter.시작+"년" : null); if (yearFilter.시작 == "" && yearFilter.종료 != "") filterReportData = filterReportData.filter(item => (item.approvalYear)? item.approvalYear <= yearFilter.종료+"년" : null); @@ -276,7 +279,7 @@ const SearchModal: React.FC = ({ return (item.approvalYear)? item.approvalYear >= yearFilter.시작+"년" && item.approvalYear <= yearFilter.종료+"년": null; }); } - if (gubun !== "") { + if (gubun !== "") { // 구분검색 filterReportData = filterReportData.filter(item => (item.plantZoneGugun)? String(item.plantZoneGugun).includes(String(gubun)) : null); } console.log('report count:', filterReportData.length); @@ -284,7 +287,8 @@ const SearchModal: React.FC = ({ filterReportData = filterReportData.slice((curPage-1)*10, curPage*10); // paging filterReportData = filterReportData?.map((item, index)=>({...item, no:(curPage-1)*10+index+1})); setTableData(filterReportData || []); - + const fileList = await getDcFile("CLS20250530000041"); + console.log(fileList); } else { console.log('API URL:', `${API_URL}/v1/fclts?${queryParams.toString()}`); const res = await axios.get(`${API_URL}/v1/fclts?${queryParams.toString()}`); diff --git a/apps/sn/app/(map-layout)/map/components/searchModalReportApi.ts b/apps/sn/app/(map-layout)/map/components/searchModalReportApi.ts index e4af3a127..93c0b6b13 100644 --- a/apps/sn/app/(map-layout)/map/components/searchModalReportApi.ts +++ b/apps/sn/app/(map-layout)/map/components/searchModalReportApi.ts @@ -71,8 +71,8 @@ export const useSggCd = () => { } }; fetch(); + console.log("useSggCd호출"); }, []); - return data; }; export const useCityCd = () => { @@ -86,8 +86,8 @@ export const useCityCd = () => { } }; fetch(); + console.log("useCityCd호출"); }, []); - return data; }; diff --git a/apps/sn/middleware.ts b/apps/sn/middleware.ts index d69ef5513..8fe638ebe 100644 --- a/apps/sn/middleware.ts +++ b/apps/sn/middleware.ts @@ -102,8 +102,11 @@ export function middleware(req: NextRequest) { if (pathname.startsWith("/dc-service")) { const requestHeaders = new Headers(req.headers); - const newUrl = `${RSONE_DC_URL}${pathname}`; - + const decodedParams = Array.from(searchParams.entries()) + .map(([key, value]) => `${key}=${decodeURIComponent(value)}`) + .join("&"); + + const newUrl = `${RSONE_DC_URL}${pathname}${decodedParams ? `?${decodedParams}` : ""}`; console.log( `[Middleware] Rewriting from '/dc-service' path to: ${newUrl}`, );