Merge branch 'iipbs/sn/dev' into iipbs/wr/dev

apps/cs/src/pages/link/ui/link-form.tsx

@@ -244,7 +244,9 @@ const LinkForm = ({ form, linkSn, updateLinkInfo, handleInsertLink, deleteLink,
                                     </TableCell>
                                 </TableRow>
                                 <TableRow>
-                                    <TableHead>연계서버 IP</TableHead>
+                                    <TableHead>
+                                        {'link0007' === form.watch('link_clsf_cd') as string ? '연계 파일명 구분자' : '연계서버 IP'}
+                                    </TableHead>
                                     <TableCell>
                                         <FormField
                                             control={form.control}

apps/dm/.env.production

@@ -13,7 +13,7 @@ NEXT_PUBLIC_CS_SERVER_API_URL = http://apigateway.iipbs-was.svc.cluster.local:80
 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_WR_API_URL= http://apigateway.iipbs-was.svc.cluster.local:8000/reuse-service/api/v1
+NEXT_PUBLIC_WR_SERVER_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/reuse-service/api/v1
 NEXT_PUBLIC_SEWERAGE_API_URL = http://apigateway.iipbs-was.svc.cluster.local:8000/sewerage-service
 NEXT_PUBLIC_NGII_URL = http://172.29.143.87
 NEXT_PUBLIC_NGII_PARAM = BDE2BEF39DAFEC293AB6730150F222AC&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={y}&tilerow={x}

apps/dm/app/(base-layout)/pages/sdmMng/sdmInsert/page.tsx

@@ -58,7 +58,7 @@ export default function MyForm() {
           dataList={demandCompList}
           rtnValue={callback}
           rtnInputData={handleInsertSdmData}
-          openNetwork={true}
+          openNetwork={false}
         />
         <Toaster position="top-center" />
       </div>

apps/dm/app/(popup-layout)/map/service/map.ts

@@ -43,7 +43,7 @@ export const mapService = {
     return response.json();
   },
   getPbnstRuseFclts: async (ruseFcltPk:any) => {
-    const response = await fetch(`${DEV_URL_WR}/api/v1/reuseFc/pubFc/${ruseFcltPk}`, {
+    const response = await fetch(`${DEV_URL_WR}/reuseFc/pubFc/${ruseFcltPk}`, {
       method: 'GET',
       headers: {
         'Accept': 'application/json',

apps/fo/app/pages/(with-layout)/flowRate/modal/page.tsx

@@ -25,6 +25,8 @@ const tabList = [
   { value: 'tab_term_rain', label: '강우시' }
 ];
 
+const commentArray = "[미처리하수 추정량 산식 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]/강우시 일별유입BOD)]";
+
 export default function FlowRateModal(props: { fcltyName: string; facilityCd: string; searchYear: string }) {
   // 그리드 관련
   const { Common, FlowRateModal, searchFlowRateModalList } = useFoStore((state) => state);
@@ -192,12 +194,13 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
           "연계처리량(m³/일)": CommaToNumber(item.sumFlow),
           "총인반류수량(m³/일)": CommaToNumber(item.returnAmnt),
           "방류량(m³/일)": CommaToNumber(item.efflAmnt),
-          /* "강우량(mm/일)": item.infoRnDay, */
+          "미처리하수 추정량(m³/일)": CommaToNumber(item.noProcessInflAmnt),
+          "강우량(mm/일)": CommaToNumber(item.infoRnDay),
         });
       });
     }
     if (excelDownList && excelDownList.length > 0) {
-      downloadExcel({ data: JSON.parse(JSON.stringify(excelDownList)), fileName: props.searchYear+'년 '+props.fcltyName + ' 유량현황', sheetNameArray: [props.fcltyName + ' 유량현황'], headerRange: 'A1:G1' });
+      downloadExcel({ data: JSON.parse(JSON.stringify(excelDownList)), fileName: props.searchYear+'년 '+props.fcltyName + ' 유량현황', sheetNameArray: [props.fcltyName + ' 유량현황'], headerRange: 'A1:H1' });
     } else if (prevExcelListRef.current && prevExcelListRef.current.length > 0) {
       alert('다운받을 데이터가 없습니다.');
     }
@@ -233,6 +236,9 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
               boldArray={[0,1,2]}
             />
           </div>
+          <div className="mt-20">
+            <UnderComment commentArray={[commentArray]} />
+          </div>
         </TabsContent>
         <TabsContent value="tab_term_summer">
           <FacilityTermModalHeader<FlowRateModalInterface>
@@ -257,6 +263,9 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
               boldArray={[0,1,2]}
             />
           </div>
+          <div className="mt-20">
+            <UnderComment commentArray={[commentArray]} />
+          </div>
         </TabsContent>
         <TabsContent value="tab_term_winter">
           <FacilityTermModalHeader<FlowRateModalInterface>
@@ -281,6 +290,9 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
               boldArray={[0,1,2]}
             />
           </div>
+          <div className="mt-20">
+            <UnderComment commentArray={[commentArray]} />
+          </div>
         </TabsContent>
         <TabsContent value="tab_term_chuncheon">  
           <FacilityTermModalHeader<FlowRateModalInterface>
@@ -305,6 +317,9 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
               boldArray={[0,1,2]}
             />
           </div>
+          <div className="mt-20">
+            <UnderComment commentArray={[commentArray]} />
+          </div>
         </TabsContent>
         <TabsContent value="tab_term_rain">
           <FacilityTermModalHeader<FlowRateModalInterface>
@@ -319,7 +334,9 @@ export default function FlowRateModal(props: { fcltyName: string; facilityCd: st
           <div className="h-[370px] overflow-y-auto overflow-x-hidden">
             <UiTable headName="유량현황" tableData={copyYearList} headlist={upHeadListFlowRateModalYear} pageSize={0} total={0} cellClick={undefined} onPageChange={() => {}} className="h-[370px]" boldArray={[0,1,2]}/>
           </div>
-          <UnderComment commentArray={["강우량 3mm 이상만 날과 강우영향일(강우일+2일)의 날"]} />
+          <div className="mt-20">
+            <UnderComment commentArray={["미처리하수 추정량 산식 =[(강우시 일별유입유량*강우시 일별유입BOD)-(청천시 연평균유입유량*청천시 연평균유입BOD)]/강우시 일별유입BOD)","강우량 3mm 이상만 날과 강우영향일(강우일+2일)의 날"]} />
+          </div>
         </TabsContent>
       </UITab>
     </>

apps/fo/app/pages/(with-layout)/rdi/page.tsx

@@ -14,6 +14,7 @@ import LoadingOverlay from "@common/business_components/ui/loadingBar";
 import UnderComment from "@/app/components/common/UnderComment";
 
 const commentArray = [
+  "적정판단근거 = 하절기(6~8)월 강우일 중 BOD수질이 최저인 일자의 RDII추정량을 기준으로 판단",
   "강우시 총 추정유입량 = 청천시 유입하수량 + RDII 추정값",
   "주) 처리장 유입부에서 측정된 유량 및 수질조사 자료를 기준으로 산정된 결과임"
 ]
@@ -202,7 +203,7 @@ export default function Rdi() {
           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">

apps/fo/app/pages/(with-layout)/underWaterInput/page.tsx

@@ -15,6 +15,12 @@ import { useCallback, useEffect, useRef, useState } from "react";
 import UnderWaterInputModal from "./modal/page";
 import type { UnderWaterProps } from "@/app/store/underWaterInput/types";
 import LoadingOverlay from "@common/business_components/ui/loadingBar";
+import UnderComment from "@/app/components/common/UnderComment";
+
+const commentArray = [
+  "적정여부(=연간 지하수유입량/연평균 유입하수량*100)가 20%이하면 “적정”으로 표출, 그 이상은 “초과유입”으로 표출",
+  "지하수 유입량 = 하수처리장 청천시 실제유입량 - (물사용량 × 오수전환율)"
+]
 
 export default function UnderWaterInput() {
   const {Common
@@ -238,9 +244,8 @@ export default function UnderWaterInput() {
           <div className={widthSize}>
             <UiTable cellClick={(index: number | undefined) => index !== undefined && cellClick(index)} headName={"지하수유입량 추정"} tableData={mainList} headlist={upheadList} pageSize={10} total={total} resetPageNo={resetPage} onPageChange={handlePageChange} widthFixed={true}/>
           </div>
+          <UnderComment commentArray={commentArray} />
         </div>
-        <span className="text-2xl text-gray-500">※적정여부 = 연간 지하수유입량/연평균 유입하수량*100 </span><br></br>
-        <span className="text-2xl text-gray-500">※지하수 유입량 = 하수처리장 청천시 실제유입량 - (물사용량 × 오수전환율)</span>
       </ListDiv>
       </ContentsDiv>
       {selectedRow !== null && (

apps/fo/app/store/flowRate/index.tsx

@@ -59,7 +59,8 @@ export type modalExcelType = {
     "연계처리량(m³/일)": number | '',
     "총인반류수량(m³/일)": number | '',
     "방류량(m³/일)": number | '',
-    /* "강우량(mm/일)": number | string | '', */
+    "미처리하수 추정량(m³/일)": number | '',
+    "강우량(mm/일)": number | string | '',
 }
 /**
  * (2) 모달
@@ -159,7 +160,7 @@ const upHeadListFlowRateModal:TableUpperProps[] = [
     { id: "sumFlow", title: "연계처리량(m³/일)", align:"right"},
     { id: "returnAmnt", title: "총인 반류수량(m³/일)", align:"right"},
     { id: "efflAmnt", title: "방류량(m³/일)", align:"right"},
-    { id: "noProcessInflAmnt", title: "미처리하수량(m³/일)", align:"right"},
+    { id: "noProcessInflAmnt", title: "미처리하수 추정량(m³/일)", align:"right"},
     { id: "infoRnDay", title: "강우량(mm/일)", align:"right"} 
 ]
 

packages/common/business_components/src/ui/sdmInsertForm/index.tsx

@@ -124,7 +124,7 @@ export default function SdmInsertForm({selectSidoData, selectSigunData, dataList
       // form 에러 체크
       const formErrors = form.formState.errors;
        
-      const myUUID =  getCookie('token-id');
+      const myUUID =  getCookie('token-id') ||'c475824c-0e82-4a06-a282-2b55a20df265';
 
       if (Object.keys(formErrors).length > 0 ) {
         const errorMessage = Object.values(formErrors)[0]?.message || '입력값을 확인해주세요.';
@@ -132,10 +132,7 @@ export default function SdmInsertForm({selectSidoData, selectSigunData, dataList
         return;
       }
 
-      if(!myUUID){
-        toast.error('사용자 정보가 올바르지 않습니다. 다시 로그인 해주세요.');
-        return;
-      }
+
      
       const dmdInfoId = data.dmdInfoId + (data.bznmTotNo || '0000');
       const formData = {