diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/aplcnYms.ts b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/aplcnYms.ts index 857749bf1..ae5c87298 100644 --- a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/aplcnYms.ts +++ b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/aplcnYms.ts @@ -5,13 +5,9 @@ import moment from "moment"; export type TInftwtAnls = { inftwtAnlsSn:number; aplcnYm: string; - enoCd: string; ctpvCd: string; sggCd: string; - swageTmplntCd: string; - swageTmplntNm: string; - swtrmtZoneCd: string; - swtrmtZoneNm: string; + swtrmtFcltNm: string; atflCd: string; atflId: string; atflInpNm: string; @@ -32,13 +28,9 @@ export type TInftwtAnlsRslt = { export type TRdiiAnls = { rainInfwtAnlsSn:number; aplcnYm: string; - enoCd: string; ctpvCd: string; sggCd: string; - swageTmplntCd: string; - swageTmplntNm: string; - swtrmtZoneCd: string; - swtrmtZoneNm: string; + swtrmtFcltNm: string; atflCd: string; atflId: string; atflInpNm: string; diff --git a/apps/sn/app/(with-base-layout)/ii/BaseLayout.tsx b/apps/sn/app/(with-base-layout)/ii/BaseLayout.tsx index fcea807df..275126474 100644 --- a/apps/sn/app/(with-base-layout)/ii/BaseLayout.tsx +++ b/apps/sn/app/(with-base-layout)/ii/BaseLayout.tsx @@ -52,6 +52,7 @@ type BaseLayout = { setCtpvCd: (ctpv: number) => void; setSggCd: (sgg: number) => void; setSggName?: (sggName: string) => void; + setSwtrmtFcltNm?: (swtrmtFcltNm: string) => void; setIsLoading?: (isLoading: boolean) => void; onExcelDownload?: () => void; onDeleteFile?: () => void; @@ -81,6 +82,7 @@ const BaseLayout = ({ setCtpvCd, setSggCd, setSggName, + setSwtrmtFcltNm, setIsLoading, onExcelDownload, onDeleteFile, @@ -184,6 +186,7 @@ const BaseLayout = ({ setSggName={setSggName} selectedSwagePrcsFclt={selectedSwagePrcsFclt} onSwagePrcsFcltChange={onSwagePrcsFcltChange} + setSwtrmtFcltNm={setSwtrmtFcltNm} setIsLoading={setIsLoading} /> {selectBox?.searchChk && ( diff --git a/apps/sn/app/(with-base-layout)/ii/irsetting/page.tsx b/apps/sn/app/(with-base-layout)/ii/irsetting/page.tsx index 7bb508e50..0f3d710c7 100644 --- a/apps/sn/app/(with-base-layout)/ii/irsetting/page.tsx +++ b/apps/sn/app/(with-base-layout)/ii/irsetting/page.tsx @@ -18,6 +18,7 @@ import { AUTH_USER_ID } from "@/shared/config"; import { useQuery } from "@tanstack/react-query"; import { ENDPOINT } from "@common/components/config"; import { getUserInfo } from "@common/components/api"; +import LoadingOverlay from '@common/business_components/ui/loadingBar'; const formSchema = z.object({ @@ -55,6 +56,7 @@ const IrSetting = () => { const [ctpvCd, setCtpvCd] = useState(0); // 시도 코드 상태 const [sggCd, setSggCd] = useState(0); // 시군구 코드 상태 const [sggName, setSggName] = useState(''); // 시군구 이름 상태 + const [swtrmtFcltNm, setSwtrmtFcltNm] = useState(''); // 하수처리시설명 상태 const { data: userInfo } = useQuery({ queryKey: [ENDPOINT.USER_SERVICE.USERS], @@ -115,6 +117,7 @@ const IrSetting = () => { setInput1(''); // 입력 필드 초기화 setInput2(''); // 입력 필드 초기화 setSelect1(0); + setSwtrmtFcltNm(''); setFormResetKey(prevKey => prevKey + 1); // FileUploadForm 재마운트를 위해 key 변경 }; @@ -156,6 +159,7 @@ const IrSetting = () => { // 침입수 분석 실행 버튼 클릭 핸들러 const handleAnalysisClick = async () => { + console.log('분석 시작'); setIsLoadingResult(true); // 로딩 상태 시작 // 기본 선택 항목들 검증 (환경청, 시도, 시군구, 하수처리장) @@ -296,9 +300,7 @@ const IrSetting = () => { const combinedAnalysisData = { ctpvCd: (ctpvCd ? String(ctpvCd) : null), sggCd: (sggCd ? String(sggCd) : null), // 시군구코드 (선택값) - swageTmplntCd: (select1 && select1 !== '0' && select1 !== 0) - ? select1.toString().split('.').pop() || null // '.'으로 split해서 마지막 부분만 사용 - : null, // 하수처리장코드 (선택값) + swtrmtFcltNm: swtrmtFcltNm ?? null, aplcnYm: selectedDate, // 적용연월 drtwSwtcRt: parseFloat(input1) || null, // 오수전환율 (숫자로 변환) anlsInfo: input2, // 분석정보 @@ -330,6 +332,7 @@ const IrSetting = () => { return ( <> + { setCtpvCd={setCtpvCd} setSggCd={setSggCd} setSggName={setSggName} + setSwtrmtFcltNm={setSwtrmtFcltNm} setIsLoading={setIsLoadingResult} onAnalysis={handleAnalysisClick} > diff --git a/apps/sn/app/(with-base-layout)/ii/rdii/page.tsx b/apps/sn/app/(with-base-layout)/ii/rdii/page.tsx index a8b0a2b84..f0da9ad47 100644 --- a/apps/sn/app/(with-base-layout)/ii/rdii/page.tsx +++ b/apps/sn/app/(with-base-layout)/ii/rdii/page.tsx @@ -20,15 +20,15 @@ import { AUTH_USER_ID } from "@/shared/config"; import { useQuery } from "@tanstack/react-query"; import { ENDPOINT } from "@common/components/config"; import { getUserInfo } from "@common/components/api"; +import LoadingOverlay from '@common/business_components/ui/loadingBar'; + // zod 스키마 정의 const formSchema = z.object({ - enoCd: z.string(), // 환경청코드 ctpvCd: z.string(), // 시도코드 sggCd: z.string(), // 시군구코드 - swageTmplntCd: z.string(), // 하수처리장코드 - swtrmtZoneCd: z.string(), // 하수처리구역코드 + swtrmtFcltNm: z.string(), // 하수처리시설명 rtkSource: z.string(), // RTK계수 출처 rdiiArea: z.string(), // RDII 기여면적 unitFactors: z.array(z.object({ // 단위도 계수 @@ -56,11 +56,9 @@ const formSchema = z.object({ type FormSchemaType = z.infer; // 기본 폼 값 정의 (테스트 편의를 위해 초기값 설정, 추후 삭제 필요) const defaultFormValues: FormSchemaType = { - enoCd: "", ctpvCd: "", sggCd: "", - swageTmplntCd: "", - swtrmtZoneCd: "", + swtrmtFcltNm: "", rtkSource: "", rdiiArea: "", // 문자열로 기본값 설정 unitFactors: [ @@ -114,10 +112,11 @@ export default function RTKForm() { initialFileInfo, // 2: 강우자료 ]); - const [select1, setSelect1] = useState('0'); // 하수처리장 (swageTmplntCd) + const [select1, setSelect1] = useState('0'); // 하수처리장 (swtrmtFcltCd) const [ctpvCd, setCtpvCd] = useState(0); // 시도 코드 상태 const [sggCd, setSggCd] = useState(0); // 시군구 코드 상태 const [sggName, setSggName] = useState(''); // 시군구 이름 상태 + const [swtrmtFcltNm, setSwtrmtFcltNm] = useState(''); // 하수처리시설명 상태 const { data: userInfo } = useQuery({ queryKey: [ENDPOINT.USER_SERVICE.USERS], @@ -293,9 +292,7 @@ export default function RTKForm() { aplcnYm: formData.date, // 적용연월 (YYYYMM 형식) ctpvCd: ctpvCd ? String(ctpvCd) : null, // 시도코드 (선택값) sggCd: sggCd ? String(sggCd) : null, // 시군구코드 (선택값) - swageTmplntCd: (select1 && select1 !== '0' && select1 !== 0) - ? select1.toString().split('.').pop() || null // '.'으로 split해서 마지막 부분만 사용 - : null, // 하수처리장코드 (선택값) + swtrmtFcltNm: swtrmtFcltNm ?? null, atflCd: file1?.atflCd, // 첨부파일CD (오수관망도) atflId: file1?.atflId, // 첨부파일ID (오수관망도) atflInpNm: file1?.file?.name || "", // 오수관망도 파일명 @@ -324,9 +321,9 @@ export default function RTKForm() { mdPrdRcvryRt: parseFloat(formData.initialDepths[1]?.Drec || "0"), mdPrdBgngDpth: parseFloat(formData.initialDepths[1]?.Do || "0"), - longTermMaxDpth: parseFloat(formData.initialDepths[2]?.Dmax || "0"), - longTermRcvryRt: parseFloat(formData.initialDepths[2]?.Drec || "0"), - longTermBgngDpth: parseFloat(formData.initialDepths[2]?.Do || "0"), + longPrdMaxDpth: parseFloat(formData.initialDepths[2]?.Dmax || "0"), + longPrdRcvryRt: parseFloat(formData.initialDepths[2]?.Drec || "0"), + longPrdBgngDpth: parseFloat(formData.initialDepths[2]?.Do || "0"), drtwSwtcRt: parseFloat(formData.rate || "0"), // 오수전환율 anlsInfo: formData.analysisInfo, // 분석정보 @@ -386,140 +383,144 @@ export default function RTKForm() { } return ( - { }} // BaseLayout의 form 태그에 연결될 onSubmit - graphBtn={false} - analysisBtn={'RDII분석 실행'} - ctpvCd={ctpvCd} - sggCd={sggCd} - sggName={sggName} - selectedSwagePrcsFclt={select1} - onSwagePrcsFcltChange={setSelect1} - setCtpvCd={setCtpvCd} - setSggCd={setSggCd} - setSggName={setSggName} - setIsLoading={setIsLoadingResult} - onAnalysis={handleAnalysisClick} - > - {[
-
- - - - - -
-
-
- - + <> + + { }} // BaseLayout의 form 태그에 연결될 onSubmit + graphBtn={false} + analysisBtn={'RDII분석 실행'} + ctpvCd={ctpvCd} + sggCd={sggCd} + sggName={sggName} + selectedSwagePrcsFclt={select1} + onSwagePrcsFcltChange={setSelect1} + setCtpvCd={setCtpvCd} + setSggCd={setSggCd} + setSggName={setSggName} + setSwtrmtFcltNm={setSwtrmtFcltNm} + setIsLoading={setIsLoadingResult} + onAnalysis={handleAnalysisClick} + > + {[
+
+ + + + + +
+
+
+ + +
+
+ + +
-
- - +
+
+ handleFileSelection(0, file, cd, id)} + showButton={false} + showPreview={true} + accept={".inp"} + fileIdx={0} /> +
+
+ handleFileSelection(1, file, cd, id)} + showButton={false} + showPreview={true} + accept={".xls, .xlsx, .xlsm, .xltx"} + fileIdx={1} /> +
+
+ handleFileSelection(2, file, cd, id)} + showButton={false} + showPreview={true} + accept={".xls, .xlsx, .xlsm, .xltx"} + fileIdx={2} /> +
+ + { + const newValue = e.target.value; + + if (newValue === "") { + form.setValue("rate", newValue); // form의 rate 필드에 설정 + return; + } + + // 숫자와 '.'만 허용하고, '.'은 최대 하나인지 확인 + const isValidChars = /^[0-9]*\.?[0-9]*$/.test(newValue); + if (!isValidChars) return; // 유효하지 않은 문자 또는 여러 개의 '.' 포함 + + // '.' 기호가 처음에 오면 안 됨 + if (newValue.startsWith('.')) return; + + // 완성된 숫자인 경우에만 범위 체크 (입력 중인 경우 허용) + if (!newValue.endsWith('.')) { + const numericValue = parseFloat(newValue); + if (isNaN(numericValue) || numericValue < 0 || numericValue > 1) return; + } + + form.setValue("rate", newValue, { shouldValidate: true }); // form의 rate 필드에 설정 + }} + className="h-12 text-center text-xl w-[225px] ml-5" + placeholder="0 ~ 1 사이의 값 입력" + /> + + + { + form.setValue("date", value, { shouldValidate: true }); // form의 date 필드에 직접 설정 + } + }} + selectClass="ml-5 w-[225px]" + startYear={1900} // 시작 연도 설정 + /> + + + { + if (e.key === 'Enter') { + e.preventDefault(); // Enter 키 기본 동작 방지 + handleAnalysisClick(); + } + }} + /> +
-
-
- handleFileSelection(0, file, cd, id)} - showButton={false} - showPreview={true} - accept={".inp"} - fileIdx={0} /> -
-
- handleFileSelection(1, file, cd, id)} - showButton={false} - showPreview={true} - accept={".xls, .xlsx, .xlsm, .xltx"} - fileIdx={1} /> -
-
- handleFileSelection(2, file, cd, id)} - showButton={false} - showPreview={true} - accept={".xls, .xlsx, .xlsm, .xltx"} - fileIdx={2} /> -
- - { - const newValue = e.target.value; - - if (newValue === "") { - form.setValue("rate", newValue); // form의 rate 필드에 설정 - return; - } - - // 숫자와 '.'만 허용하고, '.'은 최대 하나인지 확인 - const isValidChars = /^[0-9]*\.?[0-9]*$/.test(newValue); - if (!isValidChars) return; // 유효하지 않은 문자 또는 여러 개의 '.' 포함 - - // '.' 기호가 처음에 오면 안 됨 - if (newValue.startsWith('.')) return; - - // 완성된 숫자인 경우에만 범위 체크 (입력 중인 경우 허용) - if (!newValue.endsWith('.')) { - const numericValue = parseFloat(newValue); - if (isNaN(numericValue) || numericValue < 0 || numericValue > 1) return; - } - - form.setValue("rate", newValue, { shouldValidate: true }); // form의 rate 필드에 설정 - }} - className="h-12 text-center text-xl w-[225px] ml-5" - placeholder="0 ~ 1 사이의 값 입력" - /> - - - { - form.setValue("date", value, { shouldValidate: true }); // form의 date 필드에 직접 설정 - } - }} - selectClass="ml-5 w-[225px]" - startYear={1900} // 시작 연도 설정 - /> - - - { - if (e.key === 'Enter') { - e.preventDefault(); // Enter 키 기본 동작 방지 - handleAnalysisClick(); - } - }} - /> - -
-
- ]} - + ]} + + ) } diff --git a/apps/sn/app/(with-base-layout)/ii/rdiiResult/page.tsx b/apps/sn/app/(with-base-layout)/ii/rdiiResult/page.tsx index d57aa34d6..784aeb6a5 100644 --- a/apps/sn/app/(with-base-layout)/ii/rdiiResult/page.tsx +++ b/apps/sn/app/(with-base-layout)/ii/rdiiResult/page.tsx @@ -12,8 +12,8 @@ import useStore from '../../../store/useStore'; const formSchema = z.object({ - swageTmplntCd: z.string().default('0'), // 하수처리장 - swtrmtZoneCd: z.string().default('0'), // 하수처리구역 + swtrmtFcltCd: z.string().default('0'), // 하수처리시설코드 + swtrmtFcltNm: z.string().default(''), // 하수처리시설명 aplcnYmFrom: z.string().default(() => { // Date에서 string(yyyyMM 형식)으로 변경 const now = new Date(); const year = now.getFullYear(); @@ -33,11 +33,9 @@ type ResultFormValues = z.infer const tableColumn = [ { id: 'rowNumber', title: '일련번호' }, - { id: 'enoNm', title: '환경청' }, { id: 'ctpvNm', title: '시도' }, { id: 'sggNm', title: '시군구' }, - { id: 'swageTmplntNm', title: '하수처리장' }, - // { id: 'swtrmtZoneNm', title: '처리구역' }, + { id: 'swtrmtFcltNm', title: '하수처리시설' }, { id: 'aplcnYm', title: '상수사용연월' }, { id: 'drtwSwtcRt', title: '오수 전환율' }, { id: 'srcNm', title: 'RTK 계수 출처' }, @@ -54,8 +52,7 @@ const Result = () => { const form = useForm({ resolver: zodResolver(formSchema), defaultValues: { - swageTmplntCd: '0', - swtrmtZoneCd: '0', + swtrmtFcltCd: '0', aplcnYmFrom: (() => { // 현재 연월을 yyyyMM 형식으로 설정 const now = new Date(); const year = now.getFullYear(); @@ -112,22 +109,13 @@ const Result = () => { const formValues = form.getValues(); // react-hook-form에서 현재 값 가져오기 console.log("formValues", formValues); - // swageTmplntCd 처리 로직 추가 - const processedSwageTmplntCd = formValues.swageTmplntCd && formValues.swageTmplntCd !== '0' - ? (() => { - const valString = String(formValues.swageTmplntCd); - const parts = valString.split('.'); - return parts.length > 1 ? parts[1] : valString; - })() - : null; - - let inftwtAnlsSearchDto = { - "aplcnYmFrom": formValues.aplcnYmFrom && formValues.aplcnYmFrom !== '' ? formValues.aplcnYmFrom : null, - "aplcnYmTo": formValues.aplcnYmTo && formValues.aplcnYmTo !== '' ? formValues.aplcnYmTo : null, - "ctpvCd": ctpvCd === 0 ? null : ctpvCd, - "sggCd": sggCd === 0 ? null : sggCd, - "swageTmplntCd": processedSwageTmplntCd, - "auth": AUTH, + const inftwtAnlsSearchDto = { + aplcnYmFrom: formValues.aplcnYmFrom?.trim() ? formValues.aplcnYmFrom : null, + aplcnYmTo: formValues.aplcnYmTo?.trim() ? formValues.aplcnYmTo : null, + ctpvCd: ctpvCd || null, + sggCd: sggCd || null, + swtrmtFcltNm: formValues.swtrmtFcltNm?.trim() ? formValues.swtrmtFcltNm : null, + auth: AUTH, }; console.log("Search DTO:", inftwtAnlsSearchDto); @@ -217,7 +205,7 @@ const Result = () => { }; // 파일명 생성 (분석번호 기반) - const fileName = `RDII분석결과_${selectedRowData.swageTmplntNm}_${selectedRowData.aplcnYm}_${selectedRowData.rainInfwtAnlsSn}`; + const fileName = `RDII분석결과_${selectedRowData.swtrmtFcltNm}_${selectedRowData.aplcnYm}_${selectedRowData.rainInfwtAnlsSn}`; await downloadExcelWithKoreanHeaders({ data: excelData as JSON[], @@ -292,8 +280,8 @@ const Result = () => { ctpvCd={ctpvCd} sggCd={sggCd} sggName={sggName} - selectedSwagePrcsFclt={form.watch("swageTmplntCd")} - onSwagePrcsFcltChange={(val) => form.setValue("swageTmplntCd", String(val))} + selectedSwagePrcsFclt={form.watch("swtrmtFcltCd")} + onSwagePrcsFcltChange={(val) => form.setValue("swtrmtFcltCd", String(val))} aplcnYmFrom={form.watch("aplcnYmFrom")} setAplcnYmFrom={(val: string) => { form.setValue("aplcnYmFrom", val) }} aplcnYmTo={form.watch("aplcnYmTo")} @@ -301,6 +289,7 @@ const Result = () => { setCtpvCd={setCtpvCd} setSggCd={setSggCd} setSggName={setSggName} + setSwtrmtFcltNm={(val: string) => { form.setValue("swtrmtFcltNm", val) }} setIsLoading={setIsLoadingResult} // Excel 다운로드 핸들러 추가 onExcelDownload={handleExcelDownload} diff --git a/apps/sn/app/(with-base-layout)/ii/result/page.tsx b/apps/sn/app/(with-base-layout)/ii/result/page.tsx index de96eb0ae..6e929933a 100644 --- a/apps/sn/app/(with-base-layout)/ii/result/page.tsx +++ b/apps/sn/app/(with-base-layout)/ii/result/page.tsx @@ -11,8 +11,8 @@ import { formatDisplayData } from '@/components/lib/utils/formatDisplayValue'; import useStore from '../../../store/useStore'; const formSchema = z.object({ - swageTmplntCd: z.string().default('0'), // 하수처리장 - swtrmtZoneCd: z.string().default('0'), // 하수처리구역 + swtrmtFcltCd: z.string().default('0'), // 하수처리시설코드 + swtrmtFcltNm: z.string().default(''), // 하수처리시설명 aplcnYmFrom: z.string().default(() => { // Date에서 string(yyyyMM 형식)으로 변경 const now = new Date(); const year = now.getFullYear(); @@ -32,11 +32,9 @@ type ResultFormValues = z.infer const tableColumn = [ { id: 'rowNumber', title: '일련번호' }, - { id: 'enoNm', title: '환경청' }, { id: 'ctpvNm', title: '시도' }, { id: 'sggNm', title: '시군구' }, - { id: 'swageTmplntNm', title: '하수처리장' }, - // { id: 'swtrmtZoneNm', title: '처리구역' }, + { id: 'swtrmtFcltNm', title: '하수처리시설' }, { id: 'aplcnYm', title: '적용연월' }, { id: 'drtwSwtcRt', title: '오수 전환율' }, { id: 'anlsInfo', title: '침입수 분석정보' }, @@ -51,8 +49,8 @@ const Result = () => { const form = useForm({ resolver: zodResolver(formSchema), defaultValues: { - swageTmplntCd: '0', - swtrmtZoneCd: '0', + swtrmtFcltCd: '0', + swtrmtFcltNm: '', aplcnYmFrom: (() => { // 현재 연월을 yyyyMM 형식으로 설정 const now = new Date(); const year = now.getFullYear(); @@ -105,23 +103,12 @@ const Result = () => { const formValues = form.getValues(); // react-hook-form에서 현재 값 가져오기 console.log("formValues", formValues); - - - // swageTmplntCd 처리 로직 추가 - const processedSwageTmplntCd = formValues.swageTmplntCd && formValues.swageTmplntCd !== '0' - ? (() => { - const valString = String(formValues.swageTmplntCd); - const parts = valString.split('.'); - return parts.length > 1 ? parts[1] : valString; - })() - : null; - let inftwtAnlsSearchDto = { "aplcnYmFrom": formValues.aplcnYmFrom && formValues.aplcnYmFrom !== '' ? formValues.aplcnYmFrom : null, "aplcnYmTo": formValues.aplcnYmTo && formValues.aplcnYmTo !== '' ? formValues.aplcnYmTo : null, "ctpvCd": ctpvCd === 0 ? null : ctpvCd, "sggCd": sggCd === 0 ? null : sggCd, - "swageTmplntCd": processedSwageTmplntCd, + "swtrmtFcltNm": formValues.swtrmtFcltNm?.trim() ? formValues.swtrmtFcltNm : null, "auth": AUTH, }; @@ -213,7 +200,7 @@ const Result = () => { }; // 파일명 생성 (분석번호 기반) - const fileName = `침입수분석결과_${selectedRowData.swageTmplntNm}_${selectedRowData.aplcnYm}_${selectedRowData.inftwtAnlsSn}`; + const fileName = `침입수분석결과_${selectedRowData.swtrmtFcltNm}_${selectedRowData.aplcnYm}_${selectedRowData.inftwtAnlsSn}`; await downloadExcelWithKoreanHeaders({ data: excelData as JSON[], @@ -289,8 +276,8 @@ const Result = () => { ctpvCd={ctpvCd} sggCd={sggCd} sggName={sggName} - selectedSwagePrcsFclt={form.watch("swageTmplntCd")} - onSwagePrcsFcltChange={(val) => form.setValue("swageTmplntCd", String(val))} + selectedSwagePrcsFclt={form.watch("swtrmtFcltCd")} + onSwagePrcsFcltChange={(val) => form.setValue("swtrmtFcltCd", String(val))} aplcnYmFrom={form.watch("aplcnYmFrom")} setAplcnYmFrom={(val: string) => { form.setValue("aplcnYmFrom", val) }} aplcnYmTo={form.watch("aplcnYmTo")} @@ -298,8 +285,8 @@ const Result = () => { setCtpvCd={setCtpvCd} setSggCd={setSggCd} setSggName={setSggName} + setSwtrmtFcltNm={(val: string) => { form.setValue("swtrmtFcltNm", val) }} setIsLoading={setIsLoadingResult} - // Excel 다운로드 핸들러 추가 onExcelDownload={handleExcelDownload} onDeleteFile={handleFileDelete} selectedRowData={selectedRowData} diff --git a/apps/sn/app/(with-base-layout)/oper/floodPre/page.tsx b/apps/sn/app/(with-base-layout)/oper/floodPre/page.tsx index 4ea485821..141f2652a 100644 --- a/apps/sn/app/(with-base-layout)/oper/floodPre/page.tsx +++ b/apps/sn/app/(with-base-layout)/oper/floodPre/page.tsx @@ -9,6 +9,11 @@ import { Button, DatePicker, Input, Label } from '@common/components/ui' import { useEffect, useState } from 'react' import { tableHeadlist } from '..' import OperFileUploadForm from '../../../components/ui/operFileUploadForm' +import { tokenManager } from '@/entities/auth/lib/token-manager'; +import { AUTH_USER_ID } from "@/shared/config"; +import { useQuery } from "@tanstack/react-query"; +import { ENDPOINT } from "@common/components/config"; +import { getUserInfo } from "@common/components/api"; const Page = () => { @@ -29,6 +34,12 @@ const Page = () => { const [resetSelection, setResetSelection] = useState(false); // 선택 초기화 상태 const [isResetPage, setIsResetPage] = useState(false); + const { data: userInfo } = useQuery({ + queryKey: [ENDPOINT.USER_SERVICE.USERS], + queryFn: () => getUserInfo(), + enabled: true, + }); + useEffect(() => { setCurPage(1) fetchData() @@ -109,14 +120,18 @@ const Page = () => { // 현황 등록 const registFile = async (fileName: string, year: string, quater: string, cd: string, id: string) => { - const data = await postData('v1/sbmrgPrevnt', { + const json = { atflNm: fileName, mngYr: year, mngQu: quater, atflCd: cd, atflId: id, - sbmrgPrevntBizNm: fileName - }) + sbmrgPrevntBizNm: fileName, + rgtr: tokenManager.getToken(AUTH_USER_ID) || null, + rgtrNm: userInfo?.userName, + } + console.log('request DTO', json); + const data = await postData('v1/sbmrgPrevnt', json) if (data) { alert('파일이 등록되었습니다.'); setIsModalOpen(false); diff --git a/apps/sn/app/(with-base-layout)/oper/oldPp/page.tsx b/apps/sn/app/(with-base-layout)/oper/oldPp/page.tsx index de7695636..1fbb536a5 100644 --- a/apps/sn/app/(with-base-layout)/oper/oldPp/page.tsx +++ b/apps/sn/app/(with-base-layout)/oper/oldPp/page.tsx @@ -9,6 +9,11 @@ import { Button, DatePicker, Input, Label } from '@common/components/ui' import { useEffect, useState } from 'react' import { tableHeadlistOldPp } from '..' import OperFileUploadForm from '../../../components/ui/operFileUploadForm' +import { tokenManager } from '@/entities/auth/lib/token-manager'; +import { AUTH_USER_ID } from "@/shared/config"; +import { useQuery } from "@tanstack/react-query"; +import { ENDPOINT } from "@common/components/config"; +import { getUserInfo } from "@common/components/api"; const Page = () => { @@ -27,6 +32,12 @@ const Page = () => { const [resetSelection, setResetSelection] = useState(false); // 선택 초기화 상태 const [isResetPage, setIsResetPage] = useState(false); + const { data: userInfo } = useQuery({ + queryKey: [ENDPOINT.USER_SERVICE.USERS], + queryFn: () => getUserInfo(), + enabled: true, + }); + useEffect(() => { setCurPage(1) fetchData() @@ -112,7 +123,9 @@ const Page = () => { mngQu: quater, atflCd: cd, atflId: id, - dcrpPplMtncBizNm: fileNm + dcrpPplMtncBizNm: fileNm, + rgtr: tokenManager.getToken(AUTH_USER_ID) || null, + rgtrNm: userInfo?.userName, }) if (data) { alert('파일이 등록되었습니다.'); diff --git a/apps/sn/app/components/ui/ctpvSggPrcsFcltSelectBox.tsx b/apps/sn/app/components/ui/ctpvSggPrcsFcltSelectBox.tsx index 7e401ef3a..a7472d4c0 100644 --- a/apps/sn/app/components/ui/ctpvSggPrcsFcltSelectBox.tsx +++ b/apps/sn/app/components/ui/ctpvSggPrcsFcltSelectBox.tsx @@ -20,6 +20,7 @@ interface CtpvSggPrcsFcltSelectBoxProps { className?: string; selectedSwagePrcsFclt?: string | number; onSwagePrcsFcltChange?: (value: string | number) => void; + setSwtrmtFcltNm?: (name: string) => void; setIsLoading?: (isLoading: boolean) => void; } @@ -36,6 +37,7 @@ export function CtpvSggPrcsFcltSelectBox({ className = "", selectedSwagePrcsFclt, onSwagePrcsFcltChange, + setSwtrmtFcltNm, setIsLoading, }: CtpvSggPrcsFcltSelectBoxProps) { @@ -50,6 +52,7 @@ export function CtpvSggPrcsFcltSelectBox({ setCtpvName(""); setSggName(""); } + if (setSwtrmtFcltNm) setSwtrmtFcltNm(""); })(); }, []); @@ -118,6 +121,7 @@ export function CtpvSggPrcsFcltSelectBox({ onSelectValue={val => { onSidoChange(Number(val)); if (setCtpvName) setCtpvName(ctpv.find(opt => Number(opt.id) === Number(val))?.name || ""); + if (setSwtrmtFcltNm) setSwtrmtFcltNm(""); }} selectContentClass="z-[101]" /> @@ -137,6 +141,7 @@ export function CtpvSggPrcsFcltSelectBox({ onSelectValue={val => { onSigunguChange(Number(val)) if (setSggName) setSggName(sgg.find(opt => Number(opt.id) === Number(val))?.name || ""); + if (setSwtrmtFcltNm) setSwtrmtFcltNm("") }} selectContentClass="z-[101]" /> @@ -149,7 +154,10 @@ export function CtpvSggPrcsFcltSelectBox({ label="" selectArray={[defaultOption, ...prcsFcltOptions]} value={selectedSwagePrcsFclt} - onSelectValue={(val) => onSwagePrcsFcltChange?.(val)} + onSelectValue={(val) => { + onSwagePrcsFcltChange?.(val) + if (setSwtrmtFcltNm) setSwtrmtFcltNm(prcsFcltOptions.find(opt => String(opt.val) === String(val))?.text || "") + }} selectContentClass="z-[101]" />