From f8102ec13d1027ec0e5e56a51e025c2aee0270f7 Mon Sep 17 00:00:00 2001 From: leedj312 Date: Wed, 29 Oct 2025 11:22:30 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B1=B4=EC=B6=95=EB=AC=BC=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=EC=8B=9C=20mdfr=20rgtr=20=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=ED=95=9C=20=EC=82=AC=EC=9A=A9=EC=9E=90=EC=9D=98=20uuid?= =?UTF-8?q?=EB=A5=BC=20=EC=9E=85=EB=A0=A5=ED=95=A0=EC=88=98=20=EC=9E=88?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/ruseFcltMng/fcltReg/htdflReg/index.tsx | 12 ++++++------ .../store/ruseFcltMng/fcltReg/rainReg/index.tsx | 12 ++++++------ .../store/ruseFcltMng/fcltReg/rswtReg/index.tsx | 12 ++++++------ .../ui/form/fcltReg/htdflReg/htdflRegForm.tsx | 13 ++++++++++--- .../ui/form/fcltReg/rainReg/rainRegForm.tsx | 14 +++++++++++--- .../ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx | 15 +++++++++++---- apps/wr/public/locales/ko/message.json | 3 ++- 7 files changed, 52 insertions(+), 29 deletions(-) diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx index 232e670c4..857168408 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx @@ -100,8 +100,8 @@ export type htdflFacState = { type htdflFacSActions = { initHtdflReg: (code: string) => void; htdflNmSearch: (code: string | number, fcltNm:string) => void; - htdflBdstUpdate: (data: customHtdflBdst, code: string | number) => void; - htdflBdstReg: (data: customHtdflBdst, code: string | number) => void; + htdflBdstUpdate: (data: customHtdflBdst, code: string | number,myUUID:string) => void; + htdflBdstReg: (data: customHtdflBdst, code: string | number,myUUID:string) => void; getHtdflBdstData: (pageNation: number, code: string | number) => void; resetHtdflTableIndex:(index:number)=>void; }; @@ -170,9 +170,9 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = ( console.log(error); } }, - htdflBdstUpdate: async (data: customHtdflBdst, code: string | number) => { + htdflBdstUpdate: async (data: customHtdflBdst, code: string | number,myUUID:string) => { try { - const chData = await makeMdfr(data); + const chData = await makeMdfr(data,myUUID); const res = await putFectch("/drain/facility", chData); if (res.status) { toast.success("온배수 시설물 수정이 완료되었습니다."); @@ -195,12 +195,12 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = ( console.log(errorUpdate); } }, - htdflBdstReg: async (data: customHtdflBdst, code: string | number) => { + htdflBdstReg: async (data: customHtdflBdst, code: string | number,myUUID:string) => { try { // data는 단일 객체이므로 .map을 사용할 수 없습니다. // 등록 시에는 건축물 변경 이력이 없으므로 chgBuilding을 빈 배열로 설정하고, // API가 배열을 기대하므로 단일 객체를 배열로 감싸줍니다. - const chData = makeRstr(data); + const chData = makeRstr(data,myUUID); const res = await postFectch("/drain/facility", chData); if (res.status ===200) { toast.success("온배수 시설 등록이 완료되었습니다."); diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx index ce18ac782..cdaccf94f 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx @@ -96,8 +96,8 @@ type rainFacSActions = { initRain: (code: string | number) => void; getRainData: (pageNation: number, code: string | number) => void; rainSearch: (txt: string, pageNation: number, code: string) => void; - rainBdstReg: (data: customRainBdst, code: string | number) => void; - rainBdstUpdate: (data: customRainBdst, code: string | number) => void; + rainBdstReg: (data: customRainBdst, code: string | number,myUUID:string) => void; + rainBdstUpdate: (data: customRainBdst, code: string | number,myUUID:string) => void; resetRainTableIndex:(index:number)=>void; }; @@ -186,9 +186,9 @@ export const rainFacActionsExport: (set: any) => rainFacSActions = ( } }, // 빗물 이용시설을 등록한다. - rainBdstReg: async (data: customRainBdst, code: string | number) => { + rainBdstReg: async (data: customRainBdst, code: string | number,myUUID:string) => { try { - const test = await makeRstr(data); + const test = await makeRstr(data,myUUID); const res = await postFectch("/reuseFc/rainyInfo", test); if (res.status === 200) { if (data.chgBuilding.length > 0) { @@ -226,9 +226,9 @@ export const rainFacActionsExport: (set: any) => rainFacSActions = ( } }, // 빗물이용시설 시설에 대한 사항을 업데이트한다 - rainBdstUpdate: async (data: customRainBdst, code: string | number) => { + rainBdstUpdate: async (data: customRainBdst, code: string | number,myUUID:string) => { try { - const chData = await makeMdfr(data); + const chData = await makeMdfr(data,myUUID); const res = await putFectch("/reuseFc/rainyInfo", chData); if (res.status === 200) { if (data.chgBuilding.length > 0) { diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx index 117fe8125..e18a50803 100644 --- a/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx +++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx @@ -67,14 +67,14 @@ export type rswtFacState = { }; type rswtFacSActions = { initRswt: (code: string | number) => void; - rswtBdstUpdate: (data: customRswtBdst, code: string | number) => void; + rswtBdstUpdate: (data: customRswtBdst, code: string | number,myUUID:string) => void; getRswtBdstData: (pageNation: number, code: string | number) => void; rswtBdstSearch: ( txt: string, pageNation: number, code: string | number ) => void; - rswtBdstReg: (data: customRswtBdst, code: string | number) => void; + rswtBdstReg: (data: customRswtBdst, code: string | number,myUUID:string) => void; resetRswtTableIndex:(index:number)=>void; }; @@ -160,9 +160,9 @@ export const rswtFacActionsExport: (set: any) => rswtFacSActions = ( } }, // 중수도 시설에 대한 사항을 업데이트한다 - rswtBdstUpdate: async (data: customRswtBdst, code: string | number) => { + rswtBdstUpdate: async (data: customRswtBdst, code: string | number,myUUID:string) => { try { - const chData = await makeMdfr(data); + const chData = await makeMdfr(data,myUUID); const res = await putFectch("/reuseFc/waterreuseFc", chData); if (res.status === 200) { if (data.chgBuilding.length > 0) { @@ -204,9 +204,9 @@ export const rswtFacActionsExport: (set: any) => rswtFacSActions = ( } }, // 중수도 시설을 등록한다. - rswtBdstReg: async (data: customRswtBdst, code: string | number) => { + rswtBdstReg: async (data: customRswtBdst, code: string | number,myUUID:string) => { try { - const chData = await makeRstr(data); + const chData = await makeRstr(data,myUUID); const res = await postFectch("/reuseFc/waterreuseFc", chData); if (res.status === 200) { if (data.chgBuilding.length > 0) { diff --git a/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx b/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx index fc3a07af8..1bfc882eb 100644 --- a/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx +++ b/apps/wr/components/ui/form/fcltReg/htdflReg/htdflRegForm.tsx @@ -42,7 +42,7 @@ export default function HtdflRegForm({ setIsModal?: (modal: boolean) => void; isMap?: boolean; }) { - const { auth, code, htdflBdstUpdate, htdflBdstReg, resetHtdflTableIndex } = + const { auth, code, htdflBdstUpdate, htdflBdstReg, resetHtdflTableIndex,getMyUUID } = useWrStore((state) => state); const [frontPHdata, setFrontPHdata] = useState(""); const [backPHdata, setBackPHdata] = useState(""); @@ -61,6 +61,13 @@ export default function HtdflRegForm({ const isPowerPlant = bdstNm?.includes("발전소"); const { t } = useTranslation("base"); const onSubmit = async (values: z.infer) => { + + const myUUID = await getMyUUID(); + + if (!myUUID) { + toast.error(t('noUserInfoMsg')); + return; + } if (isModal) { const data = regCtpvCd ? regCtpvCd : regSggcd ? regSggcd : "noCd"; if (data === "noCd") { @@ -68,13 +75,13 @@ export default function HtdflRegForm({ return; } const handleConfirm = async () => { - htdflBdstReg(values, data); + htdflBdstReg(values, data,myUUID); if (setIsModal) setIsModal(false); }; confirmToast(t("isInsertMsg"), handleConfirm); } else { const handleConfirm = async () => { - await htdflBdstUpdate(values, laeSeCd); + await htdflBdstUpdate(values, laeSeCd,myUUID); console.log(' htdflBdstUpdate ') resetHtdflTableIndex(0); }; diff --git a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx index c210bbe1e..c18a1d4fd 100644 --- a/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx +++ b/apps/wr/components/ui/form/fcltReg/rainReg/rainRegForm.tsx @@ -38,7 +38,7 @@ export default function RainRegForm({ readonly?: boolean; isMap?: boolean; }) { - const { auth,code, rainBdstReg, rainBdstUpdate ,resetRainTableIndex} = useWrStore( + const { auth,code, rainBdstReg, rainBdstUpdate ,resetRainTableIndex, getMyUUID} = useWrStore( (state) => state ); const { rainFcltCd } = code; @@ -130,6 +130,14 @@ export default function RainRegForm({ }, [form.formState.errors]); const onSubmit = async(values: z.infer) => { + + const myUUID = await getMyUUID(); + + if (!myUUID) { + toast.error(t('noUserInfoMsg')); + return; + } + if (isModal) { const data = regCtpvCd ? regCtpvCd : regSggcd ? regSggcd : "noCd"; @@ -138,13 +146,13 @@ export default function RainRegForm({ return; } const handleConfirm = async () => { - rainBdstReg(values, data); + rainBdstReg(values, data,myUUID); if (setIsModal) setIsModal(false); }; confirmToast(t('isInsertMsg'), handleConfirm); } else { const handleConfirm = async () => { - await rainBdstUpdate(values, laeSeCd); + await rainBdstUpdate(values, laeSeCd,myUUID); resetRainTableIndex(0) }; confirmToast(t('isUpdateMsg'), handleConfirm); diff --git a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx index b9a4503fe..fac38b3ba 100644 --- a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx +++ b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx @@ -43,7 +43,7 @@ export default function RswtrRegForm({ readonly?: boolean; isMap?: boolean; }) { - const { auth,code, rswtBdstUpdate, rswtBdstReg ,resetRswtTableIndex} = useWrStore((state) => state); + const { auth,code, rswtBdstUpdate, rswtBdstReg ,resetRswtTableIndex,getMyUUID} = useWrStore((state) => state); // const [divStyle, setDivStyle] = useState("h-[53vh]"); const {laeSeCd } = auth; useEffect(() => { @@ -67,7 +67,14 @@ export default function RswtrRegForm({ - const onSubmit = (values: z.infer) => { + const onSubmit =async (values: z.infer) => { + + const myUUID = await getMyUUID(); + + if (!myUUID) { + toast.error(t('noUserInfoMsg')); + return; + } if (isModal) { const data = regCtpvCd ? regCtpvCd : regSggcd ? regSggcd : "noCd"; if (data === "noCd") { @@ -75,13 +82,13 @@ export default function RswtrRegForm({ return; } const handleConfirm = async () => { - rswtBdstReg(values, data); + rswtBdstReg(values, data,myUUID); if (setIsModal) setIsModal(false); }; confirmToast(t("isInsertMsg"), handleConfirm); } else { const handleConfirm = async () => { - rswtBdstUpdate(values, laeSeCd); + rswtBdstUpdate(values, laeSeCd,myUUID); resetRswtTableIndex(0) }; confirmToast(t("isUpdateMsg"), handleConfirm); diff --git a/apps/wr/public/locales/ko/message.json b/apps/wr/public/locales/ko/message.json index fa122d798..ee1bead78 100644 --- a/apps/wr/public/locales/ko/message.json +++ b/apps/wr/public/locales/ko/message.json @@ -23,5 +23,6 @@ "costCalcErrMsg": "공사비 계산 진행 후 저장을 눌러주세요", "maxYearErrMsg": "최대 {{year}}년까지 선택가능합니다.", "checkQtyMsg": "요구수량(m³/일)을 확인해주세요 계산할 수 없습니다.", - "insertRuseBiz": "{{cycle}}차 사업이 추가되었습니다." + "insertRuseBiz": "{{cycle}}차 사업이 추가되었습니다.", + "noUserInfoMsg": "사용자 정보가 없습니다. 다시 로그인해주세요." } \ No newline at end of file