Merge branch 'iipbs/sn/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/sn/ii

apps/sn/.env.development

@@ -3,6 +3,7 @@ NEXT_PUBLIC_PORT = 11302
 NEXT_PUBLIC_PROXY_HOST = http://con.mind-one.co.kr:11302
 NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000
 NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver
+NEXT_PUBLIC_TEMP_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver #TODO 운영에서 바꿔야 함 
 NEXT_PUBLIC_CLAIM_NAME = Authorization
 NEXT_PUBLIC_AUTH_USER_ID = token-id
 NEXT_PUBLIC_ACCESS_TOKEN = access-token

apps/sn/.env.local

@@ -3,11 +3,12 @@ NEXT_PUBLIC_PORT = 3002
 NEXT_PUBLIC_PROXY_HOST = http://localhost:3002
 NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000
 NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver
+NEXT_PUBLIC_TEMP_GEOSERVER_URL = http://192.168.1.20:8080/geoserver #TODO 운영에서 바꿔야 함 
 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_SEWERAGE_API_URL=http://192.168.1.128:8883/sewerage-service/api         # 최용성 부장님 API
+#NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service/api   # 개발 서버 API
+NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.128:8883/sewerage-service/api         # 최용성 부장님 API
 #NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.66:8883/sewerage-service/api          # 박이정 차장님 API

apps/sn/app/(map-layout)/map/featureClickEventPopup.tsx

@@ -170,7 +170,7 @@ const FeatureClickEventPopup = ({ onClose, featureData }: { onClose: () => void,
       </div>
       <div className="overflow-y-auto overflow-x-hidden flex-1" ref={contentRef}>
         <VerticalTable
-          headName='LX 연계정보'
+          headName='기본정보'
           tableName1={layerNm === '중점우수토실' ? "측정지점" : undefined}
           tableData={[tableData]}
           headlist={headlist}

apps/sn/app/page.tsx

@@ -1,8 +1,9 @@
-"use client";
-import Link from "next/link";
-import { Button } from "@common/components/ui";
+import { redirect } from "next/navigation";
 
 export default function Home() {
+  redirect("/map");
+
+  /*
   return (
     <div>
       <div>
@@ -45,4 +46,5 @@ export default function Home() {
       </div>
     </div>
   );
+  */
 }

apps/sn/middleware.ts

@@ -3,8 +3,9 @@ import { NextRequest, NextResponse } from "next/server";
 const AUTH_USER_ID = process.env.NEXT_PUBLIC_AUTH_USER_ID || "token-id";
 const CLAIM_NAME = process.env.NEXT_PUBLIC_CLAIM_NAME || "Authorization";
 const SERVER_API_URL = process.env.NEXT_PUBLIC_SERVER_API_URL || "";
-const GEOSERVER_URL = process.env.NEXT_PUBLIC_GEOSERVER_URL || "";
 const SEWERAGE_API_URL = process.env.NEXT_PUBLIC_SEWERAGE_API_URL || "";
+const GEOSERVER_URL = process.env.NEXT_PUBLIC_GEOSERVER_URL || "";
+const TEMP_GEOSERVER_URL = process.env.NEXT_PUBLIC_TEMP_GEOSERVER_URL || "";
 
 export function middleware(req: NextRequest) {
   console.log("Middleware 진입:", req.nextUrl.pathname);
@@ -22,7 +23,25 @@ export function middleware(req: NextRequest) {
 
   if (pathname.startsWith("/geoserver")) {
     const queryParams = searchParams.toString();
-    const newUrl = `${GEOSERVER_URL}${pathname.replace("/geoserver", "")}${
+    
+    //TODO 운영에서 변경 해야함.
+    const typename = searchParams.get("TYPENAME");
+
+    let newUrl = `${GEOSERVER_URL}${pathname.replace("/geoserver", "")}${
+      queryParams ? `?${queryParams}` : ""
+    }`;
+    if(typename == 'hasudo:tb_ms_swage_ppl'){
+      newUrl = `${TEMP_GEOSERVER_URL}${pathname.replace("/geoserver", "")}${
+        queryParams ? `?${queryParams}` : ""
+      }`;
+    }
+    console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`);
+    return NextResponse.rewrite(new URL(newUrl));
+  }
+
+  if (pathname.startsWith("/tempgeoserver")) {
+    const queryParams = searchParams.toString();
+    const newUrl = `${TEMP_GEOSERVER_URL}${pathname.replace("/geoserver", "")}${
       queryParams ? `?${queryParams}` : ""
     }`;
     console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`);

packages/common/business_components/src/ui/map/Gis.js

@@ -121,7 +121,7 @@ function Gis({ isOpen , gisMaps, isSearchModalOpen, treeData = [], isSearch = fa
 				projection: GisApp.TO_PROJ,
 				zoom: gisCore.defaults.zoom,
 				center: olProj.transform(
-					[126.6757, 37.5585],
+					[127.4875, 37.4916],
 					GisApp.FROM_PROJ,
 					GisApp.TO_PROJ
 				),

packages/common/business_components/src/ui/map/lib/gis.core.js

@@ -94,7 +94,7 @@ GisApp.core.prototype = {
 		target: '',
 		centerX: 37.2806094,
 		centerY: 127.0032502,
-		zoom: 12,
+		zoom: 15,
 		minZoom: 6,
 		maxZoom: 20,
 	},

packages/common/components/src/api/site.ts

@@ -26,7 +26,6 @@ export interface SiteInfo {
 const client = getApiClient();
 
 export const getSiteInfo = async (siteId: string) => {
-  console.log("2:::",siteId)
   const response = await client.get<SiteInfo>(
     `${ENDPOINT.CMS_SERVICE.SITES}/${siteId}`,
   );

packages/common/components/src/ui/header/index.tsx

@@ -31,8 +31,6 @@ export function Header({ viewOnly }: { viewOnly?: boolean }) {
     enabled: !viewOnly,
   });
 
-  console.log("1:::",{SITE_ID})
-  console.log("1.1:::", process.env.NEXT_PUBLIC_SITE_ID)
   const { data: siteInfo } = useQuery({
     queryKey: [ENDPOINT.CMS_SERVICE.SITES, SITE_ID],
     queryFn: () => getSiteInfo(SITE_ID ?? ""),