Compare commits

...
Author SHA1 Message Date
swcho f002c05292 chmod: drgtSttn (가뭄지도 패키지 경로 변경) 2025-09-25 17:13:12 +09:00
swcho 0a2284138c remove: updateRainDetail, setUpdateRSwtDetail 초기화 로직 삭제 (중복) 2025-09-22 17:26:49 +09:00
swcho 536f07a13f Merge branch 'iipbs/wr/drgtPopup' into iipbs/wr/dev 2025-09-22 17:23:28 +09:00
swcho bf3ced7a00 fix: 하수재이용시설등록 페이지 계통도, 평면도 pdf만 업로드 되도록 수정 2025-09-22 17:20:19 +09:00
leedj312 0d9ebcbd55 로그인 사용자 건축물 등록 시도코드 적용/ 하수처리장 지도PopUp data 오류 슈ㅜ정/지도점검 오류 수정 2025-09-22 17:17:30 +09:00
swcho 64e5c4c0fb fix: 지도점검결과 등록 페이지 updateRainDetail 초기화 에러 수정 2025-09-22 15:39:19 +09:00
swcho 29e8223efa fix:
- 오타수정(upadateData -> updateData)
- 등록 후 셀 선택 초기화 에러 수정
2025-09-22 14:01:58 +09:00
swcho d12610db98 fix: 지도점검결과 등록 토스트 메세지 오타 수정 2025-09-22 13:49:01 +09:00
swcho ab0d787615 Merge branch 'iipbs/common/main' into iipbs/wr/drgtPopup 2025-09-22 09:54:50 +09:00
swcho 39e2734a49 fix: searchBar.tsx 하수처리시설 검색 에러 수정 2025-09-22 09:54:35 +09:00
swcho bc016c71ae refactor: drgtSttn(가뭄정보) 페이지 패키지 경로 변경 2025-09-22 09:53:56 +09:00
leedj312 77b4ba01b4 물재이용 주석 추가중 2025-09-18 14:09:55 +09:00
leedj312 eac09bde2e Merge commit '311ce14fc97c833c99b69cd6ba928150ecda80c6' 2025-09-17 18:04:03 +09:00
leedj312 ebd2a9f2c8 Merge commit '6844db4c295b7ceab1ffe49255630ad90082edb7' 2025-09-17 18:03:33 +09:00
leedj312 41b90bd7b5 수요처 등록 컴포넌트 파라미터 추가 2025-09-17 18:03:20 +09:00
leedj312 6844db4c29 대민 수요처 등록 파라미터 추가 2025-09-17 17:52:52 +09:00
leedj312 311ce14fc9 물재이용 업무 대민 주소검색 컴포넌트 사용 x 2025-09-17 17:32:03 +09:00
leedj312 3c5d37cc6c 온배수 시설 수정 , 주석 삭제 2025-09-17 17:00:02 +09:00
mind-one003 d92d4d3949 - 테이블 비율 고정 변수 추가(wideFixed)
- store headerlist 에서 비율 변수 추가(widePercent)
2025-09-17 16:15:11 +09:00
leedj312 858a2c0bac 물재이용 아이디별 지자체 코드 적용 실적 완료 2025-09-16 17:22:33 +09:00
leedj312 0bc87e2082 물재이용 로그인한 사용자의 시군구 코드에 따른 코드값 변경 (시설물 등록 부분만 완료) 2025-09-16 15:25:08 +09:00
leedj312 5588eddbc5 테이블 헤드 기호 추가 및 버튼 위치 수정 2025-09-16 10:13:35 +09:00
leedj312 682cc1297c 지도점검 엑셀 등록시 lodingbar추가 2025-09-15 17:45:22 +09:00
leedj312 e26d800449 통계 수정 2025-09-15 16:23:47 +09:00
leedj312 e6be168d0d 물재이용 공통코드 작업 수정 사항 추가 2025-09-15 15:38:25 +09:00
leedj312 ad6e4484b7 물재이용 공통코드 작업 2025-09-15 15:36:56 +09:00
leedj312 92f12c2104 공통코드 작업 완료/ 지도점검 등록/현황 페이지 수정 2025-09-12 17:29:34 +09:00
mind-one005 75d2d0c827 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2025-09-11 12:42:55 +09:00
mind-one005 675a1a09fa /api/proxy 미들웨어 추가 2025-09-11 12:42:23 +09:00
mind-one003 b93efa5503 라인바, 라인차트 x축 라벨 크기 확대 2025-09-11 11:17:37 +09:00
swcho 00b0832acb Merge branch 'iipbs/sn/dev' 2025-09-10 15:30:26 +09:00
swcho 6e109e970e refactor:
- SearchModal 껐다 킬 때 페이지네이션 정보 잃어버리는 에러 수정
- useSearchModal.ts useEffect 의존성 배열을 searchModal.tsx 로 이동
- import 정리
2025-09-10 15:24:24 +09:00
leedj312 00ecc1dc72 차트 데이터 , 제거 및 년도 공통 변수 처리 2025-09-09 13:39:34 +09:00
yschoi 328787e1b2 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2025-09-09 10:39:27 +09:00
yschoi 1862497bf4 api url 수정 2025-09-09 10:38:11 +09:00
leedj312 344e77eafa Merge commit '500a6b1489456e94df84b590050d84c69fe200d3' 2025-09-09 10:12:05 +09:00
leedj312 1bf8afd9ac Merge commit 'c9169772922b9ad3046b894b4375f3983779a1bd' 2025-09-09 10:10:30 +09:00
leedj312 f50de19137 gis 오버레이 수정 2025-09-09 10:10:19 +09:00
swcho f9e8748906 Merge branch 'iipbs/sn/dev' 2025-09-09 09:59:41 +09:00
swcho 2f5d76ed38 Merge branch 'iipbs/common/main' into iipbs/sn/ii 2025-09-09 09:54:55 +09:00
swcho 0b8559891a remove: Gis.js에서 SearchView 컴포넌트 props 삭제 2025-09-09 09:54:40 +09:00
leedj312 c916977292 대민 물재이용 현황 데이터 받는걸로 수정 2025-09-08 17:42:50 +09:00
swcho d898121764 refactor, add:
- searchModal Store 패턴을 사용하여 상태 관리 및 UI, 비즈니스로직 분리
- tsconfig.json에 import paths 추가
2025-09-08 14:49:23 +09:00
leedj312 500a6b1489 물재이용 지도 하수재이용 오버레이 변경 , 온배수 항목 추가 , 주소 검색 키 변수명 변경 2025-09-05 16:39:02 +09:00
mind-one003 ffa1781005 라인바 차트 좌측 여백 및 라벨 좌측으로 좀 더 이동 2025-09-05 14:21:39 +09:00
mind-one003 b47c0dff2b 라인바 차트 크기 수정, custom left 축 만드는 로직 추가 2025-09-05 13:49:22 +09:00
leedj312 7e7335530e Merge commit '2d474696e6e5e648e940cf0ba6ec9153a32316f5' 2025-09-05 11:30:02 +09:00
leedj312 2d474696e6 대민 변경 2025-09-05 11:27:57 +09:00
yschoi a89eb98191 Merge remote-tracking branch 'origin/iipbs/fo/dev' 2025-09-05 09:24:16 +09:00
yschoi 2b28bae58f Merge remote-tracking branch 'origin/iipbs/wr/dev' 2025-09-05 09:23:18 +09:00
mind-one003 9fadb172f9 오타수정 2025-09-04 17:51:11 +09:00
mind-one003 99b0580697 총인시설 여부에 따라 총인시설 row 추가 혹은 제거 2025-09-04 15:30:31 +09:00
mind-one003 d9b52ba5ef rdi 조회화면과 대시보드의 rdii 값 맞춰주는 작업 진행 2025-09-04 14:52:26 +09:00
leedj312 cbc7c4918f 물재이용 사례관리 엑셀 등록 유효성 검사 및 저장 로직 변경 2025-09-04 14:43:29 +09:00
swcho 192cb91517 fix: sn/package.json에 xlsx 의존성 추가 (build 에러 수정) 2025-09-04 11:07:03 +09:00
yschoi ca45874fe9 Merge remote-tracking branch 'origin/iipbs/fo/dev' 2025-09-04 10:18:53 +09:00
yschoi d051d3fa1d Merge remote-tracking branch 'origin/iipbs/wr/dev' 2025-09-04 10:16:42 +09:00
swcho d99dbfee36 Merge remote-tracking branch 'origin/main' into iipbs/sn/dev 2025-09-04 09:44:06 +09:00
swcho ab6279a449 fix: 하수처리구역 시군구 매핑 에러 수정 2025-09-04 09:42:26 +09:00
leedj312 c4c5e68267 하수재이용 통계 매뉴 이동 수정 2025-09-03 17:55:05 +09:00
leedj312 5ec38f1fb4 Merge commit 'a03359540a57d48b8bc1af7ca8ccc2a232e2d12a' into iipbs/wr/dev 2025-09-03 16:28:21 +09:00
leedj312 a03359540a 주소검색 특수문자, sql 입력 방지 함수 추가 2025-09-03 16:27:58 +09:00
mind-one003 9707232954 총인시설 유무확인 로직 수정 - 데이터 들어올 시 확인필요 2025-09-03 15:18:31 +09:00
leedj312 d9cd742355 지도 팝업 데이터 없는경우 메시지 표출 2025-09-03 15:07:44 +09:00
leedj312 b92351a6aa Merge commit '721dcbc634fff67e1135f391fb1b137da7adffaf' 2025-09-03 14:39:11 +09:00
leedj312 4dec379846 오버레이 생성 div 를ㄹ promise로 받을수 있도록 변경 2025-09-03 14:38:56 +09:00
leedj312 721dcbc634 물재이용 지도 오버레이 팝업 수정(드래그, 축소 기능 추가) 2025-09-03 14:34:34 +09:00
swcho a26262d3b2 refactor: cql filter 각 파일로 이동 2025-09-03 14:20:31 +09:00
mind-one003 50b5c66a7e console.log 제거 2025-09-03 14:05:03 +09:00
mind-one003 b92baf8b2a 팝업 엑셀 다운로드 추가 2025-09-03 14:02:59 +09:00
swcho 283711fce7 Merge remote-tracking branch 'origin/iipbs/sn/dev' 2025-09-03 11:43:19 +09:00
swcho 99fec24764 fix: 우수토실 조회 버튼 오른쪽 배치로 수정 2025-09-03 11:02:56 +09:00
swcho 18c46ce829 refactor: useSearchModal.tsx store 이용하여 상태관리 리팩토링 2025-09-03 10:57:28 +09:00
swcho 0506464a97 refactor: searchModal UI, 비즈니스 로직 및 상태 컴포넌트 분리 2025-09-02 17:49:22 +09:00
leedj312 1ccba8797e Merge commit '05b4a4dae547541197c9b9162aab9c3e74ec63bf' 2025-09-02 17:46:05 +09:00
leedj312 44c687d432 gis 오버레이 추가 2025-09-02 17:45:36 +09:00
leedj312 05b4a4dae5 물재이용 지도 오버레이 중복 빼고 완료 2025-09-02 17:30:05 +09:00
mind-one003 236cc9fdd2 미처리하수량 주석추가 2025-09-02 17:18:19 +09:00
mind-one003 f923297498 Merge branch 'iipbs/common/main' into iipbs/fo/dev 2025-09-02 16:46:16 +09:00
mind-one003 83f5d878e7 라인바 y축 범위 수정 2025-09-02 16:44:43 +09:00
mind-one003 2f00efadfc - 미처리하수량 컬럼 추가
- 연 평균 > 연평균
2025-09-02 16:43:38 +09:00
swcho 4052b46429 Merge branch 'main' into iipbs/sn/dev 2025-09-02 16:03:47 +09:00
swcho d172b17880 merge 2025-09-02 16:03:25 +09:00
swcho ebafff03ec merge 2025-09-02 16:02:22 +09:00
swcho bd1250762e Merge branch 'iipbs/common/main' 2025-09-02 16:01:08 +09:00
swcho e815b9662f remove: comboSearchBar index 삭제 2025-09-02 16:00:49 +09:00
swcho 90d47282fb Merge branch 'iipbs/sn/dev' 2025-09-02 15:53:28 +09:00
swcho 809deff401 Merge remote-tracking branch 'origin/iipbs/sn/ii' into iipbs/sn/dev 2025-09-02 15:53:06 +09:00
swcho 3b1c34aecb Merge branch 'iipbs/common/main' into iipbs/sn/ii 2025-09-02 15:52:50 +09:00
swcho 2e6cbad49c remove, refactor:
- comboSearchBar.tsx 삭제
- any 타입 추가
- procSearchBar 시군구, 시설 가나다순 정렬
2025-09-02 15:52:13 +09:00
leedj312 e941c1ba3e Merge commit 'a42be8059acc915ddd3ca2aeb8a734054c3c8873' 2025-09-02 14:46:53 +09:00
jcchoi 9ebd3c47a6 대시보드 레이아웃 수정 2025-09-02 14:34:52 +09:00
jcchoi 2c9580c835 footer 수정정 2025-09-02 14:33:51 +09:00
jcchoi 06e9938e84 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2025-09-02 13:25:55 +09:00
jcchoi 1119f968b0 header 메뉴 추가 및 CM용 layout 추가 2025-09-02 13:25:50 +09:00
swcho a42be8059a remove: 가뭄지도 EXPRS_ORDERD_LAYERS 삭제 2025-09-02 11:16:59 +09:00
swcho 3bbf3bae3d Merge remote-tracking branch 'origin/iipbs/common/main' into iipbs/wr/drgtPopup 2025-09-02 11:11:59 +09:00
swcho a8c8d82f8e Merge branch 'iipbs/sn/dev' 2025-09-02 11:08:17 +09:00
swcho 540203d153 Merge branch 'iipbs/sn/ii' into iipbs/sn/dev 2025-09-02 11:07:26 +09:00
swcho 7879bd8c3c Merge branch 'iipbs/common/main' into iipbs/sn/ii 2025-09-02 11:06:53 +09:00
swcho ede5ef6a21 refactor: GisTree.js 주석 추가 및 최신화 2025-09-02 11:06:37 +09:00
swcho 59bd8eddfb remove: waterDepth.tsx에서 orderedLayers 삭제 2025-09-02 10:57:59 +09:00
swcho c4a42e0f7c Merge branch 'iipbs/common/main' into iipbs/sn/ii 2025-09-02 10:57:26 +09:00
swcho 621d222799 remove: GisTree, Gis 에서 orderedLayers porps 삭제 2025-09-02 10:55:16 +09:00
swcho b3658576b3 Merge remote-tracking branch 'origin/iipbs/sn/dev' 2025-09-02 09:31:03 +09:00
swcho be455992a3 Merge remote-tracking branch 'origin/iipbs/sn/ii' into iipbs/sn/dev 2025-09-02 09:29:51 +09:00
mind-one003 34e88c6b63 날짜형식 오류 수정 2025-09-02 09:17:15 +09:00
swcho fe7960ee14 refactor:
- if문 -> switch문
- log 삭제
2025-09-01 18:12:03 +09:00
mind-one003 c85147e989 Merge branch 'iipbs/common/main' into iipbs/fo/dev 2025-09-01 17:01:32 +09:00
mind-one003 01df37d0b3 라인차트 호출 시 config color에 dash붙을시 해당색상의 대시라인 생성 2025-09-01 17:01:18 +09:00
mind-one003 e434e711bf 결함조치 하는중 2025-09-01 17:00:10 +09:00
swcho af630429b3 Merge branch 'iipbs/sn/dev' 2025-09-01 13:12:45 +09:00
swcho 4b2dc7557e Merge remote-tracking branch 'origin/iipbs/sn/ii' into iipbs/sn/dev 2025-09-01 13:12:32 +09:00
swcho a6a4d7ccff remove: 주석 삭제 및 수정 2025-09-01 13:12:19 +09:00
swcho 48dd2ff40e Merge branch 'iipbs/sn/dev' 2025-09-01 13:09:18 +09:00
swcho 8774cf7207 Merge remote-tracking branch 'origin/iipbs/sn/ii' into iipbs/sn/dev 2025-09-01 13:08:25 +09:00
swcho 5be1374b47 Merge branch 'iipbs/common/main' into iipbs/sn/ii 2025-09-01 13:08:04 +09:00
swcho 072a5337a3 Merge branch 'iipbs/common/main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/common/main 2025-09-01 13:07:49 +09:00
swcho 2a0f5dce25 remove: 상류관로 보기 함수 삭제 2025-09-01 13:07:46 +09:00
swcho 27801244b0 refactor: 상류관로 보기 함수 위치 이동 (Gis.js -> popupComponent/smh.tsx) 2025-09-01 13:06:53 +09:00
swcho 5b4c102b16 Merge branch 'iipbs/sn/dev' 2025-09-01 10:24:27 +09:00
swcho b3d8dec409 refactor: 도시침수예방사업 운영관리현황 점검결과 탭 가로 스크롤 hidden 처리 2025-09-01 10:24:08 +09:00
swcho 875434239e feat:
- 도시침수예방사업 엑셀 보기 모달 구현
- 노후 하수관로 정비사업 엑셀 보기 모달 구현 (엑셀 양식이 확정 안돼서 수정 필요)
2025-09-01 10:21:05 +09:00
mind-one003 3067646ba2 운영파일 신규추가된건 추가 및 불필요한거 원복 2025-08-29 16:35:13 +09:00
mind-one003 63ccfe6b3b 운영형상에 맞춰서 세팅 2025-08-29 15:54:53 +09:00
mind-one003 03dd39b128 운영형상에 맞춰서 세팅 2025-08-29 15:32:02 +09:00
mind-one003 cfc4d70d43 Merge branch 'iipbs/common/main' into iipbs/fo/dev 2025-08-29 14:59:32 +09:00
mind-one003 26f2c60f4c 라인바 차트
- 데이터가 NaN이거나 null인 경우 툴팁에서 제외
- NULL인 경우 0으로 라인을 그리는 현상 다음 있는데이터로 라인을 그리도록 수정
2025-08-29 14:59:10 +09:00
mind-one003 ebe7d1a86c 주요그래프 총인유입tp 0이나 null인 경우 안보여지도록 수정(0으로 안나오도록..) 2025-08-29 14:55:55 +09:00
leedj312 2be2028c27 Merge commit 'cc9389b91c93f60bce2c933fcea48c8c4c98c5e4' 2025-08-29 14:00:27 +09:00
leedj312 c5973e25e7 Merge commit 'd910dcce914269169efd14079c8dc4222a807bc8' 2025-08-29 13:58:29 +09:00
leedj312 8ec548301c 주소 검색 컴포넌트 수정사항 반영 2025-08-29 13:57:13 +09:00
leedj312 cc9389b91c 대민 주소서비스반영 2025-08-29 13:40:15 +09:00
swcho c161576c77 Merge branch 'iipbs/sn/dev' 2025-08-28 17:35:25 +09:00
swcho 555b918872 Merge branch 'iipbs/common/main' into iipbs/sn/ii 2025-08-28 17:33:09 +09:00
swcho 28d0e21815 feat: UiTable에 페이지 번호 props 추가 2025-08-28 17:32:52 +09:00
swcho cf61ada719 feat: searchModal 다시 열 때 페이지 번호 상태 유지 기능 구현 2025-08-28 17:31:05 +09:00
swcho b1d4582e2a Merge branch 'iipbs/sn/dev' 2025-08-28 17:21:32 +09:00
swcho 94dceae6cd Merge remote-tracking branch 'origin/iipbs/common/main' into iipbs/sn/ii 2025-08-28 17:12:13 +09:00
swcho 49c475709f feat:
- 시설 검색, 다중 시설 검색 시 이전 검색 시설 레이어 삭제 기능 추가
- 시설 위치 정보 없을 때 alert 추가
- 시설 검색 시 해당 시설 아이콘 이미지 표출
2025-08-28 17:11:35 +09:00
leedj312 52bae1b5f7 주소검색 미들웨어 리라이트 방식으로 변경 2025-08-28 15:24:29 +09:00
leedj312 d910dcce91 물재이용 주소 검색 미들웨어 추가 2025-08-28 15:22:10 +09:00
mind-one003 155f345911 강우일 운영현황 toBeInfoRnDay가 추가됨에 따른 로직 수정 2025-08-28 14:13:04 +09:00
leedj312 abe7e51f37 주소 자동 완성 input 초기값 설정 2025-08-28 10:55:02 +09:00
mind-one003 a2a38f8937 강우영향일 로직수정
- changePart 제거
- 강우영향일 계산 후 강우일 담은 toBeInfoRnDay 변수 추가
2025-08-28 10:53:31 +09:00
leedj312 3353770ad9 건축물 등록시 디폴트 밸류 설정 2025-08-28 10:51:43 +09:00
mind-one003 1bfc8b6a19 계획하수량 산정지표현황
- 필요없는 콘솔제거
- 변동부하율 계산 수정
2025-08-28 09:34:47 +09:00
jcchoi 5ddf9fe6e0 FOOTER 배너 표시 2025-08-27 21:07:20 +09:00
mind-one003 1cdbdd00d9 다운로드 엑셀 헤더에 단위 추가 2025-08-27 17:44:38 +09:00
jcchoi 2368202fa7 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2025-08-27 16:08:43 +09:00
mind-one003 eea932f43a Merge branch 'iipbs/common/main' into iipbs/fo/dev 2025-08-27 14:56:31 +09:00
mind-one003 31b8152d37 차트 좌우 axis custom 추가 2025-08-27 14:56:02 +09:00
leedj312 2611f304d9 대민 데이트 피커를 input date로 변경(향후 날짜로 인해) 2025-08-27 13:45:13 +09:00
jcchoi 5896d678e3 메뉴 클릭시 새창 기능 추가 2025-08-27 13:19:29 +09:00
jcchoi f7f954a2a6 그룹관리 메뉴권한 모달 수정 2025-08-27 12:30:20 +09:00
leedj312 b6380e9aac 데이트 피커를 그냥 일단 input date로 변경 2025-08-27 10:59:40 +09:00
mind-one003 5357a65b91 대시보드 tn,tp 불일치 수정 2025-08-27 09:55:42 +09:00
swcho 00d280d33b Merge branch 'iipbs/sn/dev' 2025-08-26 18:47:33 +09:00
swcho 3c7da38e52 feat:
- 도시침수예방사업 모달 너비 수정으로 줄바꿈 처리
- UiTable 내부 셀 줄바꿈 처리 적용
2025-08-26 18:46:32 +09:00
swcho 599a3aaf7b Merge branch 'iipbs/common/main' into iipbs/sn/ii 2025-08-26 18:43:17 +09:00
swcho b9f5eb50e5 feat: UiTable 내부 셀 줄바꿈 처리 pre-line 적용 2025-08-26 18:42:36 +09:00
mind-one003 9d8678e8e5 Merge branch 'iipbs/common/main' into iipbs/fo/dev 2025-08-26 17:51:10 +09:00
mind-one003 c7772a0a23 빌드에러 수정 2025-08-26 17:50:50 +09:00
mind-one003 03d5fc330a Merge branch 'iipbs/common/main' into iipbs/fo/dev 2025-08-26 17:48:11 +09:00
mind-one003 392ccefb16 라인바 차트property 추가 (setXAxisYearTick - 날짜 x축일경우 (년도-월)별로 만들어주는 속성) 2025-08-26 17:47:51 +09:00
mind-one003 7ddb7dda97 라인바 차트property 추가 (setXAxisYearTick - 날짜 x축일경우 (년도-월)별로 만들어주는 속성) 2025-08-26 17:47:29 +09:00
leedj312 ff6634b250 Merge commit 'b7133c9197a948475692634f3b9e20e2f7688a0c' 2025-08-26 17:47:05 +09:00
leedj312 dae440a4b4 수요처 등록시 주소 검색 서치인풋으로 변경 2025-08-26 17:46:51 +09:00
leedj312 b7133c9197 대민 수요정보 등록시 오류사항 수정 2025-08-26 17:42:30 +09:00
mind-one003 2e6679c14f Merge branch 'iipbs/common/main' into iipbs/fo/dev 2025-08-26 17:39:23 +09:00
mind-one003 aeaf507c47 차트property 추가 (setXAxisYearTick - 날짜 x축일경우 (년도-월)별로 만들어주는 속성) 2025-08-26 17:39:07 +09:00
mind-one003 14c1846fe1 차트property 추가 (setXAxisYearTick - 날짜 x축일경우 (년도-월)별로 만들어주는 속성) 2025-08-26 17:38:25 +09:00
leedj312 f2447cb1f5 Merge commit 'fa8e41909a91a659c2875979f550af8d97264b60' 2025-08-26 15:54:41 +09:00
leedj312 632f1b0fd9 주소검색 api 및 컴포넌트 생성(인터넷용) 2025-08-26 15:54:25 +09:00
leedj312 fa8e41909a 주소검색 input 박스 관련 수정 2025-08-26 15:52:18 +09:00
swcho 8ea7427264 feat: 운영정보 결과 관로도 지도에서 전체 보기 기능 추가 (이전 검색결과 관로 삭제되게끔 수정 필요) 2025-08-26 14:47:31 +09:00
mind-one003 1600927237 팝업 데이터 포맷출력방식 변경 2025-08-26 14:05:39 +09:00
mind-one003 88893eb0be 에러수정 2025-08-26 13:33:18 +09:00
mind-one003 d3fa026e22 Merge branch 'iipbs/common/main' into iipbs/fo/dev 2025-08-26 13:31:21 +09:00
mind-one003 2f4cfa0d78 바차트 툴팁 숫자의 경우 천자리 쉼포 추가 2025-08-26 13:30:24 +09:00
leedj312 94833e54d3 Merge commit 'b2bd7ce16a48f72951ada66f9fc53607e49a949b' 2025-08-26 13:07:36 +09:00
swcho 8541c72752 Merge branch 'iipbs/sn/dev' 2025-08-26 13:03:28 +09:00
swcho 2db685b533 feat:
- fileUploadForm 첨부 시가 아닌 등록 시에 업로드 되도록 수정
- rdii 분석 오수관망도 inp 파일이 마인드원 DB에 저장되도록 수정
2025-08-26 11:37:58 +09:00
mind-one003 537c895ebe qltyDataSetting common index 로 이동 2025-08-26 11:24:39 +09:00
mind-one003 1b22d55b94 대시보드 수질현황 팝업과 데이터 맞추는 작업 완료 2025-08-26 11:19:29 +09:00
leedj312 3b5fdd14b6 수요처 등록 컴포넌트 재사용(현황과 함께 사용) 2025-08-26 10:52:58 +09:00
leedj312 3aacb5bc72 Merge commit 'ebfc520d676842cc71556474359fbfd28f0ca244' 2025-08-26 10:48:18 +09:00
leedj312 b2bd7ce16a 물재이용 용어 수정(PH -> ph, m3->m2) 2025-08-26 10:37:19 +09:00
swcho 1ac7c97041 feat: 침입수 분석 오수관망도 inp 파일이 마인드원 DB에 저장되도록 수정 2025-08-26 09:59:10 +09:00
mind-one003 1fceb181b7 유량현황 데이터 맞추는 작업 완료 , 수질현황 작업진행 예정 2025-08-25 18:01:17 +09:00
swcho 26f227e85f feat: 도시침수예방사업 모달 너비 수정으로 줄바꿈 처리 2025-08-25 17:59:52 +09:00
leedj312 c8957ce0da 시설 현황 및 건축물 관련 수정 2025-08-25 14:31:16 +09:00
swcho 3235524479 feat: 운영관리현황 테이블에 일자 추가 2025-08-25 14:10:16 +09:00
swcho c53a768c94 refactor:
- any 타입 지정
- postMutiPart 함수 정리
2025-08-25 13:47:50 +09:00
swcho 5aec4b957c feat: 도시침수예방사업 엑셀 데이터 모달로 띄우기 기능 구현 (셀 세로 merge 처리 필요) 2025-08-25 13:46:53 +09:00
swcho 11cf9f91ca Merge branch 'iipbs/sn/dev' into iipbs/sn/ii 2025-08-25 09:23:32 +09:00
mind-one005 3d0dccaa35 침입수 파일업로드 2025-08-22 20:53:31 +09:00
mind-one003 aa54f32ba2 빌드에러 수정 2025-08-22 18:26:15 +09:00
mind-one003 bc5bce3171 대시보드 하절기 강우시 유입하수량 수정 완료 2025-08-22 18:23:31 +09:00
mind-one003 af8677d510 - 오수전환율 공통변수로 생성 - OSU_PERCENT
- CalcRainEffect 강우영향일만, 강우량만 계산되도록 파라미터 추가
2025-08-22 13:51:10 +09:00
mind-one003 8013483d17 대시보드 수치 맞추는 작업 진행중 (현재 유입유량 및 총유입량 맞추는 작업완료) 2025-08-21 18:27:52 +09:00
mind-one005 68c99ad6c0 파일업로드 sample 2025-08-21 17:14:50 +09:00
swcho fe57f85632 feat: RDII 분석 상수사용량 적용월 검증 로직 추가 2025-08-21 13:07:14 +09:00
mind-one003 7ca09a60d8 -CalcRainEffect 강우량 자릿수 소수점 첫째자리 표시
- 수질현황 최대 최소 BOD, COD 수치 이상수정
2025-08-21 11:25:11 +09:00
mind-one003 f425a303e5 - 페이지에 산식 추가
- 오타수정
- CalcRainEffect에 강우량 x시 0.0으로 표시
2025-08-21 11:00:02 +09:00
swcho 64813531f1 feat: 침입수분석, RDII 분석 양식 파일 추가 및 버튼 위치 변경 2025-08-21 10:24:14 +09:00
mind-one003 fc70b9c4be CalcRainEffect 수정(weather 수정) 2025-08-21 09:32:05 +09:00
mind-one005 0c0fcd5166 Merge branch 'iipbs/sn/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/sn/dev 2025-08-20 21:26:00 +09:00
mind-one005 1579df57c4 공단개발 sewerage 주소변경 2025-08-20 21:25:55 +09:00
swcho cbab18c53d Merge remote-tracking branch 'origin/iipbs/common/main' into iipbs/sn/ii 2025-08-20 18:51:12 +09:00
swcho ebfc520d67 feat:
- 여러 개의 검색 결과를 GeoJSON으로 표시 함수 추가
- 피쳐 ID로 지오서버에서 검색해서 여러개 피처의 벡터소스 리턴하는 함수 추가
- 여러 extent 배열을 받아 중앙값 extent를 반환하는 함수 추가
2025-08-20 18:50:08 +09:00
swcho 3fb331b4bc feat: 기본정보 조회 시설 지도에서 보기 (이전 시설 데이터 초기화 해야 함) 2025-08-20 18:42:35 +09:00
mind-one003 cc4e3ea0cf 빌드 에러 수정 2025-08-20 18:11:59 +09:00
mind-one003 1fa1a880e9 에러 수정 2025-08-20 18:01:06 +09:00
mind-one003 035f2fd4c1 rdii 산식 및 주석 추가 2025-08-20 16:58:21 +09:00
mind-one003 fda8750f14 rdii 개선 2025-08-20 16:52:19 +09:00
jcchoi 956fcb77e2 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2025-08-20 13:00:08 +09:00
jcchoi 7a18924edf 저장후 목록이동처리 2025-08-20 12:59:51 +09:00
mind-one003 4e7d291ad9 강우영향일 공통화 진행 2025-08-20 11:15:47 +09:00
swcho c4732ebb8f feat:
- 운영정보 결과 관로 클릭시 해당 관로로 이동 기능 구현
- searchModal 데이터 유지되도록 변경
2025-08-20 11:07:51 +09:00
mind-one003 03f87c2042 강우량 현황 팝업수정진행중 2025-08-20 10:53:30 +09:00
swcho e75e9b9873 refactor: 수용가-맨홀 양식 파일 헤더 색칠 2025-08-20 10:50:39 +09:00
swcho 4845450ea5 feat, refactor:
- 수용가-맨홀 매칭결과 양식 파일 다운로드 기능 추가
- 파일 다운로드 버튼 색상 green으로 변경
2025-08-19 18:23:47 +09:00
yschoi ea84947b9e Merge remote-tracking branch 'origin/iipbs/fo/dev' 2025-08-19 17:43:45 +09:00
yschoi 2b3c0304e2 Merge remote-tracking branch 'origin/iipbs/sn/dev' 2025-08-19 17:43:12 +09:00
mind-one003 715d5ab433 시설별 강수현황 모달 스타일 수정 2025-08-19 17:13:38 +09:00
mind-one003 be8b354e85 강우영향일 로직 수정
to-be : 강우량 변경 로직 중 어느 날짜가 강우영향일에 포함될 경우 3보다 큰 강우량일 경우에는 강우량 update 안하고 현재일자 강우량 그대로 유지하도록 수정
2025-08-19 16:51:57 +09:00
swcho 40e0dde0e0 fix: searchModal 엑셀 다운로드 에러 수정 2025-08-19 16:31:03 +09:00
swcho 42c94e8b43 feat: 파일 다운로드안내 alert 및 toast 기능 추가 2025-08-19 16:08:24 +09:00
swcho 507618a437 Merge branch 'iipbs/common/main' into iipbs/sn/ii 2025-08-19 15:25:11 +09:00
swcho 4df286b086 feat: UiTable 컴포넌트에 headButton props 추가 2025-08-19 15:24:52 +09:00
swcho d676d726f2 feat: searchModal.tsx 기본정보, 운영정보 파일 다운로드 기능 구현 2025-08-19 15:23:36 +09:00
mind-one003 bd63b0b28f 빌드 에러 수정 2025-08-19 15:06:37 +09:00
mind-one003 3746dcf005 숫자 우측정렬, 자릿수 수정 2025-08-19 15:04:38 +09:00
swcho 443f9e32f6 fix: 하수관로, 하수맨홀 cql 필터 에러 수정 2025-08-19 13:11:50 +09:00
mind-one003 5b3bbf0204 변동부하율 % 미삭제된거 수정 2025-08-19 09:21:08 +09:00
mind-one003 081fcdd4c5 빌드에러 수정 2025-08-18 18:19:17 +09:00
mind-one003 8e43ca281f 자릿수 변경 2025-08-18 18:14:06 +09:00
yschoi ae2df551ac env 수정 2025-08-18 17:21:52 +09:00
yschoi d0324bf136 warn 로그 출력 제거 2025-08-18 16:18:23 +09:00
mind-one003 95007191ea - 2021년 이전은 ()로 cod안내
- 오수전환율 90%로 변경
2025-08-18 15:56:10 +09:00
leedj312 9c19f239c2 건축물 데이터 검증 소스 수정 2025-08-18 14:53:00 +09:00
mind-one003 d155714d51 변동부하율 소수점 둘째자리까지 반올림 2025-08-18 14:39:55 +09:00
mind-one003 be131e37c2 -시설구분 삭제
-500이하 > 500미만
-대시보드에서 총인설비 유입이 없을 경우 해당 행 삭제
-지하수유입량 모달 시설명오류 수정
2025-08-18 14:35:24 +09:00
yschoi 666307d76c Merge remote-tracking branch 'origin/iipbs/fo/dev' 2025-08-18 10:52:52 +09:00
mind-one003 09aecc38ad 화면에서 시설코드 제외(엑셀 및 팝업은 제외) 2025-08-18 10:43:05 +09:00
leedj312 6b88a8584b 콘솔로그 삭제 2025-08-14 17:44:45 +09:00
yschoi 47a833103b Merge remote-tracking branch 'origin/iipbs/dm/dev' 2025-08-14 15:41:13 +09:00
yschoi 76328f55b6 Merge remote-tracking branch 'origin/iipbs/wr/dev' 2025-08-14 15:40:40 +09:00
leedj312 0a0e89647f 공단 지적사항 수정 2025-08-14 15:23:23 +09:00
yschoi 0ba9909ddf 로딩바 2025-08-14 15:05:05 +09:00
leedj312 e6882f3900 일단 대민 수정 2025-08-14 14:18:09 +09:00
yschoi 1c64f80d9d Merge remote-tracking branch 'origin/iipbs/dm/dev' 2025-08-14 13:34:39 +09:00
yschoi 4f7bb4e17c Merge remote-tracking branch 'origin/iipbs/fo/dev' 2025-08-14 13:34:19 +09:00
yschoi ee01c88d60 Merge remote-tracking branch 'origin/iipbs/wr/dev' 2025-08-14 13:33:57 +09:00
yschoi 1a1cce0ed0 Merge remote-tracking branch 'origin/main' into iipbs/fo/dev 2025-08-14 13:30:56 +09:00
yschoi 1420d6d8ad Merge remote-tracking branch 'origin/main' into iipbs/wr/dev 2025-08-14 13:28:11 +09:00
yschoi c9e65ed001 Merge remote-tracking branch 'origin/main' into iipbs/sn/dev 2025-08-14 13:27:28 +09:00
yschoi ab3f0aa6db Merge remote-tracking branch 'origin/main' into iipbs/dm/dev 2025-08-14 11:34:24 +09:00
yschoi 39a78f475f 디버깅용 콘솔 로그 삭제 2025-08-14 11:32:11 +09:00
leedj312 ff09a773f9 대민 공단 통합테스트 수정사항 반영 2025-08-14 11:07:59 +09:00
leedj312 5b4dd9fd9f Merge commit '262cf21546fcd513704e1c6edf118722d9523fad' into iipbs/wr/dev 2025-08-14 10:45:01 +09:00
leedj312 c65b3649df 하수 재이용 등록시 조회 로직 변경 2025-08-14 09:29:28 +09:00
leedj312 a4a050a56c 재이용 시설 폼 오류 수정 2025-08-13 23:10:59 +09:00
swcho b5150c6f35 Merge branch 'iipbs/common/main' into iipbs/sn/dev 2025-08-13 17:20:57 +09:00
swcho 262cf21546 remove: 잘못 추가된 물재이용(wr)의 가뭄지도 팝업 페이지 삭제 2025-08-13 17:20:40 +09:00
leedj312 aacadcb929 물재이용 감리 지적사항 수정 2025-08-13 17:17:18 +09:00
swcho 7c3d4e8f13 feat: 재이용시설현황 지도로보기 초기 화면 전국으로 수정 2025-08-13 17:01:17 +09:00
swcho b67a859983 Merge branch 'iipbs/common/main' into iipbs/wr/dev 2025-08-13 16:31:13 +09:00
swcho 056b7bae3c fix: defaultZoom props 수정 2025-08-13 16:31:01 +09:00
swcho 1eb30cc8ba Merge branch 'iipbs/wr/drgtPopup' into iipbs/wr/dev 2025-08-13 16:26:57 +09:00
swcho 1732f5ba18 feat: 가뭄지도 시도, 시군구 Custom 정렬 2025-08-13 16:26:45 +09:00
swcho f21bd9a582 Merge branch 'iipbs/common/main' into iipbs/wr/drgtPopup 2025-08-13 16:25:07 +09:00
swcho ce94ca7282 Merge branch 'iipbs/common/main' into iipbs/wr/dev 2025-08-13 16:20:31 +09:00
swcho 428f617802 fix: defaultZoom props 수정 2025-08-13 16:20:15 +09:00
swcho 9b4609a5b3 Merge remote-tracking branch 'origin/iipbs/wr/drgtPopup' into iipbs/wr/dev 2025-08-13 16:15:00 +09:00
swcho be11f6252a feat: 가뭄지도 초기 화면을 전국으로 수정 2025-08-13 16:14:10 +09:00
swcho d831bcf1a1 Merge branch 'iipbs/common/main' into iipbs/wr/drgtPopup 2025-08-13 16:11:59 +09:00
swcho e797bdbdf7 feat: Gis.js defaultZoom, defaultLonLat props 추가 2025-08-13 16:11:33 +09:00
mind-one005 ff0fca0b4d Merge branch 'iipbs/sn/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/sn/dev 2025-08-13 15:55:24 +09:00
mind-one005 49dc55e5f7 Merge branch 'iipbs/common/main' into iipbs/sn/dev 2025-08-13 15:55:12 +09:00
mind-one005 cb11ec839e UiModal <div> <> 2025-08-13 15:50:23 +09:00
swcho afbe4e9a8f Merge remote-tracking branch 'origin/iipbs/sn/ii' into iipbs/sn/dev 2025-08-13 15:49:32 +09:00
swcho 2d22426efd Merge branch 'iipbs/sn/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/sn/dev 2025-08-13 15:49:08 +09:00
swcho f02a38702a fix: 시군구, 하수맨홀 용도 SelectBox 너비 수정 2025-08-13 15:48:16 +09:00
mind-one005 848e28d99e 파일modal 디자인 수정 2025-08-13 15:45:41 +09:00
swcho f9424f6ac8 fix: merge 반영 안된 사항 추가 2025-08-13 15:45:06 +09:00
swcho 1fa935752f Merge branch 'iipbs/common/main' into iipbs/sn/ii 2025-08-13 15:40:39 +09:00
swcho 772dd1c1aa refactor: 시도, 시군구 순서 Custom 정렬 2025-08-13 15:40:07 +09:00
swcho 7c9848cbc5 fix: 시도, 시군구 순서 Custom 정렬 2025-08-13 15:35:09 +09:00
mind-one005 11a3e0cb01 Merge branch 'iipbs/sn/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/sn/dev 2025-08-13 15:17:52 +09:00
mind-one005 5e9a49abe8 파일목록 modal 2025-08-13 15:17:45 +09:00
swcho 1da2ae59f7 fix: 설계빈도 에러 메세지 상태 초기화 추가 2025-08-13 14:57:56 +09:00
swcho 10f44bba3c fix: 빗물펌프장 자체 입력정보에서 '설계빈도(년)'에 숫자만 입력되게끔 수정 (placeholder 추가, alert, validation) 2025-08-13 14:51:25 +09:00
leedj312 5f559b4e2d 하수처리시설 팝업도 수정 2025-08-13 13:56:51 +09:00
swcho 12baddecbf fix:
- 사업유형 SelectArray에 ‘AAAAA‘ 항목 빼고 '전체' 항목 추가
- 하수관로, 맨홀에도 '전체' 항목 추가
- 맨홀에서 용도 조회 조건이 적용 안되는 에러 수정
- 맨홀 조회 결과 컬럼에서 '재질'을 '용도'로 변경
2025-08-13 13:31:07 +09:00
leedj312 c47167cc64 Merge commit 'aec7e7de3a006936c703d0d6e40c5d0c42aab84b' into iipbs/wr/dev 2025-08-13 13:21:19 +09:00
leedj312 6fef06963d 감리지적사항 수정 2025-08-13 13:17:31 +09:00
truthwing aec7e7de3a 년도 역 정렬 되도록 수정. 2025-08-13 11:40:07 +09:00
truthwing 0964eddc0e 불필요한 filter로 인한 함수 오류 해결.
jsyang product(titanume knife 준비 완료)
2025-08-13 11:18:50 +09:00
rsone001 f43e14f664 연계 리스트 검색 조건 추가 2025-08-13 11:18:41 +09:00
swcho d137438725 Merge branch 'iipbs/sn/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/sn/dev 2025-08-13 11:10:45 +09:00
swcho a527b15ce0 fix: searchModal UiTable 페이지네이션시 Select 초기화 에러 수정 2025-08-13 11:10:18 +09:00
mind-one005 e4df3ac86c 수용가 상수사용량 2025-08-13 09:51:04 +09:00
leedj312 a5f7fb7fe8 빗물 통계 수정 2025-08-13 09:43:43 +09:00
mind-one003 5c28d56d83 빌드에러 수정 2025-08-12 18:46:29 +09:00
mind-one003 ba81c01b06 지하수유입량 모달 평균최대최소 수정 2025-08-12 18:39:56 +09:00
swcho e597ba391c refactor: 변수 선언 삭제 2025-08-12 17:42:20 +09:00
leedj312 2edb56284e 물재이용 지도 팝업 창 수정 2025-08-12 17:31:57 +09:00
yschoi 1af498b382 Merge branch 'iipbs/sn/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/sn/dev 2025-08-12 17:26:35 +09:00
yschoi 3641058fd0 목록에서 시설 클릭시 화면으로 이동 기능 추가 2025-08-12 17:26:26 +09:00
mind-one003 f35c937c0f 강우일 운영현황 수정, 콘솔들 제거 2025-08-12 16:40:39 +09:00
leedj312 667dc58847 하수재이용 시설 현황 팝업 실적 없을시 표출 안함으로 수정 2025-08-12 14:38:01 +09:00
mind-one003 a6f39491ef rdii 분석 수정 2025-08-12 11:36:38 +09:00
swcho 98d4de2938 feat: 하수맨홀, 하수펌프장, 우수토실 시도, 시군구 조회 조건 및 컬럼 추가 2025-08-12 11:33:09 +09:00
leedj312 1feec308c1 중수도 지도점검 엑셀 검증 로직 수정 변경 2025-08-12 11:03:41 +09:00
swcho a3325b104d Merge branch 'iipbs/sn/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/sn/dev 2025-08-12 10:59:06 +09:00
swcho 8c79a13d3a fix:
- searchModal viewPort Max값 100으로 수정.
- 운영정보 조회 건수 5개로 수정
2025-08-12 10:59:03 +09:00
mind-one005 cc1c8caeef 수용가 상수사용량 upload 2025-08-12 10:58:18 +09:00
jcchoi 8b404648de 오류 처리 2025-08-12 10:56:53 +09:00
swcho bd7c5b4d50 fix: 운영정보 조회 건수 4건으로 수정 2025-08-12 10:39:26 +09:00
jcchoi 18ebfa1c79 site ID 변경시 경고메세지지 2025-08-12 10:26:16 +09:00
leedj312 70dcc69f2d 중수도 지도점검 업데이트시 조회 기능 오류 수정 2025-08-12 10:18:54 +09:00
jcchoi 2ab1a9fe19 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2025-08-12 10:13:02 +09:00
jcchoi 32ce555321 단위테스트 오류 수정. 2025-08-12 10:12:29 +09:00
swcho 7b6c2af463 fix: 기본정보 하수관로 검색 너비 수정 2025-08-12 10:10:21 +09:00
leedj312 b8cd986435 중수도 지도점검 엑셀등록 수정 2025-08-12 09:55:09 +09:00
swcho fa7a7d1bd9 fix:
- 침입수 분석, RDII 분석 실행 후 하수처리시설명 안 보이는 에러 수정
- reportTab.tsx에 불필요 log 삭제
2025-08-12 09:45:48 +09:00
swcho 6d768432f8 refactor: 처리구역 값 없을 때 '-'로 표시 2025-08-12 09:20:20 +09:00
mind-one003 eeef871a93 빌드에러 수정 2025-08-11 22:16:15 +09:00
mind-one003 4941593bb0 대시보드 연계처리수 배포완료, 대시보드 기준년도 텍스트 추가 2025-08-11 22:13:37 +09:00
leedj312 99aff0c53c 지도점검 수정사항 반영 2025-08-11 21:04:31 +09:00
leedj312 33e46e0fe8 지도점검 수정사항 반영 2025-08-11 21:04:19 +09:00
leedj312 f2dd0ae3a9 하수재이용 시설 지도 찾기 pk 변경 2025-08-11 19:46:55 +09:00
leedj312 3ed0049eee 수요처 수정사항 반영 2025-08-11 19:10:35 +09:00
swcho a91b2d2c36 fix: trim() 에러 수정 2025-08-11 18:27:57 +09:00
swcho 701cd92760 Merge branch 'iipbs/common/main' into iipbs/sn/dev 2025-08-11 18:23:24 +09:00
swcho 579e599eb1 feat searchBar 시설명 가나다 순으로 정렬 2025-08-11 18:23:05 +09:00
swcho 1886bd74e0 fix: 시도, 시군구 원앤올 -> 알애스원 변경으로 인한 수정 작업 2025-08-11 18:16:37 +09:00
leedj312 b737b04c86 Merge branch 'iipbs/wr/dev' 2025-08-11 18:05:04 +09:00
mind-one003 a6bb1bc663 콘솔제거, 대시보드 년도 추출수정 2025-08-11 17:51:32 +09:00
leedj312 0e99fb8192 대민 및 물재이용 수요처 등록 폼 readOnly 추가 2025-08-11 17:51:27 +09:00
swcho 4c76e572b2 fix: reportTab 시도, 시군구 타입 수정 2025-08-11 17:49:10 +09:00
swcho 792e38c0c5 feat:
- 운영정보 검색에 하수처리구역 컬럼 추가
- 기본정보 하수관로 검색에 시도, 시군구, 용도 컬럼 추가
- 공통 코드 시도, 시군구 API 원앤올 -> 알애스원으로 변경
2025-08-11 17:39:59 +09:00
leedj312 12b9ffe65c 수요처 팝업 추가 완료 2025-08-11 17:39:30 +09:00
leedj312 06c840951b 필요없는 코드 삭제 2025-08-11 16:25:43 +09:00
leedj312 7d137c93c5 detaile시설 입력 팝업 셀누르면 이동및 팝업 창 뜨도록 수정 2025-08-11 15:58:41 +09:00
rsone001 ad7bfc0456 연계 정포 form 수정 2025-08-11 15:21:58 +09:00
mind-one003 055d0bef16 오타수정, 처리구역정보 컬럼변경 2025-08-11 14:50:52 +09:00
swcho b87d1280ef fix: 컬럼명 변경으로 인한 cql_filter 수정 2025-08-11 14:45:28 +09:00
yschoi 959f3df7e9 Merge remote-tracking branch 'origin/iipbs/fo/dev' 2025-08-11 14:38:57 +09:00
yschoi 6c45d96473 불필요 삭제 2025-08-11 14:38:16 +09:00
yschoi 8ec4523dbf Merge remote-tracking branch 'origin/iipbs/fo/dev' 2025-08-11 14:10:30 +09:00
yschoi e299ad0854 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2025-08-11 14:10:11 +09:00
yschoi 5eb80b1362 Merge branch 'iipbs/fo/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/fo/dev 2025-08-11 14:09:37 +09:00
yschoi ebd37ccea1 초기화 버튼 추가 2025-08-11 14:09:26 +09:00
mind-one003 83880cea6d - 오수발생량 추정 기간선택 문제해결
- geoserver 주소 변경
2025-08-11 14:04:31 +09:00
swcho 7373aba2cd refactor: NoFooterLayout 적용으로 인한 featureClickEventPopup의 height 조절 2025-08-11 13:45:36 +09:00
swcho e512f47045 Merge branch 'iipbs/sn/dev' into iipbs/sn/ii 2025-08-11 13:42:13 +09:00
swcho 0925c80326 Merge remote-tracking branch 'origin/iipbs/wr/dev' 2025-08-11 13:34:54 +09:00
swcho 255ec04cfb Merge branch 'iipbs/sn/dev' 2025-08-11 13:33:21 +09:00
swcho 39fe92154f fix: GEOSERVER_URL 변경 (침수위험지도 표출 에러 때문) 2025-08-11 13:28:10 +09:00
swcho d32e5ea592 fix: GEOSERVER_URL 변경 (침수위험지도 표출 에러 때문) 2025-08-11 13:19:04 +09:00
Your Name 92cdbd8a7b 오수발생량 조치 진행중 2025-08-11 13:03:43 +09:00
chanii8 10abca7d35 [common/components] fix: siteId 가져오는 방식 수정 2025-08-11 12:26:17 +09:00
chanii8 579db080a3 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2025-08-11 11:08:02 +09:00
yschoi f364277ae8 로그 삭제 2025-08-11 10:54:16 +09:00
yschoi 1691829c42 Merge remote-tracking branch 'origin/iipbs/wr/dev' 2025-08-11 10:50:37 +09:00
yschoi b5f0ee5cdc geometry 정보 없을때 알랏 2025-08-11 10:32:10 +09:00
chanii8 2fd1159615 Revert "[common/features] feat: 환경 변수 URL 방식 도입"
This reverts commit e4d52611d7.
2025-08-11 10:29:13 +09:00
yschoi 1e0ef0c713 온배수 시설 지도 표출 수정 2025-08-11 10:23:47 +09:00
yschoi 3d480a40a7 로그 삭제 2025-08-11 09:47:20 +09:00
yschoi ce9c536858 가동개시일 공백제거 2025-08-11 09:45:58 +09:00
yschoi bde50388d1 시설용량 천단위 콤마 2025-08-11 09:34:05 +09:00
yschoi d86d0b0fca 피처 좌표 정보 없을때 알랏 2025-08-11 09:21:40 +09:00
yschoi 4c3d79f488 Merge remote-tracking branch 'origin/main' into iipbs/fo/dev 2025-08-10 22:39:19 +09:00
yschoi fc80078d96 Merge remote-tracking branch 'origin/main' into iipbs/fo/dev 2025-08-10 22:37:42 +09:00
yschoi 5aaf346074 Merge remote-tracking branch 'origin/iipbs/fo/dev' 2025-08-10 22:36:48 +09:00
yschoi 21af492743 로그인 처리 layout으로 이동 처리 2025-08-10 22:32:10 +09:00
yschoi 6ccbfba3b9 Merge remote-tracking branch 'origin/iipbs/wr/dev' 2025-08-10 22:29:22 +09:00
yschoi 6d9327bf00 불필요 삭제 2025-08-10 22:20:22 +09:00
yschoi 1a4fa66519 빌드 2025-08-10 21:57:58 +09:00
yschoi d85e8c0572 빌드 2025-08-10 21:57:09 +09:00
yschoi 94306f052e 망할 빌드 2025-08-10 21:55:26 +09:00
yschoi aec64ac26d 빌드 오류 2025-08-10 21:45:24 +09:00
yschoi c0ffec1492 Merge branch 'iipbs/wr/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/wr/dev 2025-08-10 21:32:28 +09:00
yschoi be43fd38a7 물재이용 지도보기 수정 2025-08-10 21:32:21 +09:00
jcchoi db441ab353 "yargs": "^17.7.2", 2025-08-10 21:08:22 +09:00
leedj312 cceb84aa99 후보지 조회 부분 기능 적용 2025-08-10 20:07:51 +09:00
jcchoi df4f1f6157 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2025-08-10 19:18:34 +09:00
jcchoi 96deebdaad Elint 오류 수정 2025-08-10 19:18:17 +09:00
yschoi fbd057e248 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2025-08-10 19:13:09 +09:00
yschoi 1a0c5d01ce fo 빌드 오류 수정 2025-08-10 19:13:03 +09:00
jcchoi f8bcac3d2b Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2025-08-10 18:28:15 +09:00
yschoi a3d9c32024 운영실태 지도 2025-08-10 18:24:57 +09:00
yschoi 061cd5aecc Merge remote-tracking branch 'origin/iipbs/fo/dev' 2025-08-10 15:56:08 +09:00
yschoi 940b3208f1 맵 레이아웃 수정 2025-08-10 15:52:56 +09:00
yschoi e91b5a5ddb Merge remote-tracking branch 'origin/main' into iipbs/fo/dev 2025-08-10 15:23:07 +09:00
yschoi 239d838aae Merge remote-tracking branch 'origin/iipbs/fo/dev' 2025-08-10 15:22:21 +09:00
yschoi c93571781d 운영실태 지도 오류 수정중 2025-08-10 15:21:47 +09:00
jcchoi 57e363e1a3 CM 회원가입 추가 2025-08-10 13:04:42 +09:00
jcchoi a2b081eb10 CM 회원가입 수정정 2025-08-10 13:04:11 +09:00
yschoi b44eac9671 Merge remote-tracking branch 'origin/iipbs/wr/dev' 2025-08-10 03:56:39 +09:00
yschoi 5aed78e228 error 제거 2025-08-10 03:50:06 +09:00
yschoi 11396a92d6 빌드 2025-08-10 03:28:04 +09:00
yschoi 7304eccf1b 빌드 오류 2025-08-10 03:23:31 +09:00
yschoi 2207d7f61b 빌드 오류 2025-08-10 03:20:15 +09:00
yschoi 0c23c99ef6 빌드 오류 2025-08-10 03:06:35 +09:00
yschoi 9dc1c88c80 임시 2025-08-10 02:59:43 +09:00
yschoi a9c3d7f0b9 Merge remote-tracking branch 'origin/iipbs/wr/dev' 2025-08-10 02:46:30 +09:00
yschoi 044c3a3cb9 타입 수정 2025-08-10 02:32:00 +09:00
yschoi a64328ef89 불필요 삭제 2025-08-10 02:18:11 +09:00
yschoi 027dd01747 Merge branch 'iipbs/wr/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/wr/dev 2025-08-10 02:05:13 +09:00
yschoi 4903684bce 공급처 선정 지도 팝업 추가 2025-08-10 02:05:04 +09:00
swcho fe524f98b4 test: 개발 서버 배포 에러로 인한 wr에 ol 패키지 추가 2025-08-10 00:59:52 +09:00
swcho b5c111fef0 fix: 개발 서버 빌드 에러로 인한 import 수정 2025-08-10 00:52:35 +09:00
swcho 5b4b8fbd80 fix: 개발 서버 빌드 에러로 인한 타입 다시 제거 2025-08-10 00:48:54 +09:00
swcho bd3015dec5 fix: 개발 서버 빌드 에러로 인한 타입 추가 2025-08-10 00:40:23 +09:00
swcho 57fc624fbc feat: WR(물재이용) 가뭄지도 팝업 구현 (잠재수요처, 수요처 클릭 이벤트 구현 필요) 2025-08-10 00:29:50 +09:00
swcho e6eec2a097 Merge branch 'iipbs/common/main' into iipbs/wr/drgtPopup 2025-08-09 23:46:40 +09:00
swcho 3cc8fcb2eb fix: 오타 수정 2025-08-09 23:46:20 +09:00
swcho f644bd6b7e refactor, remove, add: GIS main 브랜치와 동기화 2025-08-09 23:43:37 +09:00
swcho 0c2a5f5287 Merge remote-tracking branch 'origin/iipbs/common/main' into iipbs/wr/drgtPopup 2025-08-09 23:05:49 +09:00
swcho b871226f8e refactor: import 및 변수 정리 2025-08-09 22:53:58 +09:00
swcho 3116fe8bed fix: mapService import 경로 수정 2025-08-09 22:53:07 +09:00
swcho 828f46fceb Merge branch 'main' into iipbs/sn/ii 2025-08-09 22:46:10 +09:00
swcho b095ca7ed8 Merge branch 'iipbs/common/main' into iipbs/sn/ii 2025-08-09 22:43:23 +09:00
swcho ed288d3e49 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2025-08-09 22:42:20 +09:00
swcho 78bc841f9a Merge branch 'iipbs/common/main' 2025-08-09 22:39:41 +09:00
swcho f685884ed7 feat: WR(물재이용) 가뭄지도 팝업 구현 을 위한 Gis 수정 2025-08-09 22:38:02 +09:00
swcho 958f6eea02 feat: WR(물재이용) 가뭄지도 팝업 구현 (잠재수요처, 수요처 클릭 이벤트 구현 필요) 2025-08-09 22:26:51 +09:00
yschoi b1c1b0bc29 Merge remote-tracking branch 'origin/iipbs/wr/dev' 2025-08-09 17:41:23 +09:00
mind-one001 fef6ac864b Delete pnpm-lock.yaml 2025-08-09 17:38:21 +09:00
yschoi 9f4e07833d Merge remote-tracking branch 'origin/iipbs/wr/dev' 2025-08-09 17:21:31 +09:00
leedj312 968bf94de2 물재이용 수요매칭 검토 후보처 선택을 위한 사전작업 2025-08-09 16:49:52 +09:00
yschoi 807822082d Merge remote-tracking branch 'origin/iipbs/wr/dev' 2025-08-09 16:19:05 +09:00
leedj312 552c9a1532 재이용시설 팝업 실적등록 수정 2025-08-08 18:40:02 +09:00
swcho 114270d8e9 Merge branch 'iipbs/sn/dev' 2025-08-08 17:37:13 +09:00
swcho 9bf66d8ca3 Merge branch 'iipbs/sn/ii' into iipbs/sn/dev 2025-08-08 17:34:55 +09:00
swcho 388315bdf6 add: swcho 로컬 백엔드 주소 env.local에 추가 2025-08-08 17:33:57 +09:00
swcho 92692c0c46 feat:
- 도시침수예방사업, 노후 하수관로 정비사업 등록자 등록 및 조회 기능 구현
- 컬럼명 수정된 거에 맞게 변수명 수정 (하수펌프장, 하수맨홀)
2025-08-08 17:32:06 +09:00
leedj312 986e7a5c3b 페이지 선택 오류 및 잘못된 api 설정 2025-08-08 17:30:22 +09:00
chanii8 e4d52611d7 [common/features] feat: 환경 변수 URL 방식 도입 2025-08-08 17:22:58 +09:00
chanii8 2b3475a626 Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2025-08-08 16:27:13 +09:00
swcho a21d4d3d5d Merge branch 'iipbs/sn/ii' into iipbs/sn/dev 2025-08-08 15:30:56 +09:00
swcho 32c36c770c feat: 도시침수예방사업, 노후하수관로 등록 시 등록자 정보 추가 2025-08-08 15:30:37 +09:00
leedj312 fcb39e289e 지도 팝업 수정사항 반영 2025-08-08 14:53:18 +09:00
leedj312 0e1f8f5868 풋터없는 레이아웃 적용 2025-08-08 14:43:38 +09:00
chanii8 e11c200f4c [apps/cs] feat: 모듈API관리 폼 수정 2025-08-08 14:36:56 +09:00
leedj312 e36c744ad9 Merge commit '8561b95e47c33b32114cc8ea265835f8dd8fee64' into iipbs/wr/dev 2025-08-08 14:35:49 +09:00
leedj312 8561b95e47 빌드 오류 수정 2025-08-08 14:34:45 +09:00
leedj312 21599945ac Merge commit 'c2711a7ad4513c8d4708934fa0abe3003b57baf7' 2025-08-08 14:22:24 +09:00
chanii8 6a99d1f0d8 [apps/cs] feat: 권한맵핑 다이얼로그 검색 조건 추가 2025-08-08 14:20:59 +09:00
swcho 2756abec49 fix: 침입수 분석, RDII 분석 컬럼명 수정에 따른 변수명 수정 및 로직 수정 (아직 테스트 미완료) 2025-08-08 13:59:54 +09:00
swcho c2711a7ad4 Merge branch 'iipbs/common/main' 2025-08-08 13:35:32 +09:00
swcho a2af60d52e fix: NoFooterLayout 사용으로 인한 Gis.js의 default height 수정 2025-08-08 13:34:58 +09:00
leedj312 305cea6bf5 Merge commit 'abe930c37a0e8f47fd40096e6ec28ede6d0e1349' 2025-08-08 13:34:32 +09:00
swcho 5a6a2974fb feat: SN(하수관로) Gis Page Layout NoFooterLayout으로 변경 2025-08-08 13:34:17 +09:00
leedj312 abe930c37a 운영실태 레이아웃 구조 변경 2025-08-08 13:34:08 +09:00
yschoi d9e1a988be Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend 2025-08-08 13:00:57 +09:00
yschoi 17022bc626 물재이용 지도 onOpenPopup 추가 2025-08-08 13:00:49 +09:00
leedj312 4e65b3129f 지도 nofooter 레이아웃 추가 2025-08-08 11:20:47 +09:00
rsone001 bab8edb85b 데이터 스키마 수정 2025-08-08 10:47:53 +09:00
yschoi 4f9f605597 lock 삭제 2025-08-08 10:26:32 +09:00
yschoi 0ef170b7a2 Merge remote-tracking branch 'origin/main' into iipbs/sn/dev 2025-08-08 10:26:15 +09:00
yschoi fbeb9a106a ngii 변수 추가 2025-08-08 10:18:58 +09:00
mind-one005 b019562023 Merge branch 'iipbs/sn/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/sn/dev 2025-08-08 09:24:40 +09:00
leedj312 effc8243cb Merge remote-tracking branch 'origin/iipbs/wr/dev' 2025-08-08 09:18:08 +09:00
leedj312 487edd4573 팝업 크기 수정/ 재이용 시설 팝업 추가 2025-08-07 19:54:17 +09:00
mind-one005 42cccbd0d4 Merge branch 'iipbs/sn/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/sn/dev 2025-08-07 15:11:20 +09:00
mind-one005 92677d1e71 뷴석결과 시도,시군구명 조회 2025-08-07 15:11:15 +09:00
leedj312 c5e18c80fc 물재이용 안쓰는api삭제 2025-08-07 13:29:18 +09:00
371 changed files with 26817 additions and 11514 deletions
+1
View File
@@ -1,5 +1,6 @@
# turbo
.turbo/
.vscode/**/*
# dependencies
node_modules/
+1 -1
View File
@@ -3,6 +3,6 @@ NEXT_PUBLIC_PORT=3000
NEXT_PUBLIC_PROXY_HOST=http://localhost:3000
NEXT_PUBLIC_SITE_ID=CS
NEXT_PUBLIC_SUB_DOMAIN=http://localhost:13000
NEXT_PUBLIC_SERVER_API_URL=http://192.168.0.102:8000
NEXT_PUBLIC_SERVER_API_URL=http://dev.onasys.co.kr:8000
NEXT_PUBLIC_LINK_BACKEND_API_HOST=http://rsone.iptime.org:10014
NEXT_PUBLIC_TINY_API_KEY=t9nc4z6inquvvd5pq1vea8wcp7lb01qmqseh6egms9vpaju2
+35
View File
@@ -0,0 +1,35 @@
"use client";
import { usePathname, useRouter } from "next/navigation";
import { useQueryClient } from "@tanstack/react-query";
import { NoLNBLayout } from "@common/components";
import type { MenuItem } from "@/entities/menu";
import { useMenuStore } from "@/shared/lib";
import { PageLayout } from "@/shared/ui/page-layout";
export default function WithBaseLayout({
children,
}: {
children: React.ReactNode;
}) {
const router = useRouter();
const pathname = usePathname();
const queryClient = useQueryClient();
const setCurrentMenuInfo = useMenuStore((state) => state.setCurrentMenuInfo);
const handleMenuClick = (item: MenuItem) => {
setCurrentMenuInfo(item);
router.push(item.urlPath);
};
return (
<NoLNBLayout
queryClient={queryClient}
currentPath={pathname ?? ""}
handleMenuClick={handleMenuClick}
>
<PageLayout>{children}</PageLayout>
</NoLNBLayout>
);
}
@@ -0,0 +1,2 @@
import { SkeletonPage } from "@/shared/ui/skeleton-page";
export default SkeletonPage;
@@ -13,6 +13,11 @@ const AuthWrapper = ({ children }: { children: React.ReactNode }) => {
const { userInfo, setUserInfo } = useUserStore((state) => state);
async function authCheck() {
// 로그인 페이지에서는 인증 체크를 건너뜀
if (window.location.pathname === '/auth/login') {
return;
}
const userId = getCookie(AUTH_USER_ID);
if (!userId) {
throw new Error("Missing required authentication tokens");
+1
View File
@@ -0,0 +1 @@
export { CodeSelect } from "../ui/code-select";
@@ -0,0 +1,14 @@
import { client } from "@/shared/api";
import { ENDPOINT } from "@/shared/config";
import type { CodeService, ICode } from "../model/code-interface";
export class CodeApiService implements CodeService {
public async getCode(upCd: string): Promise<ICode[]> {
const response = await client.get<ICode[]>(
`${ENDPOINT.CMS_SERVICE.CODE}/${upCd}`,
);
return response.data;
}
}
export const CodeApi = new CodeApiService();
@@ -0,0 +1,73 @@
import { client } from "@/shared/api";
import { ENDPOINT } from "@/shared/config";
import {
LwpoCodeFormSchema,
type LwpoCodeService,
type LwpoCodeList,
type LwpoCodeDetail,
type LwpoCodeParams,
type LwpoCodeFormData,
} from "../model/lwpocode-interface";
export class LwpoCodeApiService implements LwpoCodeService {
public async getLwpoCodeList(params?: LwpoCodeParams): Promise<LwpoCodeList> {
const response = await client.get<LwpoCodeList>(
`${ENDPOINT.CMS_SERVICE.LWPO_CODE}`,
{ params },
);
return response.data;
}
public async getUpCodeLwpoCodeList(upCd: string): Promise<LwpoCodeList> {
const response = await client.get<LwpoCodeList>(
`${ENDPOINT.CMS_SERVICE.LWPO_CODE}/up-cd/${upCd}`,
);
return response.data;
}
public async lwpoCodeDetail(
upCd: string,
lwpoCd: string,
): Promise<LwpoCodeDetail> {
const response = await client.get<LwpoCodeDetail>(
`${ENDPOINT.CMS_SERVICE.LWPO_CODE}/${lwpoCd}/up-cd/${upCd}`,
);
return response.data;
}
public async createLwpoCode(data: LwpoCodeFormData): Promise<void> {
const validatedData = LwpoCodeFormSchema.parse(data);
const response = await client.post<void>(
`${ENDPOINT.CMS_SERVICE.LWPO_CODE}`,
validatedData,
);
return response.data;
}
public async updateLwpoCode(
upCd: string,
lwpoCd: string,
data: LwpoCodeFormData,
): Promise<void> {
const validatedData = LwpoCodeFormSchema.parse(data);
const response = await client.put<void>(
`${ENDPOINT.CMS_SERVICE.LWPO_CODE}/${lwpoCd}/up-cd/${upCd}`,
validatedData,
);
return response.data;
}
public async deleteLwpoCode(upCd: string, lwpoCd: string): Promise<void> {
await client.delete<void>(
`${ENDPOINT.CMS_SERVICE.LWPO_CODE}/${lwpoCd}/up-cd/${upCd}`,
);
}
public async codeRefreshAll(): Promise<void> {
await client.post<void>(
`${ENDPOINT.CMS_SERVICE.LWPO_CODE}/cache/refresh-all`,
);
}
}
export const LwpoCodeApi = new LwpoCodeApiService();
@@ -0,0 +1,47 @@
import { client } from "@/shared/api";
import { ENDPOINT } from "@/shared/config";
import {
upCodeFormSchema,
type UpCodeService,
type UpCodeList,
type UpCodeDetail,
type UpCodeParams,
type UpCodeFormData,
} from "../model/upcode-interface";
export class UpCodeApiService implements UpCodeService {
public async getUpCodeList(params?: UpCodeParams): Promise<UpCodeList> {
const response = await client.get<UpCodeList>(
`${ENDPOINT.CMS_SERVICE.UP_CODE}`,
{ params },
);
return response.data;
}
public async upCodeDetail(upCd: string): Promise<UpCodeDetail> {
const response = await client.get<UpCodeDetail>(
`${ENDPOINT.CMS_SERVICE.UP_CODE}/${upCd}`,
);
return response.data;
}
public async createUpCode(data: UpCodeFormData): Promise<void> {
const validatedData = upCodeFormSchema.parse(data);
const response = await client.post<void>(
`${ENDPOINT.CMS_SERVICE.UP_CODE}`,
validatedData,
);
return response.data;
}
public async updateUpCode(upCd: string, data: UpCodeFormData): Promise<void> {
const validatedData = upCodeFormSchema.parse(data);
const response = await client.put<void>(
`${ENDPOINT.CMS_SERVICE.UP_CODE}/${upCd}`,
validatedData,
);
return response.data;
}
}
export const UpCodeApi = new UpCodeApiService();
+19
View File
@@ -0,0 +1,19 @@
export { CodeApi } from "./api/code-service";
export type { ICode } from "./model/code-interface";
export { CodeSelect } from "./ui/code-select";
export { UpCodeApi } from "./api/upcode-service";
export {
upCodeFormSchema,
type UpCode,
type UpCodeFormData,
type UpCodeParams,
} from "./model/upcode-interface";
export { LwpoCodeApi } from "./api/lwpocode-service";
export {
LwpoCodeFormSchema,
type LwpoCode,
type LwpoCodeFormData,
type LwpoCodeParams,
} from "./model/lwpocode-interface";
@@ -0,0 +1,10 @@
export interface ICode {
lwpoCd: string;
upCd: string;
lwpoCdNm: string;
unit: string;
}
export interface CodeService {
getCode(upCd: string): Promise<ICode[]>;
}
@@ -0,0 +1,69 @@
import { z } from "zod";
import type { PageableParams, PageableList } from "@/shared/model";
export interface LwpoCodeParams extends PageableParams {
upCd?: string;
lwpoCd?: string;
lwpoCdNm?: string;
useYn?: string;
}
export interface LwpoCode {
lwpoCd: string;
upCd: string;
lwpoCdNm: string;
lwpoCdExpln: string;
unit: string;
prntLwpoCd: string;
useYn: string;
sortSeq: number;
regDt: string;
rgTr: string;
rgTrNm: string;
mdfcnDt: string;
mdFr: string;
}
export interface LwpoCodeDetail extends LwpoCodeFormData {
lwpoCd: string;
upCd: string;
lwpoCdNm: string;
lwpoCdExpln: string;
unit: string;
prntLwpoCd: string;
useYn: string;
sortSeq: 0;
}
export const LwpoCodeFormSchema = z.object({
lwpoCd: z.string().max(10).nonempty(),
upCd: z.string().max(10).nonempty(),
lwpoCdNm: z.string().max(100).nonempty(),
lwpoCdExpln: z.string().max(1000).nullish(),
unit: z.string().max(20).nullish(),
prntLwpoCd: z.string().max(10).nullish(),
useYn: z.string(),
sortSeq: z.number(),
delYn: z.string(),
});
export type LwpoCodeFormData = z.infer<typeof LwpoCodeFormSchema>;
export type LwpoCodeList = PageableList<LwpoCode>;
export interface LwpoCodeService {
getLwpoCodeList(params: LwpoCodeParams): Promise<LwpoCodeList>;
getUpCodeLwpoCodeList(upCd: string): Promise<LwpoCodeList>;
lwpoCodeDetail(upCd: string, lwpoCd: string): Promise<LwpoCodeDetail>;
updateLwpoCode(
upCd: string,
lwpoCd: string,
data: LwpoCodeFormData,
): Promise<void>;
createLwpoCode(data: LwpoCodeFormData): Promise<void>;
deleteLwpoCode(
upCd: string,
lwpoCd: string,
data: LwpoCodeFormData,
): Promise<void>;
codeRefreshAll(): Promise<void>;
}
@@ -0,0 +1,52 @@
import { z } from "zod";
import type { PageableParams, PageableList } from "@/shared/model";
export interface UpCodeParams extends PageableParams {
keyword?: string;
upCd?: string;
cdSe?: string;
useYn?: string;
siteId?: string;
}
export interface UpCode {
upCd: string;
upCdNm: string;
upCdExpln: string;
cdSe: string;
siteId: string;
useYn: string;
regDt: string;
}
export interface UpCodeDetail extends UpCodeFormData {
upCd: string;
upCdNm: string;
upCdExpln: string;
cdSe: string;
siteId: string;
useYn: string;
delYn: string;
regDt: string;
rgTrNm: string;
}
export const upCodeFormSchema = z.object({
upCd: z.string().max(10).nonempty(),
upCdNm: z.string().max(100).nonempty(),
upCdExpln: z.string().max(1000).nullish(),
cdSe: z.string().max(10).nonempty(),
siteId: z.string().max(2).nullish(),
useYn: z.string(),
delYn: z.string(),
});
export type UpCodeFormData = z.infer<typeof upCodeFormSchema>;
export type UpCodeList = PageableList<UpCode>;
export interface UpCodeService {
getUpCodeList(params: UpCodeParams): Promise<UpCodeList>;
upCodeDetail(upCodeId: string): Promise<UpCodeDetail>;
updateUpCode(upCodeId: string, data: UpCodeFormData): Promise<void>;
createUpCode(data: UpCodeFormData): Promise<void>;
}
@@ -0,0 +1,47 @@
import { useQuery } from "@tanstack/react-query";
import {
cn,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@common/components";
import { ENDPOINT } from "@/shared/config";
import { CodeApi } from "../api/code-service";
type CodeSelectProps = {
upCd: string;
placeholder?: string;
className?: string;
} & React.ComponentPropsWithoutRef<typeof Select>;
function CodeSelect({
upCd,
placeholder = "선택",
className,
...props
}: CodeSelectProps) {
const { data: code } = useQuery({
queryKey: [ENDPOINT.CMS_SERVICE.CODE, upCd],
queryFn: () => CodeApi.getCode(upCd),
enabled: !!upCd,
});
return (
<Select {...props}>
<SelectTrigger className={cn("w-[12rem]", className)}>
<SelectValue placeholder={placeholder} />
</SelectTrigger>
<SelectContent>
{code?.map((item) => (
<SelectItem key={item.lwpoCd} value={item.lwpoCd}>
{item.lwpoCdNm}
</SelectItem>
))}
</SelectContent>
</Select>
);
}
export { CodeSelect };
@@ -0,0 +1,225 @@
import { client } from "@/shared/api";
import { ENDPOINT } from "@/shared/config";
import type {
UserService,
UserSearchParams,
UserList,
UserDetailResponse,
UserSttsStatsList,
UserUpdateData,
UserPasswordUpdateData,
UserFindPasswordUpdateData,
UserPasswordMatchData,
UserUpdateInfoData,
UserSaveData,
UserFindPasswordSaveData,
UserVerifyData,
UserEmailData,
UserIdData,
AdminUserList,
} from "../model/user-interface";
export class UserApiService implements UserService {
// 사용자 목록 조회
public async findPageUser(params: UserSearchParams): Promise<UserList> {
const response = await client.get<UserList>(
`${ENDPOINT.USER_SERVICE.USERS}`,
{ params },
);
return response.data;
}
// 사용자 단건 조회
public async findByUserUnqId(userUnqId: string): Promise<UserDetailResponse> {
const response = await client.get<UserDetailResponse>(
`${ENDPOINT.USER_SERVICE.USERS}/${userUnqId}`,
);
return response.data;
}
// 로그인한 사용자 정보 조회
public async findByUserUnqIdByLogin(): Promise<UserDetailResponse> {
const response = await client.get<UserDetailResponse>(
`${ENDPOINT.USER_SERVICE.USERS}/info/me`,
);
return response.data;
}
// 사용자 회원상태 통계 조회
public async selectUserSttsStats(): Promise<UserSttsStatsList> {
const response = await client.get<UserSttsStatsList>(
`${ENDPOINT.USER_SERVICE.USERS}/stts/stats`,
);
return response.data;
}
// 사용자 저장
public async saveUser(data: UserSaveData): Promise<string> {
const response = await client.post<string>(
`${ENDPOINT.USER_SERVICE.USERS}`,
data,
);
return response.data;
}
// 사용자 수정
public async updateUser(
userUnqId: string,
data: UserUpdateData,
): Promise<string> {
const response = await client.put<string>(
`${ENDPOINT.USER_SERVICE.USERS}/${userUnqId}`,
data,
);
return response.data;
}
// 사용자 삭제
public async deleteUser(userUnqId: string): Promise<boolean> {
const response = await client.delete<boolean>(
`${ENDPOINT.USER_SERVICE.USERS}/delete/${userUnqId}`,
);
return response.data;
}
// 사용자 계정잠금 처리
public async lockUser(userUnqId: string): Promise<boolean> {
const response = await client.put<boolean>(
`${ENDPOINT.USER_SERVICE.USERS}/lock/${userUnqId}`,
);
return response.data;
}
// 사용자 계정잠금 해제처리
public async unlockUser(userUnqId: string): Promise<boolean> {
const response = await client.put<boolean>(
`${ENDPOINT.USER_SERVICE.USERS}/unlock/${userUnqId}`,
);
return response.data;
}
// 리프레시 토큰 정보 재발급
public async refreshToken(): Promise<void> {
await client.put(`${ENDPOINT.USER_SERVICE.USERS}/token/refresh`);
}
// 사용자 비밀번호 변경
public async updatePassword(data: UserPasswordUpdateData): Promise<boolean> {
const response = await client.put<boolean>(
`${ENDPOINT.USER_SERVICE.USERS}/password/update`,
data,
);
return response.data;
}
// 사용자 비밀번호 초기화(관리자용)
public async initializePassword(
userUnqId: string,
data: UserPasswordUpdateData,
): Promise<boolean> {
const response = await client.put<boolean>(
`${ENDPOINT.USER_SERVICE.USERS}/password/initialize/${userUnqId}`,
data,
);
return response.data;
}
// 사용자 비밀번호 찾기 변경
public async changePassword(
data: UserFindPasswordUpdateData,
): Promise<boolean> {
const response = await client.put<boolean>(
`${ENDPOINT.USER_SERVICE.USERS}/password/change`,
data,
);
return response.data;
}
// 사용자 비밀번호 확인
public async matchPassword(data: UserPasswordMatchData): Promise<boolean> {
const response = await client.post<boolean>(
`${ENDPOINT.USER_SERVICE.USERS}/password/match`,
data,
);
return response.data;
}
// 사용자 비밀번호 찾기
public async findPasswordUser(
data: UserFindPasswordSaveData,
): Promise<boolean> {
const response = await client.post<boolean>(
`${ENDPOINT.USER_SERVICE.USERS}/password/find`,
data,
);
return response.data;
}
// 사용자 비밀번호 찾기 유효성 확인
public async validPassword(token: string): Promise<boolean> {
const response = await client.get<boolean>(
`${ENDPOINT.USER_SERVICE.USERS}/password/valid/${token}`,
);
return response.data;
}
// 사용자 회원정보 변경
public async updateInfo(
userUnqId: string,
data: UserUpdateInfoData,
): Promise<string> {
const response = await client.put<string>(
`${ENDPOINT.USER_SERVICE.USERS}/info/${userUnqId}`,
data,
);
return response.data;
}
// 사용자 승인처리
public async applyUser(userUnqId: string): Promise<boolean> {
const response = await client.put<boolean>(
`${ENDPOINT.USER_SERVICE.USERS}/apply/${userUnqId}`,
);
return response.data;
}
// 사용자 회원탈퇴
public async leaveUser(data: UserVerifyData): Promise<boolean> {
const response = await client.post<boolean>(
`${ENDPOINT.USER_SERVICE.USERS}/leave`,
data,
);
return response.data;
}
// 사용자 이메일 중복 체크
public async existsEmail(data: UserEmailData): Promise<boolean> {
const response = await client.post<boolean>(
`${ENDPOINT.USER_SERVICE.USERS}/exists`,
data,
);
return response.data;
}
// 사용자 아이디 중복 체크
public async existsUserId(data: UserIdData): Promise<boolean> {
const response = await client.post<boolean>(
`${ENDPOINT.USER_SERVICE.USERS}/existsUserId`,
data,
);
return response.data;
}
// 관리자 목록 조회
public async findPageAdminUser(
params: UserSearchParams,
): Promise<AdminUserList> {
const response = await client.get<AdminUserList>(
`${ENDPOINT.USER_SERVICE.USERS}/admin/list`,
{ params },
);
return response.data;
}
}
export const UserApi = new UserApiService();
+17
View File
@@ -0,0 +1,17 @@
export { UserApi } from "./api/user-service";
export {
USER_STATE_CODE,
userSaveSchema,
userPasswordUpdateSchema,
userUpdateSchema,
type UserStateCode,
type UserSearchParams,
type UserListResponse,
type UserSaveData,
type UserDetailResponse,
type UserPasswordUpdateData,
type UserUpdateData,
type AdminUserList,
type AdminUserListResponse,
} from "./model/user-interface";
export { PasswordResetDialog } from "./ui/password-reset-dialog";
@@ -0,0 +1,362 @@
import { z } from "zod";
import type { PageableList, PageableParams } from "@/shared/model";
export const USER_STATE_CODE = {
대기: "00",
정상: "01",
정지: "07",
탈퇴: "08",
삭제: "09",
} as const;
export type UserStateCode =
(typeof USER_STATE_CODE)[keyof typeof USER_STATE_CODE];
// 사용자 검색 파라미터
export interface UserSearchParams extends PageableParams {
keywordType?: string;
keyword?: string;
userStateCode?: string;
aprvYn?: string;
grpId?: string;
frDateYmd?: string;
toDateYmd?: string;
userName?: string;
}
// 사용자 목록 응답 인터페이스
export interface UserListResponse {
userId: string;
userName: string;
email: string;
roleId: string;
roleName: string;
userStateCode: UserStateCode;
userStateCodeName: string;
lastLoginDate: string;
loginFailCount: number;
userUnqId: string;
mphn: string;
telno: string;
aprvYn: string;
regDt: string;
laeSeCd: string;
laeSeNm: string;
ogdpSeCd: string;
ogdpSeNm: string;
instSeCd: string;
instSeNm: string;
aprvYmd: string;
}
// 사용자 상세 응답 인터페이스
export interface UserDetailResponse {
regDt: string;
mdfcnDt: string;
rgtr: string;
mdfr: string;
userUnqId: string;
userId: string;
userName: string;
email: string;
encryptedPassword: string;
refreshToken: string;
userStateCode: UserStateCode;
lastLoginDate: string;
loginFailCount: number;
pswdHnt: string;
pswdAns: string;
mphn: string;
telno: string;
zip: string;
addr: string;
daddr: string;
laeSeCd: string;
ogdpSeCd: string;
aprvYn: string;
autzrId: string;
expryYmd: string;
lastPswdChgDt: string;
googleId: string;
kakaoId: string;
naverId: string;
isSocialUser: boolean;
hasPassword: boolean;
twoFactorEnabled: boolean;
adminRoleYn: string;
instSeCd: string;
aprvYmd: string;
enoCd: string;
dtlInstCd: string;
laeSeNm: string;
ogdpSeNm: string;
instSeNm: string;
userStateNm: string;
pswdHntNm: string;
ecoNm: string;
dtlInstNm: string;
}
// 사용자 상태 통계 응답 인터페이스
export interface UserSttsStatsResponse {
sttsCd: string;
sttsNm: string;
cnt: number;
}
// 관리자 목록 응답 인터페이스
export interface AdminUserListResponse {
userUnqId: string;
userId: string;
userName: string;
groupId: string;
groupNm: string;
userStateCode: string;
userStateCodeName: string;
laeSeCd: string;
laeSeNm: string;
ogdpSeCd: string;
ogdpSeNm: string;
instSeCd: string;
instSeNm: string;
dtlInstCd: string;
dtlInstNm: string;
mdfr: string;
mdfrNm: string;
mdfcnDt: string;
}
// 사용자 수정 요청 스키마
export const userUpdateSchema = z.object({
userId: z.string().optional(),
userName: z.string(),
email: z.string().email().optional(),
password: z
.string()
.regex(
/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>/?]).{8,20}$/,
"비밀번호는 8~20자, 영문/숫자/특수기호를 모두 포함해야 합니다.",
)
.optional(),
roleId: z.string().optional(),
userStateCode: z.string(),
pswdHnt: z.string().max(10),
pswdAns: z.string().max(100).optional(),
mphn: z.string().max(11).optional(),
telno: z.string().max(11).optional(),
zip: z.string().max(5).optional(),
addr: z.string().max(200).optional(),
daddr: z.string().max(200).optional(),
laeSeCd: z.string().max(10),
ogdpSeCd: z.string().max(10),
aprvYn: z.string(),
autzrId: z.string().uuid().optional(),
expryYmd: z.string().max(8),
instSeCd: z.string().optional(),
dtlInstCd: z.string().optional(),
aprvYmd: z.string().max(8).optional(),
enoCd: z.string().optional(),
});
// 사용자 비밀번호 변경 스키마
export const userPasswordUpdateSchema = z
.object({
password: z.string().optional(),
provider: z.string().optional(),
token: z.string().optional(),
newPassword: z
.string()
.regex(
/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>/?]).{8,20}$/,
"비밀번호는 8~20자, 영문/숫자/특수기호를 모두 포함해야 합니다.",
),
newPasswordConfirm: z.string(),
})
.refine((data) => data.newPassword === data.newPasswordConfirm, {
message: "비밀번호가 일치하지 않습니다.",
path: ["newPasswordConfirm"],
});
// 사용자 비밀번호 찾기 변경 스키마
export const userFindPasswordUpdateSchema = z.object({
tokenValue: z.string(),
password: z
.string()
.regex(
/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>/?]).{8,20}$/,
"비밀번호는 8~20자, 영문/숫자/특수기호를 모두 포함해야 합니다.",
),
});
// 사용자 비밀번호 확인 스키마
export const userPasswordMatchSchema = z.object({
password: z
.string()
.regex(
/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>/?]).{8,20}$/,
"비밀번호는 8~20자, 영문/숫자/특수기호를 모두 포함해야 합니다.",
),
});
// 사용자 회원정보 변경 스키마
export const userUpdateInfoSchema = z.object({
password: z
.string()
.regex(
/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>/?]).{8,20}$/,
"비밀번호는 8~20자, 영문/숫자/특수기호를 모두 포함해야 합니다.",
)
.optional(),
provider: z.string().optional(),
token: z.string().optional(),
userName: z.string(),
email: z.string().email().optional(),
});
// 사용자 저장 스키마
export const userSaveSchema = z.object({
userId: z.string(),
userName: z.string(),
email: z.string().email().optional(),
password: z
.string()
.regex(
/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>/?]).{8,20}$/,
"비밀번호는 8~20자, 영문/숫자/특수기호를 모두 포함해야 합니다.",
),
pswdHnt: z.string().max(10),
pswdAns: z.string().max(100).optional(),
mphn: z.string().max(11).optional(),
telno: z.string().max(11).optional(),
zip: z.string().max(5).optional(),
addr: z.string().max(200).optional(),
daddr: z.string().max(200).optional(),
laeSeCd: z.string().max(10),
ogdpSeCd: z.string().max(10),
expryYmd: z.string().max(8),
instSeCd: z.string().optional(),
dtlInstCd: z.string().optional(),
enoCd: z.string().optional(),
});
// 사용자 비밀번호 찾기 저장 스키마
export const userFindPasswordSaveSchema = z.object({
userName: z.string(),
emailAddr: z.string().email(),
mainUrl: z.string(),
changePasswordUrl: z.string(),
});
// 사용자 인증 요청 스키마
export const userVerifySchema = z.object({
password: z
.string()
.regex(/((?=.*[0-9])(?=.*[a-zA-Z])(?=.*\W)(?=\S+$).{8,20})|()/)
.optional(),
provider: z.string().optional(),
token: z.string().optional(),
});
// 사용자 이메일 요청 스키마
export const userEmailSchema = z.object({
userId: z.string().optional(),
email: z.string().email(),
});
// 사용자 ID 요청 스키마
export const userIdSchema = z.object({
userId: z.string(),
});
// Zod 스키마 타입 정의
export type UserUpdateData = z.infer<typeof userUpdateSchema>;
export type UserPasswordUpdateData = z.infer<typeof userPasswordUpdateSchema>;
export type UserFindPasswordUpdateData = z.infer<
typeof userFindPasswordUpdateSchema
>;
export type UserPasswordMatchData = z.infer<typeof userPasswordMatchSchema>;
export type UserUpdateInfoData = z.infer<typeof userUpdateInfoSchema>;
export type UserSaveData = z.infer<typeof userSaveSchema>;
export type UserFindPasswordSaveData = z.infer<
typeof userFindPasswordSaveSchema
>;
export type UserVerifyData = z.infer<typeof userVerifySchema>;
export type UserEmailData = z.infer<typeof userEmailSchema>;
export type UserIdData = z.infer<typeof userIdSchema>;
// 페이지네이션 타입 정의
export type UserList = PageableList<UserListResponse>;
export type UserSttsStatsList = UserSttsStatsResponse[];
export type AdminUserList = PageableList<AdminUserListResponse>;
// 사용자 서비스 인터페이스
export interface UserService {
// 사용자 목록 조회
findPageUser: (params: UserSearchParams) => Promise<UserList>;
// 사용자 단건 조회
findByUserUnqId: (userUnqId: string) => Promise<UserDetailResponse>;
// 로그인한 사용자 정보 조회
findByUserUnqIdByLogin: () => Promise<UserDetailResponse>;
// 사용자 회원상태 통계 조회
selectUserSttsStats: () => Promise<UserSttsStatsList>;
// 사용자 저장
saveUser: (data: UserSaveData) => Promise<string>;
// 사용자 수정
updateUser: (userUnqId: string, data: UserUpdateData) => Promise<string>;
// 사용자 삭제
deleteUser: (userUnqId: string) => Promise<boolean>;
// 사용자 계정잠금 처리
lockUser: (userUnqId: string) => Promise<boolean>;
// 사용자 계정잠금 해제처리
unlockUser: (userUnqId: string) => Promise<boolean>;
// 리프레시 토큰 정보 재발급
refreshToken: () => Promise<void>;
// 사용자 비밀번호 변경
updatePassword: (data: UserPasswordUpdateData) => Promise<boolean>;
// 사용자 비밀번호 초기화(관리자용)
initializePassword: (
userUnqId: string,
data: UserPasswordUpdateData,
) => Promise<boolean>;
// 사용자 비밀번호 찾기 변경
changePassword: (data: UserFindPasswordUpdateData) => Promise<boolean>;
// 사용자 비밀번호 확인
matchPassword: (data: UserPasswordMatchData) => Promise<boolean>;
// 사용자 비밀번호 찾기
findPasswordUser: (data: UserFindPasswordSaveData) => Promise<boolean>;
// 사용자 비밀번호 찾기 유효성 확인
validPassword: (token: string) => Promise<boolean>;
// 사용자 회원정보 변경
updateInfo: (userUnqId: string, data: UserUpdateInfoData) => Promise<string>;
// 사용자 승인처리
applyUser: (userUnqId: string) => Promise<boolean>;
// 사용자 회원탈퇴
leaveUser: (data: UserVerifyData) => Promise<boolean>;
// 사용자 이메일 중복 체크
existsEmail: (data: UserEmailData) => Promise<boolean>;
// 사용자 아이디 중복 체크
existsUserId: (data: UserIdData) => Promise<boolean>;
// 관리자 목록 조회
findPageAdminUser: (params: UserSearchParams) => Promise<AdminUserList>;
}
@@ -0,0 +1,124 @@
"use client";
import { useState } from "react";
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import {
Dialog,
DialogContent,
DialogHeader,
DialogTitle,
DialogFooter,
DialogClose,
Button,
Input,
DialogTrigger,
} from "@common/components";
import {
UserApi,
userPasswordUpdateSchema,
type UserPasswordUpdateData,
} from "@/entities/user";
import {
Form,
FormControl,
FormField,
FormItem,
FormLabel,
FormMessage,
} from "@/shared/ui/form";
import { useAlertStore, useMutationWrapper } from "@/shared/lib";
interface PasswordResetDialogProps {
userUnqId: string;
children: React.ReactNode;
}
export function PasswordResetDialog({
userUnqId,
children,
}: PasswordResetDialogProps) {
const alert = useAlertStore((state) => state.setMessage);
const [open, setOpen] = useState(false);
const form = useForm<UserPasswordUpdateData>({
resolver: zodResolver(userPasswordUpdateSchema),
defaultValues: {
newPassword: "",
newPasswordConfirm: "",
provider: "password",
},
});
const { mutate: onPasswordReset } = useMutationWrapper({
mutationFn: (data: UserPasswordUpdateData) =>
UserApi.initializePassword(userUnqId, data),
onSuccess: () => {
alert("비밀번호가 초기화되었습니다.", () => {
setOpen(false);
form.reset();
});
},
});
return (
<Dialog open={open} onOpenChange={setOpen}>
<DialogTrigger asChild>{children}</DialogTrigger>
<DialogContent>
<DialogHeader>
<DialogTitle>비밀번호 초기화</DialogTitle>
</DialogHeader>
<Form {...form}>
<form
onSubmit={form.handleSubmit((data) => onPasswordReset(data))}
className="space-y-6"
>
<FormField
control={form.control}
name="newPassword"
render={({ field }) => (
<FormItem>
<FormLabel>새 비밀번호</FormLabel>
<FormControl>
<Input
{...field}
type="password"
className="!text-[1.3rem]"
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="newPasswordConfirm"
render={({ field }) => (
<FormItem>
<FormLabel>새 비밀번호 확인</FormLabel>
<FormControl>
<Input
{...field}
type="password"
className="!text-[1.3rem]"
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<DialogFooter>
<DialogClose asChild>
<Button type="button" className="white">
취소
</Button>
</DialogClose>
<Button type="submit">확인</Button>
</DialogFooter>
</form>
</Form>
</DialogContent>
</Dialog>
);
}
@@ -0,0 +1,701 @@
"use client";
import { useState, useEffect } from "react";
import type { UserSaveData } from "@/entities/user";
import { ENDPOINT, BASE_URL } from "@/shared/config";
import { SignupClient } from "@/shared/api/signup-client";
import "./signup-modal.css";
interface SignupModalProps {
open: boolean;
onOpenChange: (open: boolean) => void;
onClose: () => void;
onSuccess: () => void;
}
function SignupModal({ open, onClose, onSuccess }: SignupModalProps) {
const [currentStep, setCurrentStep] = useState<'agreement' | 'signup'>('agreement');
const [agreed, setAgreed] = useState(false);
const [formData, setFormData] = useState({
userId: "",
userName: "",
email: "",
password: "",
confirmPassword: "",
pswdHnt: "",
pswdAns: "",
mphn: "",
telno: "",
zip: "",
addr: "",
daddr: "",
laeSeCd: "",
ogdpSeCd: "",
expryYmd: "",
instSeCd: "",
dtlInstCd: "",
enoCd: "",
});
const [errors, setErrors] = useState<Record<string, string>>({});
const [isLoading, setIsLoading] = useState(false);
const [isCheckingId, setIsCheckingId] = useState(false);
const [isCheckingEmail, setIsCheckingEmail] = useState(false);
const [idAvailable, setIdAvailable] = useState<boolean | null>(null);
const [emailAvailable, setEmailAvailable] = useState<boolean | null>(null);
// 모달이 닫힐 때 초기화
useEffect(() => {
if (!open) {
setCurrentStep('agreement');
setAgreed(false);
setFormData({
userId: "",
userName: "",
email: "",
password: "",
confirmPassword: "",
pswdHnt: "",
pswdAns: "",
mphn: "",
telno: "",
zip: "",
addr: "",
daddr: "",
laeSeCd: "",
ogdpSeCd: "",
expryYmd: "",
instSeCd: "",
dtlInstCd: "",
enoCd: "",
});
setErrors({});
setIdAvailable(null);
setEmailAvailable(null);
}
}, [open]);
const handleAgreementChange = (e: React.ChangeEvent<HTMLInputElement>) => {
setAgreed(e.target.checked);
};
const handleNextStep = () => {
if (agreed) {
setCurrentStep('signup');
}
};
const handleInputChange = (e: React.ChangeEvent<HTMLInputElement | HTMLSelectElement>) => {
const { name, value } = e.target;
setFormData(prev => ({ ...prev, [name]: value }));
// 에러 초기화
if (errors[name]) {
setErrors(prev => ({ ...prev, [name]: "" }));
}
};
const validateForm = () => {
const newErrors: Record<string, string> = {};
// 필수 필드 검증
if (!formData.userId) newErrors.userId = "아이디를 입력해주세요.";
if (!formData.userName) newErrors.userName = "이름을 입력해주세요.";
if (!formData.password) newErrors.password = "비밀번호를 입력해주세요.";
if (!formData.confirmPassword) newErrors.confirmPassword = "비밀번호 확인을 입력해주세요.";
if (!formData.pswdHnt) newErrors.pswdHnt = "비밀번호 힌트를 입력해주세요.";
if (!formData.laeSeCd) newErrors.laeSeCd = "법인구분을 선택해주세요.";
if (!formData.ogdpSeCd) newErrors.ogdpSeCd = "기관구분을 선택해주세요.";
// 비밀번호 확인
if (formData.password && formData.confirmPassword && formData.password !== formData.confirmPassword) {
newErrors.confirmPassword = "비밀번호가 일치하지 않습니다.";
}
// 비밀번호 정규식 검증
const passwordRegex = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>/?]).{8,20}$/;
if (formData.password && !passwordRegex.test(formData.password)) {
newErrors.password = "비밀번호는 8~20자, 영문/숫자/특수기호를 모두 포함해야 합니다.";
}
// 이메일 형식 검증
if (formData.email && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(formData.email)) {
newErrors.email = "올바른 이메일 형식을 입력해주세요.";
}
// 중복 체크 검증
if (idAvailable === false) newErrors.userId = "이미 사용 중인 아이디입니다.";
if (emailAvailable === false) newErrors.email = "이미 사용 중인 이메일입니다.";
setErrors(newErrors);
const isValid = Object.keys(newErrors).length === 0;
console.log("폼 검증 결과:", { isValid, errors: newErrors, formData });
return isValid;
};
const checkUserIdDuplicate = async () => {
if (!formData.userId) {
setErrors(prev => ({ ...prev, userId: "아이디를 입력해주세요." }));
return;
}
setIsCheckingId(true);
try {
// SignupClient를 통해 중복 체크 API 호출
const signupClient = SignupClient.getInstance({
baseURL: BASE_URL,
});
const response = await signupClient.post<boolean>(
`${ENDPOINT.USER_SERVICE.USERS}/existsUserId`,
{ userId: formData.userId }
);
const exists = response.data;
setIdAvailable(!exists);
if (exists) {
setErrors(prev => ({ ...prev, userId: "이미 사용 중인 아이디입니다." }));
} else {
setErrors(prev => ({ ...prev, userId: "" }));
}
} catch (error) {
console.error("아이디 중복 체크 오류:", error);
setErrors(prev => ({ ...prev, userId: "아이디 중복 체크 중 오류가 발생했습니다." }));
} finally {
setIsCheckingId(false);
}
};
const checkEmailDuplicate = async () => {
if (!formData.email) {
setErrors(prev => ({ ...prev, email: "이메일을 입력해주세요." }));
return;
}
setIsCheckingEmail(true);
try {
// SignupClient를 통해 중복 체크 API 호출
const signupClient = SignupClient.getInstance({
baseURL: BASE_URL,
});
const response = await signupClient.post<boolean>(
`${ENDPOINT.USER_SERVICE.USERS}/exists`,
{ email: formData.email }
);
const exists = response.data;
setEmailAvailable(!exists);
if (exists) {
setErrors(prev => ({ ...prev, email: "이미 사용 중인 이메일입니다." }));
} else {
setErrors(prev => ({ ...prev, email: "" }));
}
} catch (error) {
console.error("이메일 중복 체크 오류:", error);
setErrors(prev => ({ ...prev, email: "이메일 중복 체크 중 오류가 발생했습니다." }));
} finally {
setIsCheckingEmail(false);
}
};
const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault();
console.log("회원가입 버튼 클릭됨");
if (!validateForm()) {
console.log("폼 검증 실패");
return;
}
setIsLoading(true);
try {
const signupData: UserSaveData = {
userId: formData.userId,
userName: formData.userName,
email: formData.email || undefined,
password: formData.password,
pswdHnt: formData.pswdHnt,
pswdAns: formData.pswdAns || undefined,
mphn: formData.mphn || undefined,
telno: formData.telno || undefined,
zip: formData.zip || undefined,
addr: formData.addr || undefined,
daddr: formData.daddr || undefined,
laeSeCd: formData.laeSeCd,
ogdpSeCd: formData.ogdpSeCd,
expryYmd: "",
instSeCd: formData.instSeCd || undefined,
dtlInstCd: formData.dtlInstCd || undefined,
enoCd: formData.enoCd || undefined,
};
// SignupClient를 통해 익명사용자 회원가입 API 호출
const signupClient = SignupClient.getInstance({
baseURL: BASE_URL
});
const response = await signupClient.post(
`${ENDPOINT.USER_SERVICE.USERS}/anonymouse/users/join`,
signupData
);
console.log("회원가입 성공:", response.data);
// 성공 시 모달 닫기 및 콜백 호출
onSuccess();
onClose();
// 폼 초기화
setFormData({
userId: "",
userName: "",
email: "",
password: "",
confirmPassword: "",
pswdHnt: "",
pswdAns: "",
mphn: "",
telno: "",
zip: "",
addr: "",
daddr: "",
laeSeCd: "",
ogdpSeCd: "",
expryYmd: "",
instSeCd: "",
dtlInstCd: "",
enoCd: "",
});
setErrors({});
setIdAvailable(null);
setEmailAvailable(null);
} catch (error: unknown) {
console.error("회원가입 오류:", error);
if (error instanceof Error) {
setErrors(prev => ({ ...prev, submit: error.message }));
} else {
setErrors(prev => ({ ...prev, submit: "회원가입에 실패했습니다." }));
}
} finally {
setIsLoading(false);
}
};
if (!open) return null;
return (
<div className="modal-overlay" onClick={onClose}>
<div className="modal-content" onClick={(e) => e.stopPropagation()}>
<div className="modal-header">
<h2>{currentStep === 'agreement' ? '개인정보제공동의' : '회원가입'}</h2>
<button className="close-button" onClick={onClose}>×</button>
</div>
{currentStep === 'agreement' ? (
<div className="agreement-content">
<div className="agreement-text">
<h3>개인정보 수집 및 이용 동의</h3>
<p>회원가입을 위해 다음과 같이 개인정보를 수집 및 이용합니다.</p>
<h4>1. 수집하는 개인정보 항목</h4>
<ul>
<li>필수항목: 아이디, 이름, 비밀번호, 비밀번호 힌트, 법인구분, 기관구분</li>
<li>선택항목: 이메일, 휴대폰번호, 전화번호, 주소, 기관코드, 상세기관코드, 사업자등록번호</li>
</ul>
<h4>2. 개인정보의 수집 및 이용목적</h4>
<ul>
<li>회원가입 및 관리</li>
<li>서비스 제공 및 운영</li>
<li>고객상담 및 문의응답</li>
</ul>
<h4>3. 개인정보의 보유 및 이용기간</h4>
<p>회원탈퇴 시까지 (단, 관련 법령에 따라 보존이 필요한 경우 해당 기간까지)</p>
<h4>4. 동의 거부권 및 거부 시 불이익</h4>
<p>개인정보 수집 및 이용에 대한 동의를 거부할 수 있으며, 동의 거부 시 회원가입이 제한됩니다.</p>
</div>
<div className="agreement-checkbox">
<label>
<input
type="checkbox"
checked={agreed}
onChange={handleAgreementChange}
/>
<span>개인정보 수집 및 이용에 동의합니다.</span>
</label>
</div>
<div className="agreement-actions">
<button
type="button"
onClick={onClose}
className="cancel-button"
>
취소
</button>
<button
type="button"
onClick={handleNextStep}
className="next-button"
disabled={!agreed}
>
다음
</button>
</div>
</div>
) : (
<form onSubmit={handleSubmit} className="signup-form">
<div className="form-section">
<h3>기본 정보</h3>
<div className="form-row">
<div className="form-group">
<label htmlFor="userId">아이디 *</label>
<div className="input-with-button">
<input
type="text"
id="userId"
name="userId"
value={formData.userId}
onChange={handleInputChange}
placeholder="아이디를 입력하세요"
maxLength={12}
disabled={isLoading}
/>
<button
type="button"
onClick={checkUserIdDuplicate}
disabled={isCheckingId || isLoading || !formData.userId}
className="check-button"
>
{isCheckingId ? "확인중..." : "중복확인"}
</button>
</div>
{idAvailable === true && <span className="success-message">사용 가능한 아이디입니다.</span>}
{errors.userId && <span className="error-message">{errors.userId}</span>}
</div>
</div>
<div className="form-row">
<div className="form-group">
<label htmlFor="userName">이름 *</label>
<input
type="text"
id="userName"
name="userName"
value={formData.userName}
onChange={handleInputChange}
placeholder="이름을 입력하세요"
disabled={isLoading}
/>
{errors.userName && <span className="error-message">{errors.userName}</span>}
</div>
</div>
<div className="form-row">
<div className="form-group">
<label htmlFor="email">이메일</label>
<div className="input-with-button">
<input
type="email"
id="email"
name="email"
value={formData.email}
onChange={handleInputChange}
placeholder="이메일을 입력하세요"
disabled={isLoading}
/>
<button
type="button"
onClick={checkEmailDuplicate}
disabled={isCheckingEmail || isLoading || !formData.email}
className="check-button"
>
{isCheckingEmail ? "확인중..." : "중복확인"}
</button>
</div>
{emailAvailable === true && <span className="success-message">사용 가능한 이메일입니다.</span>}
{errors.email && <span className="error-message">{errors.email}</span>}
</div>
</div>
<div className="form-row">
<div className="form-group">
<label htmlFor="password">비밀번호 *</label>
<input
type="password"
id="password"
name="password"
value={formData.password}
onChange={handleInputChange}
placeholder="8~20자, 영문/숫자/특수기호 포함"
maxLength={20}
disabled={isLoading}
/>
{errors.password && <span className="error-message">{errors.password}</span>}
</div>
</div>
<div className="form-row">
<div className="form-group">
<label htmlFor="confirmPassword">비밀번호 확인 *</label>
<input
type="password"
id="confirmPassword"
name="confirmPassword"
value={formData.confirmPassword}
onChange={handleInputChange}
placeholder="비밀번호를 다시 입력하세요"
maxLength={20}
disabled={isLoading}
/>
{errors.confirmPassword && <span className="error-message">{errors.confirmPassword}</span>}
</div>
</div>
<div className="form-row">
<div className="form-group">
<label htmlFor="pswdHnt">비밀번호 힌트 *</label>
<input
type="text"
id="pswdHnt"
name="pswdHnt"
value={formData.pswdHnt}
onChange={handleInputChange}
placeholder="비밀번호 힌트를 입력하세요"
maxLength={10}
disabled={isLoading}
/>
{errors.pswdHnt && <span className="error-message">{errors.pswdHnt}</span>}
</div>
</div>
<div className="form-row">
<div className="form-group">
<label htmlFor="pswdAns">비밀번호 답변</label>
<input
type="text"
id="pswdAns"
name="pswdAns"
value={formData.pswdAns}
onChange={handleInputChange}
placeholder="비밀번호 답변을 입력하세요"
maxLength={100}
disabled={isLoading}
/>
{errors.pswdAns && <span className="error-message">{errors.pswdAns}</span>}
</div>
</div>
</div>
<div className="form-section">
<h3>연락처 정보</h3>
<div className="form-row">
<div className="form-group">
<label htmlFor="mphn">휴대폰 번호</label>
<input
type="tel"
id="mphn"
name="mphn"
value={formData.mphn}
onChange={handleInputChange}
placeholder="휴대폰 번호를 입력하세요"
maxLength={11}
disabled={isLoading}
/>
{errors.mphn && <span className="error-message">{errors.mphn}</span>}
</div>
</div>
<div className="form-row">
<div className="form-group">
<label htmlFor="telno">전화번호</label>
<input
type="tel"
id="telno"
name="telno"
value={formData.telno}
onChange={handleInputChange}
placeholder="전화번호를 입력하세요"
maxLength={11}
disabled={isLoading}
/>
{errors.telno && <span className="error-message">{errors.telno}</span>}
</div>
</div>
</div>
<div className="form-section">
<h3>주소 정보</h3>
<div className="form-row">
<div className="form-group">
<label htmlFor="zip">우편번호</label>
<input
type="text"
id="zip"
name="zip"
value={formData.zip}
onChange={handleInputChange}
placeholder="우편번호를 입력하세요"
maxLength={5}
disabled={isLoading}
/>
{errors.zip && <span className="error-message">{errors.zip}</span>}
</div>
</div>
<div className="form-row">
<div className="form-group">
<label htmlFor="addr">주소</label>
<input
type="text"
id="addr"
name="addr"
value={formData.addr}
onChange={handleInputChange}
placeholder="주소를 입력하세요"
maxLength={200}
disabled={isLoading}
/>
{errors.addr && <span className="error-message">{errors.addr}</span>}
</div>
</div>
<div className="form-row">
<div className="form-group">
<label htmlFor="daddr">상세주소</label>
<input
type="text"
id="daddr"
name="daddr"
value={formData.daddr}
onChange={handleInputChange}
placeholder="상세주소를 입력하세요"
maxLength={200}
disabled={isLoading}
/>
{errors.daddr && <span className="error-message">{errors.daddr}</span>}
</div>
</div>
</div>
<div className="form-section">
<h3>기관 정보</h3>
<div className="form-row">
<div className="form-group">
<label htmlFor="laeSeCd">법인구분 *</label>
<select
id="laeSeCd"
name="laeSeCd"
value={formData.laeSeCd}
onChange={handleInputChange}
disabled={isLoading}
>
<option value="">법인구분을 선택하세요</option>
<option value="01">공공기관</option>
<option value="02">민간기업</option>
<option value="03">개인</option>
</select>
{errors.laeSeCd && <span className="error-message">{errors.laeSeCd}</span>}
</div>
</div>
<div className="form-row">
<div className="form-group">
<label htmlFor="ogdpSeCd">기관구분 *</label>
<select
id="ogdpSeCd"
name="ogdpSeCd"
value={formData.ogdpSeCd}
onChange={handleInputChange}
disabled={isLoading}
>
<option value="">기관구분을 선택하세요</option>
<option value="01">환경부</option>
<option value="02">지방자치단체</option>
<option value="03">공공기관</option>
<option value="04">민간기업</option>
</select>
{errors.ogdpSeCd && <span className="error-message">{errors.ogdpSeCd}</span>}
</div>
</div>
<div className="form-row">
<div className="form-group">
<label htmlFor="instSeCd">기관코드</label>
<input
type="text"
id="instSeCd"
name="instSeCd"
value={formData.instSeCd}
onChange={handleInputChange}
placeholder="기관코드를 입력하세요"
maxLength={10}
disabled={isLoading}
/>
{errors.instSeCd && <span className="error-message">{errors.instSeCd}</span>}
</div>
</div>
<div className="form-row">
<div className="form-group">
<label htmlFor="dtlInstCd">상세기관코드</label>
<input
type="text"
id="dtlInstCd"
name="dtlInstCd"
value={formData.dtlInstCd}
onChange={handleInputChange}
placeholder="상세기관코드를 입력하세요"
maxLength={10}
disabled={isLoading}
/>
{errors.dtlInstCd && <span className="error-message">{errors.dtlInstCd}</span>}
</div>
</div>
</div>
{errors.submit && (
<div className="form-row">
<div className="error-message submit-error">{errors.submit}</div>
</div>
)}
<div className="form-actions">
<button
type="button"
onClick={() => setCurrentStep('agreement')}
className="back-button"
disabled={isLoading}
>
이전
</button>
<button
type="button"
onClick={onClose}
className="cancel-button"
disabled={isLoading}
>
취소
</button>
<button
type="submit"
className="submit-button"
disabled={isLoading}
>
{isLoading ? "가입 중..." : "회원가입"}
</button>
</div>
</form>
)}
</div>
</div>
);
}
export default SignupModal;
@@ -0,0 +1,901 @@
"use client";
import React, { useState, useEffect } from "react";
import { SignupClient } from "@/shared/api/signup-client";
import { BASE_URL, ENDPOINT } from "@/shared/config";
import "./user-signup-modal.css";
interface UserSignupModalProps {
open: boolean;
onClose: () => void;
onSuccess: () => void;
}
interface UserSignupData {
userId: string;
userName: string;
email?: string;
password: string;
pswdHnt: string;
pswdAns?: string;
mphn?: string;
telno?: string;
zip?: string;
addr?: string;
daddr?: string;
laeSeCd: string;
ogdpSeCd: string;
instSeCd?: string;
dtlInstCd?: string;
enoCd?: string;
}
// 익명 사용자용 CodeSelect 컴포넌트
interface AnonymousCodeSelectProps {
upCd: string;
value: string;
onValueChange: (value: string) => void;
disabled?: boolean;
placeholder?: string;
}
function AnonymousCodeSelect({
upCd,
value,
onValueChange,
disabled,
placeholder = "선택",
}: AnonymousCodeSelectProps) {
const [codes, setCodes] = useState<
Array<{ lwpoCd: string; lwpoCdNm: string }>
>([]);
const [isLoading, setIsLoading] = useState(false);
useEffect(() => {
const fetchCodes = async () => {
if (!upCd) return;
setIsLoading(true);
try {
const signupClient = SignupClient.getInstance({
baseURL: BASE_URL,
});
const response = await signupClient.get(
`${ENDPOINT.CMS_SERVICE.CODE}/${upCd}`,
);
if (response.data && Array.isArray(response.data)) {
setCodes(response.data);
} else {
setCodes([]);
}
} catch (error) {
console.error(`공통 코드 로드 실패 (${upCd}):`, error);
setCodes([]);
} finally {
setIsLoading(false);
}
};
fetchCodes();
}, [upCd]);
return (
<select
value={value}
onChange={(e) => onValueChange(e.target.value)}
disabled={disabled || isLoading}
className="user-signup-select"
>
<option value="">{isLoading ? "로딩 중..." : placeholder}</option>
{codes.map((code) => (
<option key={code.lwpoCd} value={code.lwpoCd}>
{code.lwpoCdNm}
</option>
))}
</select>
);
}
function UserSignupModal({ open, onClose, onSuccess }: UserSignupModalProps) {
const [currentStep, setCurrentStep] = useState<"agreement" | "signup">(
"agreement",
);
const [agreed, setAgreed] = useState(false);
const [formData, setFormData] = useState({
userId: "",
userName: "",
email: "",
password: "",
confirmPassword: "",
pswdHnt: "",
pswdAns: "",
mphn: "",
telno: "",
zip: "",
addr: "",
daddr: "",
laeSeCd: "",
ogdpSeCd: "",
instSeCd: "",
dtlInstCd: "",
enoCd: "",
});
const [errors, setErrors] = useState<Record<string, string>>({});
const [isLoading, setIsLoading] = useState(false);
const [isCheckingId, setIsCheckingId] = useState(false);
const [isCheckingEmail, setIsCheckingEmail] = useState(false);
const [idAvailable, setIdAvailable] = useState<boolean | null>(null);
const [emailAvailable, setEmailAvailable] = useState<boolean | null>(null);
// 모달이 닫힐 때 초기화
useEffect(() => {
if (!open) {
setCurrentStep("agreement");
setAgreed(false);
setFormData({
userId: "",
userName: "",
email: "",
password: "",
confirmPassword: "",
pswdHnt: "",
pswdAns: "",
mphn: "",
telno: "",
zip: "",
addr: "",
daddr: "",
laeSeCd: "",
ogdpSeCd: "",
instSeCd: "",
dtlInstCd: "",
enoCd: "",
});
setErrors({});
setIdAvailable(null);
setEmailAvailable(null);
}
}, [open]);
const handleAgreementChange = (e: React.ChangeEvent<HTMLInputElement>) => {
setAgreed(e.target.checked);
};
const handleNextStep = () => {
if (agreed) {
setCurrentStep("signup");
}
};
const handleInputChange = (
e: React.ChangeEvent<HTMLInputElement | HTMLSelectElement>,
) => {
const { name, value } = e.target;
setFormData((prev) => ({ ...prev, [name]: value }));
// 에러 초기화
if (errors[name]) {
setErrors((prev) => ({ ...prev, [name]: "" }));
}
};
const validateForm = () => {
const newErrors: Record<string, string> = {};
console.log("폼 검증 시작:", formData);
// 필수 필드 검증
if (!formData.userId) newErrors.userId = "아이디를 입력해주세요.";
if (!formData.userName) newErrors.userName = "이름을 입력해주세요.";
if (!formData.password) newErrors.password = "비밀번호를 입력해주세요.";
if (!formData.confirmPassword)
newErrors.confirmPassword = "비밀번호 확인을 입력해주세요.";
if (!formData.pswdHnt) newErrors.pswdHnt = "비밀번호 힌트를 선택해주세요.";
if (!formData.laeSeCd) newErrors.laeSeCd = "법인구분을 선택해주세요.";
if (!formData.ogdpSeCd) newErrors.ogdpSeCd = "기관구분을 선택해주세요.";
// 비밀번호 확인
if (
formData.password &&
formData.confirmPassword &&
formData.password !== formData.confirmPassword
) {
newErrors.confirmPassword = "비밀번호가 일치하지 않습니다.";
}
// 비밀번호 정규식 검증
const passwordRegex =
/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[!@#$%^&*()_+\-=[\]{};':"\\|,.<>/?]).{8,20}$/;
if (formData.password && !passwordRegex.test(formData.password)) {
newErrors.password =
"비밀번호는 8~20자, 영문/숫자/특수기호를 모두 포함해야 합니다.";
}
// 이메일 형식 검증
if (formData.email && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(formData.email)) {
newErrors.email = "올바른 이메일 형식을 입력해주세요.";
}
// 중복 체크 검증
if (idAvailable === false)
newErrors.userId = "이미 사용 중인 아이디입니다.";
if (emailAvailable === false)
newErrors.email = "이미 사용 중인 이메일입니다.";
setErrors(newErrors);
const isValid = Object.keys(newErrors).length === 0;
console.log("폼 검증 결과:", { isValid, errors: newErrors, formData });
return isValid;
};
const checkUserIdDuplicate = async () => {
if (!formData.userId) {
setErrors((prev) => ({ ...prev, userId: "아이디를 입력해주세요." }));
return;
}
setIsCheckingId(true);
try {
const signupClient = SignupClient.getInstance({
baseURL: BASE_URL,
});
const response = await signupClient.post<boolean>(
`${ENDPOINT.USER_SERVICE.USERS}/existsUserId`,
{ userId: formData.userId },
);
const exists = response.data;
setIdAvailable(!exists);
if (exists) {
setErrors((prev) => ({
...prev,
userId: "이미 사용 중인 아이디입니다.",
}));
} else {
setErrors((prev) => ({ ...prev, userId: "" }));
}
} catch (error) {
console.error("아이디 중복 체크 오류:", error);
setErrors((prev) => ({
...prev,
userId: "아이디 중복 체크 중 오류가 발생했습니다.",
}));
} finally {
setIsCheckingId(false);
}
};
const checkEmailDuplicate = async () => {
if (!formData.email) {
setErrors((prev) => ({ ...prev, email: "이메일을 입력해주세요." }));
return;
}
setIsCheckingEmail(true);
try {
const signupClient = SignupClient.getInstance({
baseURL: BASE_URL,
});
const response = await signupClient.post<boolean>(
`${ENDPOINT.USER_SERVICE.USERS}/exists`,
{ email: formData.email },
);
const exists = response.data;
setEmailAvailable(!exists);
if (exists) {
setErrors((prev) => ({
...prev,
email: "이미 사용 중인 이메일입니다.",
}));
} else {
setErrors((prev) => ({ ...prev, email: "" }));
}
} catch (error) {
console.error("이메일 중복 체크 오류:", error);
setErrors((prev) => ({
...prev,
email: "이메일 중복 체크 중 오류가 발생했습니다.",
}));
} finally {
setIsCheckingEmail(false);
}
};
const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault();
console.log("회원가입 버튼 클릭됨 - handleSubmit");
console.log("현재 폼 데이터:", formData);
if (!validateForm()) {
console.log("폼 검증 실패");
return;
}
console.log("폼 검증 성공, 회원가입 API 호출 시작");
setIsLoading(true);
try {
const signupData: UserSignupData = {
userId: formData.userId,
userName: formData.userName,
email: formData.email || undefined,
password: formData.password,
pswdHnt: formData.pswdHnt,
pswdAns: formData.pswdAns || undefined,
mphn: formData.mphn || undefined,
telno: formData.telno || undefined,
zip: formData.zip || undefined,
addr: formData.addr || undefined,
daddr: formData.daddr || undefined,
laeSeCd: formData.laeSeCd,
ogdpSeCd: formData.ogdpSeCd,
instSeCd: formData.instSeCd || undefined,
dtlInstCd: formData.dtlInstCd || undefined,
enoCd: formData.enoCd || undefined,
};
// SignupClient를 통해 익명사용자 회원가입 API 호출
console.log("SignupClient 생성 및 API 호출:", {
baseURL: BASE_URL,
endpoint: ENDPOINT.USER_SERVICE.USER_JOIN,
data: signupData,
});
const signupClient = SignupClient.getInstance({
baseURL: BASE_URL,
});
const response = await signupClient.post(
ENDPOINT.USER_SERVICE.USER_JOIN,
signupData,
);
console.log("회원가입 성공:", response.data);
// 성공 시 모달 닫기 및 콜백 호출
onSuccess();
onClose();
// 폼 초기화
setFormData({
userId: "",
userName: "",
email: "",
password: "",
confirmPassword: "",
pswdHnt: "",
pswdAns: "",
mphn: "",
telno: "",
zip: "",
addr: "",
daddr: "",
laeSeCd: "",
ogdpSeCd: "",
instSeCd: "",
dtlInstCd: "",
enoCd: "",
});
setErrors({});
setIdAvailable(null);
setEmailAvailable(null);
} catch (error: unknown) {
console.error("회원가입 오류:", error);
if (error instanceof Error) {
setErrors((prev) => ({ ...prev, submit: error.message }));
} else {
setErrors((prev) => ({ ...prev, submit: "회원가입에 실패했습니다." }));
}
} finally {
setIsLoading(false);
}
};
if (!open) return null;
return (
<div className="user-signup-modal-overlay">
<div className="user-signup-modal-content">
<div className="user-signup-modal-header">
<h2>
{currentStep === "agreement" ? "개인정보제공동의" : "회원가입"}
</h2>
<button className="user-signup-close-button" onClick={onClose}>
×
</button>
</div>
{currentStep === "agreement" ? (
<div className="user-signup-agreement-content">
<div className="user-signup-agreement-text">
<h3>개인정보 수집 및 이용 동의</h3>
<p>회원가입을 위해 다음과 같이 개인정보를 수집 및 이용합니다.</p>
<h4>1. 수집하는 개인정보 항목</h4>
<ul>
<li>
필수항목: 아이디, 이름, 비밀번호, 비밀번호 힌트, 법인구분,
기관구분
</li>
<li>
선택항목: 이메일, 휴대폰번호, 전화번호, 주소, 기관코드,
상세기관코드, 사업자등록번호
</li>
</ul>
<h4>2. 개인정보의 수집 및 이용목적</h4>
<ul>
<li>회원가입 및 관리</li>
<li>서비스 제공 및 운영</li>
<li>고객상담 및 문의응답</li>
</ul>
<h4>3. 개인정보의 보유 및 이용기간</h4>
<p>
회원탈퇴 시까지 (단, 관련 법령에 따라 보존이 필요한 경우 해당
기간까지)
</p>
<h4>4. 동의 거부권 및 거부 시 불이익</h4>
<p>
개인정보 수집 및 이용에 대한 동의를 거부할 수 있으며, 동의 거부
시 회원가입이 제한됩니다.
</p>
</div>
<div className="user-signup-agreement-checkbox">
<label>
<input
type="checkbox"
checked={agreed}
onChange={handleAgreementChange}
/>
<span>개인정보 수집 및 이용에 동의합니다.</span>
</label>
</div>
<div className="user-signup-agreement-actions">
<button
type="button"
onClick={onClose}
className="user-signup-cancel-button"
>
취소
</button>
<button
type="button"
onClick={handleNextStep}
className="user-signup-next-button"
disabled={!agreed}
>
다음
</button>
</div>
</div>
) : (
<form onSubmit={handleSubmit} className="user-signup-form">
<div className="user-signup-form-section">
<h3>기본 정보</h3>
<div className="user-signup-form-row">
<div className="user-signup-form-group">
<label htmlFor="userId">아이디 *</label>
<div className="user-signup-input-with-button">
<input
type="text"
id="userId"
name="userId"
value={formData.userId}
onChange={handleInputChange}
placeholder="아이디를 입력하세요"
maxLength={12}
disabled={isLoading}
/>
<button
type="button"
onClick={checkUserIdDuplicate}
disabled={isCheckingId || isLoading || !formData.userId}
className="user-signup-check-button"
>
{isCheckingId ? "확인중..." : "중복확인"}
</button>
</div>
{idAvailable === true && (
<span className="user-signup-success-message">
사용 가능한 아이디입니다.
</span>
)}
{errors.userId && (
<span className="user-signup-error-message">
{errors.userId}
</span>
)}
</div>
</div>
<div className="user-signup-form-row">
<div className="user-signup-form-group">
<label htmlFor="userName">이름 *</label>
<input
type="text"
id="userName"
name="userName"
value={formData.userName}
onChange={handleInputChange}
placeholder="이름을 입력하세요"
disabled={isLoading}
/>
{errors.userName && (
<span className="user-signup-error-message">
{errors.userName}
</span>
)}
</div>
</div>
<div className="user-signup-form-row">
<div className="user-signup-form-group">
<label htmlFor="email">이메일</label>
<div className="user-signup-input-with-button">
<input
type="email"
id="email"
name="email"
value={formData.email}
onChange={handleInputChange}
placeholder="이메일을 입력하세요"
disabled={isLoading}
/>
<button
type="button"
onClick={checkEmailDuplicate}
disabled={isCheckingEmail || isLoading || !formData.email}
className="user-signup-check-button"
>
{isCheckingEmail ? "확인중..." : "중복확인"}
</button>
</div>
{emailAvailable === true && (
<span className="user-signup-success-message">
사용 가능한 이메일입니다.
</span>
)}
{errors.email && (
<span className="user-signup-error-message">
{errors.email}
</span>
)}
</div>
</div>
<div className="user-signup-form-row">
<div className="user-signup-form-group">
<label htmlFor="password">비밀번호 *</label>
<input
type="password"
id="password"
name="password"
value={formData.password}
onChange={handleInputChange}
placeholder="8~20자, 영문/숫자/특수기호 포함"
maxLength={20}
disabled={isLoading}
/>
{errors.password && (
<span className="user-signup-error-message">
{errors.password}
</span>
)}
</div>
</div>
<div className="user-signup-form-row">
<div className="user-signup-form-group">
<label htmlFor="confirmPassword">비밀번호 확인 *</label>
<input
type="password"
id="confirmPassword"
name="confirmPassword"
value={formData.confirmPassword}
onChange={handleInputChange}
placeholder="비밀번호를 다시 입력하세요"
maxLength={20}
disabled={isLoading}
/>
{errors.confirmPassword && (
<span className="user-signup-error-message">
{errors.confirmPassword}
</span>
)}
</div>
</div>
<div className="user-signup-form-row">
<div className="user-signup-form-group">
<label htmlFor="pswdHnt">비밀번호 힌트 *</label>
<AnonymousCodeSelect
upCd="PSWDHNT"
value={formData.pswdHnt}
onValueChange={(value: string) =>
setFormData((prev) => ({ ...prev, pswdHnt: value }))
}
disabled={isLoading}
placeholder="비밀번호 힌트를 선택하세요"
/>
{errors.pswdHnt && (
<span className="user-signup-error-message">
{errors.pswdHnt}
</span>
)}
</div>
</div>
<div className="user-signup-form-row">
<div className="user-signup-form-group">
<label htmlFor="pswdAns">비밀번호 답변</label>
<input
type="text"
id="pswdAns"
name="pswdAns"
value={formData.pswdAns}
onChange={handleInputChange}
placeholder="비밀번호 답변을 입력하세요"
maxLength={100}
disabled={isLoading}
/>
{errors.pswdAns && (
<span className="user-signup-error-message">
{errors.pswdAns}
</span>
)}
</div>
</div>
</div>
<div className="user-signup-form-section">
<h3>연락처 정보</h3>
<div className="user-signup-form-row">
<div className="user-signup-form-group">
<label htmlFor="mphn">휴대폰 번호</label>
<input
type="tel"
id="mphn"
name="mphn"
value={formData.mphn}
onChange={handleInputChange}
placeholder="휴대폰 번호를 입력하세요"
maxLength={11}
disabled={isLoading}
/>
{errors.mphn && (
<span className="user-signup-error-message">
{errors.mphn}
</span>
)}
</div>
</div>
<div className="user-signup-form-row">
<div className="user-signup-form-group">
<label htmlFor="telno">전화번호</label>
<input
type="tel"
id="telno"
name="telno"
value={formData.telno}
onChange={handleInputChange}
placeholder="전화번호를 입력하세요"
maxLength={11}
disabled={isLoading}
/>
{errors.telno && (
<span className="user-signup-error-message">
{errors.telno}
</span>
)}
</div>
</div>
</div>
<div className="user-signup-form-section">
<h3>주소 정보</h3>
<div className="user-signup-form-row">
<div className="user-signup-form-group">
<label htmlFor="zip">우편번호</label>
<input
type="text"
id="zip"
name="zip"
value={formData.zip}
onChange={handleInputChange}
placeholder="우편번호를 입력하세요"
maxLength={5}
disabled={isLoading}
/>
{errors.zip && (
<span className="user-signup-error-message">
{errors.zip}
</span>
)}
</div>
</div>
<div className="user-signup-form-row">
<div className="user-signup-form-group">
<label htmlFor="addr">주소</label>
<input
type="text"
id="addr"
name="addr"
value={formData.addr}
onChange={handleInputChange}
placeholder="주소를 입력하세요"
maxLength={200}
disabled={isLoading}
/>
{errors.addr && (
<span className="user-signup-error-message">
{errors.addr}
</span>
)}
</div>
</div>
<div className="user-signup-form-row">
<div className="user-signup-form-group">
<label htmlFor="daddr">상세주소</label>
<input
type="text"
id="daddr"
name="daddr"
value={formData.daddr}
onChange={handleInputChange}
placeholder="상세주소를 입력하세요"
maxLength={200}
disabled={isLoading}
/>
{errors.daddr && (
<span className="user-signup-error-message">
{errors.daddr}
</span>
)}
</div>
</div>
</div>
<div className="user-signup-form-section">
<h3>기관 정보</h3>
<div className="user-signup-form-row">
<div className="user-signup-form-group">
<label htmlFor="laeSeCd">법인구분 *</label>
<AnonymousCodeSelect
upCd="LAESECD"
value={formData.laeSeCd}
onValueChange={(value: string) =>
setFormData((prev) => ({ ...prev, laeSeCd: value }))
}
disabled={isLoading}
placeholder="법인구분을 선택하세요"
/>
{errors.laeSeCd && (
<span className="user-signup-error-message">
{errors.laeSeCd}
</span>
)}
</div>
</div>
<div className="user-signup-form-row">
<div className="user-signup-form-group">
<label htmlFor="ogdpSeCd">기관구분 *</label>
<AnonymousCodeSelect
upCd="OGDPSECD"
value={formData.ogdpSeCd}
onValueChange={(value: string) =>
setFormData((prev) => ({ ...prev, ogdpSeCd: value }))
}
disabled={isLoading}
placeholder="기관구분을 선택하세요"
/>
{errors.ogdpSeCd && (
<span className="user-signup-error-message">
{errors.ogdpSeCd}
</span>
)}
</div>
</div>
<div className="user-signup-form-row">
<div className="user-signup-form-group">
<label htmlFor="instSeCd">기관코드</label>
<input
type="text"
id="instSeCd"
name="instSeCd"
value={formData.instSeCd}
onChange={handleInputChange}
placeholder="기관코드를 입력하세요"
maxLength={10}
disabled={isLoading}
/>
{errors.instSeCd && (
<span className="user-signup-error-message">
{errors.instSeCd}
</span>
)}
</div>
</div>
<div className="user-signup-form-row">
<div className="user-signup-form-group">
<label htmlFor="dtlInstCd">상세기관코드</label>
<input
type="text"
id="dtlInstCd"
name="dtlInstCd"
value={formData.dtlInstCd}
onChange={handleInputChange}
placeholder="상세기관코드를 입력하세요"
maxLength={10}
disabled={isLoading}
/>
{errors.dtlInstCd && (
<span className="user-signup-error-message">
{errors.dtlInstCd}
</span>
)}
</div>
</div>
</div>
{errors.submit && (
<div className="user-signup-form-row">
<div className="user-signup-error-message user-signup-submit-error">
{errors.submit}
</div>
</div>
)}
<div className="user-signup-form-actions">
<button
type="button"
onClick={() => setCurrentStep("agreement")}
className="user-signup-back-button"
disabled={isLoading}
>
이전
</button>
<button
type="button"
onClick={onClose}
className="user-signup-cancel-button"
disabled={isLoading}
>
취소
</button>
<button
type="submit"
className="user-signup-submit-button"
disabled={isLoading}
onClick={(e) => {
e.preventDefault();
console.log("회원가입 버튼 클릭됨 - onClick");
handleSubmit(e);
}}
>
{isLoading ? "가입 중..." : "회원가입"}
</button>
</div>
</form>
)}
</div>
</div>
);
}
export default UserSignupModal;
@@ -7,6 +7,7 @@ import { LoginApi } from "@/entities/auth";
import { ENDPOINT } from "@/shared/config";
import OtpModal from "./OtpModal";
import TwoFAModal from "./TwoFAModal";
import UserSignupModal from "./UserSignupModal";
import "./login.css";
import { useRouter } from "next/navigation";
@@ -14,8 +15,10 @@ function LoginPage() {
const [isOtpEnabled, setIsOtpEnabled] = useState(false);
const [showOtpModal, setShowOtpModal] = useState(false);
const [showTwoFAModal, setShowTwoFAModal] = useState(false);
const [showSignupModal, setShowSignupModal] = useState(false);
const [isLoading, setIsLoading] = useState(false);
const [error, setError] = useState("");
const [successMessage, setSuccessMessage] = useState("");
const router = useRouter();
// 모달 상태 디버깅
@@ -27,6 +30,7 @@ function LoginPage() {
e.preventDefault();
setIsLoading(true);
setError("");
setSuccessMessage("");
try {
const formData = new FormData(e.target as HTMLFormElement);
@@ -123,6 +127,18 @@ function LoginPage() {
localStorage.removeItem("tempToken");
};
const handleSignupSuccess = () => {
console.log("회원가입 성공");
setError(""); // 에러 메시지 초기화
setSuccessMessage("회원가입이 완료되었습니다. 로그인해주세요.");
};
const handleSignupClose = () => {
console.log("회원가입 모달 닫기");
setShowSignupModal(false);
setSuccessMessage(""); // 성공 메시지 초기화
};
return (
<>
<div className="login fx">
@@ -214,6 +230,28 @@ function LoginPage() {
{error}
</div>
)}
{successMessage && (
<div className="success-message" style={{ color: "green", textAlign: "center", marginTop: "10px" }}>
{successMessage}
</div>
)}
<div className="signup-link" style={{ textAlign: "center", marginTop: "15px" }}>
<span style={{ color: "#666", fontSize: "14px" }}>계정이 없으신가요? </span>
<button
type="button"
onClick={() => setShowSignupModal(true)}
style={{
background: "none",
border: "none",
color: "#3b82f6",
textDecoration: "underline",
cursor: "pointer",
fontSize: "14px"
}}
>
회원가입
</button>
</div>
<div className="footer">
<div className="copy fx">
<p>copyright © 2023 KECO. All rights reserved.</p>
@@ -269,6 +307,13 @@ function LoginPage() {
open={showTwoFAModal}
onOpenChange={setShowTwoFAModal}
/>
{/* 회원가입 모달 */}
<UserSignupModal
onClose={handleSignupClose}
onSuccess={handleSignupSuccess}
open={showSignupModal}
/>
</>
);
}
@@ -0,0 +1,277 @@
/* 모달 오버레이 */
.modal-overlay {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
justify-content: center;
align-items: center;
z-index: 1000;
padding: 20px;
}
/* 모달 컨텐츠 */
.modal-content {
background: white;
border-radius: 8px;
box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
max-width: 800px;
width: 100%;
max-height: 90vh;
overflow-y: auto;
position: relative;
}
/* 모달 헤더 */
.modal-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 20px 24px;
border-bottom: 1px solid #e5e7eb;
background-color: #f9fafb;
border-radius: 8px 8px 0 0;
}
.modal-header h2 {
margin: 0;
font-size: 1.8rem;
font-weight: 600;
color: #1f2937;
}
.close-button {
background: none;
border: none;
font-size: 1.5rem;
cursor: pointer;
color: #6b7280;
padding: 4px;
border-radius: 4px;
transition: color 0.2s;
}
.close-button:hover {
color: #374151;
}
/* 폼 스타일 */
.signup-form {
padding: 24px;
}
.form-section {
margin-bottom: 32px;
}
.form-section h3 {
margin: 0 0 16px 0;
font-size: 1.4rem;
font-weight: 600;
color: #374151;
padding-bottom: 8px;
border-bottom: 2px solid #e5e7eb;
}
.form-row {
margin-bottom: 16px;
}
.form-group {
display: flex;
flex-direction: column;
}
.form-group label {
margin-bottom: 6px;
font-weight: 500;
color: #374151;
font-size: 1.1rem;
}
.form-group input,
.form-group select {
padding: 12px 14px;
border: 1px solid #d1d5db;
border-radius: 6px;
font-size: 1.1rem;
transition: border-color 0.2s, box-shadow 0.2s;
background-color: white;
}
.form-group input:focus,
.form-group select:focus {
outline: none;
border-color: #3b82f6;
box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
}
.form-group input:disabled,
.form-group select:disabled {
background-color: #f3f4f6;
color: #6b7280;
cursor: not-allowed;
}
/* 입력 필드와 버튼이 함께 있는 경우 */
.input-with-button {
display: flex;
gap: 8px;
align-items: flex-end;
}
.input-with-button input {
flex: 1;
}
.check-button {
padding: 10px 16px;
background-color: #6b7280;
color: white;
border: none;
border-radius: 6px;
font-size: 0.8rem;
font-weight: 500;
cursor: pointer;
transition: background-color 0.2s;
white-space: nowrap;
min-width: 80px;
}
.check-button:hover:not(:disabled) {
background-color: #4b5563;
}
.check-button:disabled {
background-color: #d1d5db;
cursor: not-allowed;
}
/* 메시지 스타일 */
.error-message {
color: #dc2626;
font-size: 0.8rem;
margin-top: 4px;
display: block;
}
.success-message {
color: #059669;
font-size: 0.8rem;
margin-top: 4px;
display: block;
}
.submit-error {
background-color: #fef2f2;
border: 1px solid #fecaca;
color: #dc2626;
padding: 12px;
border-radius: 6px;
margin-bottom: 16px;
text-align: center;
}
/* 폼 액션 버튼 */
.form-actions {
display: flex;
gap: 12px;
justify-content: flex-end;
padding-top: 20px;
border-top: 1px solid #e5e7eb;
margin-top: 24px;
}
.cancel-button,
.submit-button {
padding: 12px 24px;
border-radius: 6px;
font-weight: 500;
font-size: 0.9rem;
cursor: pointer;
transition: all 0.2s;
border: none;
min-width: 100px;
}
.cancel-button {
background-color: #f3f4f6;
color: #374151;
border: 1px solid #d1d5db;
}
.cancel-button:hover:not(:disabled) {
background-color: #e5e7eb;
}
.submit-button {
background-color: #3b82f6;
color: white;
}
.submit-button:hover:not(:disabled) {
background-color: #2563eb;
}
.cancel-button:disabled,
.submit-button:disabled {
opacity: 0.6;
cursor: not-allowed;
}
/* 반응형 디자인 */
@media (max-width: 768px) {
.modal-content {
margin: 10px;
max-height: 95vh;
}
.modal-header {
padding: 16px 20px;
}
.signup-form {
padding: 20px;
}
.form-actions {
flex-direction: column;
}
.cancel-button,
.submit-button {
width: 100%;
}
.input-with-button {
flex-direction: column;
align-items: stretch;
}
.check-button {
width: 100%;
margin-top: 8px;
}
}
/* 스크롤바 스타일 */
.modal-content::-webkit-scrollbar {
width: 6px;
}
.modal-content::-webkit-scrollbar-track {
background: #f1f1f1;
border-radius: 3px;
}
.modal-content::-webkit-scrollbar-thumb {
background: #c1c1c1;
border-radius: 3px;
}
.modal-content::-webkit-scrollbar-thumb:hover {
background: #a8a8a8;
}
@@ -0,0 +1,436 @@
/* 신규 사용자 가입 모달 오버레이 */
.user-signup-modal-overlay {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
justify-content: center;
align-items: center;
z-index: 1000;
padding: 20px;
}
/* 신규 사용자 가입 모달 컨텐츠 */
.user-signup-modal-content {
background: white;
border-radius: 8px;
box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
max-width: 800px;
width: 100%;
max-height: 90vh;
overflow-y: auto;
position: relative;
}
/* 신규 사용자 가입 모달 헤더 */
.user-signup-modal-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 20px 24px;
border-bottom: 1px solid #e5e7eb;
background-color: #f9fafb;
border-radius: 8px 8px 0 0;
}
.user-signup-modal-header h2 {
margin: 0;
font-size: 1.8rem;
font-weight: 600;
color: #1f2937;
}
.user-signup-close-button {
background: none;
border: none;
font-size: 1.5rem;
cursor: pointer;
color: #6b7280;
padding: 4px;
border-radius: 4px;
transition: color 0.2s;
}
.user-signup-close-button:hover {
color: #374151;
}
/* 신규 사용자 가입 폼 스타일 */
.user-signup-form {
padding: 24px;
}
.user-signup-form-section {
margin-bottom: 32px;
}
.user-signup-form-section h3 {
margin: 0 0 16px 0;
font-size: 1.4rem;
font-weight: 600;
color: #374151;
padding-bottom: 8px;
border-bottom: 2px solid #e5e7eb;
}
.user-signup-form-row {
margin-bottom: 16px;
}
.user-signup-form-group {
display: flex;
flex-direction: column;
}
.user-signup-form-group label {
margin-bottom: 6px;
font-weight: 500;
color: #374151;
font-size: 1.1rem;
}
.user-signup-form-group input,
.user-signup-form-group select {
padding: 12px 14px;
border: 1px solid #d1d5db;
border-radius: 6px;
font-size: 1.1rem;
transition: border-color 0.2s, box-shadow 0.2s;
background-color: white;
}
/* CodeSelect 컴포넌트 스타일링 */
.user-signup-form-group .CodeSelect {
width: 100%;
}
.user-signup-form-group .CodeSelect select {
width: 100%;
padding: 12px 14px;
border: 1px solid #d1d5db;
border-radius: 6px;
font-size: 1.1rem;
transition: border-color 0.2s, box-shadow 0.2s;
background-color: white;
}
.user-signup-form-group .CodeSelect select:focus {
outline: none;
border-color: #3b82f6;
box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
}
.user-signup-form-group .CodeSelect select:disabled {
background-color: #f3f4f6;
color: #6b7280;
cursor: not-allowed;
}
/* Select 요소 스타일링 */
.user-signup-select {
width: 100%;
padding: 12px 14px;
border: 1px solid #d1d5db;
border-radius: 6px;
font-size: 1.1rem;
transition: border-color 0.2s, box-shadow 0.2s;
background-color: white;
cursor: pointer;
}
.user-signup-select:focus {
outline: none;
border-color: #3b82f6;
box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
}
.user-signup-select:disabled {
background-color: #f3f4f6;
color: #6b7280;
cursor: not-allowed;
}
.user-signup-select option {
padding: 8px;
font-size: 1rem;
}
.user-signup-form-group input:focus,
.user-signup-form-group select:focus {
outline: none;
border-color: #3b82f6;
box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
}
.user-signup-form-group input:disabled,
.user-signup-form-group select:disabled {
background-color: #f3f4f6;
color: #6b7280;
cursor: not-allowed;
}
/* 입력 필드와 버튼이 함께 있는 경우 */
.user-signup-input-with-button {
display: flex;
gap: 8px;
align-items: flex-end;
}
.user-signup-input-with-button input {
flex: 1;
}
.user-signup-check-button {
padding: 10px 16px;
background-color: #6b7280;
color: white;
border: none;
border-radius: 6px;
font-size: 0.8rem;
font-weight: 500;
cursor: pointer;
transition: background-color 0.2s;
white-space: nowrap;
min-width: 80px;
}
.user-signup-check-button:hover:not(:disabled) {
background-color: #4b5563;
}
.user-signup-check-button:disabled {
background-color: #d1d5db;
cursor: not-allowed;
}
/* 메시지 스타일 */
.user-signup-error-message {
color: #dc2626;
font-size: 0.8rem;
margin-top: 4px;
display: block;
}
.user-signup-success-message {
color: #059669;
font-size: 0.8rem;
margin-top: 4px;
display: block;
}
.user-signup-submit-error {
background-color: #fef2f2;
border: 1px solid #fecaca;
color: #dc2626;
padding: 12px;
border-radius: 6px;
margin-bottom: 16px;
text-align: center;
}
/* 폼 액션 버튼 */
.user-signup-form-actions {
display: flex;
gap: 12px;
justify-content: flex-end;
padding-top: 20px;
border-top: 1px solid #e5e7eb;
margin-top: 24px;
}
.user-signup-cancel-button,
.user-signup-submit-button,
.user-signup-back-button {
padding: 12px 24px;
border-radius: 6px;
font-weight: 500;
font-size: 0.9rem;
cursor: pointer;
transition: all 0.2s;
border: none;
min-width: 100px;
}
.user-signup-cancel-button {
background-color: #f3f4f6;
color: #374151;
border: 1px solid #d1d5db;
}
.user-signup-cancel-button:hover:not(:disabled) {
background-color: #e5e7eb;
}
.user-signup-submit-button {
background-color: #3b82f6;
color: white;
}
.user-signup-submit-button:hover:not(:disabled) {
background-color: #2563eb;
}
.user-signup-back-button {
background-color: #6b7280;
color: white;
}
.user-signup-back-button:hover:not(:disabled) {
background-color: #4b5563;
}
.user-signup-cancel-button:disabled,
.user-signup-submit-button:disabled,
.user-signup-back-button:disabled {
opacity: 0.6;
cursor: not-allowed;
}
/* 개인정보제공동의 스타일 */
.user-signup-agreement-content {
padding: 24px;
}
.user-signup-agreement-text {
margin-bottom: 24px;
}
.user-signup-agreement-text h3 {
margin: 0 0 16px 0;
font-size: 1.4rem;
font-weight: 600;
color: #374151;
}
.user-signup-agreement-text h4 {
margin: 20px 0 8px 0;
font-size: 1.1rem;
font-weight: 600;
color: #374151;
}
.user-signup-agreement-text p {
margin: 8px 0;
color: #6b7280;
line-height: 1.5;
}
.user-signup-agreement-text ul {
margin: 8px 0;
padding-left: 20px;
color: #6b7280;
}
.user-signup-agreement-text li {
margin: 4px 0;
line-height: 1.5;
}
.user-signup-agreement-checkbox {
margin-bottom: 24px;
padding: 16px;
background-color: #f9fafb;
border-radius: 6px;
border: 1px solid #e5e7eb;
}
.user-signup-agreement-checkbox label {
display: flex;
align-items: center;
gap: 8px;
cursor: pointer;
font-weight: 500;
color: #374151;
}
.user-signup-agreement-checkbox input[type="checkbox"] {
width: 18px;
height: 18px;
margin: 0;
}
.user-signup-agreement-actions {
display: flex;
gap: 12px;
justify-content: flex-end;
}
.user-signup-next-button {
padding: 12px 24px;
background-color: #3b82f6;
color: white;
border: none;
border-radius: 6px;
font-weight: 500;
font-size: 0.9rem;
cursor: pointer;
transition: background-color 0.2s;
min-width: 100px;
}
.user-signup-next-button:hover:not(:disabled) {
background-color: #2563eb;
}
.user-signup-next-button:disabled {
background-color: #d1d5db;
cursor: not-allowed;
}
/* 반응형 디자인 */
@media (max-width: 768px) {
.user-signup-modal-content {
margin: 10px;
max-height: 95vh;
}
.user-signup-modal-header {
padding: 16px 20px;
}
.user-signup-form {
padding: 20px;
}
.user-signup-form-actions {
flex-direction: column;
}
.user-signup-cancel-button,
.user-signup-submit-button,
.user-signup-back-button {
width: 100%;
}
.user-signup-input-with-button {
flex-direction: column;
align-items: stretch;
}
.user-signup-check-button {
width: 100%;
margin-top: 8px;
}
}
/* 스크롤바 스타일 */
.user-signup-modal-content::-webkit-scrollbar {
width: 6px;
}
.user-signup-modal-content::-webkit-scrollbar-track {
background: #f1f1f1;
border-radius: 3px;
}
.user-signup-modal-content::-webkit-scrollbar-thumb {
background: #c1c1c1;
border-radius: 3px;
}
.user-signup-modal-content::-webkit-scrollbar-thumb:hover {
background: #a8a8a8;
}
@@ -29,7 +29,7 @@ function DashboardPage() {
if (!accessToken || !userId) {
console.log('No tokens found, redirecting to login');
setError('로그인이 필요합니다.');
router.push('/login');
router.push('/auth/login');
return;
}
@@ -49,7 +49,7 @@ function DashboardPage() {
if (error instanceof Error && error.message.includes('401')) {
setError('인증이 만료되었습니다. 다시 로그인해주세요.');
tokenManager.clearAuthToken();
router.push('/login');
router.push('/auth/login');
} else {
setError('네트워크 오류가 발생했습니다.');
}
@@ -65,7 +65,7 @@ function DashboardPage() {
localStorage.removeItem('tempToken');
// tokenManager를 통해 쿠키 정리
tokenManager.clearAuthToken();
router.push('/login');
router.push('/auth/logout');
};
const handleChangePassword = () => {
@@ -73,20 +73,68 @@ function DashboardPage() {
};
return (
<div className="max-w-md mx-auto mt-20 p-8 border rounded shadow">
<h2 className="text-2xl mb-6">대시보드</h2>
{error && <div className="text-red-500 mb-4">{error}</div>}
{userInfo ? (
<div className="mb-4">
<div><b>이메일:</b> {userInfo.email || userInfo.userId}</div>
<div><b>이름:</b> {userInfo.userName || '-'}</div>
<div><b>2FA 활성화:</b> {userInfo.twoFactorEnabled ? '예' : '아니오'}</div>
<div className="p-6">
<div className="flex flex-col gap-1">
{/* 첫번째 라인 */}
<div className="grid grid-cols-7 gap-1">
{/* 총 회원수 카드 */}
<div className="card card-border h-80 !p-0 col-span-2">
</div>
{/* 전체 게시물 카드 */}
<div className="card card-border h-80 !p-0 col-span-2">
</div>
{/* 오늘 접속자 수 카드 */}
<div className="card card-border h-80 !p-0 col-span-2">
</div>
{/* 사용자 정보 카드 */}
<div className="card card-border h-80 p-10 col-span-1">
<h2 className="text-2xl mb-6">사용자 정보</h2>
{error && <div className="text-red-500 mb-4">{error}</div>}
{userInfo ? (
<div className="mb-4">
<div><b>아이디:</b> {userInfo.userId}</div>
<div><b>이메일:</b> {userInfo.email || userInfo.userId}</div>
<div><b>이름:</b> {userInfo.userName || '-'}</div>
<div><b>2FA 활성화:</b> {userInfo.twoFactorEnabled ? '예' : '아니오'}</div>
</div>
) : (
!error && <div>사용자 정보를 불러오는 중...</div>
)}
<button className="btn w-full mb-2" onClick={handleLogout}>로그아웃</button>
<button className="btn w-full" onClick={handleChangePassword}>패스워드 변경</button>
</div>
</div>
) : (
!error && <div>사용자 정보를 불러오는 중...</div>
)}
<button className="btn w-full mb-2" onClick={handleLogout}>로그아웃</button>
<button className="btn w-full" onClick={handleChangePassword}>패스워드 변경</button>
{/* 두번째 라인 */}
<div className="grid grid-cols-2 gap-1">
<div className="card card-border h-80 p-10 col-span-1">
</div>
<div className="card card-border h-80 p-10 col-span-1">
</div>
</div>
{/* 세번째 라인 */}
<div className="grid grid-cols-2 gap-1">
<div className="card card-border h-80 p-10 col-span-1">
</div>
<div className="card card-border h-80 p-10 col-span-1">
</div>
</div>
{/* 네번째 라인 */}
<div className="grid grid-cols-2 gap-1">
<div className="card card-border h-80 p-10 col-span-1">
</div>
<div className="card card-border h-80 p-10 col-span-1">
</div>
</div>
</div>
</div>
);
}
@@ -0,0 +1,41 @@
import { client } from "@/shared/api";
import { ENDPOINT } from "@/shared/config";
import type { PageableList, PageableParams } from "@/shared/model";
export interface ZipSearchParams extends PageableParams {
zoneNo?: string; // 구역번호
ctpvNm?: string; // 시도명
sggNm?: string; // 시군구명
emdNm?: string; // 읍면동명
roadNm?: string; // 도로명
stdgNm?: string; // 법정동명
dongNm?: string; // 행정동명
lotnoMno?: number | null; // 지번본번
lotnoSno?: number | null; // 지번부번
}
export interface Zip {
zipId: number;
zoneNo: string;
ctpvNm: string;
sggNm: string;
emdNm: string;
roadNm: string;
lotnoMno: number;
lotnoSno: number;
lotno: string;
zipAddr: string;
}
type ZipList = PageableList<Zip>;
export class ZipApiService {
public async searchZip(params: ZipSearchParams): Promise<ZipList> {
const response = await client.get<ZipList>(`${ENDPOINT.CMS_SERVICE.ZIPS}`, {
params,
});
return response.data;
}
}
export const ZipApi = new ZipApiService();
+1
View File
@@ -0,0 +1 @@
export { CreatePage } from "./ui/create-page";
@@ -0,0 +1,88 @@
import dayjs from "dayjs";
import type { ColumnDef } from "@tanstack/react-table";
import {
USER_STATE_CODE,
type UserListResponse,
type UserStateCode,
} from "@/entities/user";
import { Badge } from "@common/components";
export const columns: ColumnDef<UserListResponse>[] = [
{
id: "no",
header: "No",
cell: ({ row, table }) => {
const totalRows = table.getRowCount();
const currentPage = table.getState().pagination.pageIndex;
const pageSize = table.getState().pagination.pageSize;
return totalRows - (currentPage * pageSize + row.index);
},
},
{
accessorKey: "userId",
header: "아이디",
},
{
accessorKey: "userName",
header: "이름",
},
{
accessorKey: "telno",
header: "전화번호",
},
{
accessorKey: "email",
header: "이메일",
},
{
accessorKey: "laeSeNm",
header: "구분",
},
{
accessorKey: "ogdpSeNm",
header: "소속",
},
{
accessorKey: "instSeNm",
header: "기관/부서",
},
{
accessorKey: "userStateCode",
header: "회원상태",
cell: ({ row }) => {
return getUserStateBadge(row.original.userStateCode);
},
},
{
accessorKey: "aprvYmd",
header: "승인일자",
},
{
accessorKey: "loginFailCount",
header: "로그인실패횟수",
},
{
accessorKey: "lastLoginDate",
header: "최종접속일",
cell: ({ row }) => {
return row.original.lastLoginDate
? dayjs(row.original.lastLoginDate).format("YYYY-MM-DD")
: "";
},
},
];
const getUserStateBadge = (userStateCode: UserStateCode) => {
switch (userStateCode) {
case USER_STATE_CODE.대기:
return <Badge color="gray">대기</Badge>;
case USER_STATE_CODE.정상:
return <Badge color="green">정상</Badge>;
case USER_STATE_CODE.정지:
return <Badge color="yellow">정지</Badge>;
case USER_STATE_CODE.탈퇴:
return <Badge color="purple">탈퇴</Badge>;
case USER_STATE_CODE.삭제:
return <Badge color="red">삭제</Badge>;
}
};
@@ -0,0 +1,179 @@
import { useState } from "react";
import {
keepPreviousData,
useQuery,
useQueryClient,
} from "@tanstack/react-query";
import {
getCoreRowModel,
getPaginationRowModel,
type PaginationState,
} from "@tanstack/react-table";
import {
Dialog,
DialogContent,
DialogHeader,
DialogFooter,
DialogTitle,
DialogTrigger,
DialogClose,
Button,
Input,
Label,
} from "@common/components";
import {
LwpoCodeApi,
type LwpoCode,
type LwpoCodeParams,
} from "@/entities/code";
import { ENDPOINT } from "@/shared/config";
import { useDataTable } from "@/shared/lib";
interface AgencySearchDialogProps {
onSelectAgency: (data: { lwpoCd: string; lwpoCdNm: string }) => void;
}
function AgencySearchDialog({ onSelectAgency }: AgencySearchDialogProps) {
const queryClient = useQueryClient();
const [open, setOpen] = useState(false);
const [selectedAgency, setSelectedAgency] = useState<LwpoCode | null>(null);
const [pagination, setPagination] = useState<PaginationState>({
pageIndex: 0,
pageSize: 10,
});
const [searchQuery, setSearchQuery] = useState<LwpoCodeParams>({
lwpoCdNm: "",
});
const query = useQuery({
queryKey: [ENDPOINT.CMS_SERVICE.LWPO_CODE, pagination],
queryFn: () =>
LwpoCodeApi.getLwpoCodeList({
...searchQuery,
upCd: "AGENCYCD",
page: pagination.pageIndex,
size: pagination.pageSize,
}),
placeholderData: keepPreviousData,
});
const handleRowClick = (row: LwpoCode) => {
table.setRowSelection({
[row.lwpoCd.toString()]: true,
});
setSelectedAgency(row);
};
const { tableComponent, tableInstance: table } = useDataTable({
query,
tableOptions: {
columns: [
{
accessorKey: "lwpoCd",
header: "기관코드",
meta: {
width: 200,
},
},
{
accessorKey: "lwpoCdNm",
header: "기관명",
},
],
state: {
pagination,
},
manualPagination: true,
enableMultiRowSelection: false,
getRowId: (row) => row.lwpoCd.toString(),
onPaginationChange: setPagination,
getCoreRowModel: getCoreRowModel(),
getPaginationRowModel: getPaginationRowModel(),
},
dataTableOptions: {
onRowClick: handleRowClick,
viewPagination: true,
variant: "secondary",
},
});
const handleSearch = async () => {
await query.refetch();
queryClient.removeQueries({
queryKey: [ENDPOINT.CMS_SERVICE.LWPO_CODE],
});
setPagination({
pageIndex: 0,
pageSize: 10,
});
table.setRowSelection({});
setSelectedAgency(null);
};
const handleSelectAgency = () => {
if (!selectedAgency) return;
onSelectAgency({
lwpoCd: selectedAgency.lwpoCd,
lwpoCdNm: selectedAgency.lwpoCdNm,
});
setOpen(false);
};
return (
<Dialog open={open} onOpenChange={setOpen}>
<DialogTrigger asChild>
<Button className="px-6">기관 검색</Button>
</DialogTrigger>
<DialogContent
className="max-h-[80vh] max-w-[60rem] overflow-auto"
aria-describedby={undefined}
>
<DialogHeader>
<DialogTitle>기관 검색</DialogTitle>
</DialogHeader>
<form
onSubmit={(e) => {
e.preventDefault();
e.stopPropagation();
handleSearch();
}}
>
<div className="card card-border !mx-0 flex flex-col gap-2">
<div className="flex items-center gap-2">
<Label className="mr-2 whitespace-nowrap">기관명</Label>
<Input
value={searchQuery.lwpoCdNm ?? ""}
onChange={(e) =>
setSearchQuery({
...searchQuery,
lwpoCdNm: e.target.value,
})
}
placeholder="기관명을 입력하세요"
className="!text-[1.3rem]"
/>
<Button type="submit">검색</Button>
</div>
</div>
</form>
{tableComponent}
<DialogFooter className="!justify-center">
<Button
size="lg"
onClick={handleSelectAgency}
disabled={!selectedAgency}
>
선택
</Button>
<DialogClose asChild>
<Button size="lg" color="white">
취소
</Button>
</DialogClose>
</DialogFooter>
</DialogContent>
</Dialog>
);
}
export { AgencySearchDialog };
@@ -0,0 +1,45 @@
"use client";
import { useRouter } from "next/navigation";
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { useMutationWrapper, useAlertStore } from "@/shared/lib";
import { UserApi, userSaveSchema, type UserSaveData } from "@/entities/user";
import { UsersForm } from "./users-form";
function CreatePage() {
const router = useRouter();
const alert = useAlertStore((state) => state.setMessage);
const form = useForm<UserSaveData>({
resolver: zodResolver(userSaveSchema),
defaultValues: {
userId: "",
userName: "",
password: "",
pswdHnt: "",
laeSeCd: "",
ogdpSeCd: "",
expryYmd: "",
},
});
// 사용자 등록 mutation
const { mutateAsync: saveUser } = useMutationWrapper({
mutationFn: (data: UserSaveData) => UserApi.saveUser(data),
onSuccess: () => {
alert("회원이 등록되었습니다.", router.back);
},
});
return (
<div className="card card-border !mt-6">
<div className="card-header">
<h3 className="text-2xl font-medium text-label">회원 등록</h3>
</div>
<UsersForm form={form} handleSave={saveUser} />
</div>
);
}
export { CreatePage };
@@ -0,0 +1,75 @@
"use client";
import React from "react";
import { useRouter } from "next/navigation";
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { useQuery } from "@tanstack/react-query";
import {
UserApi,
userUpdateSchema,
type UserUpdateData,
} from "@/entities/user";
import { ENDPOINT } from "@/shared/config";
import { useMutationWrapper, useAlertStore } from "@/shared/lib";
import { UsersForm } from "./users-form";
interface ModifyPageProps {
userUnqId: string;
}
export function ModifyPage({ userUnqId }: ModifyPageProps) {
const router = useRouter();
const alert = useAlertStore((state) => state.setMessage);
const { data: userData } = useQuery({
queryKey: [ENDPOINT.USER_SERVICE.USERS, userUnqId],
queryFn: () => UserApi.findByUserUnqId(userUnqId),
enabled: !!userUnqId,
});
const form = useForm<UserUpdateData>({
resolver: zodResolver(userUpdateSchema),
defaultValues: {
userId: userData?.userId ?? "",
userName: userData?.userName ?? "",
email: userData?.email ?? "",
userStateCode: userData?.userStateCode ?? "",
pswdHnt: userData?.pswdHnt ?? "",
pswdAns: userData?.pswdAns ?? "",
mphn: userData?.mphn ?? "",
telno: userData?.telno ?? "",
zip: userData?.zip ?? "",
addr: userData?.addr ?? "",
daddr: userData?.daddr ?? "",
laeSeCd: userData?.laeSeCd ?? "",
ogdpSeCd: userData?.ogdpSeCd ?? "",
aprvYn: userData?.aprvYn ?? "",
expryYmd: userData?.expryYmd ?? "",
instSeCd: userData?.instSeCd ?? "",
dtlInstCd: userData?.dtlInstCd ?? "",
aprvYmd: userData?.aprvYmd ?? "",
enoCd: userData?.enoCd ?? "",
},
});
const { mutateAsync: updateUser } = useMutationWrapper({
mutationFn: (data: UserUpdateData) => UserApi.updateUser(userUnqId, data),
onSuccess: () => {
alert("회원 정보가 수정되었습니다.", router.back);
},
});
return (
<div className="card card-border !mt-6">
<div className="card-header">
<h3 className="text-2xl font-medium text-label">회원 정보 수정</h3>
</div>
<UsersForm
userId={userData?.userId}
form={form}
handleSave={updateUser}
/>
</div>
);
}
+187
View File
@@ -0,0 +1,187 @@
"use client";
import dayjs from "dayjs";
import { usePathname, useRouter } from "next/navigation";
import { useQuery, useQueryClient } from "@tanstack/react-query";
import { useConfirm } from "@frontend-opensource/use-react-hooks";
import {
Button,
Table,
TableBody,
TableCell,
TableHead,
TableRow,
} from "@common/components";
import { USER_STATE_CODE, UserApi, PasswordResetDialog } from "@/entities/user";
import { ENDPOINT } from "@/shared/config";
import { useAlertStore, useMutationWrapper } from "@/shared/lib";
function UserDetail({ userUnqId }: { userUnqId: string }) {
const router = useRouter();
const pathname = usePathname();
const { confirm } = useConfirm();
const queryClient = useQueryClient();
const alert = useAlertStore((state) => state.setMessage);
const { data, refetch } = useQuery({
queryKey: [ENDPOINT.USER_SERVICE.USERS, userUnqId],
queryFn: () => UserApi.findByUserUnqId(userUnqId),
enabled: !!userUnqId,
});
const { mutate: onLockUser } = useMutationWrapper({
mutationFn: () => UserApi.lockUser(userUnqId),
onSuccess: () => {
alert("계정 잠금이 활성화 되었습니다.");
refetch();
},
});
const { mutate: onUnlockUser } = useMutationWrapper({
mutationFn: () => UserApi.unlockUser(userUnqId),
onSuccess: () => {
alert("계정 잠금이 해제되었습니다.");
refetch();
},
});
const { mutate: onApplyUser } = useMutationWrapper({
mutationFn: () => UserApi.applyUser(userUnqId),
onSuccess: () => {
alert("사용자 승인이 완료되었습니다.");
refetch();
},
});
const { mutateAsync: deleteUser } = useMutationWrapper({
mutationFn: () => UserApi.deleteUser(userUnqId),
onSuccess: () => {
alert("회원이 삭제되었습니다.", router.back);
queryClient.invalidateQueries({
queryKey: [ENDPOINT.USER_SERVICE.USERS],
});
},
});
const handleDelete = async () => {
if (await confirm("삭제하시겠습니까?")) {
await deleteUser();
}
};
return (
<div className="card card-border !mt-6">
<div className="card-header">
<h3 className="text-2xl font-medium text-label">회원 정보</h3>
</div>
<div className="card">
<div className="mb-4 flex justify-end gap-2">
{data?.userStateCode === USER_STATE_CODE.정지 ? (
<Button color="orange" onClick={() => onUnlockUser()}>
<i className="diveicon di-lock-open" />
잠금해제
</Button>
) : (
<Button color="orange" onClick={() => onLockUser()}>
<i className="diveicon di-lock" />
계정잠금
</Button>
)}
<PasswordResetDialog userUnqId={userUnqId}>
<Button color="gray">
<i className="diveicon di-arrow-reset" /> 비밀번호 초기화
</Button>
</PasswordResetDialog>
{data?.userStateCode === USER_STATE_CODE.대기 && (
<Button className="emerald" onClick={() => onApplyUser()}>
<i className="diveicon di-check-circle-line" /> 가입승인
</Button>
)}
</div>
<Table variant="secondary">
<colgroup>
<col width="20%" />
<col width="80%" />
</colgroup>
<TableBody>
<TableRow>
<TableHead>아이디</TableHead>
<TableCell className="!px-4">{data?.userId}</TableCell>
</TableRow>
<TableRow>
<TableHead>이름</TableHead>
<TableCell className="!px-4">{data?.userName}</TableCell>
</TableRow>
<TableRow>
<TableHead rowSpan={2}>연락처</TableHead>
<TableCell className="!px-4">휴대폰: {data?.mphn}</TableCell>
</TableRow>
<TableRow>
<TableCell className="!px-4">전화번호: {data?.telno}</TableCell>
</TableRow>
<TableRow>
<TableHead>이메일</TableHead>
<TableCell className="!px-4">{data?.email}</TableCell>
</TableRow>
<TableRow>
<TableHead rowSpan={2}>주소</TableHead>
<TableCell className="!px-4">
{data?.zip && `(${data?.zip})`} {data?.addr}
</TableCell>
</TableRow>
<TableRow>
<TableCell className="!px-4">{data?.daddr}</TableCell>
</TableRow>
<TableRow>
<TableHead>기관구분</TableHead>
<TableCell className="!px-4">{data?.ogdpSeNm}</TableCell>
</TableRow>
<TableRow>
<TableHead>세부기관</TableHead>
<TableCell className="!px-4">{data?.dtlInstNm}</TableCell>
</TableRow>
<TableRow>
<TableHead>소속</TableHead>
<TableCell className="!px-4">{data?.laeSeNm}</TableCell>
</TableRow>
<TableRow>
<TableHead>환경청</TableHead>
<TableCell className="!px-4">{data?.ecoNm}</TableCell>
</TableRow>
<TableRow>
<TableHead>가입일</TableHead>
<TableCell className="!px-4">
{data?.regDt ? dayjs(data?.regDt).format("YYYY-MM-DD") : ""}
</TableCell>
</TableRow>
<TableRow>
<TableHead>최근로그인</TableHead>
<TableCell className="!px-4">
{data?.lastLoginDate
? dayjs(data?.lastLoginDate).format("YYYY-MM-DD HH:mm:ss")
: ""}
</TableCell>
</TableRow>
<TableRow>
<TableHead>계정상태</TableHead>
<TableCell className="!px-4">{data?.userStateNm}</TableCell>
</TableRow>
</TableBody>
</Table>
</div>
<div className="flex justify-center gap-4 pb-12 pt-10">
<Button size="lg" className="white" onClick={router.back}>
목록
</Button>
<Button size="lg" onClick={() => router.push(`${pathname}/modify`)}>
수정
</Button>
<Button size="lg" color="red" onClick={handleDelete}>
삭제
</Button>
</div>
</div>
);
}
export { UserDetail };
+669
View File
@@ -0,0 +1,669 @@
import { useState, useMemo, useCallback } from "react";
import {
useWatch,
type Path,
type PathValue,
type UseFormReturn,
} from "react-hook-form";
import { useQuery } from "@tanstack/react-query";
import {
Button,
Input,
Table,
TableBody,
TableCell,
TableHead,
TableRow,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@common/components";
import { FormWrapper } from "@/widgets/form-wrapper";
import { CodeApi, CodeSelect } from "@/entities/code";
import {
UserApi,
type UserSaveData,
type UserUpdateData,
} from "@/entities/user";
import {
FormField,
FormItem,
FormControl,
FormMessage,
} from "@/shared/ui/form";
import { ENDPOINT } from "@/shared/config";
import { useAlertStore, useMutationWrapper } from "@/shared/lib";
import { ZipSearchDialog } from "./zip-search-dialog";
import { AgencySearchDialog } from "./agency-search-dialog";
type UsersFormProps<T extends UserSaveData | UserUpdateData> = {
userId?: string;
form: UseFormReturn<T>;
handleSave: (data: T) => Promise<string>;
handleDelete?: () => Promise<void>;
};
function UsersForm<T extends UserSaveData | UserUpdateData>({
userId,
form,
...props
}: UsersFormProps<T>) {
const isModifyMode = !!userId;
const [watchOgdpSeCd, watchDtlInstCd] = useWatch({
control: form.control,
name: ["ogdpSeCd" as Path<T>, "dtlInstCd" as Path<T>],
});
const alert = useAlertStore((state) => state.setMessage);
const [isValidUserId, setIsValidUserId] = useState(false);
const [isValidEmail, setIsValidEmail] = useState(false);
const [passwordMatch, setPasswordMatch] = useState(true);
const [instSeCdNm, setInstSeCdNm] = useState("");
const { data: authSeCd } = useQuery({
queryKey: [ENDPOINT.CMS_SERVICE.CODE, "AUTHSECD"],
queryFn: () => CodeApi.getCode("AUTHSECD"),
});
const { data: laeSeCd } = useQuery({
queryKey: [ENDPOINT.CMS_SERVICE.CODE, "LAESECD"],
queryFn: () => CodeApi.getCode("LAESECD"),
});
const { mutateAsync: checkDuplicateUserId } = useMutationWrapper({
mutationFn: (userId: string) => UserApi.existsUserId({ userId }),
onSuccess: (duplicate) => {
if (!duplicate) {
alert("사용가능한 아이디입니다.");
setIsValidUserId(true);
return;
}
alert("중복된 아이디입니다.");
},
});
const { mutateAsync: checkDuplicateEmail } = useMutationWrapper({
mutationFn: (email: string) => UserApi.existsEmail({ email }),
onSuccess: (duplicate) => {
if (!duplicate) {
alert("사용가능한 이메일입니다.");
setIsValidEmail(true);
return;
}
alert("중복된 이메일입니다.");
},
});
const authSeCdSelectData = useMemo(() => {
if (watchOgdpSeCd === "1")
return (
authSeCd?.filter(
(code) =>
code.lwpoCd === "ROLE_USER1" ||
code.lwpoCd === "ROLE_USER2" ||
code.lwpoCd === "ROLE_USER3",
) ?? []
);
if (watchOgdpSeCd === "3" || watchOgdpSeCd === "4")
return (
authSeCd?.filter(
(code) =>
code.lwpoCd === "ROLE_USER4" || code.lwpoCd === "ROLE_USER5",
) ?? []
);
return [];
}, [authSeCd, watchOgdpSeCd]);
const laeSeCdSelectData = useMemo(() => {
if (watchDtlInstCd === "ROLE_USER1")
return laeSeCd?.filter((code) => code.lwpoCd === "G102") ?? [];
if (watchDtlInstCd === "ROLE_USER2")
return laeSeCd?.filter((code) => code.lwpoCd === "G101") ?? [];
if (watchDtlInstCd === "ROLE_USER3")
return laeSeCd?.filter((code) => code.lwpoCd.startsWith("G2")) ?? [];
if (watchDtlInstCd === "ROLE_USER4")
return (
laeSeCd?.filter(
(code) => code.lwpoCd.startsWith("G3") && code.lwpoCd.length === 4,
) ?? []
);
if (watchDtlInstCd === "ROLE_USER5")
return (
laeSeCd?.filter(
(code) => code.lwpoCd.startsWith("G3") && code.lwpoCd.length === 7,
) ?? []
);
return [];
}, [laeSeCd, watchDtlInstCd]);
const enoCdSelectData = useMemo(
() => laeSeCd?.filter((code) => code.lwpoCd?.startsWith("G2")) ?? [],
[laeSeCd],
);
const handlePasswordConfirmChange = useCallback((value: string) => {
const password = form.getValues("password" as Path<T>);
setPasswordMatch(!password || value === password);
}, []);
const handleAddressSelect = useCallback(
(data: { zip: string; addr: string }) => {
form.setValue("zip" as Path<T>, data.zip as PathValue<T, Path<T>>);
form.setValue("addr" as Path<T>, data.addr as PathValue<T, Path<T>>);
},
[form],
);
const handleAgencySelect = useCallback(
(data: { lwpoCd: string; lwpoCdNm: string }) => {
form.setValue(
"instSeCd" as Path<T>,
data.lwpoCd as PathValue<T, Path<T>>,
);
setInstSeCdNm(data.lwpoCdNm);
},
[form],
);
return (
<FormWrapper form={form} isModifyMode={isModifyMode} {...props}>
<div className="card">
<Table variant="secondary">
<colgroup>
<col width="20%" />
<col width="80%" />
</colgroup>
<TableBody>
{/* 아이디 */}
<TableRow>
<TableHead data-required>아이디</TableHead>
<TableCell className="border">
<FormField
control={form.control}
name={"userId" as Path<T>}
render={({ field }) => (
<div className="flex items-center gap-2">
<FormItem>
<FormControl>
<Input
{...field}
value={field.value ?? ""}
onChange={(e) => {
field.onChange(e);
setIsValidUserId(false);
}}
className="w-[24rem] !text-[1.3rem]"
placeholder="아이디를 입력하세요"
disabled={isModifyMode}
/>
</FormControl>
</FormItem>
{!isModifyMode && (
<Button
color="green"
className="px-6"
onClick={(e) => {
e.preventDefault();
checkDuplicateUserId(field.value as string);
}}
disabled={!field.value || isValidUserId}
>
{isValidUserId && <i className="diveicon di-check" />}
중복확인
</Button>
)}
</div>
)}
/>
</TableCell>
</TableRow>
{/* 비밀번호 */}
<TableRow>
<TableHead data-required>비밀번호</TableHead>
<TableCell className="border">
<FormField
control={form.control}
name={"password" as Path<T>}
render={({ field }) => (
<FormItem>
<FormControl>
<Input
{...field}
type="password"
value={field.value ?? ""}
className="w-[24rem] !text-[1.3rem]"
placeholder="비밀번호를 입력하세요"
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
</TableCell>
</TableRow>
{/* 비밀번호 확인 */}
<TableRow>
<TableHead>비밀번호 확인</TableHead>
<TableCell className="border">
<div className="flex flex-col">
<Input
type="password"
onChange={(e) =>
handlePasswordConfirmChange(e.target.value)
}
className="w-[24rem] !text-[1.3rem]"
placeholder="비밀번호를 다시 입력하세요"
/>
{!passwordMatch && (
<p className="mt-2 text-base text-red-500">
비밀번호가 일치하지 않습니다.
</p>
)}
</div>
</TableCell>
</TableRow>
{/* 비밀번호 힌트 */}
<TableRow>
<TableHead data-required>비밀번호 힌트</TableHead>
<TableCell className="border">
<FormField
control={form.control}
name={"pswdHnt" as Path<T>}
render={({ field }) => (
<FormItem>
<FormControl>
<CodeSelect
{...field}
upCd="PSWDHNT"
className="w-[24rem]"
onValueChange={field.onChange}
/>
</FormControl>
</FormItem>
)}
/>
</TableCell>
</TableRow>
{/* 비밀번호 정답 */}
<TableRow>
<TableHead>비밀번호 정답</TableHead>
<TableCell className="border">
<FormField
control={form.control}
name={"pswdAns" as Path<T>}
render={({ field }) => (
<FormItem>
<FormControl>
<Input
{...field}
value={field.value ?? ""}
className="w-[24rem] !text-[1.3rem]"
placeholder="비밀번호 정답을 입력하세요"
/>
</FormControl>
</FormItem>
)}
/>
</TableCell>
</TableRow>
{/* 이름 */}
<TableRow>
<TableHead data-required>이름</TableHead>
<TableCell className="border">
<FormField
control={form.control}
name={"userName" as Path<T>}
render={({ field }) => (
<FormItem>
<FormControl>
<Input
{...field}
value={field.value ?? ""}
className="w-[24rem] !text-[1.3rem]"
placeholder="이름을 입력하세요"
/>
</FormControl>
</FormItem>
)}
/>
</TableCell>
</TableRow>
{/* 연락처 */}
<TableRow>
<TableHead rowSpan={2}>연락처</TableHead>
<TableCell>
<FormField
control={form.control}
name={"mphn" as Path<T>}
render={({ field }) => (
<FormItem>
<FormControl>
<Input
{...field}
value={field.value ?? ""}
className="w-[24rem] !text-[1.3rem]"
placeholder="휴대폰 번호(-를 제외하고 입력)"
/>
</FormControl>
</FormItem>
)}
/>
</TableCell>
</TableRow>
<TableRow>
<TableCell>
<FormField
control={form.control}
name={"telno" as Path<T>}
render={({ field }) => (
<FormItem>
<FormControl>
<Input
{...field}
value={field.value ?? ""}
className="w-[24rem] !text-[1.3rem]"
placeholder="전화번호(-를 제외하고 입력)"
/>
</FormControl>
</FormItem>
)}
/>
</TableCell>
</TableRow>
{/* 이메일 */}
<TableRow>
<TableHead>이메일</TableHead>
<TableCell className="border">
<FormField
control={form.control}
name={"email" as Path<T>}
render={({ field }) => (
<div className="flex items-center gap-2">
<FormItem>
<FormControl>
<Input
{...field}
value={field.value ?? ""}
onChange={(e) => {
field.onChange(e);
setIsValidEmail(false);
}}
className="w-[24rem] !text-[1.3rem]"
placeholder="이메일을 입력하세요"
/>
</FormControl>
</FormItem>
<Button
color="green"
className="px-6"
onClick={(e) => {
e.preventDefault();
if (field.value) {
checkDuplicateEmail(field.value as string);
}
}}
disabled={!field.value || isValidEmail}
>
{isValidEmail && <i className="diveicon di-check" />}
중복확인
</Button>
</div>
)}
/>
</TableCell>
</TableRow>
{/* 주소 */}
<TableRow>
<TableHead rowSpan={2}>주소</TableHead>
<TableCell className="border">
<div className="flex flex-col gap-2">
<div className="mb-2 flex items-center gap-2">
<FormField
control={form.control}
name={"zip" as Path<T>}
render={({ field }) => (
<FormItem>
<FormControl>
<Input
{...field}
value={field.value ?? ""}
className="w-[10rem] !text-[1.3rem]"
disabled
/>
</FormControl>
</FormItem>
)}
/>
<ZipSearchDialog onSelectAddress={handleAddressSelect} />
</div>
<FormField
control={form.control}
name={"addr" as Path<T>}
render={({ field }) => (
<FormItem>
<FormControl>
<Input
{...field}
value={field.value ?? ""}
className="w-[36rem] !text-[1.3rem]"
disabled
/>
</FormControl>
</FormItem>
)}
/>
</div>
</TableCell>
</TableRow>
<TableRow>
<TableCell>
<FormField
control={form.control}
name={"daddr" as Path<T>}
render={({ field }) => (
<FormItem>
<FormControl>
<Input
{...field}
value={field.value ?? ""}
className="w-[36rem] !text-[1.3rem]"
placeholder="상세 주소를 입력하세요"
/>
</FormControl>
</FormItem>
)}
/>
</TableCell>
</TableRow>
{/* 기관구분 */}
<TableRow>
<TableHead data-required>기관구분</TableHead>
<TableCell className="border">
<FormField
control={form.control}
name={"ogdpSeCd" as Path<T>}
render={({ field }) => (
<FormItem>
<FormControl>
<CodeSelect
{...field}
upCd="OGDPSECD"
value={field.value ?? ""}
onValueChange={(value) => {
field.onChange(value);
form.setValue(
"dtlInstCd" as Path<T>,
"" as PathValue<T, Path<T>>,
);
form.setValue(
"laeSeCd" as Path<T>,
"" as PathValue<T, Path<T>>,
);
form.setValue(
"enoCd" as Path<T>,
"" as PathValue<T, Path<T>>,
);
}}
className="w-[16rem]"
placeholder="기관 선택"
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
</TableCell>
</TableRow>
{/* 세부기관 */}
<TableRow>
<TableHead>세부기관</TableHead>
<TableCell className="border">
<FormField
control={form.control}
name={"dtlInstCd" as Path<T>}
render={({ field }) => (
<FormItem>
<FormControl>
<Select
value={field.value ?? ""}
onValueChange={(value) => {
field.onChange(value);
form.setValue(
"laeSeCd" as Path<T>,
"" as PathValue<T, Path<T>>,
);
form.setValue(
"enoCd" as Path<T>,
"" as PathValue<T, Path<T>>,
);
}}
>
<SelectTrigger className="w-[16rem]">
<SelectValue placeholder="세부기관 선택" />
</SelectTrigger>
<SelectContent>
{authSeCdSelectData?.map((code) => (
<SelectItem key={code.lwpoCd} value={code.lwpoCd}>
{code.lwpoCdNm}
</SelectItem>
))}
</SelectContent>
</Select>
</FormControl>
</FormItem>
)}
/>
</TableCell>
</TableRow>
{/* 소속 */}
<TableRow>
<TableHead data-required>소속</TableHead>
<TableCell className="border">
<FormField
control={form.control}
name={"laeSeCd" as Path<T>}
render={({ field }) => (
<FormItem>
<FormControl>
<Select
value={field.value ?? ""}
onValueChange={(value) => {
field.onChange(value);
form.setValue(
"enoCd" as Path<T>,
"" as PathValue<T, Path<T>>,
);
}}
>
<SelectTrigger className="w-[16rem]">
<SelectValue placeholder="소속 선택" />
</SelectTrigger>
<SelectContent>
{laeSeCdSelectData?.map((code) => (
<SelectItem key={code.lwpoCd} value={code.lwpoCd}>
{code.lwpoCdNm}
</SelectItem>
))}
</SelectContent>
</Select>
</FormControl>
</FormItem>
)}
/>
</TableCell>
</TableRow>
{/* 환경청 */}
<TableRow>
<TableHead>환경청</TableHead>
<TableCell className="border">
<FormField
control={form.control}
name={"enoCd" as Path<T>}
render={({ field }) => (
<FormItem>
<FormControl>
<Select
value={field.value ?? ""}
onValueChange={field.onChange}
disabled={
!(
watchDtlInstCd === "ROLE_USER4" ||
watchDtlInstCd === "ROLE_USER5"
)
}
>
<SelectTrigger className="w-[16rem]">
<SelectValue placeholder="환경청 선택" />
</SelectTrigger>
<SelectContent>
{enoCdSelectData?.map((code) => (
<SelectItem key={code.lwpoCd} value={code.lwpoCd}>
{code.lwpoCdNm}
</SelectItem>
))}
</SelectContent>
</Select>
</FormControl>
</FormItem>
)}
/>
</TableCell>
</TableRow>
{/* 환경청 기관/업체명 */}
<TableRow>
<TableHead>기관/업체명</TableHead>
<TableCell className="border">
<div className="flex items-center gap-2">
<Input
value={instSeCdNm}
className="w-[24rem] !text-[1.3rem]"
disabled
/>
<AgencySearchDialog onSelectAgency={handleAgencySelect} />
</div>
</TableCell>
</TableRow>
</TableBody>
</Table>
</div>
</FormWrapper>
);
}
export { UsersForm };
+396
View File
@@ -0,0 +1,396 @@
"use client";
import dayjs from "dayjs";
import { useState } from "react";
import { useRouter } from "next/navigation";
import { useQuery } from "@tanstack/react-query";
import { getCoreRowModel, type PaginationState } from "@tanstack/react-table";
import {
Button,
Checkbox,
Input,
Label,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@common/components";
import { CodeApi } from "@/entities/code";
import {
UserApi,
type UserListResponse,
type UserSearchParams,
} from "@/entities/user";
import { ENDPOINT } from "@/shared/config";
import { useDataTable } from "@/shared/lib";
import { InputDateRangePicker } from "@/shared/ui/input-date-range-picker";
import { columns } from "../model/table-columns";
type DateRange = {
from?: Date | undefined;
to?: Date | undefined;
};
function UsersPage() {
const router = useRouter();
const [pagination, setPagination] = useState<PaginationState>({
pageIndex: 0,
pageSize: 10,
});
const [presetDateRange, setPresetDateRange] = useState("");
const [dateRange, setDateRange] = useState<DateRange>({
from: undefined,
to: undefined,
});
const [keywordType, setKeywordType] = useState("all");
const [keyword, setKeyword] = useState("");
const [userStateCode, setUserStateCode] = useState("");
const [aprvYn, setAprvYn] = useState("");
const [grpId, setGrpId] = useState("");
const [searchParams, setSearchParams] = useState<UserSearchParams>({
keywordType: "all",
keyword: "",
userStateCode: "",
aprvYn: "",
grpId: "",
frDateYmd: "",
toDateYmd: "",
sort: "regDt,desc",
});
const { data: userSttsStats } = useQuery({
queryKey: [ENDPOINT.USER_SERVICE.USERS, "userStatusStatistics"],
queryFn: () => UserApi.selectUserSttsStats(),
});
const query = useQuery({
queryKey: [ENDPOINT.USER_SERVICE.USERS, searchParams, pagination],
queryFn: () =>
UserApi.findPageUser({
...searchParams,
page: pagination.pageIndex,
size: pagination.pageSize,
}),
});
const { data: userStateCodes } = useQuery({
queryKey: [ENDPOINT.CMS_SERVICE.CODE],
queryFn: () => CodeApi.getCode("USERSTTS"),
});
const handleRowClick = (row: UserListResponse) => {
router.push(`/users/${row.userUnqId}`);
};
const { tableComponent, tableInstance: table } = useDataTable({
query,
tableOptions: {
columns,
state: {
pagination,
},
manualPagination: true,
getCoreRowModel: getCoreRowModel(),
onPaginationChange: setPagination,
},
dataTableOptions: {
onRowClick: handleRowClick,
viewPagination: true,
},
});
const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault();
setPagination({
...pagination,
pageIndex: 0,
});
setSearchParams({
...searchParams,
keywordType,
keyword,
userStateCode,
aprvYn,
grpId,
frDateYmd: dateRange?.from
? dayjs(dateRange.from).format("YYYYMMDD")
: "",
toDateYmd: dateRange?.to ? dayjs(dateRange.to).format("YYYYMMDD") : "",
});
};
const handleReset = () => {
setKeywordType("all");
setKeyword("");
setUserStateCode("");
setAprvYn("");
setGrpId("");
setDateRange({
from: undefined,
to: undefined,
});
setSearchParams({
...searchParams,
keywordType: "all",
keyword: "",
userStateCode: "",
aprvYn: "",
grpId: "",
frDateYmd: "",
toDateYmd: "",
});
};
const handlePresetDateRange = (value: string) => {
let presetDateRange: DateRange;
switch (value) {
case "1M":
presetDateRange = {
from: dayjs().subtract(1, "month").toDate(),
to: dayjs().toDate(),
};
break;
case "3M":
presetDateRange = {
from: dayjs().subtract(3, "month").toDate(),
to: dayjs().toDate(),
};
break;
case "6M":
presetDateRange = {
from: dayjs().subtract(6, "month").toDate(),
to: dayjs().toDate(),
};
break;
default:
presetDateRange = {
from: undefined,
to: undefined,
};
}
setPresetDateRange(value);
setDateRange(presetDateRange);
};
const handleDateRangeChange = (dateRange: DateRange) => {
setDateRange(dateRange);
setPresetDateRange("");
};
const getUserSttsStatsCnt = (code: string): string => {
if (!Array.isArray(userSttsStats)) return "0";
const count = userSttsStats.find((item) => item.sttsCd === code)?.cnt ?? 0;
return count.toLocaleString();
};
const handleUserStateCodeChange = (code: string, checked: boolean) => {
let newUserStateCode = userStateCode;
if (checked) {
newUserStateCode = userStateCode ? `${userStateCode},${code}` : code;
} else {
newUserStateCode = userStateCode
.split(",")
.filter((c) => c !== code)
.join(",");
}
setUserStateCode(newUserStateCode);
};
return (
<div className="card card-border !mt-6">
<div className="card card-border flex items-center justify-center gap-10 !bg-accent !py-6">
<div className="flex items-center gap-4">
<div className="flex size-12 items-center justify-center rounded-full bg-[rgba(153,153,153,1)]">
<i className="diveicon di-person text-xl text-white" />
</div>
<span className="text-2xl font-medium text-label">
승인대기{" "}
<em className="not-italic text-primary">
{getUserSttsStatsCnt("00")}
</em>
명
</span>
</div>
<div className="flex items-center gap-4">
<div className="flex size-12 items-center justify-center rounded-full bg-primary">
<i className="diveicon di-person-fill text-xl text-white" />
</div>
<span className="text-2xl font-medium text-label">
전체{" "}
<em className="not-italic text-primary">
{getUserSttsStatsCnt("TOTAL")}
</em>
명
</span>
</div>
<div className="flex items-center gap-4">
<div className="flex size-12 items-center justify-center rounded-full bg-[rgba(255,149,0,1)]">
<i className="diveicon di-lock text-xl text-white" />
</div>
<span className="text-2xl font-medium text-label">
잠금{" "}
<em className="not-italic text-primary">
{getUserSttsStatsCnt("07")}
</em>
명
</span>
</div>
<div className="flex items-center gap-4">
<div className="flex size-12 items-center justify-center rounded-full bg-destructive">
<i className="diveicon di-exclamation-triangle-fill text-xl text-white" />
</div>
<span className="text-2xl font-medium text-label">
탈퇴{" "}
<em className="not-italic text-primary">
{getUserSttsStatsCnt("08")}
</em>
명
</span>
</div>
</div>
<div className="card card-border">
<form onSubmit={handleSubmit} className="flex flex-col gap-6 p-2">
<div className="flex items-center gap-6">
<div className="flex items-center gap-2">
<Label className="mr-2 whitespace-nowrap text-label">
회원정보
</Label>
<Select
value={keywordType}
onValueChange={(value) => setKeywordType(value)}
>
<SelectTrigger className="w-[18rem]">
<SelectValue placeholder="선택" />
</SelectTrigger>
<SelectContent>
<SelectItem value="all">전체</SelectItem>
<SelectItem value="userId">아이디</SelectItem>
<SelectItem value="userName">이름</SelectItem>
<SelectItem value="email">이메일</SelectItem>
<SelectItem value="mphn">휴대폰번호</SelectItem>
</SelectContent>
</Select>
<Input
value={keyword}
onChange={(e) => setKeyword(e.target.value)}
className="!text-[1.3rem]"
placeholder="검색어를 입력하세요"
/>
</div>
<div className="flex items-center gap-2">
<Label className="mr-2 text-label">그룹</Label>
{/* Select */}
</div>
<div className="flex items-center gap-2">
<Label className="mr-2 text-label">기간</Label>
<Select
value={presetDateRange}
onValueChange={handlePresetDateRange}
>
<SelectTrigger className="w-[12rem]">
<SelectValue placeholder="기간 선택" className="w-[24rem]" />
</SelectTrigger>
<SelectContent>
<SelectItem value="1M">1개월</SelectItem>
<SelectItem value="3M">3개월</SelectItem>
<SelectItem value="6M">6개월</SelectItem>
</SelectContent>
</Select>
<InputDateRangePicker
dateRange={dateRange}
setDateRange={handleDateRangeChange}
/>
</div>
</div>
<div className="flex items-center gap-2">
<Label className="mr-2 text-label">회원상태</Label>
<div className="flex gap-4">
{userStateCodes?.map((item) => (
<div key={item.lwpoCd} className="flex items-center gap-2">
<Checkbox
id={item.lwpoCd}
value={item.lwpoCd}
checked={userStateCode?.includes(item.lwpoCd)}
onCheckedChange={(checked) => {
handleUserStateCodeChange(item.lwpoCd, !!checked);
}}
/>
<Label htmlFor={item.lwpoCd}>{item.lwpoCdNm}</Label>
</div>
))}
</div>
</div>
<hr />
<div className="flex justify-center gap-2">
<Button type="submit" className="w-[16rem]">
<i className="diveicon di-search" />
검색
</Button>
<Button
type="button"
color="white"
className="w-[16rem]"
onClick={handleReset}
>
초기화
</Button>
</div>
</form>
</div>
<div className="card card-border">
<div className="card-header">
<div className="flex w-full items-center justify-between">
<h3 className="text-2xl font-medium text-label">회원 목록</h3>
<div className="flex gap-2">
<Select
defaultValue="regDt,desc"
onValueChange={(value) => {
setSearchParams({
...searchParams,
sort: value,
});
}}
>
<SelectTrigger>
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="aprvYmd,desc">승인일순</SelectItem>
<SelectItem value="regDt,desc">등록일순</SelectItem>
</SelectContent>
</Select>
<Select
value={table.getState().pagination.pageSize.toString()}
onValueChange={(value) => {
table.setPageSize(parseInt(value));
}}
>
<SelectTrigger className="h-[3.2rem] w-[12rem]">
<SelectValue placeholder="페이지 크기" />
</SelectTrigger>
<SelectContent>
{[10, 20, 30, 40, 50].map((pageSize) => (
<SelectItem key={pageSize} value={pageSize.toString()}>
{pageSize}개씩 보기
</SelectItem>
))}
</SelectContent>
</Select>
<Button onClick={() => router.push("/users/register")}>
등록
</Button>
</div>
</div>
</div>
<div className="card !m-[1.2rem] !p-0">{tableComponent}</div>
</div>
</div>
);
}
export { UsersPage };
@@ -0,0 +1,224 @@
import { useState, useRef, useEffect } from "react";
import {
keepPreviousData,
useQuery,
useQueryClient,
} from "@tanstack/react-query";
import {
getCoreRowModel,
getPaginationRowModel,
type PaginationState,
} from "@tanstack/react-table";
import {
Dialog,
DialogContent,
DialogHeader,
DialogFooter,
DialogTitle,
DialogTrigger,
DialogClose,
Button,
Input,
Label,
} from "@common/components";
import { ENDPOINT } from "@/shared/config";
import { useDataTable } from "@/shared/lib";
import { ZipApi, type Zip, type ZipSearchParams } from "../api/zip-service";
interface ZipSearchDialogProps {
onSelectAddress: (data: { zip: string; addr: string }) => void;
}
function ZipSearchDialog({ onSelectAddress }: ZipSearchDialogProps) {
const queryClient = useQueryClient();
const [open, setOpen] = useState(false);
const [selectedAddress, setSelectedAddress] = useState<Zip | null>(null);
const [pagination, setPagination] = useState<PaginationState>({
pageIndex: 0,
pageSize: 10,
});
const [searchQuery, setSearchQuery] = useState<ZipSearchParams>({
roadNm: "",
lotnoMno: null,
lotnoSno: null,
});
const hasFetchedOnce = useRef(false);
const query = useQuery({
queryKey: [ENDPOINT.CMS_SERVICE.ZIPS, pagination],
queryFn: () =>
ZipApi.searchZip({
...searchQuery,
page: pagination.pageIndex,
size: pagination.pageSize,
}),
placeholderData: keepPreviousData,
enabled: false,
});
const handleRowClick = (row: Zip) => {
table.setRowSelection({
[row.zipId.toString()]: true,
});
setSelectedAddress(row);
};
const { tableComponent, tableInstance: table } = useDataTable({
query,
tableOptions: {
columns: [
{
accessorKey: "zoneNo",
header: "우편번호",
},
{
accessorKey: "zipAddr",
header: "주소",
},
],
state: {
pagination,
},
manualPagination: true,
enableMultiRowSelection: false,
getRowId: (row) => row.zipId.toString(),
onPaginationChange: setPagination,
getCoreRowModel: getCoreRowModel(),
getPaginationRowModel: getPaginationRowModel(),
},
dataTableOptions: {
onRowClick: handleRowClick,
viewPagination: true,
variant: "secondary",
},
});
const handleSearch = async () => {
await query.refetch();
queryClient.removeQueries({
queryKey: [ENDPOINT.CMS_SERVICE.ZIPS],
});
setPagination({
pageIndex: 0,
pageSize: 10,
});
table.setRowSelection({});
setSelectedAddress(null);
hasFetchedOnce.current = true;
};
const handleSelectAddress = () => {
if (!selectedAddress) return;
onSelectAddress({
zip: selectedAddress.zoneNo,
addr: selectedAddress.zipAddr,
});
setOpen(false);
};
useEffect(() => {
if (hasFetchedOnce.current) query.refetch();
}, [pagination]);
return (
<Dialog open={open} onOpenChange={setOpen}>
<DialogTrigger asChild>
<Button className="px-6">우편번호 검색</Button>
</DialogTrigger>
<DialogContent className="max-w-[60rem]" aria-describedby={undefined}>
<DialogHeader>
<DialogTitle>주소 검색</DialogTitle>
</DialogHeader>
<form
onSubmit={(e) => {
e.preventDefault();
e.stopPropagation();
handleSearch();
}}
className="mb-4 space-y-2"
>
<div className="card card-border !m-0 flex flex-col gap-4 p-4">
<div className="grid grid-cols-3 gap-4">
<div className="flex flex-col">
<Label className="mb-1 text-base">도로명</Label>
<Input
value={searchQuery.roadNm || ""}
onChange={(e) =>
setSearchQuery({
...searchQuery,
roadNm: e.target.value,
})
}
placeholder="예: 테헤란로"
className="!text-[1.3rem]"
/>
</div>
<div className="flex flex-col">
<Label className="mb-1 text-base">지번본번</Label>
<Input
type="number"
value={searchQuery.lotnoMno ?? ""}
onChange={(e) => {
const value = e.target.value
? parseInt(e.target.value)
: null;
setSearchQuery({
...searchQuery,
lotnoMno: value,
});
}}
placeholder="예: 123"
className="!text-[1.3rem]"
/>
</div>
<div className="flex flex-col">
<Label className="mb-1 text-base">지번부번</Label>
<Input
type="number"
value={searchQuery.lotnoSno ?? ""}
onChange={(e) => {
const value = e.target.value
? parseInt(e.target.value)
: null;
setSearchQuery({
...searchQuery,
lotnoSno: value,
});
}}
placeholder="예: 45"
className="!text-[1.3rem]"
/>
</div>
</div>
<div className="flex justify-end">
<Button type="submit">검색</Button>
</div>
</div>
</form>
{query.data?.content.length && tableComponent}
<DialogFooter className="!justify-center">
<Button
size="lg"
onClick={handleSelectAddress}
disabled={!selectedAddress}
>
선택
</Button>
<DialogClose asChild>
<Button size="lg" color="white">
취소
</Button>
</DialogClose>
</DialogFooter>
</DialogContent>
</Dialog>
);
}
export { ZipSearchDialog };
+71
View File
@@ -0,0 +1,71 @@
import axios from "axios";
import type { AxiosInstance, AxiosRequestConfig, AxiosResponse } from "axios";
interface SignupClientConfig {
baseURL: string;
}
class SignupClient {
private static instance: SignupClient;
private axiosInstance: AxiosInstance;
private constructor(config: SignupClientConfig) {
this.axiosInstance = axios.create({
baseURL: config.baseURL,
headers: {
"Content-Type": "application/json",
},
withCredentials: true,
});
// 인증 토큰 없이도 요청할 수 있도록 인터셉터 설정
this.axiosInstance.interceptors.request.use((config) => {
// 인증 토큰을 자동으로 추가하지 않음
return config;
});
}
public static getInstance(config: SignupClientConfig): SignupClient {
if (!SignupClient.instance) {
SignupClient.instance = new SignupClient(config);
}
return SignupClient.instance;
}
public async get<T = unknown, R = AxiosResponse<T>>(
url: string,
config?: AxiosRequestConfig
): Promise<R> {
const response = await this.axiosInstance.get<T, R>(url, config);
return response;
}
public async post<T = unknown, R = AxiosResponse<T>, D = unknown>(
url: string,
data?: D,
config?: AxiosRequestConfig<D>
): Promise<R> {
const response = await this.axiosInstance.post<T, R>(url, data, config);
return response;
}
public async put<T = unknown, R = AxiosResponse<T>, D = unknown>(
url: string,
data?: D,
config?: AxiosRequestConfig<D>
): Promise<R> {
const response = await this.axiosInstance.put<T, R>(url, data, config);
return response;
}
public async delete<T = unknown, R = AxiosResponse<T>>(
url: string,
config?: AxiosRequestConfig
): Promise<R> {
const response = await this.axiosInstance.delete<T, R>(url, config);
return response;
}
}
export type { SignupClientConfig };
export { SignupClient };
+1
View File
@@ -25,6 +25,7 @@ export const ENDPOINT = {
OTP_VERIFY: "/user-service/api/v1/auth/2fa/verify",
TWOFA_SETUP: "/user-service/api/v1/auth/2fa/setup",
TWOFA_ENABLE: "/user-service/api/v1/auth/2fa/enable",
USER_JOIN: "/user-service/api/v1/anonymouse/users/join",
},
CMS_SERVICE: {
DASHBOARD: "/cms-service/api/v1/dashboard",
+1
View File
@@ -36,6 +36,7 @@
"sonner": "^2.0.1",
"tailwindcss-animate": "^1.0.7",
"tus-js-client": "^4.3.1",
"yargs": "^18.0.0",
"zod": "^3.24.2",
"zustand": "^5.0.3"
},
-1
View File
@@ -27,7 +27,6 @@
"@/*": ["./*"],
"@common/assets": ["../../../../packages/common/assets/dist/"],
"@common/components": ["../../../../packages/common/components/dist/"],
"@common/config": ["../../../../packages/common/config/dist/"],
"@common/network": ["../../../../packages/common/network/"]
}
},
@@ -16,6 +16,7 @@ export interface Authorizations {
httpMethodCode: string;
sortSeq: number;
useYn: string;
siteId: string;
mdfr: string;
mdfcnDt: string;
}
@@ -27,6 +28,7 @@ export interface RoleAuthorizations {
urlPatternValue: string;
httpMethodCode: string;
sortSeq: number;
siteId: string;
createdAt: string;
}
@@ -40,6 +42,7 @@ export const authorizationFormSchema = z.object({
httpMethodCode: z.string(),
sortSeq: z.number(),
useYn: z.string(),
siteId: z.string(),
});
export type AuthorizationsList = PageableList<Authorizations>;
@@ -161,12 +161,7 @@ export const LinkTableColumnsSchema = z.object({
}, {
message: '최대 14자리까지 입력 가능합니다.',
}),
col_seq: z.coerce.number().nullable().optional().refine((val) => {
if (val == null) return true;
return val > 0;
}, {
message: "컬럼 매칭 순서는 0 이상이어야 합니다."
}),
col_seq: z.coerce.number().nullable().optional(),
mdfcn_dt: z.string().nullable().optional(),
mdfr_id: z.string().nullable().optional(),
});
@@ -196,6 +191,7 @@ export interface LinkSearchParam extends PageableParams {
startDate?: string;
endDate?: string;
isSucc?: string;
linkClfsCd?: string;
}
export type LinkFormData = z.infer<typeof linkFormSchema>;
@@ -11,6 +11,7 @@ export interface WithRoleIdRoleAuthorizationsParams extends PageableParams {
keywordType?: string;
keyword?: string;
roleId?: string;
siteId?: string;
}
export interface RoleAuthorizations {
@@ -131,7 +131,7 @@ function LwpoCodeSection({ upCd }: LwpoCodeSectionProps) {
</LwpoCodeManagementDialog>
</div>
</div>
<div className="card !m-4 h-[calc(100vh-35rem)] overflow-auto !p-0">
<div className="card !m-4 h-[calc(100vh-30rem)] overflow-auto !p-0">
{tableComponent}
</div>
</div>
+1 -1
View File
@@ -109,7 +109,7 @@ function UpCodeSection({ handleSelectedUpCd }: UpCodeSectionProps) {
<Button>등록</Button>
</UpCodeManagementDialog>
</div>
<div className="card !m-4 h-[calc(100vh-35rem)] overflow-auto !p-0">
<div className="card !m-4 h-[calc(100vh-30rem)] overflow-auto !p-0">
{tableComponent}
</div>
</div>
@@ -38,6 +38,9 @@ export const createColumns = (
{
accessorKey: "menuNm",
header: "메뉴명",
cell: ({ getValue }) => (
<div className="text-left">{getValue() as string}</div>
),
},
{
accessorKey: "mngAuthrtYn",
@@ -1,10 +1,16 @@
import { useState } from "react";
import { useState, useRef } from "react";
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { useQuery } from "@tanstack/react-query";
import { getCoreRowModel } from "@tanstack/react-table";
import { useConfirm } from "@frontend-opensource/use-react-hooks";
import {
Select,
SelectTrigger,
SelectValue,
SelectContent,
SelectItem,
Input,
Button,
Dialog,
DialogClose,
@@ -23,6 +29,7 @@ import {
import { ENDPOINT } from "@/shared/config";
import { useAlertStore, useDataTable, useMutationWrapper } from "@/shared/lib";
import { createColumns } from "../model/group-menu-authority-table-columns";
import { SiteSelect } from "@/entities/site";
type MenuAuthorityDialogProps = {
groupId: string;
@@ -33,9 +40,33 @@ function MenuAuthorityDialog({ groupId }: MenuAuthorityDialogProps) {
const alert = useAlertStore((state) => state.setMessage);
const [open, setOpen] = useState(false);
const inputRef = useRef<HTMLInputElement>(null);
const [siteId, setSiteId] = useState("");
const [keywordType, setKeywordType] = useState("");
const [searchParams, setSearchParams] = useState({
keyword: "",
keywordType: "",
siteId: "",
});
const handleReset = () => {
if (inputRef.current) inputRef.current.value = "";
setKeywordType("");
setSiteId("");
setSearchParams({
keyword: "",
keywordType: "",
siteId: "",
});
};
const query = useQuery({
queryKey: [ENDPOINT.CMS_SERVICE.MENU_AUTHRTS, groupId],
queryFn: () => MenuAuthorityApi.getGroupMenuAuthorityList({ groupId, useYn: "Y" }),
queryKey: [ENDPOINT.CMS_SERVICE.MENU_AUTHRTS, groupId, searchParams],
queryFn: () => MenuAuthorityApi.getGroupMenuAuthorityList({
groupId,
...searchParams
}),
enabled: open && !!groupId,
});
@@ -75,6 +106,17 @@ function MenuAuthorityDialog({ groupId }: MenuAuthorityDialogProps) {
}
};
const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault();
const formData = new FormData(e.target as HTMLFormElement);
const keyword = formData.get("keyword") as string;
setSearchParams({
keyword,
keywordType,
siteId: siteId === "ALL" ? "" : siteId,
});
};
return (
<Dialog open={open} onOpenChange={setOpen}>
<DialogTrigger asChild>
@@ -82,10 +124,42 @@ function MenuAuthorityDialog({ groupId }: MenuAuthorityDialogProps) {
메뉴권한
</Button>
</DialogTrigger>
<DialogContent className="max-w-[80rem]" aria-describedby={undefined}>
<DialogContent className="max-w-[120rem]" aria-describedby={undefined}>
<DialogHeader>
<DialogTitle>그룹별 메뉴 권한</DialogTitle>
</DialogHeader>
<div className="flex items-center justify-between">
<form onSubmit={handleSubmit} className="flex items-center gap-2">
<SiteSelect
value={siteId}
onValueChange={(value) => setSiteId(value)}
enabledAllSite
className="w-[24rem]"
/>
<Select
value={keywordType}
onValueChange={(value) => setKeywordType(value)}
>
<SelectTrigger className="w-[12rem]">
<SelectValue placeholder="선택" />
</SelectTrigger>
<SelectContent>
<SelectItem value="menuNm">메뉴명</SelectItem>
<SelectItem value="menuUrl">메뉴URL</SelectItem>
</SelectContent>
</Select>
<Input
ref={inputRef}
type="text"
name="keyword"
className="w-[12rem]"
/>
<Button type="submit">검색</Button>
<Button type="button" color="white" onClick={handleReset}>
초기화
</Button>
</form>
</div>
<div className="max-h-[40rem] overflow-auto">{tableComponent}</div>
<DialogFooter className="!justify-center">
<Button size="lg" onClick={handleSave}>
+10 -3
View File
@@ -104,6 +104,7 @@ function ImageForm({ form, imgSn, ...props }: ImageFormProps) {
value={field.value ?? ""}
className="!text-[1.3rem]"
placeholder="이미지명을 입력해주세요"
maxLength={100}
/>
</FormControl>
</FormItem>
@@ -126,11 +127,17 @@ function ImageForm({ form, imgSn, ...props }: ImageFormProps) {
min={0}
max={9999}
value={field.value ?? ""}
onChange={(e) =>
field.onChange(parseInt(e.target.value))
}
onChange={(e) => {
const value = parseInt(e.target.value);
if (value > 9999) {
field.onChange(9999);
} else {
field.onChange(value);
}
}}
className="w-[12rem] !text-[1.3rem]"
placeholder="정렬순서 입력"
maxLength={4}
/>
</FormControl>
</FormItem>
+14 -2
View File
@@ -195,7 +195,13 @@ const LinkForm = ({ form, linkSn, updateLinkInfo, handleInsertLink, deleteLink,
</TableCell>
</TableRow>
<TableRow>
<TableHead>* 연계 URL</TableHead>
<TableHead>
{['link0001', 'link0002'].includes(form.watch('link_clsf_cd') as string) ? '* 연계 데이터베이스 URL' :
(form.watch('link_clsf_cd') === 'link0007' ? '* 연계 파일 경로'
: '* 연계 URL'
)
}
</TableHead>
<TableCell>
<FormField
control={form.control}
@@ -242,7 +248,13 @@ const LinkForm = ({ form, linkSn, updateLinkInfo, handleInsertLink, deleteLink,
</TableCell>
</TableRow>
<TableRow>
<TableHead>* 연계 KEY</TableHead>
<TableHead>
{['link0001', 'link0002'].includes(form.watch('link_clsf_cd') as string) ? '* 연계 데이터베이스 DRIVER' :
(form.watch('link_clsf_cd') === 'link0007' ? '* 연계 파일 확장자'
: '* 연계 KEY'
)
}
</TableHead>
<TableCell>
<FormField
control={form.control}
+26 -3
View File
@@ -4,7 +4,7 @@ import "@common/assets/styles/grid.css";
import { useState } from "react";
import { useRouter } from "next/navigation";
import { Button, Input, Label, LoadingWithAnimation } from "@common/components";
import { Button, Input, Label, LoadingWithAnimation, Select, SelectTrigger, SelectContent, SelectItem, SelectValue } from "@common/components";
import { getCoreRowModel } from "@tanstack/react-table";
import { LinkApi, type Link, type LinkSearchParam } from "@/entities/link";
import { useQuery } from "@tanstack/react-query";
@@ -18,10 +18,12 @@ function LinkPage() {
const [linkSn, setLinkSn] = useState<string>('');
const [linkNm, setLinkNm] = useState<string>('');
const [linkClfsCd, setLinkClfsCd] = useState<string>('');
const [linkSearchParam, setLinkSearchParam] = useState<LinkSearchParam>({
linkSn: '',
linkNm: ''
linkNm: '',
linkClfsCd: '',
});
const query = useQuery({
@@ -32,10 +34,12 @@ function LinkPage() {
const handleResetSearchParam = () => {
setLinkSn('');
setLinkNm('');
setLinkClfsCd('ALL');
setLinkSearchParam({
...linkSearchParam,
linkSn: '',
linkNm: '',
linkClfsCd: 'ALL',
});
};
@@ -44,7 +48,8 @@ function LinkPage() {
setLinkSearchParam({
...linkSearchParam,
linkSn,
linkNm
linkNm,
linkClfsCd,
});
};
@@ -100,6 +105,24 @@ function LinkPage() {
onChange={(e) => setLinkNm(e.target.value)}
autoComplete="off"
/>
<Label htmlFor="linkClfsCd" className="mr-2 text-label">
연계 분류
</Label>
<Select onValueChange={(e) => setLinkClfsCd(e)} value={linkClfsCd}>
<SelectTrigger id="linkClfsCd" className="w-[20rem] mr-4">
<SelectValue placeholder="전체"></SelectValue>
</SelectTrigger>
<SelectContent>
<SelectItem value="ALL">전체</SelectItem>
<SelectItem value="link0001">TIBERO 데이터베이스</SelectItem>
<SelectItem value="link0002">ORACLE 데이터베이스</SelectItem>
<SelectItem value="link0003">공공데이터 포털 API</SelectItem>
<SelectItem value="link0004">한강홍수통제소 API</SelectItem>
<SelectItem value="link0005">기상청 API</SelectItem>
<SelectItem value="link0006">국가지하수정보센터 API</SelectItem>
<SelectItem value="link0007">행정정보공동이용센터 연계</SelectItem>
</SelectContent>
</Select>
<Button color="green" className="h-[3.2rem]" type="button" onClick={handleResetSearchParam}>
초기화
</Button>
+25 -4
View File
@@ -13,21 +13,22 @@ import {
TableRow,
} from "@common/components";
import { FormWrapper } from "@/widgets/form-wrapper";
import { CodeSelect } from "@/entities/code";
import { FormControl, FormField, FormItem } from "@/shared/ui/form";
import type {
AuthorizationFormData,
WithRoleAuthorizations,
} from "@/entities/authorization";
import { CodeSelect } from "@/entities/code";
import { SiteSelect } from "@/entities/site";
import { FormControl, FormField, FormItem } from "@/shared/ui/form";
type BannerFormProps = {
type ModuleFormProps = {
form: UseFormReturn<AuthorizationFormData>;
authorizationNo?: number;
handleSave: (data: AuthorizationFormData) => Promise<WithRoleAuthorizations>;
handleDelete?: () => Promise<void>;
};
function ModuleForm({ form, authorizationNo, ...props }: BannerFormProps) {
function ModuleForm({ form, authorizationNo, ...props }: ModuleFormProps) {
return (
<FormWrapper form={form} isModifyMode={!!authorizationNo} {...props}>
<div className="card">
@@ -99,6 +100,26 @@ function ModuleForm({ form, authorizationNo, ...props }: BannerFormProps) {
/>
</TableCell>
</TableRow>
<TableRow>
<TableHead data-required>사이트</TableHead>
<TableCell className="border">
<FormField
control={form.control}
name="siteId"
render={({ field }) => (
<FormItem className="flex flex-col">
<FormControl>
<SiteSelect
{...field}
onValueChange={field.onChange}
className="w-[20rem]"
/>
</FormControl>
</FormItem>
)}
/>
</TableCell>
</TableRow>
<TableRow>
<TableHead data-required>정렬순서</TableHead>
<TableCell className="border">
+1 -1
View File
@@ -14,7 +14,7 @@ function CreatePage() {
const { mutateAsync: createRole } = useMutationWrapper({
mutationFn: (data: RoleFormData) => RoleApi.createRole(data),
onSuccess: () => {
alert("등록되었습니다.", router.back);
alert("등록되었습니다.", () => router.push("/role"));
},
});
@@ -40,9 +40,12 @@ function MappingRoleDialog({
const queryClient = useQueryClient();
const alert = useAlertStore((state) => state.setMessage);
const inputRef = useRef<HTMLInputElement>(null);
const [keywordType, setKeywordType] = useState("");
const [siteId, setSiteId] = useState("");
const [searchParams, setSearchParams] = useState({
keyword: "",
keywordType: "authorizationName",
keywordType: "",
siteId: "",
});
const query = useQuery({
@@ -85,18 +88,20 @@ function MappingRoleDialog({
const formData = new FormData(e.target as HTMLFormElement);
const keyword = formData.get("keyword") as string;
setSearchParams({
...searchParams,
keyword,
keywordType,
siteId: siteId === "ALL" ? "" : siteId,
});
};
const handleReset = () => {
if (inputRef.current) {
inputRef.current.value = "";
}
if (inputRef.current) inputRef.current.value = "";
setKeywordType("");
setSiteId("");
setSearchParams({
...searchParams,
keyword: "",
keywordType: "",
siteId: "",
});
};
@@ -119,14 +124,22 @@ function MappingRoleDialog({
</DialogHeader>
<div className="flex items-center justify-between">
<form onSubmit={handleSubmit} className="flex items-center gap-2">
<SiteSelect enabledAllSite />
<Select>
<SiteSelect
value={siteId}
onValueChange={(value) => setSiteId(value)}
enabledAllSite
/>
<Select
value={keywordType}
onValueChange={(value) => setKeywordType(value)}
>
<SelectTrigger className="w-[12rem]">
<SelectValue placeholder="선택" />
</SelectTrigger>
<SelectContent>
<SelectItem value="authorizationName">API명</SelectItem>
<SelectItem value="urlPatternValue">API URL</SelectItem>
<SelectItem value="urlPatternValue">URL주소</SelectItem>
<SelectItem value="httpMethodCode">전송방식</SelectItem>
</SelectContent>
</Select>
<Input
+2 -2
View File
@@ -20,14 +20,14 @@ function ModifyPage({ roleId }: { roleId: string }) {
const { mutateAsync: updateRole } = useMutationWrapper({
mutationFn: (data: RoleFormData) => RoleApi.updateRole(roleId, data),
onSuccess: () => {
alert("수정되었습니다.", router.back);
alert("수정되었습니다.", () => router.push("/role"));
},
});
const { mutateAsync: deleteRole } = useMutationWrapper({
mutationFn: () => RoleApi.deleteRole(roleId),
onSuccess: () => {
alert("삭제되었습니다.", router.back);
alert("삭제되었습니다.", () => router.push("/role"));
},
});
+1 -1
View File
@@ -13,7 +13,7 @@ function CreatePage() {
const { mutateAsync: createSite } = useMutationWrapper({
mutationFn: (data: SiteFormData) => SiteApi.createSite(data),
onSuccess: () => {
alert("등록되었습니다.", router.back);
alert("등록되었습니다.", () => router.push("/site"));
},
});
+11 -3
View File
@@ -4,6 +4,7 @@ import { useRouter } from "next/navigation";
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { useQuery, useQueryClient } from "@tanstack/react-query";
import { useEffect } from "react";
import { SiteApi, siteFormSchema, type SiteFormData } from "@/entities/site";
import { useAlertStore, useMutationWrapper } from "@/shared/lib";
import { ENDPOINT } from "@/shared/config";
@@ -14,7 +15,7 @@ function ModifyPage({ siteId }: { siteId: string }) {
const queryClient = useQueryClient();
const alert = useAlertStore((state) => state.setMessage);
const { data: siteDetail } = useQuery({
const { data: siteDetail, error } = useQuery({
queryKey: [ENDPOINT.CMS_SERVICE.SITES, siteId],
queryFn: () => SiteApi.siteDetail(siteId),
select: (data) => {
@@ -25,22 +26,29 @@ function ModifyPage({ siteId }: { siteId: string }) {
};
},
enabled: !!siteId,
retry: false,
});
useEffect(() => {
if (error && siteId) {
alert("사이트 정보를 찾을 수 없습니다.", () => router.push("/site"));
}
}, [error, siteId]);
const { mutateAsync: updateSite } = useMutationWrapper({
mutationFn: (data: SiteFormData) => SiteApi.updateSite(siteId, data),
onSuccess: () => {
queryClient.invalidateQueries({
queryKey: [ENDPOINT.CMS_SERVICE.SITES],
});
alert("수정되었습니다.", router.back);
alert("수정되었습니다.", () => router.push("/site"));
},
});
const { mutateAsync: deleteSite } = useMutationWrapper({
mutationFn: () => SiteApi.deleteSite(siteId),
onSuccess: () => {
alert("삭제되었습니다.", router.back);
alert("삭제되었습니다.", () => router.push("/site"));
},
});
+4
View File
@@ -11,8 +11,12 @@ NEXT_PUBLIC_AUTH_USER_ID = token-id
NEXT_PUBLIC_ACCESS_TOKEN = access-token
NEXT_PUBLIC_REFRESH_TOKEN = refresh-token
NEXT_PUBLIC_REUSE_API_URL=http://con.mind-one.co.kr:11080/api/v1
NEXT_PUBLIC_NGII_URL = https://map.ngii.go.kr/openapi/Gettile.do?apiKey=04trYP9_xwLAfALjwZ-B8g
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 # 최용성
#NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.66:8883/sewerage-service/api # 박이정
NEXT_PUBLIC_FINDADRESS_URL=https://business.juso.go.kr/addrlink/addrLinkApi.do
NEXT_PRIVATE_WR_ADDRESS_KEY = devU01TX0FVVEgyMDI1MDgyNTEwMzkwNDExNjEwNTM=
+4
View File
@@ -14,8 +14,12 @@ NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver
NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver
NEXT_PUBLIC_CS_TUS_UPLOAD = /attach-service/api/v1/tus/upload
NEXT_PUBLIC_REUSE_API_URL=http://con.mind-one.co.kr:11080/api/v1
NEXT_PUBLIC_NGII_URL = https://map.ngii.go.kr/openapi/Gettile.do?apiKey=04trYP9_xwLAfALjwZ-B8g
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 # 최용성
#NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.66:8883/sewerage-service/api # 박이정
NEXT_PUBLIC_FINDADRESS_URL=https://business.juso.go.kr/addrlink/addrLinkApi.do
NEXT_PRIVATE_WR_ADDRESS_KEY = devU01TX0FVVEgyMDI1MDgyNTEwMzkwNDExNjEwNTM=
+4
View File
@@ -12,6 +12,10 @@ NEXT_PUBLIC_AUTH_USER_ID = token-id
NEXT_PUBLIC_ACCESS_TOKEN = access-token
NEXT_PUBLIC_REFRESH_TOKEN = refresh-token
NEXT_PUBLIC_REUSE_API_URL=http://con.mind-one.co.kr:11080/api/v1
NEXT_PUBLIC_NGII_URL = http://10.98.25.94:18080/openapi/Gettile.do?apiKey=BDE2BEF39DAFEC293AB6730150F222AC
NEXT_PUBLIC_SEWERAGE_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000/sewerage-service/api
NEXT_PUBLIC_FINDADRESS_URL=https://business.juso.go.kr/addrlink/addrLinkApi.do
NEXT_PRIVATE_WR_ADDRESS_KEY = U01TXOFVVEgyMDI1MDgyODE0MTAxNzExNjEyMjA=
@@ -60,6 +60,8 @@ export default function SdmApplyList({}: SdmApplyProps) {
// 데이터 변환을 위한 별도의 useEffect
useEffect(() => {
if (sdmInfoStatusList.length > 0) {
const newTransformedList = sdmInfoStatusList.map((item: DemandCompBizType) => ({
...item,
ctpvCd: selectSidoData.find(sido => sido.val === item.ctpvCd?.trim())?.text || '',
@@ -54,11 +54,25 @@ function SdmInfoInsertContent() {
useEffect(() => {
const user = sessionStorage.getItem("user");
setDefaultValues((prev) => ({
...prev,
sdmNm: searchParams.get("dmdCoNm") || "",
}));
sessionStorage.setItem("user", searchParams.get("dmdInfoId") || "");
if(searchParams.get("dmdInfoId")){
// const data = {
// dmdCoNm: searchParams.get("dmdCoNm") || '',
// ctpvCd: searchParams.get("ctpvCd") || '',
// sggCd: searchParams.get("sggCd") || '',
// dmdInfoId: searchParams.get("dmdInfoId") || '',
// daddr: searchParams.get("daddr") || '',
// telno: searchParams.get("telno") || '',
// }
// sessionStorage.setItem("user", JSON.stringify(data || {}));
}
//sessionStorage.setItem("user", JSON.parse(user||'') || "");
setIsLogin(user || searchParams.get("dmdInfoId") ? true : false);
}, [searchParams]);
@@ -58,6 +58,7 @@ export default function MyForm() {
dataList={demandCompList}
rtnValue={callback}
rtnInputData={handleInsertSdmData}
openNetwork={true}
/>
<Toaster position="top-center" />
</div>
+86 -257
View File
@@ -1,237 +1,43 @@
'use client';
import { regionData, regionIdMap } from '@/app/common/comFunction';
import { useDmStore } from '@/app/store';
import type { DmStatusDataType } from '@/app/store/wrStatus/type';
import { CHART_FORM, MainChart, type ChartConfig } from '@common/business_components';
import React, { useEffect, useRef, useState, useMemo, useCallback } from 'react';
import React, { useEffect, useRef, useState, useCallback } from 'react';
interface RegionData {
name: string;
x: number;
y: number;
values: number[];
interface WrStatusChartProps {
chartForm: string;
chartConfig: ChartConfig;
chartData: any;
chartTitle: string;
chartClassName?: string;
graphSize?: number;
yFieldText? : string | undefined;
yFieldText2? : string | undefined;
showLegend? : boolean;
setXAxisYearTick ?: boolean;
}
interface TableData {
region: string;
sewage: string;
rainwater: string;
reclaimed: string;
thermal: string;
}
export default function WrStatusPage() {
const WrStatusPage: React.FC = () => {
const { dmStatus, getDmStatusData} = useDmStore((state) => state);
const { statusData,facilityTotals ,chartData} = dmStatus;
const [selectedRegion, setSelectedRegion] = useState<string | null>(null);
const [hoveredRegion, setHoveredRegion] = useState<string | null>(null);
const [tooltipPosition, setTooltipPosition] = useState<{ x: number; y: number } | null>(null);
const [chartOption, setChartOption] = useState<WrStatusChartProps>({} as WrStatusChartProps)
const svgContainerRef = useRef<HTMLDivElement>(null);
const [chartData] = useState<any[]>([
{
label : '서울',
하수 : 4,
빗물 : 816,
중수도 : 371,
온배수 : 0
},
{
label : '부산',
하수 : 13,
빗물 : 68,
중수도 : 20,
온배수 : 1
},
{
label : '대구',
하수 : 9,
빗물 : 294,
중수도 : 14,
온배수 : 2
},
{
label : '인천',
하수 : 17,
빗물 : 165,
중수도 : 35,
온배수 : 15
},
{
label : '광주',
하수 : 3,
빗물 : 74,
중수도 : 15,
온배수 : 15
},
{
label : '대전',
하수 : 2,
빗물 : 52,
중수도 : 11,
온배수 : 20
},
{
label : '울산',
하수 : 8,
빗물 : 111,
중수도 : 19,
온배수 : 30
},
{
label : '세종',
하수 : 9,
빗물 : 65,
중수도 : 0,
온배수 : 0
},
{
label : '경기',
하수 : 176,
빗물 : 1009,
중수도 : 252,
온배수 : 40
},
{
label : '강원',
하수 : 69,
빗물 : 69,
중수도 : 22,
온배수 : 0
},
{
label : '충북',
하수 : 38,
빗물 : 17,
중수도 : 91,
온배수 : 0
},
{
label : '충남',
하수 : 67,
빗물 : 54,
중수도 : 188,
온배수 : 0
},
{
label : '전북',
하수 : 55,
빗물 : 33,
중수도 : 220,
온배수 : 0
},
{
label : '전남',
하수 : 83,
빗물 : 16,
중수도 : 75,
온배수 : 0
},
{
label : '경북',
하수 : 81,
빗물 : 37,
중수도 : 70,
온배수 : 0
},
{
label : '경남',
하수 : 75,
빗물 : 27,
중수도 : 140,
온배수 : 0
},
{
label : '제주',
하수 : 8,
빗물 : 47,
중수도 : 64,
온배수 : 0
}
]);
const chartConfig = chartData.reduce((config, element) => {
config[element.label] = {
label: element.label,
color : "hsl(var(--chart-1))"
};
return config;
}, {} as Record<string, { label: string; color: string; }>) satisfies ChartConfig;
const chartOption = {
chartForm : CHART_FORM.BAR,
chartConfig : chartConfig,
chartData : chartData,
chartTitle : '',
chartClassName : "h-[300px] w-full",
graphSize : 40,
yFieldText : '시설(개소)',
showLegend : true
}
const colorLegend = [
{ label: '하수', color: '#FF6B6B', key: 'sewage' },
{ label: '빗물', color: '#4ECDC4', key: 'rainwater' },
{ label: '중수도', color: '#45B7D1', key: 'reclaimed' },
{ label: '온배수', color: '#FED16A', key: 'thermal' },
];
const facilityTotalsColor = ['#FF6B6B', '#4ECDC4', '#45B7D1', '#FED16A'];
const defaultYear= '2023'
const regionIdMap: Record<string, string> = {
서울: '서울특별시',
부산: '부산광역시',
대구: '대구광역시',
인천: '인천광역시',
광주: '광주광역시',
대전: '대전광역시',
울산: '울산광역시',
세종: '세종특별자치시',
경기: '경기도',
강원: '강원특별자치도',
충북: '충청북도',
충남: '충청남도',
전북: '전라북도',
전남: '전라남도',
경북: '경상북도',
경남: '경상남도',
제주: '제주특별자치도'
};
const tableData: TableData[] = [
{ region: '전국', sewage: '717(1,137,538)', rainwater: '3544(13,945)', reclaimed: '1018(222,476)', thermal: '123(492)' },
{ region: '서울특별시', sewage: '4(114,908)', rainwater: '816(430)', reclaimed: '371(341)', thermal: '0' },
{ region: '부산광역시', sewage: '13(146,197)', rainwater: '68(335)', reclaimed: '20(512)', thermal: '1(18)' },
{ region: '대구광역시', sewage: '9(102,380)', rainwater: '294(133)', reclaimed: '14(44)', thermal: '2(12)' },
{ region: '인천광역시', sewage: '17(57,691)', rainwater: '165(642)', reclaimed: '35(7,859)', thermal: '15(32)' },
{ region: '광주광역시', sewage: '3(28,738)', rainwater: '74(23)', reclaimed: '15(450)', thermal: '15(6)' },
{ region: '대전광역시', sewage: '2(11,966)', rainwater: '52(2)', reclaimed: '11(492)', thermal: '20(100)' },
{ region: '울산광역시', sewage: '8(36,076)', rainwater: '111(39)', reclaimed: '19(28,904)', thermal: '30(130)' },
{ region: '세종특별자치시', sewage: '9(2,555)', rainwater: '65(16)', reclaimed: '0(0)', thermal: '0' },
{ region: '경기도', sewage: '176(313,298)', rainwater: '1009(4,735)', reclaimed: '252(77,096)', thermal: '40(143)' },
{ region: '강원특별자치도', sewage: '69(19,677)', rainwater: '69(4)', reclaimed: '22(447)', thermal: '0' },
{ region: '충청북도', sewage: '38(15,607)', rainwater: '17(91)', reclaimed: '91(2,211)', thermal: '0' },
{ region: '충청남도', sewage: '67(41,368)', rainwater: '54(77)', reclaimed: '188(50,434)', thermal: '0' },
{ region: '전라북도', sewage: '55(42,671)', rainwater: '33(199)', reclaimed: '220(9,453)', thermal: '0' },
{ region: '전라남도', sewage: '83(23,560)', rainwater: '16(885)', reclaimed: '75(15,412)', thermal: '0' },
{ region: '경상북도', sewage: '81(129,081)', rainwater: '37(341)', reclaimed: '70(27,818)', thermal: '0' },
{ region: '경상남도', sewage: '75(50,101)', rainwater: '27(244)', reclaimed: '140(343)', thermal: '0' },
{ region: '제주특별자치도', sewage: '8(1,666)', rainwater: '47(5,746)', reclaimed: '64(660)', thermal: '0' },
];
const regionData: RegionData[] = useMemo(() => [
{ name: '서울', x: 170, y: 140, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '인천', x: 120, y: 150, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '경기', x: 210, y: 210, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '강원', x: 330, y: 120, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '충북', x: 260, y: 280, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '충남', x: 100, y: 320, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '세종', x: 180, y: 305, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '대전', x: 195, y: 360, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '전북', x: 170, y: 450, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '전남', x: 160, y: 600, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '광주', x: 120, y: 530, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '경북', x: 400, y: 320, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '경남', x: 310, y: 530, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '대구', x: 350, y: 450, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '울산', x: 450, y: 500, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '부산', x: 420, y: 550, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '제주', x: 60, y: 750, values: [0.3, 0.3, 0.2, 0.2] },
], []);
const handleMarkerClick = (regionId: string) => {
if (selectedRegion === regionId) {
@@ -241,7 +47,6 @@ const WrStatusPage: React.FC = () => {
}
};
const createDonutMarker = useCallback((svg: SVGSVGElement, x: number, y: number, name: string, values: number[]) => {
const colors = ['#FF6B6B', '#4ECDC4', '#45B7D1', '#FED16A'];
const radius = 26;
@@ -252,7 +57,6 @@ const WrStatusPage: React.FC = () => {
console.warn(`Invalid region name: ${name}`);
return;
}
const g = document.createElementNS('http://www.w3.org/2000/svg', 'g');
g.setAttribute('transform', `translate(${x}, ${y})`);
g.setAttribute('id', `marker-${name}`);
@@ -336,6 +140,13 @@ const WrStatusPage: React.FC = () => {
svg.appendChild(g);
}, [handleMarkerClick, regionIdMap]);
useEffect(() => {
getDmStatusData(defaultYear);
},[])
useEffect(() => {
const loadSVG = async () => {
try {
@@ -393,6 +204,31 @@ const WrStatusPage: React.FC = () => {
});
}
}, [selectedRegion]);
useEffect(() => {
if(chartData.length>0){
const chartConfig = chartData.reduce((config, element) => {
config[element.label] = {
label: element.label,
color : "hsl(var(--chart-1))"
};
return config;
}, {} as Record<string, { label: string; color: string; }>) satisfies ChartConfig;
const Option = {
chartForm : CHART_FORM.BAR,
chartConfig : chartConfig,
chartData : chartData,
chartTitle : '',
chartClassName : "h-[300px] w-full",
graphSize : 40,
yFieldText : '시설(개소)',
showLegend : true
}
setChartOption(Option)
}else{
setChartOption({} as WrStatusChartProps)
}
}, [chartData]);
return (
<div className="flex h-screen bg-[#F2F2F2] text-gray-800">
@@ -401,7 +237,6 @@ const WrStatusPage: React.FC = () => {
{/* 상단 제목 */}
<div className="mb-6 flex justify-between items-center">
<h2 className="text-2xl font-bold">물재이용 현황</h2>
<div className="text-sm text-gray-500">관리자 ▼</div>
</div>
{/* 콘텐츠 본문 */}
@@ -410,7 +245,7 @@ const WrStatusPage: React.FC = () => {
<div className="bg-white rounded-xl shadow border border-[#DBE2E6] overflow-hidden max-h-[900px]">
{/* 타이틀 영역 */}
<div className="border-b border-[#DBE2E6] px-4 py-3">
<h3 className="text-[12px] font-semibold">재이용시설현황(2023)</h3>
<h3 className="text-[12px] font-semibold">{`재이용시설현황(${defaultYear})`}</h3>
<p className="text-[12px] text-[#999] font-medium">행정구역별 재이용시설현황(개소)</p>
</div>
@@ -439,11 +274,11 @@ const WrStatusPage: React.FC = () => {
<div className="font-semibold mb-1">{hoveredRegion}</div>
<div className="space-y-1">
{colorLegend.map(({ label, color, key }) => (
<div key={key} className="flex items-center space-x-2">
<div key={key+'' +color} className="flex items-center space-x-2">
<span className="text-[12px] inline-block w-3 h-3 rounded-sm" style={{ backgroundColor: color }}></span>
<span className="text-[12px]">
{label}:{' '}
{tableData.find(d => d.region === hoveredRegion)?.[key as keyof TableData] ?? '-'}
{statusData?.find(d => d.region === hoveredRegion)?.[key as keyof DmStatusDataType] || '-'}
</span>
</div>
))}
@@ -453,22 +288,12 @@ const WrStatusPage: React.FC = () => {
{/* 범례 */}
<div className="absolute bottom-2 right-2 bg-white rounded-lg shadow-md p-4 text-sm space-y-2">
<div className="flex items-center space-x-2">
<span className="inline-block w-4 h-4 rounded-sm" style={{backgroundColor: '#FF6B6B'}}></span>
<span className="text-[12px] text-gray-900">하수재이용시설 (총 717개소)</span>
</div>
<div className="flex items-center space-x-2">
<span className="inline-block w-4 h-4 rounded-sm" style={{backgroundColor: '#4ECDC4'}}></span>
<span className="text-[12px] text-gray-900">빗물이용시설 (총 3,730개소)</span>
</div>
<div className="flex items-center space-x-2">
<span className="inline-block w-4 h-4 rounded-sm" style={{backgroundColor: '#45B7D1'}}></span>
<span className="text-[12px] text-gray-900">중수도시설 (총 1,074개소)</span>
</div>
<div className="flex items-center space-x-2">
<span className="inline-block w-4 h-4 rounded-sm" style={{backgroundColor: '#FED16A'}}></span>
<span className="text-[12px] text-gray-900">온배수시설 (총 201개소)</span>
</div>
{facilityTotals?.map((item, index) => (
<div key ={'fcltTotal' +index}className="flex items-center space-x-2">
<span className="inline-block w-4 h-4 rounded-sm" style={{backgroundColor:facilityTotalsColor[index]}}></span>
<span className="text-[12px] text-gray-900">{item}</span>
</div>
)) }
</div>
</div>
</div>
@@ -479,10 +304,10 @@ const WrStatusPage: React.FC = () => {
{/* 재이용시설현황 표 */}
<div className="bg-white rounded-xl shadow border border-[#DBE2E6] overflow-hidden">
{/* 타이틀 + 버튼 영역 */}
<div className="flex justify-between items-center border-b border-[#DBE2E6] px-4 py-3">
<div className="flex justify-between items-center border-b border-[#436d85] px-4 py-3">
<div>
<h3 className="text-[12px] font-semibold">재이용시설현황(2023)</h3>
<p className="text-[12px] text-[#999] font-medium">행정구역별 재이용시설현황(개소)</p>
<h3 className="text-[12px] font-semibold">{`재이용시설현황(${defaultYear})`}</h3>
<p className="text-[12px] text-[#999] font-medium">행정구역별 재이용시설현황[개소(천m³/년)]</p>
</div>
</div>
<div className="p-4">
@@ -493,14 +318,18 @@ const WrStatusPage: React.FC = () => {
<tr>
<th className="text-[12px] font-semibold px-4 py-2">번호</th>
<th className="text-[12px] font-semibold px-4 py-2">시도</th>
<th className="text-[12px] font-semibold px-4 py-2">하수(이용량,천𝓂³/년)</th>
<th className="text-[12px] font-semibold px-4 py-2">하수재이용시설</th>
<th className="text-[12px] font-semibold px-4 py-2">빗물이용시설</th>
<th className="text-[12px] font-semibold px-4 py-2">중수도시설</th>
<th className="text-[12px] font-semibold px-4 py-2">온배수시설</th>
{/* <th className="text-[12px] font-semibold px-4 py-2">하수(이용량,천𝓂³/년)</th>
<th className="text-[12px] font-semibold px-4 py-2">빗물(이용량,천𝓂³/년)</th>
<th className="text-[12px] font-semibold px-4 py-2">중수도(이용량,천𝓂³/년)</th>
<th className="text-[12px] font-semibold px-4 py-2">온배수(이용량,천𝓂³/년)</th>
<th className="text-[12px] font-semibold px-4 py-2">온배수(이용량,천𝓂³/년)</th> */}
</tr>
</thead>
<tbody className="divide-y">
{tableData.map((row, index) => (
{statusData?.map((row, index) => (
<tr key={index} className="hover:bg-gray-50">
<td className="text-[12px] px-4 py-2 text-center">
{index+1}
@@ -521,21 +350,23 @@ const WrStatusPage: React.FC = () => {
{/* 재이용통계 차트 */}
<div className="bg-white rounded-xl shadow border border-[#DBE2E6] overflow-hidden">
<div className="border-b border-[#DBE2E6] px-4 py-3">
<h3 className="text-[12px] font-semibold">재이용통계(2023)</h3>
<h3 className="text-[12px] font-semibold">{`재이용통계(${defaultYear})`}</h3>
<p className="text-[12px] text-[#999] font-medium">행정구역별 재이용시설 현황 개소수 그래프</p>
</div>
<div className="p-4 bg-[#f9fbfd]">
<div className="h-[305px] text-gray-500">
<MainChart
chartForm={chartOption.chartForm}
chartConfig={chartOption.chartConfig}
chartData={chartOption.chartData}
chartTitle={chartOption.chartTitle}
chartClassName={chartOption.chartClassName}
graphSize={chartOption.graphSize}
yFieldText={chartOption.yFieldText}
showLegend={chartOption.showLegend}
/>
{chartOption?
<MainChart
chartForm={chartOption.chartForm}
chartConfig={chartOption.chartConfig}
chartData={chartOption.chartData}
chartTitle={chartOption.chartTitle}
chartClassName={chartOption.chartClassName}
graphSize={chartOption.graphSize}
yFieldText={chartOption.yFieldText}
showLegend={chartOption.showLegend}
/>
:<></>}
</div>
</div>
</div>
@@ -545,5 +376,3 @@ const WrStatusPage: React.FC = () => {
</div>
);
};
export default WrStatusPage;
+74
View File
@@ -0,0 +1,74 @@
import type { DmStatusChartType, DmStatusDataType, RegionData, } from "../store/wrStatus/type";
export const regionData:RegionData[] = [
{ name: '서울', x: 170, y: 140, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '인천', x: 120, y: 150, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '경기', x: 210, y: 210, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '강원', x: 330, y: 120, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '충북', x: 260, y: 280, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '충남', x: 100, y: 320, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '세종', x: 180, y: 305, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '대전', x: 195, y: 360, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '전북', x: 170, y: 450, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '전남', x: 160, y: 600, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '광주', x: 120, y: 530, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '경북', x: 400, y: 320, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '경남', x: 310, y: 530, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '대구', x: 350, y: 450, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '울산', x: 450, y: 500, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '부산', x: 420, y: 550, values: [0.3, 0.3, 0.2, 0.2] },
{ name: '제주', x: 60, y: 750, values: [0.3, 0.3, 0.2, 0.2] },
]
export const regionIdMap: Record<string, string> = {
서울: '서울특별시',
부산: '부산광역시',
대구: '대구광역시',
인천: '인천광역시',
광주: '광주광역시',
대전: '대전광역시',
울산: '울산광역시',
세종: '세종특별자치시',
경기: '경기도',
강원: '강원특별자치도',
충북: '충청북도',
충남: '충청남도',
전북: '전라북도',
전남: '전라남도',
경북: '경상북도',
경남: '경상남도',
제주: '제주특별자치도'
};
const makeRegion = (region: string) => {
if (region === '서울특별시') return '서울'
if (region === '부산광역시') return '부산'
if (region === '대구광역시') return '대구'
if (region === '인천광역시') return '인천'
if (region === '광주광역시') return '광주'
if (region === '대전광역시') return '대전'
if (region === '울산광역시') return '울산'
if (region === '세종특별자치시') return '세종'
if (region === '경기도') return '경기'
if (region === '강원특별자치도') return '강원'
if (region === '충청북도') return '충북'
if (region === '충청남도') return '충남'
if (region === '전라북도') return '전북'
if (region === '전라남도') return '전남'
if (region === '경상북도') return '경북'
if (region === '경상남도') return '경남'
if (region === '제주특별자치도') return '제주'
return region;
}
export const changeStatusMapData= (data: DmStatusDataType[]) : DmStatusChartType[]=> {
return data.map((item) => ({
label: makeRegion(item.region??''),
하수: item.sewage.split('(')[0]?.replaceAll(',','') ??'',
빗물: item.rainwater.split('(')[0]?.replaceAll(',','')??'',
중수도: item.reclaimed.split('(')[0]?.replaceAll(',','') ??'',
온배수: item.thermal.split('(')[0]?.replaceAll(',','') ??'',
}));
}
+1 -1
View File
@@ -40,7 +40,7 @@ const getRuseFclt = async (
searchPk: item.bscFctNm,
};
})
.filter((hasu) => ruseList.find((ruse) => hasu.bscFctCd === ruse));
.filter((hasu:any) => ruseList.find((ruse:any) => hasu.bscFctCd === ruse));
return { data: data, count: res.count };
});
+6 -5
View File
@@ -691,6 +691,7 @@ export const SdmReducer = (set: any): SdmActions => {
// 수요정보 신청현황
getSdmInfoStatusList: async (dmdInfoId: string) => {
const res = await getSdmInfoStatusList(dmdInfoId);
if(res.length === 0) {
set((state: SdmType) => ({
Sdm: {
@@ -700,15 +701,15 @@ export const SdmReducer = (set: any): SdmActions => {
}))
return;
}
const sdmInfoStatusList : DemandCompBizType[] = [];
//const sdmInfoStatusList : DemandCompBizType[] = [];
res.demandInfo.map((el: DemandCompBizType, index: number) => {
const sdmInfoStatusList : DemandCompBizType[]= res.demandInfo.map((el: DemandCompBizType, index: number) => {
const matchingInfo = res.demandMatchings.find((matching: DemandMatchings) => matching.dmdInfoSn === el.dmdInfoSn);
const status = matchingInfo?.splyFcltFlg?.trim() === 'Sub' ? '검토' : matchingInfo?.splyFcltFlg?.trim() === 'matched' ? '매칭완료' : '신청';
const ruseUtztnFcltNm = matchingInfo?.ruseUtztnFcltNm ? matchingInfo.ruseUtztnFcltNm : '';
const tmpData = {
return( {
...el,
index: ++index,
bzmnNo: res.bzmnNo,
@@ -725,9 +726,9 @@ export const SdmReducer = (set: any): SdmActions => {
status : status,
splyCndtList: el.splyCndtList,
ruseUtztnFcltNm: ruseUtztnFcltNm || ''
}
sdmInfoStatusList.push(tmpData);
})
})
set((state: SdmType) => ({
Sdm: {
...state.Sdm,
+38 -19
View File
@@ -1,29 +1,48 @@
import { createStore } from 'zustand/vanilla';
import { CommonReducer, CommonState, type CommonStore, type CommonType } from './common';
import { SdmReducer, SdmState, type SdmStore, type SdmType } from './sdmMng';
import { dmMapState, type DmMapType, type DmMapStore, DmMapReducer } from './map';
import { tokenManager } from '@/src/entities/auth/lib/token-manager';
import { createStore } from "zustand/vanilla";
import {
CommonReducer,
CommonState,
type CommonStore,
type CommonType,
} from "./common";
import { SdmReducer, SdmState, type SdmStore, type SdmType } from "./sdmMng";
import {
dmMapState,
type DmMapType,
type DmMapStore,
DmMapReducer,
} from "./map";
import { tokenManager } from "@/src/entities/auth/lib/token-manager";
import {
DmStatusReducer,
dmStatusState,
type DmStatusStore,
type DmStatusType,
} from "./wrStatus";
export type DmStore = CommonStore & SdmStore &DmMapStore ;
export type DmState = CommonType & SdmType &DmMapType;
export type DmStore = CommonStore & SdmStore & DmMapStore & DmStatusStore;
export type DmState = CommonType & SdmType & DmMapType & DmStatusType;
export const StoreZus = (initState: DmState= {
...CommonState,
...SdmState,
...dmMapState,
}) => {
export const StoreZus = (
initState: DmState = {
...CommonState,
...SdmState,
...dmMapState,
...dmStatusState,
}
) => {
return createStore<DmStore>()((set) => {
if (typeof window !== "undefined") {
tokenManager.setToken("site-id-key", 'DM');
tokenManager.setToken("site-theme-key", 'green');
tokenManager.setToken("site-id-key", "DM");
tokenManager.setToken("site-theme-key", "green");
}
return {
...initState,
...CommonReducer(set),
...SdmReducer(set),
...DmMapReducer(set)
}
})
}
...DmMapReducer(set),
...DmStatusReducer(set),
};
});
};
+63
View File
@@ -0,0 +1,63 @@
import { changeStatusMapData } from "@/app/common/comFunction";
import { fetchType, getFetch } from "@/components/ui/api";
import type {
DmStatusDataType,
DmStatusChartType,
} from "./type";
export type DmStatusActions = {
getDmStatusData(year: string): void;
};
export type DmStatusType = {
dmStatus: {
statusData: DmStatusDataType[];
facilityTotals: string[];
chartData: DmStatusChartType[];
};
};
export const dmStatusState: DmStatusType = {
dmStatus: {
statusData: [],
facilityTotals: [],
chartData: [],
},
};
export type DmStatusStore = DmStatusType & DmStatusActions;
export const DmStatusReducer = (set: any): DmStatusActions => {
return {
getDmStatusData: async (year: string) => {
const data = await getFetch(fetchType.WR, "/daemin/" + year);
let isData:DmStatusDataType[] =[]
if(data.data&&data.data.length>0){
isData=data.data
}else{
fetch(`data/wrStatusData.json`).then((res) => res.json()).then((json) => isData=json)//만약 백엔드에서 못가져올경우 방어책
}
const orgin: DmStatusDataType[] = isData;
const chartData = changeStatusMapData(orgin);
const facilityTotals = [
"하수재이용시설" + "(총" + orgin[0]?.sewage.split("(")[0] + "개소)",
"빗물재이용시설" + "(총" + orgin[0]?.rainwater.split("(")[0] + "개소)",
"중수도재이용시설" +
"(총" +
orgin[0]?.reclaimed.split("(")[0] +
"개소)",
"온배수재이용시설" + "(총" + orgin[0]?.thermal.split("(")[0] + "개소)",
];
set((state: DmStatusType) => ({
...state,
dmStatus: {
...state.dmStatus,
statusData: data.data,
chartData: chartData,
facilityTotals: facilityTotals,
},
}));
},
};
};
+32
View File
@@ -0,0 +1,32 @@
export type DmStatusDataType = {
region: string;
sewage: string;
rainwater: string;
reclaimed: string;
thermal: string;
};
export type DmStatusFcltType = {
sewageFclt: string;
rainwaterFclt: string;
reclaimedFclt: string;
thermalFclt: string;
};
export type DmStatusChartType = {
label: string,
하수: string,
빗물: string,
중수도: string,
온배수: string,
}
export type RegionData = {
name: string;
x: number;
y: number;
values: number[];
}
+37 -1
View File
@@ -15,4 +15,40 @@ export const sanitizeInput = (val: string, allowDecimal = false) => {
// 정수만 허용
return val.replace(/[^0-9]/g, "");
};
};
// utils: format Date <-> "YYYY-MM-DD" without moment
export const formatDateToYMD=(value: Date): string => {
if (!value) return "";
// value can be Date | string ("YYYY-MM-DD")
if (typeof value === "string") {
// assume already in yyyy-mm-dd
if (/^\d{4}-\d{2}-\d{2}$/.test(value)) return value;
const d = new Date(value);
if (isNaN(d.getTime())) return "";
return toYMD(d);
}
if (value instanceof Date) {
if (isNaN(value.getTime())) return "";
return toYMD(value);
}
return "";
}
const toYMD=(date: Date): string => {
// avoid timezone shift by normalizing to local date parts
const y = date.getFullYear();
const m = String(date.getMonth() + 1).padStart(2, "0");
const day = String(date.getDate()).padStart(2, "0");
return `${y}-${m}-${day}`;
}
// const parseYMDToDate=(ymd: string): Date | null => {
// if (!/^\d{4}-\d{2}-\d{2}$/.test(ymd)) return null;
// const [y, m, d] = ymd.split("-").map(Number);
// const date = new Date(y, (m - 1), d);
// // validate round-trip
// return (date.getFullYear() === y && date.getMonth() === m - 1 && date.getDate() === d) ? date : null;
// }
@@ -2,7 +2,7 @@ import ModalSimilarPage from "@/app/(base-layout)/pages/sdmMng/sdmInfoInsert/mod
import { useDmStore } from "@/app/store";
import {
CANDIDATE,
DatePicker,
// DatePicker,
FormField,
FormLabel,
FormUi,
@@ -22,7 +22,7 @@ import {
} from "react-hook-form";
import SearchInputText from "../common/searhDemandInput/component";
import React from "react";
import { sanitizeInput } from "../common/utils/utils";
import { formatDateToYMD, sanitizeInput } from "../common/utils/utils";
import type { DemandCompType } from "@common/business_components/ui/sdmInsertForm/form";
import type { SdmInfoFormData } from "@/app/store/sdmMng";
@@ -161,7 +161,9 @@ export function SdmInfoRegForm({
if (defaults) {
Object.entries(defaults).forEach(([field, value]) => {
form.setValue(field as keyof SdmInfoFormData, value, { shouldDirty: true });
form.setValue(field as keyof SdmInfoFormData, value, {
shouldDirty: true,
});
});
}
}, [form.getValues("usePurpose")]);
@@ -208,23 +210,34 @@ export function SdmInfoRegForm({
formIndex: 0,
required: true,
component: (field) => (
<div className="w-full">
<DatePicker
<div className="relative w-64">
{/* <DatePicker
mode="single"
selected={field.value as Date}
onSelect={(date) => {
field.onChange(date as Date);
}}
className="w-full"
defaultMonth={field.value as Date}
className=""
//defaultMonth={field.value as Date}
field={{
value: field.value as Date,
onChange: (date: Date | undefined) => {
field.onChange(date as Date);
},
}}
showOutsideDays={true}
selectClass={undefined}
/>
/> */}
{/* 네이티브 input */}
<Input
className="w-full !text-xl text-right"
type="date"
onChange= {(e) => {
const selectedDate = e.target.value ? new Date(e.target.value) : null;
field.onChange(selectedDate);
}}
value={ formatDateToYMD(field.value as Date) }
/>
</div>
),
},
@@ -269,7 +282,7 @@ export function SdmInfoRegForm({
},
{
name: "money",
label: "희망단가(원/m3)",
label: "희망단가(원)",
formIndex: 0,
required: true,
component: (field) => (
@@ -362,13 +375,11 @@ export function SdmInfoRegForm({
render={({ field }) =>
name === "money" ? (
<div>
<Label className="text-black" >
희망단가*
</Label>
{ component(field)}
<Label className="text-black">희망단가(원)*</Label>
{component(field)}
</div>
// <FormUi label={label + "*"}>{component(field)}</FormUi>
) : (
// <FormUi label={label + "*"}>{component(field)}</FormUi>
<AccessibleFormField
field={field}
label={label}
@@ -626,7 +637,7 @@ export function SdmInfoRegForm({
}}
/>
<div className="col-span-1">
<Label className="text-xl">수소이온농도(PH)</Label>
<Label className="text-xl">수소이온농도(pH)</Label>
<div className="flex flex-row items-center gap-2">
<Input
className="!text-xl w-36"
@@ -772,7 +783,7 @@ export function SdmInfoRegForm({
onSelectValue={(val: string | number) => {
field.onChange(val.toString());
}}
value={field.value }
value={field.value}
readOnly={isDisabled}
onBlur={field.onBlur}
ref={field.ref}
+2
View File
@@ -4,6 +4,7 @@ import { FlatCompat } from "@eslint/eslintrc";
const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
const isProd = process.env.NODE_ENV === "production";
const compat = new FlatCompat({
baseDirectory: __dirname,
@@ -14,6 +15,7 @@ const eslintConfig = [
{rules:{
// other rules..
"@typescript-eslint/no-explicit-any": "off",
...(isProd ? { "react-hooks/exhaustive-deps": "off" } : {}),
}},
];
+54 -29
View File
@@ -7,6 +7,8 @@ const serverApiUrl = process.env.NEXT_PUBLIC_CS_SERVER_API_URL;
const GEOSERVER_URL = process.env.NEXT_PUBLIC_GEOSERVER_URL || "";
const LX_GEOSERVER_URL = process.env.NEXT_PUBLIC_LX_GEOSERVER_URL || "";
const SEWERAGE_API_URL = process.env.NEXT_PUBLIC_SEWERAGE_API_URL || "";
const BUSINESS_JUSO_API_URL = process.env.NEXT_PUBLIC_FINDADRESS_URL || "";
const AdressKey = process.env.NEXT_PRIVATE_WR_ADDRESS_KEY || "";
export function middleware(req: NextRequest) {
const pathname = req.nextUrl.pathname;
@@ -24,8 +26,8 @@ export function middleware(req: NextRequest) {
if (pathname.startsWith("/server")) {
const decodedParams = Array.from(searchParams.entries())
.map(([key, value]) => `${key}=${decodeURIComponent(value)}`)
.join("&");
.map(([key, value]) => `${key}=${decodeURIComponent(value)}`)
.join("&");
const newUrl = `${serverApiUrl}${pathname.replace("/server", "")}${
decodedParams ? `?${decodedParams}` : ""
@@ -38,7 +40,6 @@ export function middleware(req: NextRequest) {
return NextResponse.redirect(new URL("/pages/wrStatus", req.url));
}
if (pathname.startsWith("/attach-service")) {
const requestHeaders = new Headers(req.headers);
// const token =
@@ -69,7 +70,7 @@ export function middleware(req: NextRequest) {
`[Middleware] Rewriting from '/user-service' path to: ${newUrl}`
);
return NextResponse.rewrite(new URL(newUrl), {
headers: requestHeaders
headers: requestHeaders,
});
}
@@ -81,33 +82,31 @@ export function middleware(req: NextRequest) {
let newUrl = `${GEOSERVER_URL}${pathname.replace("/geoserver", "")}${queryParams ? `?${queryParams}` : ""}`;
if (
typename == "hasudo:tb_il_swage_prcs_fclt" //하수처리시설
|| typename == "hasudo:tb_ms_swage_prcs_zone" //하수처리구역
|| typename == "hasudo:tb_ms_sbmrg_dngr_map" //침수위험지도
|| typename == "hasudo:tb_ms_flood_dngr_map" //도시침수지도
typename == "hasudo:tb_il_swage_prcs_fclt" || //하수처리시설
typename == "hasudo:tb_ms_swage_prcs_zone" || //하수처리구역
typename == "hasudo:tb_ms_sbmrg_dngr_map" || //침수위험지도
typename == "hasudo:tb_ms_flood_dngr_map" //도시침수지도
) {
newUrl = `${GEOSERVER_URL}${pathname.replace("/geoserver", "")}${queryParams ? `?${queryParams}` : ""}`;
}
else if (
typename == "hasudo:tb_ms_swage_ppl" //관로
|| typename == "hasudo:tb_ms_swage_mhl" //맨홀
|| typename == "hasudo:tb_ms_swage_pmstn" //펌프장
|| typename == "hasudo:tb_ms_stofcbr" //우수토실
} else if (
typename == "hasudo:tb_ms_swage_ppl" || //관로
typename == "hasudo:tb_ms_swage_mhl" || //맨홀
typename == "hasudo:tb_ms_swage_pmstn" || //펌프장
typename == "hasudo:tb_ms_stofcbr" //우수토실
) {
newUrl = `${LX_GEOSERVER_URL}${pathname.replace("/geoserver", "")}${queryParams ? `?${queryParams}` : ""}`;
}
else if (
typename == "hasudo:om_dt_untrt_swg_rain" //중점우수토실
|| typename == "hasudo:om_wqlt_station" //관측소
|| typename == "hasudo:tb_wr_bdst_ruse_fclt" //재이용시설
|| typename == "hasudo:tb_wr_rnwtr_utztn_fclt" //빗물이용시설
|| typename == "hasudo:tb_wr_rswtr_fclt" //중수도시설
|| typename == "hasudo:tb_wr_htdfl_fclt" //온배수시설
|| typename == "hasudo:tb_wr_ruse_fclt_dmd_co" //수요처
|| typename == "hasudo:tb_wr_tmpr_dmd_co" //잠재수요처
){
} else if (
typename == "hasudo:om_dt_untrt_swg_rain" || //중점우수토실
typename == "hasudo:om_wqlt_station" || //관측소
typename == "hasudo:tb_wr_bdst_ruse_fclt" || //재이용시설
typename == "hasudo:tb_wr_rnwtr_utztn_fclt" || //빗물이용시설
typename == "hasudo:tb_wr_rswtr_fclt" || //중수도시설
typename == "hasudo:tb_wr_htdfl_fclt" || //온배수시설
typename == "hasudo:tb_wr_ruse_fclt_dmd_co" || //수요처
typename == "hasudo:tb_wr_tmpr_dmd_co" //잠재수요처
) {
const url = req.nextUrl.clone();
url.searchParams.set('TYPENAME', typename.replace("hasudo:",""));
url.searchParams.set("TYPENAME", typename.replace("hasudo:", ""));
queryParams = url.searchParams.toString();
newUrl = `${SEWERAGE_API_URL}/v1/map/geometry${queryParams ? `?${queryParams}` : ""}`;
}
@@ -118,15 +117,41 @@ export function middleware(req: NextRequest) {
if (pathname.startsWith("/sewerage-service")) {
const queryParams = searchParams.toString();
const newUrl = `${SEWERAGE_API_URL}${pathname.replace("/sewerage-service/api", "")}${queryParams ? `?${queryParams}` : ""
}`;
const newUrl = `${SEWERAGE_API_URL}${pathname.replace("/sewerage-service/api", "")}${
queryParams ? `?${queryParams}` : ""
}`;
console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`);
return NextResponse.rewrite(new URL(newUrl));
}
if (pathname.startsWith("/bussiness-juso-service")) {
console.log("AdressKey ", AdressKey);
const params = new URLSearchParams({
currentPage: "1", // 원하는 페이지
countPerPage: "5", // 페이지당 결과 수
keyword: searchParams.get("keyword") || "", // 검색어(주소)
confmKey: AdressKey, // 인증키 인터넷용 패쇄망용은 따로 발급 필요 즉 middleware에서 치환해서 사용해야할듯
resultType: "json", // 결과 형식 기본은 xml
});
const newUrl = `${BUSINESS_JUSO_API_URL}?${params.toString()}`;
console.log(`[Middleware] Request to business.juso.go.kr`);
console.log(req.url);
console.log(
`[Middleware] Rewriting from '/business.juso.go.kr' path to: ${newUrl}`
);
return NextResponse.rewrite(new URL(newUrl));
}
return NextResponse.next();
}
export const config = {
matcher: ["/server/:path*", "/user-service/:path*", "/attach-service/:path*", "/geoserver/:path*", "/sewerage-service/:path*", "/"],
matcher: [
"/server/:path*",
"/user-service/:path*",
"/attach-service/:path*",
"/geoserver/:path*",
"/sewerage-service/:path*",
"/bussiness-juso-service/:path*",
"/",
],
};
+20
View File
@@ -0,0 +1,20 @@
[
{ "region": "전국", "sewage": "717(1,137,538)", "rainwater": "3544(13,945)", "reclaimed": "1018(222,476)", "thermal": "123(492)" },
{ "region": "서울특별시", "sewage": "4(114,908)", "rainwater": "816(430)", "reclaimed": "371(341)", "thermal": "0" },
{ "region": "부산광역시", "sewage": "13(146,197)", "rainwater": "68(335)", "reclaimed": "20(512)", "thermal": "1(18)" },
{ "region": "대구광역시", "sewage": "9(102,380)", "rainwater": "294(133)", "reclaimed": "14(44)", "thermal": "2(12)" },
{ "region": "인천광역시", "sewage": "17(57,691)", "rainwater": "165(642)", "reclaimed": "35(7,859)", "thermal": "15(32)" },
{ "region": "광주광역시", "sewage": "3(28,738)", "rainwater": "74(23)", "reclaimed": "15(450)", "thermal": "15(6)" },
{ "region": "대전광역시", "sewage": "2(11,966)", "rainwater": "52(2)", "reclaimed": "11(492)", "thermal": "20(100)" },
{ "region": "울산광역시", "sewage": "8(36,076)", "rainwater": "111(39)", "reclaimed": "19(28,904)", "thermal": "30(130)" },
{ "region": "세종특별자치시", "sewage": "9(2,555)", "rainwater": "65(16)", "reclaimed": "0(0)", "thermal": "0" },
{ "region": "경기도", "sewage": "176(313,298)", "rainwater": "1009(4,735)", "reclaimed": "252(77,096)", "thermal": "40(143)" },
{ "region": "강원특별자치도", "sewage": "69(19,677)", "rainwater": "69(4)", "reclaimed": "22(447)", "thermal": "0" },
{ "region": "충청북도", "sewage": "38(15,607)", "rainwater": "17(91)", "reclaimed": "91(2,211)", "thermal": "0" },
{ "region": "충청남도", "sewage": "67(41,368)", "rainwater": "54(77)", "reclaimed": "188(50,434)", "thermal": "0" },
{ "region": "전라북도", "sewage": "55(42,671)", "rainwater": "33(199)", "reclaimed": "220(9,453)", "thermal": "0" },
{ "region": "전라남도", "sewage": "83(23,560)", "rainwater": "16(885)", "reclaimed": "75(15,412)", "thermal": "0" },
{ "region": "경상북도", "sewage": "81(129,081)", "rainwater": "37(341)", "reclaimed": "70(27,818)", "thermal": "0" },
{ "region": "경상남도", "sewage": "75(50,101)", "rainwater": "27(244)", "reclaimed": "140(343)", "thermal": "0" },
{ "region": "제주특별자치도", "sewage": "8(1,666)", "rainwater": "47(5,746)", "reclaimed": "64(660)", "thermal": "0" }
]
+3 -2
View File
@@ -5,13 +5,14 @@ NEXT_PUBLIC_SERVER_API_URL = http://con.mind-one.co.kr:11082/api/v1
#NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000
NEXT_PUBLIC_WR_SERVER_API_URL = http://con.mind-one.co.kr:11080/api/v1
NEXT_PUBLIC_CS_SERVER_API_URL = http://dev.onasys.co.kr:8000
NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver
#NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver
NEXT_PUBLIC_GEOSERVER_URL = https://hasudo.geo.rsonesoft.com/geoserver
NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver
NEXT_PUBLIC_CLAIM_NAME = Authorization
NEXT_PUBLIC_AUTH_USER_ID = token-id
NEXT_PUBLIC_ACCESS_TOKEN = access-token
NEXT_PUBLIC_REFRESH_TOKEN = refresh-token
NEXT_PUBLIC_NGII_URL = https://map.ngii.go.kr/openapi/Gettile.do?apiKey=04trYP9_xwLAfALjwZ-B8g
NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service/api # 개발 서버 API
+3 -2
View File
@@ -5,13 +5,14 @@ NEXT_PUBLIC_SERVER_API_URL = http://con.mind-one.co.kr:11082/api/v1
#NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000
NEXT_PUBLIC_WR_SERVER_API_URL = http://con.mind-one.co.kr:11080/api/v1
NEXT_PUBLIC_CS_SERVER_API_URL = http://dev.onasys.co.kr:8000
NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver
#NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver
NEXT_PUBLIC_GEOSERVER_URL = https://hasudo.geo.rsonesoft.com/geoserver
NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver
NEXT_PUBLIC_CLAIM_NAME = Authorization
NEXT_PUBLIC_AUTH_USER_ID = token-id
NEXT_PUBLIC_ACCESS_TOKEN = access-token
NEXT_PUBLIC_REFRESH_TOKEN = refresh-token
NEXT_PUBLIC_NGII_URL = https://map.ngii.go.kr/openapi/Gettile.do?apiKey=04trYP9_xwLAfALjwZ-B8g
NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service/api # 개발 서버 API
+19 -16
View File
@@ -1,29 +1,32 @@
# NEXT_PUBLIC_SITE_ID = WR
# NEXT_PUBLIC_PORT = 11301
# NEXT_PUBLIC_PROXY_HOST = http://con.mind-one.co.kr:11301
# NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000
# NEXT_PUBLIC_SITE_ID = FO
# NEXT_PUBLIC_PORT = 11300
# NEXT_PUBLIC_PROXY_HOST = http://con.mind-one.co.kr:11300
# NEXT_PUBLIC_SERVER_API_URL = http://con.mind-one.co.kr:11082/api/v1
# #NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000
# NEXT_PUBLIC_WR_SERVER_API_URL = http://con.mind-one.co.kr:11080/api/v1
# NEXT_PUBLIC_CS_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
# NEXT_PUBLIC_CLAIM_NAME = Authorization
# NEXT_PUBLIC_AUTH_USER_ID = token-id
# 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_SITE_ID = FO
NEXT_PUBLIC_PORT = 11300
NEXT_PUBLIC_PROXY_HOST = http://con.mind-one.co.kr:11300
NEXT_PUBLIC_SERVER_API_URL = http://con.mind-one.co.kr:11082/api/v1
#NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000
NEXT_PUBLIC_WR_SERVER_API_URL = http://con.mind-one.co.kr:11080/api/v1
NEXT_PUBLIC_CS_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
NEXT_PUBLIC_PORT = 3000
NEXT_PUBLIC_PROXY_HOST = https://fo.hasuon.or.kr
# NEXT_PUBLIC_SERVER_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000
NEXT_PUBLIC_SERVER_API_URL = https://fo.hasuon.or.kr/operation-service/api/v1
NEXT_PUBLIC_FO_SERVER_API_URL = https://apigateway.hasuon.or.kr/operation-service/api/v1
NEXT_PUBLIC_CS_SERVER_API_URL = http://apigateway.iipbs-dev.svc.cluster.local:8000
NEXT_PUBLIC_CS_TUS_UPLOAD = /attach-service/api/v1/tus/upload
NEXT_PUBLIC_GEOSERVER_URL = http://172.29.143.87:8080/geoserver
NEXT_PUBLIC_LX_GEOSERVER_URL = http://172.29.143.87:8080/geoserver_swl
NEXT_PUBLIC_CLAIM_NAME = Authorization
NEXT_PUBLIC_AUTH_USER_ID = token-id
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_WR_SERVER_API_URL = https://fo.hasuon.or.kr/reuse-service/api/v1
NEXT_PUBLIC_SEWERAGE_API_URL = https://fo.hasuon.or.kr/sewerage-service/api
@@ -0,0 +1,73 @@
/**
* 강우영향일 계산 로직
*
* 1.강우영향일 및 강우량을 계산하며 강우량이 3이상이면 강우영향일이며 이후 이틀까지 강우영향일로 포함
*
* 2.강우영향일이면서 3mm이하의 강우량일 경우에는 강우영향을 준 날의 강우량을 따름
* @param data
* @param weather (default:ALL), SUNNY, ..etc
* @author jsyang
*/
export default function CalcRainEffect(data : any, weather='ALL') {
console.log("%c Calculate RainEffect !" , "background:blue;color:white");
console.log("%c Data Length :"+data.length+" Weather : "+weather , "background:yellow;color:blue");
// 강우영향일 계산 (강우량이 3 초과이면 무조건 강우영향일)
for(let idx = 0; idx < data.length; idx++) {
const item = data[idx];
if(item){
if(item.infoRnDay && Number(item.infoRnDay) >= 3) {
item.rainEffectDay = 1;
} else {
item.rainEffectDay = 0;
}
if(item.infoRnDay == 'x'){
item.infoRnDay = '0.0';
item.toBeInfoRnDay = '0.0';
}else{
item.infoRnDay = Number(item.infoRnDay).toFixed(1);
item.toBeInfoRnDay = Number(item.infoRnDay).toFixed(1);
}
}
}
// 이틀 전, 하루 전이 강우영향일(3 이상)인 경우 해당 날도 강우영향일로 설정
for(let idx = 0; idx < data.length; idx++) {
if(data[idx]) {
// 하루 전이 강우영향일(3 이상)인 경우
if(idx > 0 && data[idx-1]?.infoRnDay && Number(data[idx-1]?.infoRnDay) >= 3) {
data[idx]!.rainEffectDay = 1;
}
// 이틀 전이 강우영향일(3 이상)인 경우
if(idx > 1 && data[idx-2]?.infoRnDay && Number(data[idx-2]?.infoRnDay) >= 3) {
data[idx]!.rainEffectDay = 1;
}
}
}
for(let idx = 0; idx < data.length; idx++) {
if(data[idx] && data[idx]?.rainEffectDay === 1) {
if(idx > 1){
if(data[idx-1]?.infoRnDay && Number(data[idx]?.infoRnDay) < 3 && Number(data[idx-1]?.infoRnDay.toString().trim()) >= 3) {
data[idx]!.toBeInfoRnDay = data[idx-1]!.infoRnDay;
}
}
if(idx > 2){
if(data[idx-2]?.infoRnDay && Number(data[idx]?.infoRnDay) < 3 && Number(data[idx-2]?.infoRnDay.toString().trim()) >= 3) {
data[idx]!.toBeInfoRnDay = data[idx-2]!.infoRnDay;
}
}
}
}
let rtnData : any = [];
if (weather === 'ALL') {
rtnData = data;
} else if (weather === 'SUNNY') {
rtnData = data.filter((item: any) => item.rainEffectDay === 0);
} else {
rtnData = data.filter((item: any) => item.rainEffectDay === 1);
}
return rtnData;
}
+31 -12
View File
@@ -4,6 +4,26 @@
item: Record<string, unknown>;
}
export const roundNumber = (value : any, decimals: number) => {
if (typeof value === 'number') {
return addCommas((Math.round(value * Math.pow(10, decimals)) / Math.pow(10, decimals)).toFixed(decimals));
} else if (typeof value === 'string' && !isNaN(Number(value))) {
return addCommas(Number(value).toFixed(decimals));
}
}
export const addCommas = (value: string | number): any => {
if (typeof value === 'number') {
return value.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",").split('.').map((part, index) =>
index === 0 ? part : part.replace(/(\d{3})/g, '$1,')
).join('.');
} else if (typeof value === 'string') {
return value.includes('.')?value.split('.').map((part, index) =>
index === 0 ? part.replace(/\B(?=(\d{3})+(?!\d))/g, ",") : part
).join('.'):String(value).replace(/\B(?=(\d{3})+(?!\d))/g, ",");
}
}
export default function DataForm({ type, column, item }: DataFormProps) {
if(item) {
const value = item[column];
@@ -16,31 +36,30 @@ export default function DataForm({ type, column, item }: DataFormProps) {
if(value && value != '') {
item[column] = value.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
}
break;
case 'float1':
break;
case 'float0':
if(value) {
item[column] = String(value).includes('.')?String(Math.round(parseFloat(value.toString().replace(/,/g, '')) * 10) / 10).split('.').map((part, index) =>
item[column] = item[column] = String(value).includes('.')?String(Math.round(parseFloat(value.toString().replace(/,/g, '')) * 1) / 1).split('.').map((part, index) =>
index === 0 ? part.replace(/\B(?=(\d{3})+(?!\d))/g, ",") : part
).join('.')
: String(value).replace(/\B(?=(\d{3})+(?!\d))/g, ",");
}
break;
case 'float1':
if(value) {
item[column] = roundNumber(value, 1);
}
break;
case 'float2':
if(value) {
item[column] = String(value).includes('.')?String(Math.round(parseFloat(value.toString().replace(/,/g, '')) * 100) / 100).split('.').map((part, index) =>
index === 0 ? part.replace(/\B(?=(\d{3})+(?!\d))/g, ",") : part
).join('.')
: String(value).replace(/\B(?=(\d{3})+(?!\d))/g, ",");
item[column] = roundNumber(value, 2);
}
break;
case 'float3':
if(value) {
item[column] = String(value).includes('.')?String(Math.round(parseFloat(value.toString().replace(/,/g, '')) * 1000) / 1000).split('.').map((part, index) =>
index === 0 ? part.replace(/\B(?=(\d{3})+(?!\d))/g, ",") : part
).join('.')
: String(value).replace(/\B(?=(\d{3})+(?!\d))/g, ",");
item[column] = roundNumber(value, 3);
}
break;
}
}
}
}
@@ -97,26 +97,27 @@ export default function FacilityTermModalHeader<T extends { msrDt: string }>({
const startDateOnly = new Date(startDate.getFullYear(), startDate.getMonth(), startDate.getDate());
const endDateOnly = new Date(endDate.getFullYear(), endDate.getMonth(), endDate.getDate());
const rainEffectDay = (item as T & { rainEffectDay: number }).rainEffectDay;
if(flowPanel === '2'){
const infoRnDay = (item as T & { infoRnDay: number }).infoRnDay;
const infoRnDay = (item as T & { toBeInfoRnDay: number }).toBeInfoRnDay;
return (itemDateOnly >= startDateOnly && itemDateOnly <= endDateOnly) && infoRnDay >= 3 && infoRnDay < 10;
} else if(flowPanel === '3'){
const infoRnDay = (item as T & { infoRnDay: number }).infoRnDay;
const infoRnDay = (item as T & { toBeInfoRnDay: number }).toBeInfoRnDay;
return (itemDateOnly >= startDateOnly && itemDateOnly <= endDateOnly) && infoRnDay >= 10 && infoRnDay < 20;
} else if(flowPanel === '4'){
const infoRnDay = (item as T & { infoRnDay: number }).infoRnDay;
const infoRnDay = (item as T & { toBeInfoRnDay: number }).toBeInfoRnDay;
return (itemDateOnly >= startDateOnly && itemDateOnly <= endDateOnly) && infoRnDay >= 20 && infoRnDay < 30;
} else if(flowPanel === '5'){
const infoRnDay = (item as T & { infoRnDay: number }).infoRnDay;
const infoRnDay = (item as T & { toBeInfoRnDay: number }).toBeInfoRnDay;
return (itemDateOnly >= startDateOnly && itemDateOnly <= endDateOnly) && infoRnDay >= 30 && infoRnDay < 40;
} else if(flowPanel === '6'){
const infoRnDay = (item as T & { infoRnDay: number }).infoRnDay;
const infoRnDay = (item as T & { toBeInfoRnDay: number }).toBeInfoRnDay;
return (itemDateOnly >= startDateOnly && itemDateOnly <= endDateOnly) && infoRnDay >= 40 && infoRnDay < 50;
} else if(flowPanel === '7'){
const infoRnDay = (item as T & { infoRnDay: number }).infoRnDay;
const infoRnDay = (item as T & { toBeInfoRnDay: number }).toBeInfoRnDay;
return (itemDateOnly >= startDateOnly && itemDateOnly <= endDateOnly) && infoRnDay >= 50 && infoRnDay < 60;
} else if(flowPanel === '8'){
const infoRnDay = (item as T & { infoRnDay: number }).infoRnDay;
const infoRnDay = (item as T & { toBeInfoRnDay: number }).toBeInfoRnDay;
return (itemDateOnly >= startDateOnly && itemDateOnly <= endDateOnly) && infoRnDay >= 60;
} else {
return (itemDateOnly >= startDateOnly && itemDateOnly <= endDateOnly) && (rainEffectDay ===1);
@@ -47,11 +47,6 @@ export default function SearchInputText({label=undefined, setValue=()=>{}, sidoS
}, [fcltyName]);
const handleSuggestionClick = useCallback((bscFctCd: string, bscFctNm: string, fctCpc: number | '', trtFrfNm: string | '', efflWqltStndrdNm: string | '') => {
console.log('bscFctNm : ', bscFctNm);
console.log('bscFctCd : ', bscFctCd);
console.log('fctCpc : ', fctCpc);
console.log('trtFrfNm : ', trtFrfNm);
console.log('efflWqltStndrdNm : ', efflWqltStndrdNm);
setTextValue(bscFctNm);
setValue(bscFctCd, bscFctNm, fctCpc, trtFrfNm, efflWqltStndrdNm);
setIsOpen(false);
+11 -2
View File
@@ -1,18 +1,27 @@
"use client"
import Base from "./base";
import "./globals.css";
import { StoreProvider } from "./store";
import { LoginApi } from "@/src/entities/auth";
import { useEffect } from "react";
export default function RootLayout({
children,
}: Readonly<{
children: React.ReactNode;
}>) {
useEffect(() => {
// 렌더 중이 아니라 클라이언트에서만 실행 + 에러 캐치
void LoginApi.login({ userId: "CLEANWATER", password: "gktneh12!@" })
.catch((e) => {
console.error("Auto login failed:", e);
});
}, []);
return (
<html lang="en">
<body>
<StoreProvider>
<Base>{children}</Base>
{children}
</StoreProvider>
</body>
</html>
+24
View File
@@ -0,0 +1,24 @@
'use client'
import { NoFooterLayout } from "@common/components";
import type { MenuItem } from "../../store/common";
import { useFoStore } from "../../store";
import { usePathname, useRouter } from "next/navigation";
export default function RootLayout({
children,
}: Readonly<{
children: React.ReactNode;
}>) {
const { getMenuAuth } = useFoStore((state) => state);
const pathname = usePathname();
const router = useRouter();
const handleClick = (id: MenuItem) => {
getMenuAuth(id.menuCd);
router.push(id.urlPath);
};
return (
<NoFooterLayout currentPath={pathname ?? ""} handleMenuClick={handleClick}>{children}</NoFooterLayout>
);
}
+322
View File
@@ -0,0 +1,322 @@
"use client";
import Gis from "@common/business_components/ui/map/Gis";
import GisApp from "@common/business_components/ui/map/lib/gis.core";
import { useEffect, useRef, useState } from "react";
import { SearchBar } from "@common/business_components/ui/map/searchBar";
// OpenLayers overlay/extent 유틸
import Overlay from "ol/Overlay";
import { getCenter as getExtentCenter } from "ol/extent";
import type { Coordinate } from "ol/coordinate";
interface FeatureData {
fid?: string;
ftrIdn?: string;
id?: string;
getId?: () => string | number | undefined; // 추가
// OpenLayers Feature 비슷한 최소 인터페이스
get?: (key: string) => any;
getGeometry?: () => {
getExtent: () => number[];
getType?: () => string;
getCoordinates?: () => Coordinate;
};
setStyle?: () => void;
}
interface MapInstance {
addOverlay?: (ov: Overlay) => void;
removeOverlay?: (ov: Overlay) => void;
getOverlays?: () => { getArray: () => Overlay[] };
getLayers: () => {
getArray: () => Array<{
get: (key: string) => any;
getSource?: () => { getFeatureById?: (id: string) => FeatureData | null };
}>;
};
getView: () => { fit: (extent: number[], options: object) => void };
}
const Map = () => {
const [treeData, setTreeData] = useState([]);
const gisMaps = useRef<MapInstance | null>(null);
const [isOpen, setIsOpen] = useState(false);
const [isSearchModalOpen, setIsSearchModalOpen] = useState(false);
const [featureData, setFeatureData] = useState<FeatureData | null>(null);
// === Overlay 관리용 Ref ===
const overlayRef = useRef<Overlay | null>(null);
const overlayContainerRef = useRef<HTMLDivElement | null>(null);
const facilityTypes = [
{ text: "하수처리시설", val: "tb_il_swage_prcs_fclt" },
];
const fetchData = async () => {
try {
const API_URL = `${process.env.NEXT_PUBLIC_SEWERAGE_API_URL}/v1/map`;
const reqUrl = `${API_URL}/lyrStngs/FO_NETWORK`;
const response = await fetch(reqUrl, {
method: "GET",
headers: { accept: "application/json" },
});
if (!response.ok) throw new Error(`HTTP 오류! 상태: ${response.status}`);
const data = await response.json();
setTreeData(data);
} catch (error) {
console.error("데이터 불러오기 실패:", error);
}
};
useEffect(() => {
fetchData();
}, []);
function formatWithCommas(value: any) {
if (value === null || value === undefined) return value;
const num = Number(value);
return isNaN(num) ? value : num.toLocaleString();
}
function formatDateString(dateStr: string) {
dateStr = dateStr.trim();
if (typeof dateStr !== "string" || dateStr.length !== 8) return dateStr;
return `${dateStr.slice(0, 4)}-${dateStr.slice(4, 6)}-${dateStr.slice(6)}`;
}
// ===== 오버레이 콘텐츠 빌더 =====
const buildOverlayContent = (layerType: string, feature: FeatureData) => {
const props: Record<string, any> = {};
// 안전하게 몇 개 필드 추출(없으면 건너뜀)
const mayGet = (k: string) => (feature.get ? feature.get(k) : undefined);
const safe = (v: any) => (v === undefined || v === null ? "-" : String(v));
// 레이어 유형별 대표 필드 추출(없으면 "-")
if (layerType === "tb_il_swage_prcs_fclt") {
// 하수처리시설
props["하수처리시설명"] = mayGet("swtrmt_fclt_nm");
props["시설용량(m³/d)"] = formatWithCommas(mayGet("fclt_cpct"));
props["주소"] = mayGet("rdnm_addr");
props["가동개시일"] = formatDateString(mayGet("oprtng_strt_ymd"));
props["공법"] = mayGet("rprs_msrc_cn");
} else if (layerType === "tb_ms_swage_prcs_zone") {
// 처리구역(존)
props["하수처리구역명"] = mayGet("swtrmt_zone_nm");
props["하수처리시설명"] = mayGet("swtrmt_fclt_nm");
} else if (layerType === "om_wqlt_station") {
// 수질관측소
props["관측소명"] = mayGet("stn_ko") ?? mayGet("name");
props["주소"] = mayGet("addr") ?? mayGet("indicator");
}
const titleMap: Record<string, string> = {
tb_il_swage_prcs_fclt: "하수처리시설",
tb_ms_swage_prcs_zone: "하수처리구역",
om_wqlt_station: "관측소",
};
const title = titleMap[layerType] || "정보";
// 컨테이너 재사용(없으면 생성)
if (!overlayContainerRef.current) {
overlayContainerRef.current = document.createElement("div");
}
const el = overlayContainerRef.current;
el.className =
"ol-custom-overlay shadow-xl rounded-2xl bg-white/95 backdrop-blur p-3 border border-gray-200 min-w-[220px] max-w-[350px] ";
el.innerHTML = `
<div class="font-semibold text-lg text-gray-800 mb-2 text-center bg-green-400">${title}</div>
<table class="w-full text-base text-gray-800">
${Object.entries(props)
.map(
([k, v]) => `
<tr>
<td class="py-1 pr-2 text-gray-500 whitespace-nowrap">${k}</td>
<td class="py-1 font-medium">${safe(v)}</td>
</tr>`
)
.join("")}
</table>
`;
return el;
};
// ===== 오버레이 생성/표시 =====
const showOverlay = (
map: MapInstance,
feature: FeatureData,
layerType: string
) => {
// 이전 오버레이 제거
if (overlayRef.current) {
map.removeOverlay?.(overlayRef.current);
overlayRef.current = null;
}
// 콘텐츠 만들기
const element = buildOverlayContent(layerType, feature);
// 앵커 좌표 계산(포인트면 좌표, 아니면 extent 중심)
let position: Coordinate | undefined;
const geom = feature.getGeometry?.();
if (geom?.getType && geom.getType() === "Point" && geom.getCoordinates) {
position = geom.getCoordinates();
} else if (geom?.getExtent) {
position = getExtentCenter(geom.getExtent());
}
if (!position) return;
// 오버레이 생성 & 지도에 추가
const overlay = new Overlay({
element,
positioning: "bottom-center",
stopEvent: false,
offset: [0, -12],
});
overlay.setPosition(position);
map.addOverlay?.(overlay);
overlayRef.current = overlay;
};
// ===== 피처 선택 시 호출 =====
const onFeatureSelect = (data: FeatureData) => {
const map = gisMaps.current;
if (!map) {
console.warn("지도가 초기화되지 않았습니다.");
return;
}
type SelectModule = {
resetSelectedFeature: () => void;
selectFeature: (feature: FeatureData, selected: boolean) => void;
};
const maybeSelect = GisApp?.Module?.select; // 타입 그대로 둠 (any | unknown | null 가능)
if (!maybeSelect) {
// null/undefined면 일찍 반환
return;
}
const select = maybeSelect as SelectModule; // 여기선 null 아님이 보장됨
if (!select) return;
// 1) 기존 선택 초기화
select.resetSelectedFeature();
// 2) 피처 탐색 + 레이어 유형 파악
const featureId = String(data.getId?.() ?? "");
const foundLayerType = featureId.split(".")[0];
let foundFeature: FeatureData | null = null;
const isOlFeatureInstance =
data &&
typeof data.getGeometry === "function" &&
typeof data.setStyle === "function";
if (isOlFeatureInstance) {
foundFeature = data;
// 어떤 레이어에서 온 건지 모르는 경우가 많아 기본값으로 시도
} else {
map
.getLayers()
.getArray()
.forEach((layer) => {
if (foundFeature) return; // 이미 찾았으면 skip
const source = layer.getSource?.();
const feature = source?.getFeatureById?.(featureId);
if (feature) {
foundFeature = feature;
}
});
}
// 3) 피처 선택/줌 + 오버레이
if (foundFeature && foundFeature.getGeometry) {
const geometry = foundFeature.getGeometry();
if (geometry) {
const extent = geometry.getExtent();
map.getView().fit(extent, {
duration: 300,
padding: [50, 50, 50, 50],
maxZoom: 16,
constrainResolution: true,
nearest: true,
});
}
select.selectFeature(foundFeature, true);
// 표출 대상 레이어만 오버레이 표시
const normalized = (foundLayerType || "").toString().trim();
const TARGETS = [
"tb_il_swage_prcs_fclt",
"tb_ms_swage_prcs_zone",
"om_wqlt_station",
];
if (TARGETS.includes(normalized)) {
showOverlay(map, foundFeature, normalized);
} else {
// 대상 외 레이어 클릭 시 기존 오버레이 제거
if (overlayRef.current) {
map.removeOverlay?.(overlayRef.current);
overlayRef.current = null;
}
}
} else {
console.warn("OpenLayers Feature를 찾을 수 없습니다:", data);
// 실패 시 기존 오버레이 제거
if (overlayRef.current) {
map.removeOverlay?.(overlayRef.current);
overlayRef.current = null;
}
}
// 우측 패널/검색 모달 상태
setFeatureData(data);
setIsOpen(false);
setIsSearchModalOpen(false);
};
const onInit = () => {
const map = gisMaps.current;
if (!map) {
console.warn("지도가 초기화되지 않았습니다.");
return;
}
if (overlayRef.current) {
map.removeOverlay?.(overlayRef.current);
overlayRef.current = null;
}
}
return (
<div className="bg-container">
<Gis
treeData={treeData}
isSearch={false}
gisMaps={gisMaps}
isMiniMap={false}
searchView={undefined}
detailView={undefined}
onFeatureSelect={onFeatureSelect}
setIsOpen={setIsOpen}
setFeatureData={setFeatureData}
featureData={featureData}
setIsSearchModalOpen={setIsSearchModalOpen}
isOpen={isOpen}
isSearchModalOpen={isSearchModalOpen}
onCheckedLayersChange={undefined}
imgVisble={false}
searchBar={
<SearchBar gisMaps={gisMaps} facilityTypes={facilityTypes} onFeatureFocus={undefined} onInit={onInit} />
}
waterDepth={undefined}
/>
</div>
);
};
export default Map;
@@ -69,22 +69,12 @@ export default function DashBoardChartModal({item='', period='', title='',modalD
useEffect(() => {
if(period === 'year'){
const filteredData: yearProps[] = modalData.map((item) => {
if(waterQlty.trim().includes('T-N') || waterQlty.trim().includes('T-P')){
return {
label: item.waterQlty,
평균: typeof item.yearAvg === 'string' ? Number(item.yearAvg.replace(/,/g, '')).toFixed(3) : (item.yearAvg || 0),
최대: typeof item.yearMax === 'string' ? Number(item.yearMax.replace(/,/g, '')).toFixed(3) : (item.yearMax || 0),
최소: typeof item.yearMin === 'string' ? Number(item.yearMin.replace(/,/g, '')).toFixed(3) : (item.yearMin || 0),
평균: typeof item.yearAvg === 'string' ? Number(item.yearAvg.replace(/,/g, '')) : (item.yearAvg || 0),
최대: typeof item.yearMax === 'string' ? Number(item.yearMax.replace(/,/g, '')) : (item.yearMax || 0),
최소: typeof item.yearMin === 'string' ? Number(item.yearMin.replace(/,/g, '')) : (item.yearMin || 0),
}
}
else{
return {
label: item.waterQlty,
평균: typeof item.yearAvg === 'string' ? Number(item.yearAvg.replace(/,/g, '')).toFixed(1) : (item.yearAvg || 0),
최대: typeof item.yearMax === 'string' ? Number(item.yearMax.replace(/,/g, '')).toFixed(1) : (item.yearMax || 0),
최소: typeof item.yearMin === 'string' ? Number(item.yearMin.replace(/,/g, '')).toFixed(1) : (item.yearMin || 0),
}
}
})
if (item === 'flowRate') {
setChartData(filteredData.slice(0,5));
@@ -1,11 +1,12 @@
"use client"
import { roundNumber } from "@/app/components/common/DataForm";
import { useFoStore } from "@/app/store";
import type { TableUpperProps } from "@/app/store/processFacility";
import { ContentsDiv, UiModal, UiTable } from "@common/business_components";
import LoadingOverlay from "@common/business_components/ui/loadingBar";
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@common/components";
import { useEffect, useState } from "react";
import DashBoardChartModal from "./modal/page";
import LoadingOverlay from "@common/business_components/ui/loadingBar";
export type facilityInfoProps = {
searchYear?: string;
@@ -171,7 +172,6 @@ export default function ProcessFacilitySearch({searchYear = '', fcltyList = []}:
el['provisionalApproval'] = waterUsage1;
}
});
console.log('planFcltyList :', planFcltyList);
}
}, [waterUsage1, waterUsage2, waterUsage3, searchYear, planFcltyList]);
// 연도가 바뀌면 hasSearched를 false로 리셋
@@ -182,7 +182,7 @@ export default function ProcessFacilitySearch({searchYear = '', fcltyList = []}:
useEffect(() => {
operationalStatusList.map((item: { [key: string]: string | number | boolean },index) => {
if(index===8 || index===9 || index===10 || index===11 || index===12 || index===13 || index===14 || index===15){
item['yearAvg'] = Number(item['yearAvg']).toFixed(3);
/* item['yearAvg'] = Number(item['yearAvg']).toFixed(3);
item['yearMax'] = item['yearMax']+'%';
item['yearMin'] = item['yearMin']+'%';
item['summerAll'] = item['summerAll']+'%';
@@ -191,7 +191,7 @@ export default function ProcessFacilitySearch({searchYear = '', fcltyList = []}:
item['winterAll'] = item['winterAll']+'%';
item['winterSunnyAvg'] = item['winterSunnyAvg']+'%';
item['winterSunnyMax'] = item['winterSunnyMax']+'%';
item['winterSunnyMin'] = item['winterSunnyMin']+'%';
item['winterSunnyMin'] = item['winterSunnyMin']+'%'; */
}
});
@@ -225,7 +225,7 @@ export default function ProcessFacilitySearch({searchYear = '', fcltyList = []}:
:(index < 5 || index > 5)&& (index!= 4) && (head.id ==='provisionalApproval'||head.id ==='now'||head.id ==='stepOne'||head.id ==='stepTwo'||head.id ==='stepThree'||head.id ==='stepFour')
?<TableCell className="text-right" style={{ whiteSpace: 'pre-line' }} key={head.id+index}>{el[head.id]}</TableCell>
:(head.id === "provisionalApproval" && index === 4)
?<TableCell colSpan={6} className="text-right border border-[var(--border)] text-[rgb(100,119,132)]" style={{ whiteSpace: 'pre-line' }} key={head.id+index}>{Math.round((Number(waterUsage1)+Number(waterUsage2)+Number(waterUsage3))/3 * 100)/100}</TableCell>
?<TableCell colSpan={6} className="text-right border border-[var(--border)] text-[rgb(100,119,132)]" style={{ whiteSpace: 'pre-line' }} key={head.id+index}>{roundNumber(String((Number(waterUsage1)+Number(waterUsage2)+Number(waterUsage3))/3), 0)}</TableCell>
:((head.id ==='now'||head.id ==='stepOne'||head.id ==='stepTwo'||head.id ==='stepThree'||head.id ==='stepFour') )
?null
:(head.id === 'item' && index != 5)?
@@ -22,10 +22,12 @@ export default function DashBoardChart({searchYear = '', fcltyList = []}: facili
const [chart_tpTp, setChart_tpTp] = useState<{
chartData1: lineChartDataProps[];
chartData2: lineChartDataProps[];
chartData3: lineChartDataProps[];
}>();
const [chart_tntn, setChart_tntn] = useState<{
chartData1: lineChartDataProps[];
chartData2: lineChartDataProps[];
chartData3: lineChartDataProps[];
}>();
const [chart_inflBodInflTn, setChart_inflBodInflTn] = useState<{
chartData1: lineChartDataProps[];
@@ -46,6 +48,7 @@ export default function DashBoardChart({searchYear = '', fcltyList = []}: facili
chart_efflTn,
chart_inflBod,
isLoadingMainGraph,
waterQltyStandartd,
} = MainGraph;
/**
@@ -90,6 +93,10 @@ export default function DashBoardChart({searchYear = '', fcltyList = []}: facili
label: '방류T-P',
color: colors[1],
},
chartData3: {
label : '법적방류T-P',
color : 'blackdash',
}
} satisfies ChartConfig;
// 유입T-N-방류T-N
@@ -102,6 +109,10 @@ export default function DashBoardChart({searchYear = '', fcltyList = []}: facili
label: '방류T-N',
color: colors[1],
},
chartData3: {
label : '법적방류T-N',
color : 'blackdash',
}
} satisfies ChartConfig;
// 유입BOD-유입T-N
@@ -139,21 +150,37 @@ export default function DashBoardChart({searchYear = '', fcltyList = []}: facili
useEffect(() => {
if (!chart_chongInTp || !chart_efflTp) return;
const legalTpData: lineChartDataProps[] = [];
if (waterQltyStandartd){
chart_inflTn.forEach(item =>{
legalTpData.push({label : item.label, val:waterQltyStandartd.tp});
})
}
const chartTpTpData = {
chartData1: chart_chongInTp,
chartData2: chart_efflTp
chartData2: chart_efflTp,
chartData3: legalTpData
};
setChart_tpTp(chartTpTpData);
}, [chart_chongInTp, chart_efflTp]);
}, [chart_chongInTp, chart_efflTp, chart_inflTn, waterQltyStandartd]);
useEffect(() => {
if (!chart_inflTn || !chart_efflTn) return;
const legalTnData: lineChartDataProps[] = [];
if (waterQltyStandartd){
chart_inflTn.forEach(item =>{
legalTnData.push({label : item.label, val:waterQltyStandartd.tn});
})
}
const chartTntnData = {
chartData1: chart_inflTn,
chartData2: chart_efflTn
chartData2: chart_efflTn,
chartData3: legalTnData,
};
setChart_tntn(chartTntnData);
}, [chart_inflTn, chart_efflTn]);
}, [chart_inflTn, chart_efflTn, waterQltyStandartd]);
useEffect(() => {
if (!chart_inflBod || !chart_inflTn) return;
@@ -185,21 +212,21 @@ export default function DashBoardChart({searchYear = '', fcltyList = []}: facili
<ListDiv className="h-[300px]">
<Card className="h-full">
<CardContent className="h-full">
<MainChart chartForm={CHART_FORM.LINEBAR} chartConfig={chartConfig_inflowRain} chartData={chart_inflowRain} chartTitle="유입하수량-강수량" yFieldText="유입하수량(m³/일)" yFieldText2="강수량(mm)"></MainChart>
<MainChart chartForm={CHART_FORM.LINEBAR} chartConfig={chartConfig_inflowRain} chartData={chart_inflowRain} chartTitle="유입하수량-강수량" yFieldText="유입하수량(m³/일)" yFieldText2="강수량(mm)" setXAxisYearTick={true}></MainChart>
</CardContent>
</Card>
</ListDiv>
<ListDiv className="h-[300px]">
<Card className="h-full">
<CardContent className="h-full">
<MainChart chartForm={CHART_FORM.LINEBAR} chartConfig={chartConfig_rainBod} chartData={chart_bodRain} chartTitle="유입BOD-강수량" yFieldText="BOD(mg/L)" yFieldText2="강수량(mm)"></MainChart>
<MainChart chartForm={CHART_FORM.LINEBAR} chartConfig={chartConfig_rainBod} chartData={chart_bodRain} chartTitle="유입BOD-강수량" yFieldText="BOD(mg/L)" yFieldText2="강수량(mm)" setXAxisYearTick = {true}></MainChart>
</CardContent>
</Card>
</ListDiv>
<ListDiv className="h-[300px]">
<Card className="h-full">
<CardContent className="h-full">
<MainChart chartForm={CHART_FORM.LINE} chartConfig={chartConfig_tptp} chartData={chart_tpTp} chartTitle="총인유입T-P-방류T-P" yFieldText="T-P(mg/L)"></MainChart>
<MainChart chartForm={CHART_FORM.LINE} chartConfig={chartConfig_tptp} chartData={chart_tpTp} chartTitle="총인유입T-P-방류T-P" yFieldText="T-P(mg/L)" setXAxisYearTick={true}></MainChart>
</CardContent>
</Card>
</ListDiv>
@@ -207,7 +234,7 @@ export default function DashBoardChart({searchYear = '', fcltyList = []}: facili
<ListDiv className="h-[300px]">
<Card className="h-full">
<CardContent className="h-full">
<MainChart chartForm={CHART_FORM.LINE} chartConfig={chartConfig_tntn} chartData={chart_tntn} chartTitle="유입T-N-방류T-N" yFieldText="T-N(mg/L)"></MainChart>
<MainChart chartForm={CHART_FORM.LINE} chartConfig={chartConfig_tntn} chartData={chart_tntn} chartTitle="유입T-N-방류T-N" yFieldText="T-N(mg/L)" setXAxisYearTick={true}></MainChart>
</CardContent>
</Card>
</ListDiv>
@@ -215,7 +242,7 @@ export default function DashBoardChart({searchYear = '', fcltyList = []}: facili
<ListDiv className="h-[300px]">
<Card className="h-full">
<CardContent className="h-full">
<MainChart chartForm={CHART_FORM.LINE} chartConfig={chartConfig_inflBodInflTn} chartData={chart_inflBodInflTn} chartTitle="유입BOD-유입T-N" yFieldText="농도(mg/L)"></MainChart>
<MainChart chartForm={CHART_FORM.LINE} chartConfig={chartConfig_inflBodInflTn} chartData={chart_inflBodInflTn} chartTitle="유입BOD-유입T-N" yFieldText="농도(mg/L)" setXAxisYearTick={true}></MainChart>
</CardContent>
</Card>
</ListDiv>
@@ -223,7 +250,7 @@ export default function DashBoardChart({searchYear = '', fcltyList = []}: facili
<ListDiv className="h-[300px]">
<Card className="h-full">
<CardContent className="h-full">
<MainChart chartForm={CHART_FORM.LINE} chartConfig={chartConfig_inflBodInflTp} chartData={chart_inflBodInflTp} chartTitle="유입BOD-유입T-P" yFieldText="농도(mg/L)"></MainChart>
<MainChart chartForm={CHART_FORM.LINE} chartConfig={chartConfig_inflBodInflTp} chartData={chart_inflBodInflTp} chartTitle="유입BOD-유입T-P" yFieldText="농도(mg/L)" setXAxisYearTick={true}></MainChart>
</CardContent>
</Card>
</ListDiv>
@@ -9,6 +9,7 @@ import ProcessFacilitySearch from "./facilityInfo/page";
import DashBoardChart from "./maingraph/page";
import RainManageTab from "./rainManage/page";
import DrainageEquipment from "./drainageEquipment/page";
import { roundNumber } from "@/app/components/common/DataForm";
const tabList = [
{ value: 'facilityInfo', label: '시설정보 및 운영현황' },
@@ -17,6 +18,22 @@ const tabList = [
//{ value: 'drainageEquipment', label: '배수설비 정비현황' }
];
export const generateYearDates = (searchYear: string) => {
const dates: string[] = [];
const start = new Date(Number(searchYear), 0, 1); // 1월 1일
const end = new Date(Number(searchYear), 11, 31); // 12월 31일
for (let d = new Date(start); d <= end; d.setDate(d.getDate() + 1)) {
const year = d.getFullYear();
const month = String(d.getMonth() + 1).padStart(2, "0");
const day = String(d.getDate()).padStart(2, "0");
dates.push(`${year}-${month}-${day}`); // YYYY-MM-DD 형식
}
return dates;
}
export default function DashBoard() {
// 입력값 상태 관리
const { Common, initializeCommonData,searchMainGraph, searchRainManage, searchOperationStatus, OperationStatus, RainManage, MainGraph, PlanFclty } = useFoStore((state) => state);
@@ -60,11 +77,11 @@ export default function DashBoard() {
const [searchYear, setSearchYear] = useState<string>(selectSearchYear[0]?.val || '0');
// 시설명
const [fcltyList, setFcltyList] = useState<{bscFctCd: string, bscFctNm: string, fcltyCpc: number | '', trtFrfNm: string | '', efflWqltStndrdNm: string | ''}>({
bscFctCd: '26260PB001R',
bscFctNm: '수영',
fcltyCpc: 452000,
trtFrfNm: '표준활성슬러지법, MLE, MBR',
efflWqltStndrdNm: '500톤 이상(Ⅳ지역)'
bscFctCd: '11000SW001R',
bscFctNm: '난지',
fcltyCpc: 860000,
trtFrfNm: '표준활성슬러지법, MLE, A2O',
efflWqltStndrdNm: '500톤 이상(Ⅲ지역)'
});
const [searchFcltyList, setSearchFcltyList] = useState<{bscFctCd: string, bscFctNm: string, fcltyCpc: number | '', trtFrfNm: string | '', efflWqltStndrdNm: string | ''}>({
@@ -79,11 +96,11 @@ export default function DashBoard() {
if (!isInit) {
initializeCommonData();
setSearchFcltyList({
bscFctCd: '26260PB001R',
bscFctNm: '수영',
fcltyCpc: 452000,
trtFrfNm: '표준활성슬러지법, MLE, MBR',
efflWqltStndrdNm: '500톤 이상(Ⅳ지역)'
bscFctCd: '11000SW001R',
bscFctNm: '난지',
fcltyCpc: 860000,
trtFrfNm: '표준활성슬러지법, MLE, A2O',
efflWqltStndrdNm: '500톤 이상(Ⅲ지역)'
});
}
}, [isInit, initializeCommonData]);
@@ -190,62 +207,98 @@ export default function DashBoard() {
case 'mainGraph':
searchMainGraph(searchYear, fcltyList.bscFctCd);
const yearData = generateYearDates(searchYear);
const yearValueData : any = [];
for (const i in yearData){
const rowArray: string[] = [];
rowArray.push(yearData[i] ?? "");
//강수량
rowArray.push(roundNumber(chart_inflowRain.filter(item=>{return yearData[i] === item.label})[0]?.barVal0?.toString(), 1) || '');
//유입하수량
rowArray.push(roundNumber(chart_inflowRain.filter(item=>{return yearData[i] === item.label})[0]?.lineVal1?.toString(), 0) || '');
//시설용량
rowArray.push(roundNumber(chart_inflowRain.filter(item=>{return yearData[i] === item.label})[0]?.lineVal0?.toString(), 0) || '');
//유입BOD
rowArray.push(roundNumber(chart_bodRain.filter(item=>{return yearData[i] === item.label})[0]?.lineVal0?.toString(), 1) || '');
//유입T-P
rowArray.push(roundNumber(chart_inflTp.filter(item=>{return yearData[i] === item.label})[0]?.val?.toString(), 3) || '');
//총인유입T-P
rowArray.push(roundNumber(chart_chongInTp.filter(item=>{return yearData[i] === item.label})[0]?.val?.toString(), 3) || '');
//방류T-P
rowArray.push(roundNumber(chart_efflTp.filter(item=>{return yearData[i] === item.label})[0]?.val?.toString(), 3) || '');
//유입T-N
rowArray.push(roundNumber(chart_inflTn.filter(item=>{return yearData[i] === item.label})[0]?.val?.toString(), 3) || '');
//방류T-N
rowArray.push(roundNumber(chart_efflTn.filter(item=>{return yearData[i] === item.label})[0]?.val?.toString(), 3) || '');
yearValueData.push(
rowArray
)
}
/* const excelData = [['날짜', '강수량', '유입하수량','시설용량', '유입BOD', '유입T-P', '총인유입T-P', '방류T-P'], */
const sheetParameter = [
{
data: [['날짜', '강수량'],...chart_inflowRain.map((item) => [item.label, item.barVal0])],
data: [['날짜', '강수량', '유입하수량', '시설용량', '유입BOD', '유입T-P','총인유입T-P', '방류T-P', '유입T-N', '방류T-N'],...yearValueData],
headerNum: 1,
headerRange: 'A1:J1',
sheetName: '주요그래프'
}
/* {
data: [['날짜', '강수량'],...chart_inflowRain.map((item) => [item.label, roundNumber(item.barVal0, 1)])],
headerNum: 1,
headerRange: 'A1:B1',
sheetName: '강수량'
},
{
data: [['날짜', '유입하수량'],...chart_inflowRain.map((item) => [item.label, item.lineVal1])],
data: [['날짜', '유입하수량'],...chart_inflowRain.map((item) => [item.label, roundNumber(item.lineVal1, 0)])],
headerNum: 1,
headerRange: 'A1:B1',
sheetName: '유입하수량'
},
{
data: [['날짜', '시설용량'],...chart_inflowRain.map((item) => [item.label, item.lineVal0])],
data: [['날짜', '시설용량'],...chart_inflowRain.map((item) => [item.label, roundNumber(item.lineVal0, 0)])],
headerNum: 1,
headerRange: 'A1:B1',
sheetName: '시설용량'
},
{
data: [['날짜', '유입BOD'],...chart_bodRain.map((item) => [item.label, item.lineVal0])],
data: [['날짜', '유입BOD'],...chart_bodRain.map((item) => [item.label, roundNumber(item.lineVal0, 1)])],
headerNum: 1,
headerRange: 'A1:B1',
sheetName: '유입BOD'
},
{
data: [['날짜', '유입T-P'],...chart_inflTp.map((item) => [item.label, item.val])],
data: [['날짜', '유입T-P'],...chart_inflTp.map((item) => [item.label, roundNumber(item.val, 3)])],
headerNum: 1,
headerRange: 'A1:B1',
sheetName: '유입T-P'
},
{
data: [['날짜', '총인유입T-P'],...chart_chongInTp.map((item) => [item.label, item.val])],
data: [['날짜', '총인유입T-P'],...chart_chongInTp.map((item) => [item.label, roundNumber(item.val, 3)])],
headerNum: 1,
headerRange: 'A1:B1',
sheetName: '총인유입T-P'
},
{
data: [['날짜', '방류T-P'],...chart_efflTp.map((item) => [item.label, item.val])],
data: [['날짜', '방류T-P'],...chart_efflTp.map((item) => [item.label, roundNumber(item.val, 3)])],
headerNum: 1,
headerRange: 'A1:B1',
sheetName: '방류T-P'
},
{
data: [['날짜', '유입T-N'],...chart_inflTn.map((item) => [item.label, item.val])],
data: [['날짜', '유입T-N'],...chart_inflTn.map((item) => [item.label, roundNumber(item.val, 3)])],
headerNum: 1,
headerRange: 'A1:B1',
sheetName: '유입T-N'
},
{
data: [['날짜', '방류T-N'],...chart_efflTn.map((item) => [item.label, item.val])],
data: [['날짜', '방류T-N'],...chart_efflTn.map((item) => [item.label, roundNumber(item.val, 3)])],
headerNum: 1,
headerRange: 'A1:B1',
sheetName: '방류T-N'
}
} */
];
downloadMultipleExcel('주요그래프', sheetParameter);
@@ -265,22 +318,22 @@ export default function DashBoard() {
const initVal = () => {
setFcltyList({
bscFctCd: '26260PB001R',
bscFctNm: '수영',
fcltyCpc: 452000,
trtFrfNm: '표준활성슬러지법, MLE, MBR',
efflWqltStndrdNm: '500톤 이상(Ⅳ지역)'
bscFctCd: '11000SW001R',
bscFctNm: '난지',
fcltyCpc: 860000,
trtFrfNm: '표준활성슬러지법, MLE, A2O',
efflWqltStndrdNm: '500톤 이상(Ⅲ지역)'
});
setSearchFcltyList({
bscFctCd: '26260PB001R',
bscFctNm: '수영',
fcltyCpc: 452000,
trtFrfNm: '표준활성슬러지법, MLE, MBR',
efflWqltStndrdNm: '500톤 이상(Ⅳ지역)'
bscFctCd: '11000SW001R',
bscFctNm: '난지',
fcltyCpc: 860000,
trtFrfNm: '표준활성슬러지법, MLE, A2O',
efflWqltStndrdNm: '500톤 이상(Ⅲ지역)'
});
setSearchYear(selectSearchYear[0]?.val || '0');
searchFcltyList.bscFctNm = '수영';
searchFcltyList.bscFctNm = '난지';
setSidoValue('0');
setSigunValue('0');
@@ -1,7 +1,7 @@
"use client"
import { useFoStore } from "@/app/store";
import { useEffect, useState } from "react";
import SearchInput from "../../components/common/SearchInput";
import SearchInput from "../../../components/common/SearchInput";
export default function DashBoardFclty({ onFacilityChange, sidoSigun, facilityNm, }: { onFacilityChange?: (facility: { bscFctCd: string, bscFctNm: string, fcltyCpc: number | '', trtFrfNm: string | '', efflWqltStndrdNm: string | '' }) => void, sidoSigun?: string, facilityNm?: string }) {
// 입력값 상태 관리
@@ -12,7 +12,7 @@ export default function DashBoardFclty({ onFacilityChange, sidoSigun, facilityNm
} = Common;
// 시설명
const [bscFctNm, setFcltyName] = useState<string>(facilityNm || '수영');
const [bscFctNm, setFcltyName] = useState<string>(facilityNm || '난지');
const [bscFctCd, setbscFctCd] = useState<string>('11000SW001R');
const [fcltyCpc, setFcltyCpc] = useState<number | ''>(860000);
const [trtFrfNm, setTrtFrfNm] = useState<string | ''>('표준활성슬러지법, MLE, A2O');
@@ -1,9 +1,11 @@
"use client"
import CalcRainEffect from "@/app/components/common/CalcRainEffect";
import { roundNumber } from "@/app/components/common/DataForm";
import { useFoStore } from "@/app/store";
import type { PrecipitationPropsDetailProps } from "@/app/store/facilityPrecipitation";
import { DatePickerRange, UiTable } from "@common/business_components/ui";
import { DatePickerRange, downloadExcel, UiTable } from "@common/business_components/ui";
import ListDiv from "@common/business_components/ui/list_div";
import { Table, TableCell, TableHead, TableRow } from "@common/components/ui";
import { Button, Table, TableCell, TableHead, TableRow } from "@common/components/ui";
import { useEffect, useRef, useState } from "react";
type PrecipitationModalProps = {
@@ -19,16 +21,17 @@ type DateRange = {
}
export default function PrecipitationModal(props: PrecipitationModalProps) {
const { PrecipitationDetail } = useFoStore((state) => state);
const { Common, PrecipitationDetail } = useFoStore((state) => state);
const { upHeadListPrecipitationDetail } = PrecipitationDetail;
const { btnClass } = Common;
// Refs
const startPickerRef = useRef<HTMLDivElement>(null);
const endPickerRef = useRef<HTMLDivElement>(null);
// States
const [startDate, setStartDate] = useState<Date | null>(null);
const [endDate, setEndDate] = useState<Date | null>(null);
const [startDate, setStartDate] = useState<Date | undefined>(new Date());
const [endDate, setEndDate] = useState<Date | undefined>(new Date());
const didInit = useRef(false);
const [filteredDetailList, setFilteredDetailList] = useState<PrecipitationPropsDetailProps[]>([]);
const [copyDetailList, setCopyDetailList] = useState<PrecipitationPropsDetailProps[]>([]);
@@ -113,17 +116,20 @@ export default function PrecipitationModal(props: PrecipitationModalProps) {
};
useEffect(() => {
if(didInit.current) return;
if (props.detailList.length > 0) {
const filteredList = props.detailList.filter((item) =>
props.facilityCd === item.bscFctCd
);
setFilteredDetailList(filteredList);
setCopyDetailList(filteredList);
if (filteredList.length > 0) {
const firstDateStr = filteredList[0]?.rainDt;
const lastDateStr = filteredList[filteredList.length - 1]?.rainDt;
didInit.current = true;
const filteredList = props.detailList
.map(i => ({ ...i })) // ← 얕은 복제
.filter((item) => props.facilityCd === item.bscFctCd);
const calcData = CalcRainEffect(filteredList);
setFilteredDetailList(calcData);
setCopyDetailList(calcData);
if (calcData.length > 0) {
const firstDateStr = calcData[0]?.rainDt;
const lastDateStr = calcData[calcData.length - 1]?.rainDt;
if (firstDateStr) {
const firstDate = new Date(firstDateStr);
@@ -131,7 +137,6 @@ export default function PrecipitationModal(props: PrecipitationModalProps) {
setStartDate(firstDate);
}
}
if (lastDateStr) {
const lastDate = new Date(lastDateStr);
if (!isNaN(lastDate.getTime())) {
@@ -142,14 +147,30 @@ export default function PrecipitationModal(props: PrecipitationModalProps) {
}
}, [props.detailList, props.facilityCd]);
if (!startDate || !endDate) {
return <div>로딩 중...</div>;
const excelDownload = () => {
const totData = getTableData();
const excelDownList: any[] = [];
if(totData.length > 0){
totData.forEach((item) => {
excelDownList.push({
"날짜": item.rainDt,
"강수량(mm/일)": roundNumber(item.infoRnDay, 1),
"강우일(일)": roundNumber(item.rainDay, 0),
"강우영향일(일)": roundNumber(item.rainEffectDay, 0),
});
});
}
if (excelDownList && excelDownList.length > 0) {
downloadExcel({ data: JSON.parse(JSON.stringify(excelDownList)), fileName: props.searchYear+'년 '+props.fcltyName + ' 강수현황', sheetNameArray: ['지하수유입량'], headerRange: 'A1:D1' });
} else if (totData.length == 0) {
alert('다운받을 데이터가 없습니다.');
}
}
return (
<>
<ListDiv className="!h-[80px] !mt-10">
<div className="card !m-[1.2rem] max-h-[40rem] overflow-auto !p-0r">
<ListDiv className="!mt-5 !h-[80px]">
<div className="!m-[0.5rem] max-h-[40rem] overflow-auto">
<Table>
<thead>
<TableRow>
@@ -186,7 +207,10 @@ export default function PrecipitationModal(props: PrecipitationModalProps) {
</Table>
</div>
</ListDiv>
<ListDiv className="h-[450px] overflow-y-auto">
<ListDiv className="h-[550px] overflow-y-auto">
<Button className={btnClass} style={{float: 'right'}} color="green" onClick={excelDownload}>
{"엑셀다운로드"}
</Button>
<UiTable
headName={"강수현황"}
tableData={getTableData()}
@@ -129,7 +129,7 @@ export default function FacilityPrecipitation() {
initializeCommonData();
searchFacilityPrecipitationList(1, 10, selectSearchYear[0]?.val || "0");
}
}, [isInit, initializeCommonData, searchFacilityPrecipitationList]);
}, [isInit, initializeCommonData, searchFacilityPrecipitationList, selectSearchYear]);
useEffect(() => {
if (excelList && excelList.length > 0) {
@@ -153,14 +153,6 @@ export default function FacilityPrecipitation() {
*/
// 조회
const searchFacilityPrecipitation = useCallback(({ partValue, regionValue, unitWaterShedValue, middleRegionValue, envPartValue, sidoValue, sigunValue }: ReturnType, pageNo: number, pageCnt:number=20) => {
console.log('partValue : ', partValue);
console.log('regionValue : ', regionValue);
console.log('unitWaterShedValue : ', unitWaterShedValue);
console.log('middleRegionValue : ', middleRegionValue);
console.log('envPartValue : ', envPartValue);
console.log('sidoValue : ', sidoValue);
console.log('sigunValue : ', sigunValue);
let nameCd, partStr
switch (partValue) {
case 'R':
@@ -226,7 +218,7 @@ export default function FacilityPrecipitation() {
queryClick={chkVal}
excelClick={excelDownload}
initClick={resetVal}
ref={ref} isAdmin={false} />
ref={ref} isAdmin={false}/>
<ListDiv>
<LoadingOverlay isLoading={isLoading} />
<div className="h-full w-full overflow-x-scroll">
@@ -240,7 +232,7 @@ export default function FacilityPrecipitation() {
{selectedRow !== null && (
<UiModal
body={<PrecipitationModal searchYear={searchYear} fcltyName={fcltyNm} facilityCd={fcltyCd} detailList={gridListPrecipitationDetail}></PrecipitationModal>}
bodyClass="sm:max-w-[90vw] w-[72vw] h-[40vw]"
bodyClass="sm:max-w-[90vw] w-[1150px] h-[700px]"
open={selectedRow !== null}
onOpenChange={(open) => !open && closeModal()}
noHeaderYn="Y"
@@ -4,9 +4,10 @@ import type { FacilityWaterQltyProps, modalExcelType } from "@/app/store/facilit
import { downloadExcel, UITab, UiTable } from "@common/business_components/ui";
import { Button, TabsContent } from "@common/components/ui";
import { useCallback, useEffect, useRef, useState } from "react";
import type { ReturnType } from "../../../components/common/FacilityTermModalHeader";
import FacilityTermModalHeader from "../../../components/common/FacilityTermModalHeader";
import type { ReturnType } from "../../../../components/common/FacilityTermModalHeader";
import FacilityTermModalHeader from "../../../../components/common/FacilityTermModalHeader";
import { HeadMakeColSpan } from "../HeadMakeColSpan";
import { roundNumber } from "@/app/components/common/DataForm";
type ModalProps ={
fcltyName: string;
@@ -74,8 +75,10 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
let maxTpInflWqltBod = 0;
let maxTpInflWqltTp = 0;
let maxNoProcessInflAmnt = 0;
let maxInfoRnDay = 0;
// 초기값 설정
let minEfflWqltBod = filteredData.length > 0 ? parseNumber(filteredData[0]?.efflWqltBod) : 0;
let minEfflWqltTn = filteredData.length > 0 ? parseNumber(filteredData[0]?.efflWqltTn) : 0;
@@ -89,9 +92,9 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
let mininflAssctBfrWqltToc = filteredData.length > 0 ? parseNumber(filteredData[0]?.inflAssctBfrWqltToc) : 0;
let mininflAssctBfrWqltSs = filteredData.length > 0 ? parseNumber(filteredData[0]?.inflAssctBfrWqltSs) : 0;
let minTpInflWqltBod = filteredData.length > 0 ? parseNumber(filteredData[0]?.tpInflWqltBod) : 0;
let minTpInflWqltTp = filteredData.length > 0 ? parseNumber(filteredData[0]?.tpInflWqltTp) : 0;
let minTpInflWqltBod = 99999999;
let minTpInflWqltTp = 99999999;
let minNoProcessInflAmnt = 99999999;
let minInfoRnDay = filteredData.length > 0 ? parseNumber(filteredData[0]?.infoRnDay) : 0;
let avgEfflWqltBod = 0;
@@ -108,6 +111,10 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
let avgTpInflWqltBod = 0;
let avgTpInflWqltTp = 0;
let tpInflWqltBodCnt = 0;
let tpInflWqltTpCnt = 0;
let avgNoProcessInflAmnt = 0;
let noProcessInflAmntCnt = 0;
let avgInfoRnDay = 0;
@@ -117,16 +124,20 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
const efflWqltTp = parseNumber(item.efflWqltTp);
const efflWqltToc = parseNumber(item.efflWqltToc);
const efflWqltSs = parseNumber(item.efflWqltSs);
const inflAssctBfrWqltBod = parseNumber(item.inflAssctBfrWqltBod);
const inflAssctBfrWqltTn = parseNumber(item.inflAssctBfrWqltTn);
const inflAssctBfrWqltTp = parseNumber(item.inflAssctBfrWqltTp);
const inflAssctBfrWqltToc = parseNumber(item.inflAssctBfrWqltToc);
const inflAssctBfrWqltSs = parseNumber(item.inflAssctBfrWqltSs);
const tpInflWqltBod = parseNumber(item.tpInflWqltBod);
const tpInflWqltTp = parseNumber(item.tpInflWqltTp);
if(item.tpInflWqltBod != null && item.tpInflWqltBod.trim() != '' && item.tpInflWqltBod != undefined ){
tpInflWqltBodCnt += 1;
}
if(item.tpInflWqltTp != null && item.tpInflWqltTp.trim() != '' && item.tpInflWqltTp != undefined ){
tpInflWqltTpCnt += 1;
}
const infoRnDay = parseNumber(item.infoRnDay);
@@ -159,8 +170,14 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
mininflAssctBfrWqltToc = Math.min(mininflAssctBfrWqltToc, inflAssctBfrWqltToc);
mininflAssctBfrWqltSs = Math.min(mininflAssctBfrWqltSs, inflAssctBfrWqltSs);
minTpInflWqltBod = Math.min(minTpInflWqltBod, tpInflWqltBod);
minTpInflWqltTp = Math.min(minTpInflWqltTp, tpInflWqltTp);
if(item.tpInflWqltBod != null && item.tpInflWqltBod.trim() != '' && item.tpInflWqltBod != undefined ){
minTpInflWqltBod = Math.min(minTpInflWqltBod, tpInflWqltBod);
avgTpInflWqltBod += tpInflWqltBod;
}
if(item.tpInflWqltTp != null && item.tpInflWqltTp.trim() != '' && item.tpInflWqltTp != undefined ){
minTpInflWqltTp = Math.min(minTpInflWqltTp, tpInflWqltTp);
avgTpInflWqltTp += tpInflWqltTp;
}
minInfoRnDay = Math.min(minInfoRnDay, infoRnDay);
@@ -176,8 +193,13 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
avginflAssctBfrWqltToc += inflAssctBfrWqltToc;
avginflAssctBfrWqltSs += inflAssctBfrWqltSs;
avgTpInflWqltBod += tpInflWqltBod;
avgTpInflWqltTp += tpInflWqltTp;
if(item.noProcessInflAmnt && item.noProcessInflAmnt.toString().trim() != '' && item.noProcessInflAmnt != undefined){
const noProcessInflAmnt = Number(item.noProcessInflAmnt.toString().replaceAll(',',''));
avgNoProcessInflAmnt += noProcessInflAmnt;
maxNoProcessInflAmnt = Math.max(maxNoProcessInflAmnt, noProcessInflAmnt);
minNoProcessInflAmnt = Math.min(minNoProcessInflAmnt, noProcessInflAmnt);
noProcessInflAmntCnt +=1;
}
avgInfoRnDay += infoRnDay;
});
@@ -202,9 +224,10 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
sggNm: "",
addr: "",
fctCpc: 0,
noProcessInflAmnt : roundNumber(avgNoProcessInflAmnt / noProcessInflAmntCnt, 0),
infoRnDay: filteredData.length==0?'0.0':(Math.round(avgInfoRnDay / filteredData.length * 10) / 10).toFixed(1),
tpInflWqltBod: filteredData.length==0?'0.0':(Math.round(avgTpInflWqltBod / filteredData.length * 10) / 10).toFixed(1),
tpInflWqltTp: filteredData.length==0?'0.000':(Math.round(avgTpInflWqltTp / filteredData.length * 1000) / 1000).toFixed(3)
tpInflWqltBod: filteredData.length==0?'0.0':(Math.round(avgTpInflWqltBod / tpInflWqltBodCnt * 10) / 10).toFixed(1),
tpInflWqltTp: filteredData.length==0?'0.000':(Math.round(avgTpInflWqltTp / tpInflWqltTpCnt * 1000) / 1000).toFixed(3)
},
{
msrDt : '최대',
@@ -225,14 +248,15 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
sggNm: "",
addr: "",
fctCpc: 0,
infoRnDay: 0,
noProcessInflAmnt : roundNumber(maxNoProcessInflAmnt, 0),
infoRnDay: Math.round(maxInfoRnDay * 10) / 10?(Math.round(maxInfoRnDay * 10) / 10).toFixed(1):'0.0',
tpInflWqltBod: Math.round(maxTpInflWqltBod * 10) / 10?(Math.round(maxTpInflWqltBod * 10) / 10).toFixed(1):'0.0',
tpInflWqltTp: Math.round(maxTpInflWqltTp * 1000) / 1000?(Math.round(maxTpInflWqltTp * 1000) / 1000).toFixed(3):'0.000'
},
{
msrDt : '최소',
efflWqltBod : Math.round(minEfflWqltBod * 10) / 10?(Math.round(minEfflWqltBod?minEfflWqltBod:0 * 10) / 10).toFixed(1) : '0.0',
efflWqltToc : Math.round(minefflWqltToc * 10) / 10?(Math.round(minefflWqltToc?minefflWqltToc:0 * 10) / 10).toFixed(1) : '0.0',
efflWqltBod : Math.round(minEfflWqltBod * 10) / 10?(Math.round(minEfflWqltBod * 10) / 10).toFixed(1) : '0.0',
efflWqltToc : Math.round(minefflWqltToc * 10) / 10?(Math.round(minefflWqltToc * 10) / 10).toFixed(1) : '0.0',
efflWqltSs : Math.round(minEfflWqltSs * 10) / 10?(Math.round(minEfflWqltSs * 10) / 10).toFixed(1) : '0.0',
efflWqltTn : Math.round(minEfflWqltTn * 1000) / 1000?(Math.round(minEfflWqltTn * 1000) / 1000).toFixed(3) : '0.000',
efflWqltTp : Math.round(minEfflWqltTp * 1000) / 1000?(Math.round(minEfflWqltTp * 1000) / 1000).toFixed(3) : '0.000',
@@ -248,12 +272,14 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
sggNm: "",
addr: "",
fctCpc: 0,
infoRnDay: 0,
tpInflWqltBod: Math.round(minTpInflWqltBod * 10) / 10?'0.0':(Math.round(minTpInflWqltBod * 10) / 10).toFixed(1),
tpInflWqltTp: Math.round(minTpInflWqltTp * 1000) / 1000?'0.000':(Math.round(minTpInflWqltTp * 1000) / 1000).toFixed(3)
noProcessInflAmnt : roundNumber(minNoProcessInflAmnt, 0),
infoRnDay: Math.round(minInfoRnDay * 10) / 10?'0.0':(Math.round(minInfoRnDay * 10) / 10).toFixed(1),
tpInflWqltBod: Math.round(minTpInflWqltBod * 10) / 10 && minTpInflWqltBod != 99999999?(Math.round(minTpInflWqltBod * 10) / 10).toFixed(1):'0.0',
tpInflWqltTp: Math.round(minTpInflWqltTp * 1000) / 1000 && minTpInflWqltTp != 99999999?(Math.round(minTpInflWqltTp * 1000) / 1000).toFixed(3):'0.000'
},
...filteredData
];
return newFilteredData;
}
@@ -380,7 +406,7 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
ref={ref}
queryClick={filterData}
/>
<div className="overflow-y-auto h-[550px]">
<div className="overflow-y-auto h-[500px]">
<UiTable
headName={undefined}
tableData={copyYearList}
@@ -395,6 +421,10 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
<HeadMakeColSpan upHeadList={upHeadListModalYear} layoutNum={3} />
</UiTable>
</div>
<div className="mt-14">
<span className="text-2xl font-bold text-gray-500">☞ 미처리하수량 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]​/강우시 일별유입BOD)​</span><br></br>
<span className="text-2xl font-bold text-gray-500">☞ 음수값 발생시 제외(null, 평균값 산정시 제외)</span><br></br>
</div>
</TabsContent>
<TabsContent value="tab_term_winter">
@@ -407,34 +437,7 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
ref={ref}
queryClick={filterData}
/>
<div className="overflow-y-auto h-[550px]">
<UiTable
headName={undefined}
tableData={copyYearList}
headlist={upHeadListModalYear}
pageSize={0}
total={0}
cellClick={undefined}
onPageChange={() => {}}
className="h-[500px]"
boldArray={[0,1,2]}
>
<HeadMakeColSpan upHeadList={upHeadListModalYear} layoutNum={3} />
</UiTable>
</div>
</TabsContent>
<TabsContent value="tab_term_chuncheon">
<FacilityTermModalHeader<FacilityWaterQltyProps>
searchList={facilityWaterQltyYearList}
fcltyCd={facilityCd}
fcltyName={fcltyName}
tabName="tab_term_chuncheon"
searchYear={searchYear}
ref={ref}
queryClick={filterData}
/>
<div className="overflow-y-auto h-[550px]">
<div className="overflow-y-auto h-[500px]">
<UiTable
headName={undefined}
tableData={copyYearList}
@@ -450,6 +453,39 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
</UiTable>
</div>
<div className="mt-14">
<span className="text-2xl font-bold text-gray-500">☞ 미처리하수량 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]​/강우시 일별유입BOD)​</span><br></br>
<span className="text-2xl font-bold text-gray-500">☞ 음수값 발생시 제외(null, 평균값 산정시 제외)</span><br></br>
</div>
</TabsContent>
<TabsContent value="tab_term_chuncheon">
<FacilityTermModalHeader<FacilityWaterQltyProps>
searchList={facilityWaterQltyYearList}
fcltyCd={facilityCd}
fcltyName={fcltyName}
tabName="tab_term_chuncheon"
searchYear={searchYear}
ref={ref}
queryClick={filterData}
/>
<div className="overflow-y-auto h-[500px]">
<UiTable
headName={undefined}
tableData={copyYearList}
headlist={upHeadListModalYear}
pageSize={0}
total={0}
cellClick={undefined}
onPageChange={() => {}}
className="h-[500px]"
boldArray={[0,1,2]}
>
<HeadMakeColSpan upHeadList={upHeadListModalYear} layoutNum={3} />
</UiTable>
</div>
<div className="mt-14">
<span className="text-2xl font-bold text-gray-500">☞ 미처리하수량 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]​/강우시 일별유입BOD)​</span><br></br>
<span className="text-2xl font-bold text-gray-500">☞ 음수값 발생시 제외(null, 평균값 산정시 제외)</span><br></br>
<span className="text-2xl font-bold text-gray-500">☞ 청천시 : 강우량이 3mm미만의 날</span>
</div>
</TabsContent>
@@ -464,7 +500,7 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
ref={ref}
queryClick={filterData}
/>
<div className="overflow-y-auto h-[550px]">
<div className="overflow-y-auto h-[500px]">
<UiTable
headName={undefined}
tableData={copyYearList}
@@ -480,6 +516,8 @@ export default function WaterQualityModal({fcltyName='', facilityCd='', searchYe
</UiTable>
</div>
<div className="mt-14">
<span className="text-2xl font-bold text-gray-500">☞ 미처리하수량 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]​/강우시 일별유입BOD)​</span><br></br>
<span className="text-2xl font-bold text-gray-500">☞ 음수값 발생시 제외(null, 평균값 산정시 제외)</span><br></br>
<span className="text-2xl font-bold text-gray-500">☞ 강우량 3mm 이상만 날과 강우영향일(강우일+2일)의 날</span>
</div>
</TabsContent>
@@ -134,7 +134,7 @@ export default function ProcessFacilitySearch() {
initializeCommonData();
searchFacilityWaterQltyList(1, 10, selectSearchYear[0]?.val || "0");
}
}, [isInit, initializeCommonData, searchFacilityWaterQltyList]);
}, [isInit, initializeCommonData, searchFacilityWaterQltyList, selectSearchYear]);
useEffect(() => {
if (excelList && excelList.length > 0) {
@@ -163,7 +163,6 @@ export default function ProcessFacilitySearch() {
}, [searchFcltyQltyList]);
const total = facilityWaterQltyCount || 1;
console.log('total : ', total);
return (
<MainDiv>
<Title title="시설별 수질현황" />
@@ -5,7 +5,9 @@ import type { FlowRateModalInterface, modalExcelType } from "@/app/store/flowRat
import { downloadExcel, UITab, UiTable } from "@common/business_components/ui";
import { Button, TabsContent } from "@common/components/ui";
import { useCallback, useEffect, useRef, useState } from "react";
import type { ReturnType } from "../../../components/common/FacilityTermModalHeader";
import type { ReturnType } from "../../../../components/common/FacilityTermModalHeader";
import { roundUp } from "@/app/store/common";
import { roundNumber } from "@/app/components/common/DataForm";
const tabList = [
{ value: 'tab_term_year', label: '연간' },
@@ -58,6 +60,7 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
let maxreturnAmnt = 0;
let maxefflAmnt = 0;
let maxinfoRnDay = 0;
let maxNoProcessInflAmnt = 0;
// 초기값 설정
let mintotInflAmnt = parseNumber(filteredData[0]?.totInflAmnt);
@@ -66,6 +69,7 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
let minreturnAmnt = parseNumber(filteredData[0]?.returnAmnt);
let minefflAmnt = parseNumber(filteredData[0]?.efflAmnt);
let mininfoRnDay = parseNumber(filteredData[0]?.infoRnDay && filteredData[0]?.infoRnDay.toString().trim() !== 'x' ? filteredData[0]?.infoRnDay.toString().trim() : 0);
let minNoProcessInflAmnt = 99999999;
let avgtotInflAmnt = 0;
let avginflAmnt = 0;
@@ -73,7 +77,9 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
let avgreturnAmnt = 0;
let avgefflAmnt = 0;
let avginfoRnDay = 0;
let avgNoProcessInflAmnt = 0;
let noProcessInflAmntCnt = 0;
filteredData.forEach((item: FlowRateModalInterface) => {
const totInflAmnt = parseNumber(item.totInflAmnt);
const inflAmnt = parseNumber(item.inflAmnt);
@@ -81,6 +87,7 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
const returnAmnt = parseNumber(item.returnAmnt);
const efflAmnt = parseNumber(item.efflAmnt);
const infoRnDay = parseNumber(item.infoRnDay && item.infoRnDay.toString().trim() !== 'x' ? item.infoRnDay.toString().trim() : 0);
maxtotInflAmnt = Math.max(maxtotInflAmnt, totInflAmnt);
maxinflAmnt = Math.max(maxinflAmnt, inflAmnt);
maxsumFlow = Math.max(maxsumFlow, sumFlow);
@@ -101,37 +108,48 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
avgreturnAmnt += returnAmnt;
avgefflAmnt += efflAmnt;
avginfoRnDay += infoRnDay;
if(item.noProcessInflAmnt && item.noProcessInflAmnt.toString().trim() != '' && item.noProcessInflAmnt != undefined){
const noProcessInflAmnt = Number(item.noProcessInflAmnt.toString().replaceAll(',',''));
avgNoProcessInflAmnt += noProcessInflAmnt;
maxNoProcessInflAmnt = Math.max(maxNoProcessInflAmnt, noProcessInflAmnt);
minNoProcessInflAmnt = Math.min(minNoProcessInflAmnt, noProcessInflAmnt);
noProcessInflAmntCnt +=1;
}
});
const newFilteredData = [
{
msrDt: '평균',
totInflAmnt: Math.round(avgtotInflAmnt / filteredData.length * 10) / 10,
inflAmnt: Math.round(avginflAmnt / filteredData.length * 10) / 10,
sumFlow: Math.round(avgsumFlow / filteredData.length * 10) / 10,
returnAmnt: Math.round(avgreturnAmnt / filteredData.length * 10) / 10,
efflAmnt: Math.round(avgefflAmnt / filteredData.length * 10) / 10,
infoRnDay: avginfoRnDay > 0 ? Math.round(avginfoRnDay / filteredData.length * 10) / 10 : 0,
totInflAmnt: avgtotInflAmnt && avgtotInflAmnt!=0 ? roundUp((avgtotInflAmnt / filteredData.length), 0) : 0,
inflAmnt: avginflAmnt && avginflAmnt!=0 ? roundUp((avginflAmnt / filteredData.length), 0) : 0,
sumFlow: avgsumFlow && avgsumFlow!=0 ? roundUp((avgsumFlow / filteredData.length), 0) : 0,
returnAmnt: avgreturnAmnt && avgreturnAmnt!=0 ? roundUp((avgreturnAmnt / filteredData.length), 0) : 0,
efflAmnt: avgefflAmnt && avgefflAmnt!=0 ? roundUp((avgefflAmnt / filteredData.length), 0) : 0,
noProcessInflAmnt : roundNumber(avgNoProcessInflAmnt / noProcessInflAmntCnt, 0),
infoRnDay: avginfoRnDay > 0 ? roundUp((avginfoRnDay / filteredData.length), 1) : '0.0',
rainEffectDay: 0,
},
{
msrDt: '최대',
totInflAmnt: Math.round(maxtotInflAmnt * 10) / 10,
inflAmnt: Math.round(maxinflAmnt * 10) / 10,
sumFlow: Math.round(maxsumFlow * 10) / 10,
returnAmnt: Math.round(maxreturnAmnt * 10) / 10,
efflAmnt: Math.round(maxefflAmnt * 10) / 10,
infoRnDay: maxinfoRnDay > 0 ? (Math.round(maxinfoRnDay * 10) / 10).toFixed(1) : '0.0',
totInflAmnt: roundUp(maxtotInflAmnt, 0),
inflAmnt: roundUp(maxinflAmnt, 0),
sumFlow: roundUp(maxsumFlow, 0),
returnAmnt: roundUp(maxreturnAmnt, 0),
efflAmnt: roundUp(maxefflAmnt, 0),
noProcessInflAmnt : roundNumber(maxNoProcessInflAmnt, 0),
infoRnDay: maxinfoRnDay > 0 ? roundUp(maxinfoRnDay, 1) : '0.0',
rainEffectDay: 0,
},
{
msrDt: '최소',
totInflAmnt: Math.round(mintotInflAmnt * 10) / 10,
inflAmnt: Math.round(mininflAmnt * 10) / 10,
sumFlow: Math.round(minsumFlow * 10) / 10,
returnAmnt: Math.round(minreturnAmnt * 10) / 10,
efflAmnt: Math.round(minefflAmnt * 10) / 10,
infoRnDay: mininfoRnDay > 0 ? (Math.round(mininfoRnDay * 10) / 10).toFixed(1) : '0.0',
totInflAmnt: roundUp(mintotInflAmnt, 0),
inflAmnt: roundUp(mininflAmnt, 0),
sumFlow: roundUp(minsumFlow, 0),
returnAmnt: roundUp(minreturnAmnt, 0),
efflAmnt: roundUp(minefflAmnt, 0),
noProcessInflAmnt : roundNumber(minNoProcessInflAmnt, 0),
infoRnDay: mininfoRnDay > 0 ? roundUp(mininfoRnDay, 1) : '0.0',
rainEffectDay: 0,
},
...filteredData
@@ -207,6 +225,10 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
boldArray={[0,1,2]}
/>
</div>
<div className="mt-14">
<span className="text-2xl font-bold text-gray-500">☞ 미처리하수량 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]​/강우시 일별유입BOD)​</span><br></br>
<span className="text-2xl font-bold text-gray-500">☞ 음수값 발생시 제외(null, 평균값 산정시 제외)</span><br></br>
</div>
</TabsContent>
<TabsContent value="tab_term_summer">
<FacilityTermModalHeader<FlowRateModalInterface>
@@ -231,6 +253,10 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
boldArray={[0,1,2]}
/>
</div>
<div className="mt-14">
<span className="text-2xl font-bold text-gray-500">☞ 미처리하수량 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]​/강우시 일별유입BOD)​</span><br></br>
<span className="text-2xl font-bold text-gray-500">☞ 음수값 발생시 제외(null, 평균값 산정시 제외)</span><br></br>
</div>
</TabsContent>
<TabsContent value="tab_term_winter">
<FacilityTermModalHeader<FlowRateModalInterface>
@@ -255,6 +281,10 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
boldArray={[0,1,2]}
/>
</div>
<div className="mt-14">
<span className="text-2xl font-bold text-gray-500">☞ 미처리하수량 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]​/강우시 일별유입BOD)​</span><br></br>
<span className="text-2xl font-bold text-gray-500">☞ 음수값 발생시 제외(null, 평균값 산정시 제외)</span><br></br>
</div>
</TabsContent>
<TabsContent value="tab_term_chuncheon">
<FacilityTermModalHeader<FlowRateModalInterface>
@@ -280,6 +310,8 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
/>
</div>
<div className="mt-14">
<span className="text-2xl font-bold text-gray-500">☞ 미처리하수량 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]​/강우시 일별유입BOD)​</span><br></br>
<span className="text-2xl font-bold text-gray-500">☞ 음수값 발생시 제외(null, 평균값 산정시 제외)</span><br></br>
<span className="text-2xl font-bold text-gray-500">☞ 청천시 : 강우량이 3mm미만의 날</span>
</div>
</TabsContent>
@@ -297,6 +329,8 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
<UiTable headName="유량현황" tableData={copyYearList} headlist={upHeadListFlowRateModalYear} pageSize={0} total={0} cellClick={undefined} onPageChange={() => {}} className="h-[370px]" boldArray={[0,1,2]}/>
</div>
<div className="mt-14">
<span className="text-2xl font-bold text-gray-500">☞ 미처리하수량 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]​/강우시 일별유입BOD)​</span><br></br>
<span className="text-2xl font-bold text-gray-500">☞ 음수값 발생시 제외(null, 평균값 산정시 제외)</span><br></br>
<span className="text-2xl font-bold text-gray-500">☞ 강우량 3mm 이상만 날과 강우영향일(강우일+2일)의 날</span>
</div>
</TabsContent>
@@ -130,7 +130,7 @@ export default function ProcessFacilitySearch() {
initializeCommonData();
searchFlowRateList(1, 10, selectSearchYear[0]?.val || "0");
}
}, [isInit, initializeCommonData, searchFlowRateList]);
}, [isInit, initializeCommonData, searchFlowRateList, selectSearchYear]);
useEffect(() => {
if (excelList && excelList.length > 0) {
@@ -187,7 +187,7 @@ export default function ProcessFacilitySearch() {
queryClick={chkVal}
excelClick={excelDownload}
initClick={resetVal}
ref={ref} isAdmin={false} />
ref={ref} isAdmin={false}/>
<ListDiv>
<LoadingOverlay isLoading={isLoading} />
<div className="h-full w-full overflow-x-scroll">
@@ -0,0 +1,13 @@
"use client"
import Base from "@/app/base";
export default function RootLayout({
children,
}: Readonly<{
children: React.ReactNode;
}>) {
return (
<Base>{children}</Base>
);
}
@@ -104,10 +104,9 @@ export default function PlanSewage() {
initializeCommonData();
searchPlanSewageList(1, 10, selectSearchYear[0]?.val || "0", ref.current.partValue);
}
}, [isInit, initializeCommonData, searchPlanSewageList]);
}, [isInit, initializeCommonData, searchPlanSewageList, selectSearchYear]);
useEffect(() => {
console.log('excelList' , excelList);
if (excelList && excelList.length > 0) {
downloadExcel({
data: excelList as unknown as JSON[],

Some files were not shown because too many files have changed in this diff Show More