diff --git a/apps/sn/.env.local b/apps/sn/.env.local index dfb172cf0..69c944d7e 100644 --- a/apps/sn/.env.local +++ b/apps/sn/.env.local @@ -1,6 +1,7 @@ NEXT_PUBLIC_SITE_ID = SN NEXT_PUBLIC_PORT = 3002 NEXT_PUBLIC_PROXY_HOST = http://con.mind-one.co.kr:11302 +NEXT_PUBLIC_ADDR_URL = http://con.mind-one.co.kr:11082 NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000 NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver #TODO 운영에서 바꿔야 함 @@ -11,5 +12,5 @@ NEXT_PUBLIC_ACCESS_TOKEN = access-token NEXT_PUBLIC_REFRESH_TOKEN = refresh-token NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service/api # 개발 서버 API -#NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.128:8883/sewerage-service/api # 최용성 부장님 API -#NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.66:8883/sewerage-service/api # 박이정 차장님 API +#NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.128:8883/sewerage-service/api # 최용성 부장님 API +#NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.222:8883/sewerage-service/api # 박이정 차장님 API diff --git a/apps/sn/app/(map-layout)/map/SearchModal.tsx b/apps/sn/app/(map-layout)/map/SearchModal.tsx index e17b80724..28c93bafa 100644 --- a/apps/sn/app/(map-layout)/map/SearchModal.tsx +++ b/apps/sn/app/(map-layout)/map/SearchModal.tsx @@ -10,6 +10,8 @@ import { YearRangeSelectBox } from '@/components/ui/YearRangeSelectBox'; import { SidoSigunguSelectBox } from '@/components/ui/SidoSigunguSelectBox'; import { MsSwagePplCol2, SwtrmtFcltCol2, SwtrmtPrcsZoneCol2, MsSwageMhlCol2, SewagePump2, stofcbrCol2 } from './components/common/table'; import LoadingOverlay from '@/components/ui/LoadingBar'; +import { GovSidoSigunguSearchForm } from '@/components/ui/govSidoSigunguSearchForm'; +import { useDcTree } from './components/searchModalReportApi'; const API_URL = `${process.env.NEXT_PUBLIC_SEWERAGE_API_URL}`; @@ -99,9 +101,9 @@ const SearchModal: React.FC = ({ const [tableCount, setTableCount] = useState(0); const [curPage, setCurPage] = useState(1); const [basicType, setBasicType] = useState(BASIC_TYPES[0]?.val ?? ""); - const [시도, set시도] = useState(0); - const [시군구, set시군구] = useState(0); - const [처리구역, set처리구역] = useState(""); + const [ctpvCd, setCtpvCd] = useState(0); + const [sigungu, setSigungu] = useState(0); + const [swageProcessingZone, set처리구역] = useState(""); // 날짜 상태 선언 const [시작1, set시작1] = useState(""); const [시작2, set시작2] = useState(""); @@ -176,8 +178,8 @@ const SearchModal: React.FC = ({ set가동개시_종료_월(""); set가동개시_시작_일(""); set가동개시_종료_일(""); - set시도(0); - set시군구(0); + setCtpvCd(0); + setSigungu(0); set처리구역(""); setYearFilter({ 시작: "", @@ -226,14 +228,21 @@ const SearchModal: React.FC = ({ if (cqlFilters.length > 0) queryParams.append('cqlFiter', cqlFilters.join(' and ')); - console.log('API URL:', `${API_URL}/v1/fclts?${queryParams.toString()}`); - const res = await axios.get(`${API_URL}/v1/fclts?${queryParams.toString()}`); - console.log('필터링된 API 결과(개수):', res.data.count); - console.log('필터링된 API 결과(데이터):', res.data.data); + if (activeTab === 'report') { + const data = flattenFolders(dcData); + console.log('dcTree:', data); + setTableData(data || []); + setTableCount(data.length || []); + } else { + console.log('API URL:', `${API_URL}/v1/fclts?${queryParams.toString()}`); + const res = await axios.get(`${API_URL}/v1/fclts?${queryParams.toString()}`); + console.log('필터링된 API 결과(개수):', res.data.count); + console.log('필터링된 API 결과(데이터):', res.data.data); + setTableData(res.data.data || []); + setTableCount(res.data.count || []); + console.log('tableCount 상태 업데이트 후:', res.data.count); // tableCount 로그 추가 + } - setTableData(res.data.data || []); - setTableCount(res.data.count || []); - console.log('tableCount 상태 업데이트 후:', res.data.count); // tableCount 로그 추가 setShowTable(true); } catch (err) { console.error('API ERROR:', err); @@ -309,8 +318,8 @@ const SearchModal: React.FC = ({ // 하수처리구역용 CQL 필터 생성 const zoneCqlFilters = () => { const cqlFilters: string[] = []; - if (시도) cqlFilters.push(`ctpv_cd='${시도}'`); - if (시군구) cqlFilters.push(`sgg_cd='${시군구}'`); + if (ctpvCd) cqlFilters.push(`ctpv_cd='${ctpvCd}'`); + if (sigungu) cqlFilters.push(`sgg_cd='${sigungu}'`); if (변수1) cqlFilters.push(`swtrmt_zone_nm ILIKE '%${변수1}%'`); if (변수2) cqlFilters.push(`swtrmt_fclt_nm ILIKE '%${변수2}%'`); return cqlFilters; @@ -430,9 +439,9 @@ const SearchModal: React.FC = ({ const reportCqlFilters = () => { const cqlFilters: string[] = []; // 설치년도 범위 - if (시도) cqlFilters.push(`ctpv_cd='${시도}'`); - if (시군구) cqlFilters.push(`sgg_cd='${시군구}'`); - if (처리구역) cqlFilters.push(`처리구역='${처리구역}'`); + if (ctpvCd) cqlFilters.push(`ctpv_cd='${ctpvCd}'`); + if (sigungu) cqlFilters.push(`sgg_cd='${sigungu}'`); + if (swageProcessingZone) cqlFilters.push(`swageProcessingZone='${swageProcessingZone}'`); if (변수1) cqlFilters.push(`처리구역코드='${변수1}'`); const startDate = getDateString( yearFilter.시작, @@ -677,13 +686,13 @@ const SearchModal: React.FC = ({
{ - set시도(sidoId); - set시군구(0); + setCtpvCd(sidoId); + setSigungu(0); }} - onSigunguChange={set시군구} + onSigunguChange={setSigungu} />