[user service] 사용자 멀티 디바이스 로그인 처리 deviceId 추가건

.gitignore

@@ -30,3 +30,4 @@ settings.json
 
 apps/**/tsconfig.tsbuildinfo
 logs/
+apps/st/start_cs.log

apps/_template/.env.example

@@ -3,6 +3,3 @@ NEXT_PUBLIC_PORT=
 NEXT_PUBLIC_PROXY_HOST=
 NEXT_PUBLIC_SITE_ID=
 NEXT_PUBLIC_SERVER_API_URL=
-
-# 401 시 브라우저 리다이렉트 대상
-NEXT_PUBLIC_AUTH_LOGIN_REDIRECT_URL=/auth/login

apps/_template/package.json

@@ -25,7 +25,7 @@
   },
   "devDependencies": {
     "eslint": "^9.0.0",
-    "eslint-config-next": "15.3.8",
+    "eslint-config-next": "15.4.0",
     "postcss": "^8.4.49",
     "prettier": "^3.4.2",
     "prettier-plugin-tailwindcss": "^0.6.11",

apps/cm/package.json

@@ -52,7 +52,7 @@
     "@types/node": "^22.13.1",
     "@types/webpack": "^5.28.5",
     "eslint": "^9.0.0",
-    "eslint-config-next": "15.3.8",
+    "eslint-config-next": "15.4.0",
     "postcss": "^8.4.49",
     "prettier": "^3.4.2",
     "prettier-plugin-tailwindcss": "^0.6.11",

apps/cm/src/entities/auth/lib/auth-wrapper.tsx

@@ -5,15 +5,16 @@ import { useRouter } from "next/navigation";
 import { client } from "@/shared/api";
 import type { IUserInfo } from "@/shared/store";
 import { getCookie, useUserStore } from "@/shared/lib";
-import { isAtLoginRedirectUrl } from "@common/network";
 import { ENDPOINT, AUTH_USER_ID } from "@/shared/config";
+import { LoginApi } from "../api/login-service";
 
 const AuthWrapper = ({ children }: { children: React.ReactNode }) => {
   const router = useRouter();
   const { userInfo, setUserInfo } = useUserStore((state) => state);
 
   async function authCheck() {
-    if (isAtLoginRedirectUrl("/auth/login")) {
+    // 로그인 페이지에서는 인증 체크를 건너뜀
+    if (window.location.pathname === '/auth/login') {
       return;
     }
 
@@ -34,8 +35,13 @@ const AuthWrapper = ({ children }: { children: React.ReactNode }) => {
         await authCheck();
       } catch (error) {
         console.error(error);
-        setUserInfo(null);
-        if (!isAtLoginRedirectUrl("/auth/login")) {
+
+        try {
+          await LoginApi.silentRefresh();
+          await authCheck();
+        } catch (refreshError) {
+          console.error("Token refresh failed:", refreshError);
+          setUserInfo(null);
           router.push("/auth/login");
         }
       }

apps/common/features/package.json

@@ -46,7 +46,7 @@
     "@types/node": "^22.13.1",
     "@types/webpack": "^5.28.5",
     "eslint": "^9",
-    "eslint-config-next": "15.3.8",
+    "eslint-config-next": "15.1.7",
     "postcss": "^8",
     "prettier": "^3.4.2",
     "prettier-plugin-tailwindcss": "^0.6.11",

apps/common/features/src/entities/auth/lib/auth-wrapper.tsx

@@ -4,17 +4,13 @@ import { useEffect } from "react";
 import { client } from "@/shared/api";
 import type { IUserInfo } from "@/shared/store";
 import { getCookie, useUserStore } from "@/shared/lib";
-import { getAuthLoginRedirectUrl, isAtLoginRedirectUrl } from "@common/network";
 import { ENDPOINT, AUTH_USER_ID } from "@/shared/config";
+import { LoginApi } from "../api/login-service";
 
 const AuthWrapper = ({ children }: { children: React.ReactNode }) => {
   const { userInfo, setUserInfo } = useUserStore((state) => state);
 
   async function authCheck() {
-    if (isAtLoginRedirectUrl(getAuthLoginRedirectUrl())) {
-      return;
-    }
-
     const userId = getCookie(AUTH_USER_ID);
     if (!userId) {
       throw new Error("Missing required authentication tokens");
@@ -32,6 +28,8 @@ const AuthWrapper = ({ children }: { children: React.ReactNode }) => {
         await authCheck();
       } catch (error) {
         console.error(error);
+        await LoginApi.silentRefresh();
+        await authCheck();
       }
     })();
   }, []);

apps/cs/app/api/auth/logout/route.ts

@@ -5,6 +5,7 @@ import {
   AUTH_USER_ID,
   CLAIM_NAME,
   REFRESH_TOKEN,
+  DEVICE_ID,
 } from "@/shared/config";
 
 export async function POST() {
@@ -13,5 +14,6 @@ export async function POST() {
   cookieStore.delete(REFRESH_TOKEN);
   cookieStore.delete(AUTH_USER_ID);
   cookieStore.delete(CLAIM_NAME);
+  cookieStore.delete(DEVICE_ID); // 로그아웃 시 deviceId 함께 삭제 → 재로그인 시 새 세션 생성
   return NextResponse.json({ message: "Logged out" }, { status: 200 });
 }

apps/cs/app/api/proxy/[...url]/route.ts

@@ -5,6 +5,7 @@ import {
   REFRESH_TOKEN,
   SERVER_API_URL,
   SITE_ID,
+  DEVICE_ID,
 } from "@/shared/config";
 import { cookies } from "next/headers";
 import { NextResponse } from "next/server";
@@ -20,9 +21,16 @@ async function handler(
     "X-Site-Id": SITE_ID,
   };
   let body = {};
-  const isRefreshHandler = params.url.includes("refresh");
 
-  // silent refresh
+  const isRefreshHandler = params.url.includes("refresh");
+  const isLoginHandler = params.url.includes("login");
+
+  // ── Silent Refresh ──────────────────────────────────────────────────────────
+  // HttpOnly 쿠키에서 refresh-token 꺼내 Authorization 헤더에 주입.
+  // 쿠키에 저장된 device-id도 X-Device-Id 헤더로 함께 전달한다.
+  // 백엔드: TokenProvider.refreshToken(token, request, response)
+  //   → userService.findByRefreshToken(refreshToken, deviceId)   (Redis Hash 검증)
+  //   → userService.updateRefreshToken(userUnqId, newToken, deviceId) (RTR 갱신)
   if (isRefreshHandler) {
     const refreshToken = cookieStore.get(REFRESH_TOKEN);
     headers[CLAIM_NAME] = refreshToken?.value ?? "";
@@ -30,6 +38,27 @@ async function handler(
     if (!headers[CLAIM_NAME]) {
       return NextResponse.json({ message: "Can't refresh" }, { status: 401 });
     }
+
+    // device-id 쿠키 → X-Device-Id 헤더 (Redis 다중 세션 식별)
+    const deviceId = cookieStore.get(DEVICE_ID);
+    if (deviceId?.value) {
+      headers["X-Device-Id"] = deviceId.value;
+    }
+  }
+
+  // ── Login ────────────────────────────────────────────────────────────────────
+  // 클라이언트(login-service.ts)가 fetch 헤더에 X-Device-Id 를 포함해서 전송한다.
+  // BFF는 해당 헤더를 그대로 백엔드로 포워딩한다.
+  // 백엔드: AuthenticationFilter.successfulAuthentication
+  //   → TokenProvider.createTokenAndAddHeader(request, ...)
+  //   → request.getHeader("X-Device-Id") 로 deviceId 추출
+  //   → userService.updateRefreshToken(userUnqId, refreshToken, deviceId)
+  //   → Redis Hash[user:sessions:{userUnqId}][deviceId] = refreshToken (TTL 1일)
+  if (isLoginHandler) {
+    const deviceId = request.headers.get("X-Device-Id");
+    if (deviceId) {
+      headers["X-Device-Id"] = deviceId;
+    }
   }
 
   try {
@@ -62,16 +91,28 @@ async function handler(
 
       const forwardedHost = request.headers.get("x-forwarded-host");
       const host = request.headers.get("host");
-      const actualHost = forwardedHost || host || new URL(request.url).hostname.toString();
-      
-      // 운영 환경에서 domain 설정
-      const domain = actualHost.includes("hasuon.or.kr") ? ".hasuon.or.kr" : actualHost;
+      const rawHost =
+        forwardedHost || host || new URL(request.url).hostname.toString();
+
+      // 포트 번호 제거 (예: "localhost:3000" → "localhost")
+      const hostname = rawHost.split(":")[0];
+
+      // 쿠키 domain 결정
+      // - localhost / 127.0.0.1: domain 미지정 (undefined) → 브라우저 기본 동작
+      // - 운영(hasuon.or.kr): 서브도메인 공유를 위해 최상위 도메인 앞에 점(.) 붙임
+      // - 그 외(IP, 기타 도메인): 현재 hostname 그대로 사용
+      const isLocal = hostname === "localhost" || hostname === "127.0.0.1";
+      const domain = isLocal
+        ? undefined
+        : hostname.includes("hasuon.or.kr")
+          ? ".hasuon.or.kr"
+          : hostname;
 
       if (refreshToken) {
         cookieStore.set(REFRESH_TOKEN, refreshToken, {
           httpOnly: true,
           sameSite: "strict",
-          domain: domain,
+          ...(domain !== undefined && { domain }),
           path: "/",
         });
       }
@@ -91,7 +132,6 @@ async function handler(
   }
 }
 
-
 export async function POST(
   request: Request,
   props: { params: Promise<{ url: string[] }> },

apps/cs/package.json

@@ -52,7 +52,7 @@
     "@types/node": "^22.13.1",
     "@types/webpack": "^5.28.5",
     "eslint": "^9.0.0",
-    "eslint-config-next": "15.3.8",
+    "eslint-config-next": "15.4.0",
     "postcss": "^8.4.49",
     "prettier": "^3.4.2",
     "prettier-plugin-tailwindcss": "^0.6.11",

apps/cs/src/entities/auth/api/login-service.ts

@@ -5,6 +5,7 @@ import {
   ACCESS_TOKEN,
   AUTH_USER_ID,
   CLAIM_NAME,
+  DEVICE_ID,
 } from "@/shared/config";
 import type { LoginService, ILogin } from "../model/login-interface";
 import { tokenManager } from "../lib/token-manager";
@@ -23,8 +24,21 @@ export class LoginApiService implements LoginService {
 
   public async login(payload: ILogin): Promise<void> {
     try {
+      // ✅ 로그인 요청 전에 deviceId 생성/결정
+      // - 같은 브라우저 재로그인 시: 기존 쿠키 재사용 → 동일 Redis 슬롯 유지
+      // - 최초 로그인 / 로그아웃 후 재로그인 시: 새 UUID 생성 → 새 Redis 슬롯
+      const existingDeviceId = tokenManager.getDeviceId();
+      const deviceId = existingDeviceId ?? crypto.randomUUID();
+
       const response = await fetch(`/api/proxy${ENDPOINT.USER_SERVICE.LOGIN}`, {
         method: "POST",
+        headers: {
+          // ✅ 로그인 요청 헤더에 X-Device-Id 포함
+          // BFF route.ts → 백엔드 AuthenticationFilter → TokenProvider.createTokenAndAddHeader()
+          // → userService.updateRefreshToken(userUnqId, refreshToken, deviceId)
+          // → Redis Hash[user:sessions:{userUnqId}][deviceId] = refreshToken (TTL 1일)
+          "X-Device-Id": deviceId,
+        },
         body: JSON.stringify({
           userId: payload.userId,
           password: payload.password,
@@ -32,24 +46,27 @@ export class LoginApiService implements LoginService {
       });
 
       const data = await response.json();
-      console.log('data ', data)
+      console.log("data ", data);
       const accessToken = data[ACCESS_TOKEN];
       const tokenId = data[AUTH_USER_ID];
 
       if (!accessToken || !tokenId) {
-        if (data.message == 'Invalid Credentials' ) {
-          throw new Error('아이디와 비밀번호가 일치하지 않습니다.');
-        } else if (data.message == 'User not found') {
-          throw new Error('존재하지 않는 아이디입니다.');
-        } else if (data.message == 'User is not active') {
-          throw new Error('활성화되지 않은 계정입니다.');
-        } else if (data.message == 'User is not verified') {
-          throw new Error('이메일 인증이 필요합니다.');
+        if (data.message == "Invalid Credentials") {
+          throw new Error("아이디와 비밀번호가 일치하지 않습니다.");
+        } else if (data.message == "User not found") {
+          throw new Error("존재하지 않는 아이디입니다.");
+        } else if (data.message == "User is not active") {
+          throw new Error("활성화되지 않은 계정입니다.");
+        } else if (data.message == "User is not verified") {
+          throw new Error("이메일 인증이 필요합니다.");
         } else {
           throw new Error(data.message);
-        } 
+        }
       }
 
+      // ✅ 로그인 성공 후 deviceId 쿠키 저장 (maxAge=86400, Refresh Token TTL과 동기화)
+      tokenManager.setDeviceId(deviceId);
+
       tokenManager.setToken(CLAIM_NAME, accessToken);
       tokenManager.setToken(AUTH_USER_ID, tokenId);
       tokenManager.setupRefreshTimer(
@@ -66,6 +83,10 @@ export class LoginApiService implements LoginService {
 
   public async silentRefresh(): Promise<void> {
     try {
+      // deviceId는 BFF(route.ts)가 쿠키(device-id)에서 읽어 X-Device-Id 헤더로 자동 전달
+      // → 백엔드 TokenProvider.refreshToken(token, request, response)
+      // → userService.findByRefreshToken(refreshToken, deviceId) → Redis Hash 검증
+      // → userService.updateRefreshToken(userUnqId, newRefreshToken, deviceId) → RTR 갱신
       const response = await fetch(
         `/api/proxy${ENDPOINT.USER_SERVICE.SILENT_REFRESH}`,
         { method: "PUT" },

apps/cs/src/entities/auth/lib/auth-wrapper.tsx

@@ -1,24 +1,18 @@
 "use client";
 
 import { useEffect } from "react";
+import { useRouter } from "next/navigation";
 import { client } from "@/shared/api";
 import type { IUserInfo } from "@/shared/store";
 import { getCookie, useUserStore } from "@/shared/lib";
-import { isAtLoginRedirectUrl } from "@common/network";
-import {
-  ENDPOINT,
-  AUTH_USER_ID,
-  AUTH_LOGIN_REDIRECT_URL,
-} from "@/shared/config";
+import { ENDPOINT, AUTH_USER_ID } from "@/shared/config";
+import { LoginApi } from "../api/login-service";
 
 const AuthWrapper = ({ children }: { children: React.ReactNode }) => {
+  const router = useRouter();
   const { userInfo, setUserInfo } = useUserStore((state) => state);
 
   async function authCheck() {
-    if (isAtLoginRedirectUrl(AUTH_LOGIN_REDIRECT_URL)) {
-      return;
-    }
-
     const userId = getCookie(AUTH_USER_ID);
     if (!userId) {
       throw new Error("Missing required authentication tokens");
@@ -36,9 +30,14 @@ const AuthWrapper = ({ children }: { children: React.ReactNode }) => {
         await authCheck();
       } catch (error) {
         console.error(error);
-        setUserInfo(null);
-        if (!isAtLoginRedirectUrl(AUTH_LOGIN_REDIRECT_URL)) {
-          window.location.assign(AUTH_LOGIN_REDIRECT_URL);
+
+        try {
+          await LoginApi.silentRefresh();
+          await authCheck();
+        } catch (refreshError) {
+          console.error("Token refresh failed:", refreshError);
+          setUserInfo(null);
+          router.push("/auth/login");
         }
       }
     })();

apps/cs/src/entities/auth/lib/token-manager.ts

@@ -1,4 +1,4 @@
-import { AUTH_USER_ID, CLAIM_NAME } from "@/shared/config";
+import { AUTH_USER_ID, CLAIM_NAME, DEVICE_ID } from "@/shared/config";
 import { getCookie, setCookie, removeCookie } from "@/shared/lib";
 
 export class TokenManager {
@@ -20,22 +20,18 @@ export class TokenManager {
 
   public setToken(key: string, value: string): void {
     const domain = this.getCookieDomain();
-    
     setCookie(key, value, {
       secure: window.location.protocol === "https:",
       sameSite: "lax",
       domain: domain,
-      path: "/", // 모든 경로에서 접근 가능
+      path: "/",
     });
   }
 
-  
   private getCookieDomain(): string | undefined {
     const hostname = window.location.hostname;
-    
-    // 개발 환경에서는 localhost 도메인 사용
     if (hostname === "localhost" || hostname === "127.0.0.1") {
-      return undefined; // localhost에서는 도메인 설정하지 않음
+      return undefined;
     }
     
     // 운영 환경에서는 서브도메인을 포함한 최상위 도메인 사용
@@ -52,6 +48,33 @@ export class TokenManager {
     removeCookie(key, { domain, path: "/" });
   }
 
+  /**
+   * deviceId 쿠키 저장
+   * - httpOnly가 아닌 일반 쿠키로 저장 (BFF route.ts에서 cookieStore.get()으로 읽기 위함)
+   * - js-cookie는 maxAge를 지원하지 않으므로 expires(Date)로 변환하여 사용
+   * - expires: Refresh Token TTL(1일)과 동일하게 설정하여 브라우저 재시작 후에도 동일 Redis 슬롯 재사용
+   */
+  public setDeviceId(deviceId: string): void {
+    const domain = this.getCookieDomain();
+    // js-cookie v3는 maxAge 속성을 지원하지 않음 (number 타입에 .split() 호출로 TypeError 발생)
+    // maxAge(초) → expires(Date) 변환: 1일 = 86400초
+    const expires = new Date(Date.now() + 86400 * 1000);
+    setCookie(DEVICE_ID, deviceId, {
+      secure: window.location.protocol === "https:",
+      sameSite: "lax",
+      domain: domain,
+      path: "/",
+      expires, // Date 객체로 전달 (js-cookie가 toUTCString()으로 직렬화)
+    });
+  }
+
+  /**
+   * deviceId 쿠키 조회
+   */
+  public getDeviceId(): string | undefined {
+    return getCookie(DEVICE_ID);
+  }
+
   public setupRefreshTimer(
     callback: () => Promise<void>,
     expirationTime: number,
@@ -59,7 +82,6 @@ export class TokenManager {
     if (this.refreshTimer) {
       clearTimeout(this.refreshTimer);
     }
-
     this.refreshTimer = setTimeout(() => {
       callback().catch((error) => {
         console.error("Silent refresh failed:", error);
@@ -73,9 +95,9 @@ export class TokenManager {
       clearTimeout(this.refreshTimer);
       this.refreshTimer = null;
     }
-
     this.removeToken(CLAIM_NAME);
     this.removeToken(AUTH_USER_ID);
+    this.removeToken(DEVICE_ID); // deviceId 함께 삭제
   }
 }
 

apps/cs/src/shared/config/env.ts

@@ -2,8 +2,6 @@ export const PORT = process.env.NEXT_PUBLIC_PORT || "3000";
 export const PROXY_HOST =
   process.env.NEXT_PUBLIC_PROXY_HOST || `http://localhost:${PORT}`;
 export const SERVER_API_URL = process.env.NEXT_PUBLIC_SERVER_API_URL;
-export const AUTH_LOGIN_REDIRECT_URL =
-  process.env.NEXT_PUBLIC_AUTH_LOGIN_REDIRECT_URL || "/auth/login";
 export const SITE_ID = process.env.NEXT_PUBLIC_SITE_ID || "CS";
 export const CLAIM_NAME = process.env.NEXT_PUBLIC_CLAIM_NAME || "Authorization";
 export const ACCESS_TOKEN =
@@ -11,3 +9,4 @@ export const ACCESS_TOKEN =
 export const REFRESH_TOKEN =
   process.env.NEXT_PUBLIC_REFRESH_TOKEN || "refresh-token";
 export const AUTH_USER_ID = process.env.NEXT_PUBLIC_AUTH_USER_ID || "token-id";
+export const DEVICE_ID = process.env.NEXT_PUBLIC_DEVICE_ID || "device-id";

apps/dc/package.json

@@ -41,7 +41,7 @@
     "@types/node": "^22.17.0",
     "@types/webpack": "^5.28.5",
     "eslint": "^9.0.0",
-    "eslint-config-next": "15.3.8",
+    "eslint-config-next": "15.4.0",
     "postcss": "^8.4.49",
     "prettier": "^3.4.2",
     "prettier-plugin-tailwindcss": "^0.6.11",

apps/dc/src/entities/auth/lib/auth-wrapper.tsx

@@ -1,24 +1,20 @@
 "use client";
 
 import { useEffect } from "react";
+import { useRouter } from "next/navigation";
 import { client } from "@/shared/api";
 import type { IUserInfo } from "@/shared/store";
 import { getCookie, useUserStore } from "@/shared/lib";
-import { isAtLoginRedirectUrl } from "@common/network";
-import {
-  ENDPOINT,
-  AUTH_USER_ID,
-  AUTH_LOGIN_REDIRECT_URL,
-} from "@/shared/config";
+import { ENDPOINT, AUTH_USER_ID } from "@/shared/config";
+import { LoginApi } from "../api/login-service";
+
+const CLAIM_NAME = process.env.NEXT_PUBLIC_CLAIM_NAME || "Authorization";
 
 const AuthWrapper = ({ children }: { children: React.ReactNode }) => {
+  const router = useRouter();
   const { userInfo, setUserInfo } = useUserStore((state) => state);
 
   async function authCheck() {
-    if (isAtLoginRedirectUrl(AUTH_LOGIN_REDIRECT_URL)) {
-      return;
-    }
-
     const userId = getCookie(AUTH_USER_ID);
     if (!userId) {
       throw new Error("Missing required authentication tokens");
@@ -36,9 +32,14 @@ const AuthWrapper = ({ children }: { children: React.ReactNode }) => {
         await authCheck();
       } catch (error) {
         console.error(error);
-        setUserInfo(null);
-        if (!isAtLoginRedirectUrl(AUTH_LOGIN_REDIRECT_URL)) {
-          window.location.assign(AUTH_LOGIN_REDIRECT_URL);
+
+        try {
+          await LoginApi.silentRefresh();
+          await authCheck();
+        } catch (refreshError) {
+          console.error("Token refresh failed:", refreshError);
+          setUserInfo(null);
+          router.push("/auth/login");
         }
       }
     })();

apps/dc/src/shared/config/env.ts

@@ -3,14 +3,10 @@ export const PROXY_HOST =
   process.env.NEXT_PUBLIC_PROXY_HOST || `http://localhost:${PORT}`;
 
 export const SERVER_API_URL = process.env.NEXT_PUBLIC_SERVER_API_URL;
-export const NEXT_PUBLIC_DC_SERVICE_API_URL =
-  process.env.NEXT_PUBLIC_DC_SERVICE_API_URL || `http://localhost:${PORT}`;
-export const AUTH_LOGIN_REDIRECT_URL =
-  process.env.NEXT_PUBLIC_AUTH_LOGIN_REDIRECT_URL || "/auth/login";
+export const NEXT_PUBLIC_DC_SERVICE_API_URL = process.env.NEXT_PUBLIC_DC_SERVICE_API_URL || `http://localhost:${PORT}`;
 
 // Flask API URL
-export const FLASK_API_URL =
-  process.env.NEXT_PUBLIC_FLASK_API_URL || "http://localhost:5000";
+export const FLASK_API_URL = process.env.NEXT_PUBLIC_FLASK_API_URL || "http://localhost:5000";
 
 //export const SITE_ID = process.env.NEXT_PUBLIC_SITE_ID || "DC";
 export const SITE_ID = "DC";

apps/dm/.env.local

@@ -19,7 +19,7 @@ NEXT_PUBLIC_NGII_PARAM = 04trYP9_xwLAfALjwZ-B8g&service=WMTS&request=GetTile&ver
 NEXT_PUBLIC_GATEWAY_URL=http://con.mind-one.co.kr:11083  # 개발 서버 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_CM_LOGIN_PAGE_URL = /
+NEXT_PUBLIC_CM_LOGIN_PAGE_URL = http://dev.onasys.co.kr:3000/auth/login
 
 
 NEXT_PUBLIC_FINDADRESS_URL=https://business.juso.go.kr/addrlink/addrLinkApi.do

apps/dm/.env.mindone

@@ -17,7 +17,7 @@ NEXT_PUBLIC_SEWERAGE_API_URL=http://con.mind-one.co.kr:11083/sewerage-service
 NEXT_PUBLIC_GATEWAY_URL=http://con.mind-one.co.kr:11083  # 개발 서버 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_CM_LOGIN_PAGE_URL = /
+NEXT_PUBLIC_CM_LOGIN_PAGE_URL = http://dev.onasys.co.kr:3000/auth/login
 
 
 NEXT_PUBLIC_FINDADRESS_URL=https://business.juso.go.kr/addrlink/addrLinkApi.do

apps/dm/AGENTS.md

@@ -1,38 +0,0 @@
-## Project
-This repository contains a Next.js web application.
-
-Main technologies:
-- Next.js
-- TypeScript
-- pnpm workspace
-- turborepo
-
-이 저장소는 pnpm workspace + Turborepo 기반 monorepo이다.
-
-- 워크스페이스 범위는 `apps/*`, `apps/common/*`, `packages/*`, `packages/common/*`
-- 루트 스크립트는 `turbo run build`, `turbo run dev` 를 사용한다
-- `build` 작업은 의존 패키지의 `build` 를 먼저 수행한다 (`dependsOn: ["^build"]`)
-- `dev` 는 캐시하지 않는 지속 실행 작업이다
-- 변경 범위만 선택 실행할 수 있으므로, 전체 빌드보다 `--filter` 사용을 우선한다
-
-## Encoding 
-- UTF-8 
-- 한글이 깨지지 않도록 주의할 것
-
-## 주석 comment
-- 한글 주석을 삭제하지 말 것
-
-## Monorepo structure
-apps/
-  _template
-  as
-  cm
-  cs
-  dc
-  dm
-  dm_new
-  fo
-  sn
-  st
-  wr
-

apps/dm/package.json

@@ -29,7 +29,7 @@
     "@eslint/eslintrc": "^3",
     "@types/webpack": "^5.28.5",
     "eslint": "^9",
-    "eslint-config-next": "15.3.8",
+    "eslint-config-next": "15.1.7",
     "postcss": "^8",
     "tailwindcss": "^3.4.1",
     "typescript": "^5"

apps/dm_new/AGENTS.md

@@ -1,38 +0,0 @@
-## Project
-This repository contains a Next.js web application.
-
-Main technologies:
-- Next.js
-- TypeScript
-- pnpm workspace
-- turborepo
-
-이 저장소는 pnpm workspace + Turborepo 기반 monorepo이다.
-
-- 워크스페이스 범위는 `apps/*`, `apps/common/*`, `packages/*`, `packages/common/*`
-- 루트 스크립트는 `turbo run build`, `turbo run dev` 를 사용한다
-- `build` 작업은 의존 패키지의 `build` 를 먼저 수행한다 (`dependsOn: ["^build"]`)
-- `dev` 는 캐시하지 않는 지속 실행 작업이다
-- 변경 범위만 선택 실행할 수 있으므로, 전체 빌드보다 `--filter` 사용을 우선한다
-
-## Encoding 
-- UTF-8 
-- 한글이 깨지지 않도록 주의할 것
-
-## 주석 comment
-- 한글 주석을 삭제하지 말 것
-
-## Monorepo structure
-apps/
-  _template
-  as
-  cm
-  cs
-  dc
-  dm
-  dm_new
-  fo
-  sn
-  st
-  wr
-

apps/dm_new/app/(landing)/reuse/apply/modal/SimilarCaseModal.tsx

@@ -71,18 +71,16 @@ export default function SimilarCaseModal({
   onClose,
   rows,
   detailsByCaseId,
-  onSearch
 }: {
   open: boolean;
   onClose: () => void;
   rows: SimilarCaseRow[];
   detailsByCaseId: Record<string, SimilarCaseDetail | undefined>;
-  onSearch :(criterion: Criterion) => void;
 }) {
   const titleId = useId();
 
   const [mounted, setMounted] = useState(false);
-  const [criterion, setCriterion] = useState<Criterion>("supplyAmt");
+  const [criterion, setCriterion] = useState<Criterion>("");
   const [selectedCaseId, setSelectedCaseId] = useState<string>("");
 
   useEffect(() => setMounted(true), []);
@@ -90,8 +88,7 @@ export default function SimilarCaseModal({
   // 모달 열릴 때 초기화
   useEffect(() => {
     if (!open) return;
-    setCriterion("supplyAmt");
-    onSearch("supplyAmt");
+    setCriterion("");
     setSelectedCaseId("");
   }, [open]);
 
@@ -195,14 +192,12 @@ export default function SimilarCaseModal({
                   const v = e.target.value as Criterion;
                   setCriterion(v);
                   setSelectedCaseId("");
-
-                  if(v){
-                    onSearch(v);
-                  }
                 }}
                 className="h-10 w-[180px] rounded-md border border-neutral-300 bg-white px-3 text-sm outline-none focus:border-neutral-500"
               >
+                <option value="">유사기준선택</option>
                 <option value="supplyAmt">공급량</option>
+                <option value="treatment">처리공법</option>
                 <option value="usePurpose">이용용도</option>
               </select>
             </div>

apps/dm_new/app/(landing)/reuse/apply/register/page.tsx

@@ -633,9 +633,6 @@ export default function DemandRegisterPage() {
         onClose={() => setOpenSimilar(false)}
         rows={similarRows}
         detailsByCaseId={similarDetailsByCaseId}
-        onSearch={async (criterion) => {
-            console.log(criterion);
-          }}
       />
     </>
   );

apps/dm_new/app/(landing)/reuse/apply/status/page.tsx

@@ -3,7 +3,6 @@
 
 import { useEffect, useMemo, useRef, useState } from "react";
 import SubPageHeader from "../../_components/SubPageHeader";
-//import { useDmStore } from "@/app/store";
 
 type WaterDetail = {
   toc: string;
@@ -115,17 +114,12 @@ type PairField = { label: string; value: string };
 export default function DemandStatusPage() {
   const rows = useMemo(() => MOCK, []);
 
-  // rows가 빈 경우도 대비 (런타임 오류 방지)
+  // ✅ rows가 빈 경우도 대비 (런타임 오류 방지)
   const [selectedId, setSelectedId] = useState<number | null>(rows[0]?.id ?? null);
 
-  // 상세영역 스크롤 이동용
+  // ✅ 상세영역 스크롤 이동용
   const detailRef = useRef<HTMLDivElement | null>(null);
 
-  // update
-  /* const updateSdmInfoData = useDmStore(
-    (state) => state.updateSdmInfoData
-  ); */
-
   // ✅ selected 계산 안정화
   const selected = useMemo(() => {
     if (!rows.length) return null;

apps/dm_new/app/(popup-layout)/layout.tsx

@@ -1,11 +0,0 @@
-"use client";
-import "../globals.css";
-import { StoreProvider } from "../store";
-
-export default function PopupLayout({
-  children,
-}: Readonly<{
-  children: React.ReactNode;
-}>) {
-  return <StoreProvider>{children}</StoreProvider>;
-}

apps/dm_new/app/(popup-layout)/map/popup/page.tsx

@@ -1,352 +0,0 @@
-"use client";
-
-import Gis from "@common/business_components/ui/map/Gis";
-import { useEffect, useRef, useState } from "react";
-import { mapService } from "../service";
-import GisApp from "@common/business_components/ui/map/lib/gis.core";
-import { SearchBar } from "@/components/ui/map/searchBar/searchBar";
-import SelectedFcltList from "./selectedFcltList";
-import type { SubsInfo } from "@/app/store/map/type";
-
-const Map = () => {
-  const [treeData, setTreeData] = useState([]); // 초기값을 객체 또는 null로 설정
-  const gisMaps = useRef<any | null>(null);
-  const [isOpen, setIsOpen] = useState(false); // 팝업 열기/닫기 상태
-  const [isSearchModalOpen, setIsSearchModalOpen] = useState(true); // SearchModal 열림 상태
-  const [featureData, setFeatureData] = useState(null); // 선택된 피쳐 데이터
-  const [selectDataPk, setSelectDataPk] = useState<Record<string, any>>({});
-  const [selectedFclts, setSelectedFclts] = useState<any[]>([]);
-
-  //적용 버튼 클릭 이벤트
-  const onApply = () => {
-    if (selectedFclts.length > 3) {
-      alert("재이용시설 후보지는 최대 3개까지만 선택할 수 있습니다.");
-      return;
-    }
-
-    const subsInfoList: SubsInfo[] = selectedFclts.map((fclt) => ({
-      ruseUtztnFcltNm: fclt.ruseUtztnFcltNm,
-      ruseUtztnFcltCd: fclt.pbnstRuseFcltId,
-    }));
-
-    if (!window.opener || typeof window.opener.postMessage !== "function") {
-      alert("부모 창을 찾을 수 없습니다. 팝업이 'noopener'로 열렸거나, 보안 정책으로 차단되었을 수 있어요.");
-      return;
-    }
-
-    window.opener.postMessage(
-      {
-        type: "SET_SUBS_INFO",
-        payload: subsInfoList, // 배열로 전송 (최대 3개)
-      },
-      "*"
-    );
-
-    window.close();
-  };
-
-  //트리 레이어 데이터 조회
-  const fetchData = async () => {
-    try {
-      const response = await mapService.getLyrStngs();
-      setTreeData(response); // API 응답 저장
-    } catch (error) {
-      console.error("데이터 불러오기 실패:", error);
-    }
-  };
-
-  //하수처리시설코드로 재이용시설 목록 조회
-  const reuseData = async (ruseFcltPk: any) => {
-    if (!ruseFcltPk) {
-      console.warn("[reuseData] ruseFcltPk가 없습니다.");
-      return;
-    }
-    try {
-      console.log("[reuseData] API 호출 - ruseFcltPk:", ruseFcltPk);
-      const response = await mapService.getPbnstRuseFclts(ruseFcltPk);
-      console.log("[reuseData] API 응답 전체:", response);
-      // 응답이 배열이면 바로 사용, 객체면 .data 추출
-      const data = Array.isArray(response)
-        ? response
-        : Array.isArray(response?.data)
-          ? response.data
-          : response?.data
-            ? [response.data]
-            : [];
-      console.log("[reuseData] 파싱된 data:", data);
-      setSelectedFclts((prev) => {
-        const newItems = data.filter(
-          (item: any) =>
-            item &&
-            Object.keys(item).length > 0 &&
-            !prev.some((f) => f.pbnstRuseFcltId === item.pbnstRuseFcltId)
-        );
-        console.log("[reuseData] 추가될 newItems:", newItems);
-        return [...prev, ...newItems];
-      });
-    } catch (error) {
-      console.error("데이터 불러오기 실패:", error);
-    }
-  };
-
-  // 컴포넌트 마운트 시 1회 실행
-  useEffect(() => {
-    fetchData();
-  }, []);
-
-  // 부모창에 초기 선택값 요청 (팝업 열릴 때 기존 선택 목록 받아오기)
-  useEffect(() => {
-    const origin = window.location.origin;
-    if (window.opener) {
-      window.opener.postMessage({ type: "REQUEST_INIT_SUBS_INFO" }, origin);
-    }
-  }, []);
-
-  // 부모창에서 초기 선택값 수신
-  useEffect(() => {
-    const origin = window.location.origin;
-
-    const handler = (event: MessageEvent) => {
-      if (event.origin !== origin) return;
-
-      const data = event.data;
-      if (!data || typeof data !== "object") return;
-
-      if (data.type === "INIT_SUBS_INFO") {
-        const list = Array.isArray(data.payload) ? data.payload : [];
-        setSelectedFclts(
-          list.map((x) => ({
-            ruseUtztnFcltNm: x.ruseUtztnFcltNm ?? "",
-            pbnstRuseFcltId: x.ruseUtztnFcltCd ?? "",
-          }))
-        );
-      }
-    };
-
-    window.addEventListener("message", handler);
-    return () => window.removeEventListener("message", handler);
-  }, []);
-
-  // 레이어 생성 후 초기화 처리
-  const onCheckedLayersChange = () => {
-    //수요처 ID
-    const urlParams = new URLSearchParams(window.location.search);
-    const dmdInfoId = urlParams.get("dmdInfoId");
-    console.log("[하이라이트] dmdInfoId:", dmdInfoId);
-
-    //수요처 위치로 화면 이동
-    const maps = gisMaps.current;
-    const layer = GisApp.Module.layer as any;
-    const layerNm = "tb_wr_ruse_fclt_dmd_co";
-    const featureId = `${layerNm}.${dmdInfoId}`;
-    let foundFeature: any = null;
-
-    // 현재 로드된 레이어 목록 출력
-    const allLayerNames = maps
-      .getLayers()
-      .getArray()
-      .map((l: any) => l.get("lyrTyNm") || l.get("name") || "(unnamed)");
-    console.log("[하이라이트] 전체 레이어 목록:", allLayerNames);
-    console.log("[하이라이트] 탐색 대상 레이어:", layerNm);
-    console.log("[하이라이트] 탐색 대상 featureId:", featureId);
-
-    maps
-      .getLayers()
-      .getArray()
-      .forEach((layer: any) => {
-        if (layer.get("lyrTyNm") == layerNm) {
-          console.log("[하이라이트] 레이어 발견:", layerNm);
-          const source = layer.getSource?.();
-          if (source?.getFeatureById) {
-            const feature = source.getFeatureById(String(featureId).trim());
-            console.log("[하이라이트] feature 탐색결과:", feature);
-            if (feature) {
-              foundFeature = feature;
-              return;
-            }
-            // feature 못 찾을 때 소스 내 전체 feature ID 출력
-            if (source?.getFeatures) {
-              const allIds = source.getFeatures().map((f: any) => f.getId());
-              console.log("[하이라이트] 소스 내 전체 feature ID:", allIds);
-            }
-          }
-        }
-      });
-
-    if (!foundFeature) {
-      console.warn("[하이라이트] feature를 찾지 못했습니다. 위 레이어 목록/ID를 확인하세요.");
-    }
-
-    if (foundFeature) {
-      const geometry = foundFeature.getGeometry();
-
-      if (geometry) {
-        const extent = geometry.getExtent();
-
-        if (geometry.getType() === "Point") {
-          maps.getView().setCenter(geometry.getCoordinates());
-          maps.getView().setZoom(11);
-        } else {
-          maps.getView().fit(extent, {
-            duration: 300,
-            padding: [30, 30, 30, 30],
-            maxZoom: 16,
-          });
-        }
-      }
-
-      layer.highLightFeature(
-        [foundFeature],
-        {
-          id: GisApp.hlLayerId,
-          zIndex: 10,
-          opacity: 1,
-          selectable: true,
-        },
-        { width: 30 }
-      );
-    } else {
-      console.warn("수요처의 좌표정보를 찾을 수 없습니다. dmdInfoId:", dmdInfoId);
-    }
-
-    const formatNumber = (val: any) => {
-      const num = Number(val);
-      return isNaN(num) ? "-" : num.toLocaleString();
-    };
-
-    // 재이용시설 오버레이
-    maps
-      .getLayers()
-      .getArray()
-      .forEach((layer: any) => {
-        if (layer.get("lyrTyNm") === "tb_wr_bdst_ruse_fclt") {
-          const source = layer.getSource?.();
-          if (source?.getFeatures) {
-            const features = source.getFeatures();
-
-            features.forEach((feature: any) => {
-              // 필요한 고유 ID 또는 속성 가져오기 (예: ftrIdn 또는 feature.getId())
-              const featureId =
-                feature.getId() || feature.get("ftrIdn") || Math.random();
-
-              // HTML 또는 React 오버레이 컴포넌트 구성
-              const overlayContent = `
-              <div class="rounded-md border border-gray-300 bg-white shadow-md text-sm w-[120px]">
-                <!-- 헤더 -->
-                <div class="bg-cyan-700 text-white px-3 py-2 text-[11px] font-semibold text-center rounded-t-md">
-                  ${feature.get("swtrmt_fclt_nm") || "-"} 
-                </div>
-            
-                <!-- 테이블 -->
-                <table class="w-full text-sm text-gray-800 border-t border-gray-200">
-                  <tbody>
-                    <tr class="border-b border-gray-200">
-                      <th class="bg-gray-100 text-gray-600 font-semibold text-[10px] text-left">용량(m³/일)</th>
-                      <td class="text-right text-[10px] font-bold">${formatNumber(feature.get("fclt_cpct"))}</td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-            `;
-              feature.set("html", overlayContent);
-              feature.set("overLayId", `overLay.${featureId}`);
-            });
-          }
-        }
-      });
-  };
-
-  // 검색해서 재이용시설 선택하면 해당 시설로 화면 이동 처리
-  useEffect(() => {
-    console.warn(selectDataPk);
-    if (!selectDataPk || Object.keys(selectDataPk).length === 0) return;
-    const maps = gisMaps.current;
-    let foundFeature: any = null;
-    const layerNm = "tb_wr_bdst_ruse_fclt";
-    const featureId = `${layerNm}.${selectDataPk.bscFctCd}`;
-    maps
-      .getLayers()
-      .getArray()
-      .forEach((layer: any) => {
-        if (layer.get("lyrTyNm") == layerNm) {
-          const source = layer.getSource?.();
-          if (source?.getFeatureById) {
-            const feature = source.getFeatureById(String(featureId).trim());
-            if (feature) {
-              foundFeature = feature;
-              return;
-            }
-          }
-        }
-      });
-
-    if (foundFeature) {
-      const geometry = foundFeature.getGeometry();
-      if (geometry) {
-        const extent = geometry.getExtent();
-
-        maps.getView().fit(extent, {
-          duration: 300,
-          padding: [50, 50, 50, 50],
-          maxZoom: 16,
-          constrainResolution: true,
-          nearest: true,
-        });
-      }
-    } else {
-      console.warn("OpenLayers Feature를 찾을 수 없습니다:", selectDataPk);
-    }
-  }, [selectDataPk]);
-
-  // 재이용시설 클릭 시 선택 시설목록에 추가
-  const onFeatureSelect = (data: any) => {
-    // feature의 모든 속성 출력 (어떤 키가 있는지 확인)
-    const properties = data.getProperties?.() ?? {};
-    console.log("[onFeatureSelect] feature 속성 전체:", properties);
-    // 처리시설코드
-    const swtrmtFcltCd = data.get("swtrmt_fclt_cd");
-    console.log("[onFeatureSelect] swtrmt_fclt_cd:", swtrmtFcltCd);
-    reuseData(swtrmtFcltCd);
-  };
-
-  return (
-    <>
-      <div className="bg-container">
-        <Gis
-          showZoomLevel={true}
-          height='h-screen'
-          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={onCheckedLayersChange}
-          imgVisble={false}
-          searchBar={
-            <SearchBar
-              setHasuPk={(hasuPk: any) => {
-                if (hasuPk) setSelectDataPk(hasuPk);
-              }}
-              onApply={onApply}
-            />
-          }
-          waterDepth={undefined}
-        />
-      </div>
-      <SelectedFcltList
-        data={selectedFclts}
-        onRemove={(updatedList) => setSelectedFclts(updatedList)}
-      />
-    </>
-  );
-};
-
-export default Map;

apps/dm_new/app/(popup-layout)/map/popup/selectedFcltList.tsx

@@ -1,75 +0,0 @@
-import React from "react";
-
-type FcltItem = {
-  pbnstRuseFcltId: string;
-  ruseUtztnFcltNm: string;
-  splyExtraCpct?: number;
-  ruseCpct?: number;
-  [key: string]: any;
-};
-
-export default function SelectedFcltList({
-  data = [],
-  onRemove,
-}: {
-  data: FcltItem[];
-  onRemove: (updatedList: FcltItem[]) => void;
-}) {
-  const handleDelete = (code: string) => {
-    const updatedList = data.filter((item) => item.pbnstRuseFcltId !== code);
-    onRemove(updatedList);
-  };
-
-  const TableContent = (
-    <>
-      <thead className="bg-gray-100 text-gray-600 text-[11px] font-medium border-b border-cyan-800">
-        <tr>
-          <th className="px-2 py-1.5 text-left w-1/3">시설명</th>
-          <th className="px-2 py-1.5 text-right whitespace-nowrap">
-            처리량(㎥/일)
-          </th>
-          <th className="px-2 py-1.5 text-right whitespace-nowrap">
-            재이용량(㎥/일)
-          </th>
-          <th className="px-2 py-1.5 text-center w-10">삭제</th>
-        </tr>
-      </thead>
-      <tbody>
-        {data.map((item) => (
-          <tr key={item.pbnstRuseFcltId} className="border-b border-gray-100 last:border-none hover:bg-gray-50/50">
-            <td className="px-2 py-1.5 text-[11px] font-medium text-gray-800 break-keep">{item.ruseUtztnFcltNm}</td>
-            <td className="px-2 py-1.5 text-right text-[11px] text-gray-600">
-              {Number(item.splyExtraCpct || 0).toLocaleString()}
-            </td>
-            <td className="px-2 py-1.5 text-right text-[11px] text-gray-600">
-              {Number(item.ruseCpct || 0).toLocaleString()}
-            </td>
-            <td className="px-2 py-1.5 text-center">
-              <button
-                onClick={() => handleDelete(item.pbnstRuseFcltId)}
-                className="text-gray-400 hover:text-red-500 text-[11px] font-bold transition-colors"
-                aria-label="삭제"
-                title="삭제"
-              >
-                ✕
-              </button>
-            </td>
-          </tr>
-        ))}
-      </tbody>
-    </>
-  );
-
-  return (
-    <div className="fixed right-20 top-[3.5rem] w-[22rem] max-h-[80vh] overflow-hidden bg-white/95 backdrop-blur-sm shadow-[0_4px_12px_rgba(0,0,0,0.1)] rounded-lg border border-gray-200 z-50 flex flex-col">
-      <h3 className="bg-cyan-700 text-white text-[13px] font-semibold p-2">
-        선택된 시설
-      </h3>
-      <div className="overflow-y-auto w-full">
-        <table className="w-full text-sm text-gray-800 border-t border-gray-200 table-fixed">
-          {TableContent}
-        </table>
-      </div>
-    </div>
-  );
-}

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

@@ -1 +0,0 @@
-export * from './map'

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

@@ -1,59 +0,0 @@
-/**
- * 관망도 API
- */
-import { DEV_URL_WR, DEV_URL_SN } from "@/components/ui/config";
-
-export type LyrStngProps = {
-  lyr_sn: string
-  lyr_nm: string
-  upper_lyr_sn: string
-  drawOrdr: string
-  flterSql: string
-  gobjTy: string
-  lyrTpNm: string
-  useYn: string
-  minViewSize: string
-  iconNm: string
-  lblAtrbNm: string
-  fontNm: string
-  fontIntnColor: string
-  fontExtnColor: string
-  fontExtnWdth: string
-  lnWdth: string
-  lnColor: string
-  polgnColor: string
-  initEprssYn: string
-  clickPsblYn: string
-}
-
-export const mapService = {
-  //레이어 설정 조회
-  getLyrStngs: async () => {
-    const response = await fetch(`${DEV_URL_SN}/map/lyrStngs/DM_NETWORK`, {
-      method: 'GET',
-      headers: {
-        'Accept': 'application/json',
-      },
-    });
-
-    if (!response.ok) {
-      throw new Error(`HTTP error! status: ${response.status}`);
-    }
-
-    return response.json();
-  },
-  getPbnstRuseFclts: async (ruseFcltPk: any) => {
-    const response = await fetch(`${DEV_URL_WR}/reuseFc/pubFc/${ruseFcltPk}`, {
-      method: 'GET',
-      headers: {
-        'Accept': 'application/json',
-      },
-    });
-
-    if (!response.ok) {
-      throw new Error(`HTTP error! status: ${response.status}`);
-    }
-
-    return response.json();
-  }
-}

apps/dm_new/app/(with-layout)/apply/register/page.tsx

@@ -8,20 +8,14 @@
  */
 "use client";
 
-import { useMemo, useState, useRef, useEffect } from "react";
-import { useRouter } from "next/navigation";
+import { useMemo, useState, useRef } from "react";
 import SubPageHeader from "@/components/SubPageHeader";
 import WaterQualityRefModal from "../modal/WaterQualityRefModal";
 import CandidateSiteModal, { type CandidateSite } from "@/components/CandidateSiteModal";
-import { useDmStore } from "@/app/store";
-import type { SdmInfoFormData } from "@/app/store/sdmMng";
-import SimilarCaseModal, { type SimilarCaseDetail, type SimilarCaseRow } from "@/app/(landing)/reuse/apply/modal/SimilarCaseModal";
-//import type { SubsInfo } from "@/app/store/map/type";
 
 type PHRange = { min: string; max: string };
 
 export default function DemandRegisterPage() {
-  const router = useRouter();
   const today = useMemo(() => {
     const d = new Date();
     const yyyy = d.getFullYear();
@@ -42,7 +36,7 @@ export default function DemandRegisterPage() {
   const [hopePrice, setHopePrice] = useState<string>("");
 
   // 요구수질
-  const [coliform, setColiform] = useState<string>(""); // 총대장균군수
+  const [coliform, setColiform] = useState<string>("");
   const [noDetect, setNoDetect] = useState<boolean>(false);
 
   const [tn, setTn] = useState<string>("");
@@ -61,654 +55,265 @@ export default function DemandRegisterPage() {
   const [cand1, setCand1] = useState("");
   const [cand2, setCand2] = useState("");
   const [cand3, setCand3] = useState("");
-  //const [candidateList, setCandidateList] = useState<SubsInfo[]>([]);
-
-  const useTypesData = useDmStore((state) => state.Sdm.useTypesData);
-  const getUseTypesData = useDmStore((state) => state.getUseTypesData);
-  const [openSimilar, setOpenSimilar] = useState(false);
-
-  // 후보지 팝업 메시지 핸들러
-  const candsRef = useRef<{ name: string; code: string }[]>([]);
-
-  useEffect(() => {
-    const origin = window.location.origin;
-
-    const handleMessage = (event: MessageEvent) => {
-      const data = event.data;
-      if (!data || typeof data !== "object") return;
-
-      if (data.type === "SET_SUBS_INFO") {
-        // 팝업에서 배열로 전송 (최대 3개)
-        const list = Array.isArray(data.payload) ? data.payload : [];
-        setCand1(list[0]?.ruseUtztnFcltNm ?? "");
-        setCand2(list[1]?.ruseUtztnFcltNm ?? "");
-        setCand3(list[2]?.ruseUtztnFcltNm ?? "");
-        // 추후 REQUEST_INIT_SUBS_INFO 응답용 ref 갱신
-        candsRef.current = list.map((x: any) => ({
-          name: x.ruseUtztnFcltNm ?? "",
-          code: x.ruseUtztnFcltCd ?? "",
-        }));
-      }
-
-      if (data.type === "REQUEST_INIT_SUBS_INFO") {
-        // 팝업이 현재 선택된 후보지 초기값을 요청하면 응답
-        const initList = candsRef.current
-          .filter((x) => x.name)
-          .map((x) => ({
-            ruseUtztnFcltNm: x.name,
-            ruseUtztnFcltCd: x.code,
-          }));
-        const target = event.source as Window | null;
-        target?.postMessage(
-          { type: "INIT_SUBS_INFO", payload: initList },
-          { targetOrigin: origin }
-        );
-      }
-    };
-
-    window.addEventListener("message", handleMessage);
-    return () => window.removeEventListener("message", handleMessage);
-  }, []);
-
-  // 유사사례
-  const similarCaseList = useDmStore((state) => state.Sdm.similarCaseList);
-  const getSimilarCaseList = useDmStore((state) => state.getSimilarCaseList);
-  const [farmText, setFarmText] = useState("이하");
-
-  const insertSdmInfoData = useDmStore(
-    (state) => state.insertSdmInfoData
-  );
-
-  useEffect(() => {
-    getUseTypesData();
-  }, [getUseTypesData]);
-
-  useEffect(() => {
-    const handler = (event: MessageEvent) => {
-      if (!event.data) return;
-
-      if (event.data.type === "SET_SUBS_INFO") {
-        const list = event.data.payload || [];
-
-        // 최대 3개
-        setCand1(list[0]?.ruseUtztnFcltNm || "");
-        setCand2(list[1]?.ruseUtztnFcltNm || "");
-        setCand3(list[2]?.ruseUtztnFcltNm || "");
-        //setCandidateList(list);
-      }
-    };
-
-    window.addEventListener("message", handler);
-
-    return () => {
-      window.removeEventListener("message", handler);
-    };
-  }, []);
-
-  // option
-  // 'req':필수 / 'num' : 숫자 / 'num+[숫자] : 자릿수 
-  const validation = (val, text, option: string[] = []) => {
-    if (option.includes('req')) {
-      if (val.trim() === "" || val === undefined) {
-        alert(`${text} 항목은 필수 입력값입니다.`);
-        return false;
-      }
-    } else {
-      if (val.trim() === "") {
-        return true;
-      }
-    }
-
-    const numOption = option.find((opt) => opt.startsWith("num"));
-    if (numOption) {
-      const isDot = numOption.includes("Dot");
-
-      // 3. 숫자 체크
-      const regex = isDot ? /^\d+(\.\d+)?$/ : /^\d+$/;
-
-      if (!regex.test(val)) {
-        alert(
-          `${text}은(는) ${isDot ? "숫자 또는 소수" : "숫자"
-          }만 입력 가능합니다.`
-        );
-        return false;
-      }
-
-      // 4. 자리수 체크
-      const lengthStr = numOption.replace("numDot", "").replace("num", "");
-
-      if (lengthStr) {
-        const length = Number(lengthStr);
-
-        if (isDot) {
-          // 🔥 소수 자리수 체크 (소수점 기준)
-          const decimalPart = val.split(".")[1];
-
-          if (decimalPart && decimalPart.length > length) {
-            alert(`${text}은(는) 소수점 ${length}자리까지 가능합니다.`);
-            return false;
-          }
-        } else {
-          // 정수 자리수 체크
-          if (val.length !== length) {
-            alert(`${text}은(는) ${length}자리여야 합니다.`);
-            return false;
-          }
-        }
-      }
-    }
-    return true;
-  }
-
-  const rows: SimilarCaseRow[] = similarCaseList.map((el, idx) => ({
-    caseId: String(idx),
-    projectName: el.ruseBizNm,
-    period: `${el.bizBgngDate} ~ ${el.bizEndDate}`,
-
-    supplyFacilityType: el.splyFcltKnd,
-    supplyName: el.splyFcltNm,
-    supplyCapacity: Number(el.splyFcltCpct),
-
-    demandName: el.dmdFcltNm,
-    demandAddress: el.dmdFcltAddr,
-
-    facilityCapacity: Number(el.ruseFcltCpct),
-    pipeKm: Number(el.ruseFcltPplLen),
-    purpose: el.ruseFcltUsg,
-
-    supplyAmt: Number(el.ruseFcltSplyCpct),
-    treatment: el.ruseFcltPrcsMsrc,
-    usePurpose: el.ruseFcltUsg,
-  }));
-
-  const detailsByCaseId: Record<string, SimilarCaseDetail> = {};
-  similarCaseList.forEach((el, idx) => {
-    detailsByCaseId[String(idx)] = {
-      coliform: el.grnteWqGrssClfg,
-      residualCl: el.grnteWqCombResdch,
-      turbidity: el.grnteWqTrbt,
-      bod: el.grnteWqBod,
-      odor: el.grnteWqSmll,
-      color: el.grnteWqCrmty,
-      tn: el.grnteWqTn,
-      tp: el.grnteWqTp,
-      ph: el.grnteWqPh,
-      chloride: el.grnteWqClIonQnt,
-      ec: el.grnteWqCndctStat,
-      note: el.grnteWqRmrk,
-
-      costTotal: Number(el.reqBizGrssCst),
-      costFacility: Number(el.reqBizReuseFcltCst),
-      costPipe: Number(el.reqBizPplCst),
-      costDesign: Number(el.reqBizDesignCst),
-      costSupervision: Number(el.reqBizSpvsCst),
-      costOther: Number(el.reqBizEtc),
-
-      fundingTotal: Number(el.prcmPlanGrssCst),
-      fundingNational: Number(el.prcmPlanNlep),
-      fundingLocal: Number(el.prcmPlanLcep),
-      fundingSelf: Number(el.prcmPlanBrdnCst),
-      fundingRate: Number(el.prcmPlanEcqrRt),
-    };
-  });
-
-  // 데이터 저장
-  const saveInfo = async () => {
-    if (!validation(reqQty, '요구수량', ['req', 'numDot'])) return false;
-    if (!validation(usePurpose, '사용용도', ['req'])) return false;
-    if (!validation(hopePrice, '희망단가', ['req', 'numDot'])) return false;
-    /*  if(!noDetect && !validation(coliform, '총대장균군수', ['req','numDot'])) return false;
-     if(!validation(residualCl, ['req', '결합잔류염소', 'numDot'])) return false;
-     if(!validation(turbidity, '탁도', ['req', 'numDot'])) return false;
-     if(!validation(bod, '생물화학적산소요구량', ['req', 'numDot'])) return false;
-     if(!validation(odor, '냄새', ['req'])) return false; */
-
-    // 필수는 아니지만 숫자로는 들어와야함.
-    /*   if(!validation(tn, '총질소', ['numDot'])) return false;
-      if(!validation(residualCl, '결합잔류염소', ['numDot'])) return false;
-      if(!validation(tp, '총인', ['numDot'])) return false;
-      if(!validation(ph.min, 'ph', ['numDot'])) return false;
-      if(!validation(ph.max, 'ph', ['numDot'])) return false;
-      if(!validation(chloride, '염화물', ['numDot'])) return false;
-      if(!validation(ec, '전기전도도', ['numDot'])) return false; */
-
-    const userStr = sessionStorage.getItem("user");
-    const user = userStr ? JSON.parse(userStr) : null;
-
-    if (user) {
-      // 후보지 목록 (candsRef에 코드까지 보관됨)
-      const splyCndtList = candsRef.current
-        .filter((x) => x.name)
-        .map((x) => ({
-          ruseUtztnFcltNm: x.name,
-          ruseUtztnFcltCd: x.code,
-        }));
-
-      const payload: SdmInfoFormData = {
-        dmndTmng: new Date(reqDate),
-        dmdInfoId: user.dmdInfoId,
-        dmndQty: Number(reqQty),
-        wntUntprc: Number(hopePrice),
-        useUsgCd: usePurpose,
-        // 수질
-        grssClfg: Number(coliform),
-        tn: Number(tn) || null,
-        combResdch: Number(residualCl) || null,
-        tph: Number(tp) || null,
-        trbt: Number(turbidity),
-        ph: ph.min || '' + ((ph.min || ph.max) ? '~' : '') + ph.max || '',
-        blgcOxygDmndQnt: Number(bod),
-        clIonQnt: Number(chloride) || null,
-        smll: odor,
-        cdtnv: Number(ec) || null,
-        crmty: Number(color) || null,
-        rmrk: remark,
-        splyCndtList, // 후보지 목록 추가
-      }
-      const success = await insertSdmInfoData(payload);
-      if (success) {
-        router.push("/apply/status");
-      }
-    }
-  }
-
-  const searchCandidate = (e: React.MouseEvent) => {
-    e.preventDefault();
-    e.stopPropagation();
-    const dmdInfoId = JSON.parse(
-      sessionStorage.getItem("user") || "{}"
-    )?.dmdInfoId?.toString();
-
-    const url = `/map/popup?dmdInfoId=${encodeURIComponent(dmdInfoId)}`;
-    const width = window.screen.availWidth;
-    const height = window.screen.availHeight;
-    const left = 0;
-    const top = 0;
-    const popupOptions = `width=${width},height=${height},left=${left},top=${top},resizable=yes,scrollbars=yes`;
-    window.open(url, "candidatePopup", popupOptions);
-  };
-
-  const getCriterionCode = (criterion: string) => {
-    switch (criterion) {
-      case "supplyAmt":
-        return "S";
-      case "money":
-        return "M";
-      case "usePurpose":
-        return "U";
-      default:
-        return "";
-    }
-  };
-
-  const searchSimilarCase = async (e: React.MouseEvent) => {
-    e.preventDefault();
-    e.stopPropagation();
-    setOpenSimilar(true);
-  };
-
-  const initQualityForm = () => {
-    setColiform("");
-    setNoDetect(false);
-    setTn("");
-    setResidualCl("");
-    setTp("");
-    setTurbidity("");
-    setPh({ min: "", max: "" });
-    setBod("");
-    setChloride("");
-    setOdor("불쾌하지 않을 것");
-    setEc("");
-    setColor("");
-    setRemark("");
-    setFarmText("이하");
-  }
-
-  const fncSetOptionValue = (e: React.ChangeEvent<HTMLSelectElement>) => {
-    const value = e.target.value;
-    initQualityForm();
-
-    switch (value) {
-      // 청소화장실용도
-      case '01':
-        setTp('0.2');
-        setTurbidity('2');
-        setPh({ min: '5.8', max: '8.5' });
-        setBod('5');
-        setColor('20');
-        break;
-      // 세척살수용도  
-      case '02':
-        setTp('0.2');
-        setTurbidity('2');
-        setPh({ min: '5.8', max: '8.5' });
-        setBod('5');
-        break;
-      // 조경용도
-      case '03':
-        setTp('0.2');
-        setTurbidity('2');
-        setPh({ min: '5.8', max: '8.5' });
-        setBod('5');
-        setChloride('250');
-        break;
-      // 지하수
-      case '05':
-        break;
-      // 농업용도
-      case '06':
-        setTurbidity('5');
-        setPh({ min: '5.8', max: '8.5' });
-        setBod('8');
-        setEc('2000');
-        setFarmText("이하 (** 간접:2000,직접:700 )");
-        break;
-      // 하천 등 유지보수
-      case '07':
-        setColiform('1000');
-        setTn('10');
-        setTp('0.5');
-        setPh({ min: '5.8', max: '8.5' });
-        setBod('5');
-        break;
-      // 공업
-      case '08':
-        setPh({ min: '5.8', max: '8.5' });
-        break;
-      default:
-        console.log('잘못된 선택입니다.');
-    }
-
-    setUsePurpose(value);
-  }
 
   return (
     <>
+    
+        <main className="bg-white">
 
-      <main className="bg-white">
+            {/* 서브 타이틀 + 브레드크럼 */}
+            <SubPageHeader
+                title="수요정보등록"
+                crumbs={[
+                { label: "Home", href: "/reuse" },
+                { label: "수요신청", href: "/reuse/apply" },
+                { label: "수요정보등록" },
+                ]}
+            />
 
-        {/* 서브 타이틀 + 브레드크럼 */}
-        <SubPageHeader
-          title="수요정보등록"
-          crumbs={[
-            { label: "Home", href: "/reuse" },
-            { label: "수요신청", href: "/reuse/apply" },
-            { label: "수요정보등록" },
-          ]}
-        />
+            {/* 컨텐츠 영역 */}
+            <div>
 
-        {/* 컨텐츠 영역 */}
-        <div>
+                {/* 기본정보 테이블 */}
+                <div className="border border-neutral-200 bg-white">
+                    <FormRow label="요구시기" required>
+                        <DateInput value={reqDate} onChange={setReqDate} />
+                    </FormRow>
 
-          {/* 기본정보 테이블 */}
-          <div className="border border-neutral-200 bg-white">
-            <FormRow label="요구시기" required>
-              <DateInput value={reqDate} onChange={setReqDate} />
-            </FormRow>
+                    <Divider />
 
-            <Divider />
+                    <FormRow label="요구수량(m²/d)" required>
+                        <TextInput value={reqQty} onChange={setReqQty} placeholder="" />
+                    </FormRow>
 
-            <FormRow label="요구수량(m²/d)" required>
-              <TextInput value={reqQty} onChange={setReqQty} placeholder="" />
-            </FormRow>
+                    <Divider />
 
-            <Divider />
+                    <FormRow label="사용용도" required>
+                        <TextInput value={usePurpose} onChange={setUsePurpose} />
+                    </FormRow>
 
-            <FormRow label="사용용도" required>
-              <select
-                value={usePurpose}
-                onChange={(e) => fncSetOptionValue(e)}
-                className="h-11 w-full max-w-[200px] rounded-md border border-neutral-300 bg-white px-3 text-sm outline-none focus:border-neutral-500"
-              >
-                <option value="">선택하세요</option>
-                {useTypesData.map((item) => (
-                  <option key={item.val} value={item.val}>
-                    {item.text}
-                  </option>
-                ))}
-              </select>
-            </FormRow>
+                    <Divider />
 
-            <Divider />
+                    <FormRow label="희망단가(원)" required>
+                        <TextInput value={hopePrice} onChange={setHopePrice} />
+                    </FormRow>
+                </div>
 
-            <FormRow label="희망단가(원)" required>
-              <TextInput value={hopePrice} onChange={setHopePrice} />
-            </FormRow>
-          </div>
+                {/* 요구수질 섹션 타이틀 바 */}
+                <div className="grid grid-cols-12">
+                    <div className="col-span-12 lg:col-span-2 inline-flex justify-center items-center gap-3 px-6 py-6 text-center">
+                        <span className="text-lg font-semibold text-neutral-800">요구수질</span>
+                        <button
+                            type="button"
+                             onClick={() => setOpenRef(true)}
+                            className="rounded border-[2px] border-[#DE3412] px-2 py-3 text-[15px] font-medium text-[#4F4F4F] hover:bg-orange-50"
+                        >
+                            수질기준 참고
+                        </button>
+                        {/* 수질기준참고 모달 */}
+                        <WaterQualityRefModal
+                            open={openRef}
+                            onClose={() => setOpenRef(false)}
+                            imageSrc="/images/landing/water_quality_ref_1.png"
+                        />
+                    </div>
+                </div>
 
-          {/* 요구수질 섹션 타이틀 바 */}
-          <div className="grid grid-cols-12">
-            <div className="col-span-12 lg:col-span-2 inline-flex justify-center items-center gap-3 px-6 py-6 text-center">
-              <span className="text-lg font-semibold text-neutral-800">요구수질</span>
-              <button
-                type="button"
-                onClick={() => setOpenRef(true)}
-                className="rounded border-[2px] border-[#DE3412] px-2 py-3 text-[15px] font-medium text-[#4F4F4F] hover:bg-orange-50"
-              >
-                수질기준 참고
-              </button>
-              {/* 수질기준참고 모달 */}
-              <WaterQualityRefModal
-                open={openRef}
-                onClose={() => setOpenRef(false)}
-                imageSrc="/images/landing/water_quality_ref_1.png"
-              />
-            </div>
-          </div>
-
-          {/* 요구수질 테이블 */}
-          <div className="border border-neutral-200 bg-white">
-            {/* 1행 */}
-            <QualityRow
-              leftLabel="총대장균군수(개/mg)"
-
-              leftControl={
-                <div className="flex items-center gap-4">
-                  <TextInput
-                    value={coliform}
-                    onChange={setColiform}
-                    disabled={noDetect}
-                    className={noDetect ? "bg-neutral-100 text-neutral-400" : ""}
-                  />
-                  <label className="flex items-center gap-2 text-sm text-neutral-700">
-                    <input
-                      type="checkbox"
-                      checked={noDetect}
-                      onChange={(e) => {
-                        setNoDetect(e.target.checked);
-                        if (e.target.checked) setColiform("");
-                      }}
-                      className="h-4 w-4 rounded border-neutral-300"
+                {/* 요구수질 테이블 */}
+                <div className="border border-neutral-200 bg-white">
+                    {/* 1행 */}
+                    <QualityRow
+                        leftLabel="총대장균군수(개/mg)"
+                        leftRequired
+                        leftControl={
+                        <div className="flex items-center gap-4">
+                            <TextInput
+                            value={coliform}
+                            onChange={setColiform}
+                            disabled={noDetect}
+                            className={noDetect ? "bg-neutral-100 text-neutral-400" : ""}
+                            />
+                            <label className="flex items-center gap-2 text-sm text-neutral-700">
+                            <input
+                                type="checkbox"
+                                checked={noDetect}
+                                onChange={(e) => {
+                                setNoDetect(e.target.checked);
+                                if (e.target.checked) setColiform("");
+                                }}
+                                className="h-4 w-4 rounded border-neutral-300"
+                            />
+                            불검출
+                            </label>
+                        </div>
+                        }
+                        rightLabel="총질소(T-N)(mg/L)"
+                        rightControl={
+                        <InlineSuffixInput value={tn} onChange={setTn} suffix="이하" />
+                        }
                     />
-                    불검출
-                  </label>
+                    <Divider />
+
+                    {/* 2행 */}
+                    <QualityRow
+                        leftLabel="결합잔류염소(mg/L)"
+                        leftRequired
+                        leftControl={<TextInput value={residualCl} onChange={setResidualCl} />}
+                        rightLabel="총인(T-P)(mg/L)"
+                        rightControl={
+                        <InlineSuffixInput value={tp} onChange={setTp} suffix="이하" />
+                        }
+                    />
+                    <Divider />
+
+                    {/* 3행 */}
+                    <QualityRow
+                        leftLabel="탁도(NTU)"
+                        leftRequired
+                        leftControl={
+                        <InlineSuffixInput value={turbidity} onChange={setTurbidity} suffix="이하" />
+                        }
+                        rightLabel="수소이온농도(pH)"
+                        rightControl={
+                        <div className="flex items-center gap-2">
+                            <TextInput
+                            value={ph.min}
+                            onChange={(v) => setPh((p) => ({ ...p, min: v }))}
+                            className="w-32"
+                            />
+                            <span className="text-neutral-500">~</span>
+                            <TextInput
+                            value={ph.max}
+                            onChange={(v) => setPh((p) => ({ ...p, max: v }))}
+                            className="w-32"
+                            />
+                        </div>
+                        }
+                    />
+                    <Divider />
+
+                    {/* 4행 */}
+                    <QualityRow
+                        leftLabel={
+                        <>
+                            생물화학적산소요구량
+                            <br />
+                            (BOD)(mg/L)
+                        </>
+                        }
+                        leftRequired
+                        leftControl={<InlineSuffixInput value={bod} onChange={setBod} suffix="이하" />}
+                        rightLabel="염화물(mgCL/L)"
+                        rightControl={<InlineSuffixInput value={chloride} onChange={setChloride} suffix="이하" />}
+                    />
+                    <Divider />
+
+                    {/* 5행 */}
+                    <QualityRow
+                        leftLabel="냄새"
+                        leftRequired
+                        leftControl={
+                        <select
+                            value={odor}
+                            onChange={(e) => setOdor(e.target.value)}
+                            className="h-11 w-full max-w-[200px] rounded-md border border-neutral-300 bg-white px-3 text-sm outline-none focus:border-neutral-500"
+                        >
+                            <option>불쾌하지 않을 것</option>
+                            <option>약간 있음</option>
+                            <option>있음</option>
+                        </select>
+                        }
+                        rightLabel="전기전도도(µs/cm)"
+                        rightControl={<InlineSuffixInput value={ec} onChange={setEc} suffix="이하" />}
+                    />
+                    <Divider />
+
+                    {/* 6행 */}
+                    <QualityRow
+                        leftLabel="색도(도)"
+                        leftRequired
+                        leftControl={<InlineSuffixInput value={color} onChange={setColor} suffix="이하" />}
+                        rightLabel="비고"
+                        rightControl={
+                        <textarea
+                            value={remark}
+                            onChange={(e) => setRemark(e.target.value)}
+                            className="h-11 w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-sm outline-none focus:border-neutral-500"
+                        />
+                        }
+                    />
+                    <Divider />
+
+                    {/* 후보지 선택 */}
+                    <div className="grid grid-cols-12">
+                        <LabelCell>
+                        공급처 후보지 선택
+                        <br />
+                        (필수아님)
+                        </LabelCell>
+
+                        <div className="col-span-12 md:col-span-10 p-6">
+                            <div className="flex flex-col gap-3 xl:flex-row xl:items-center xl:gap-4">
+                                <TextInput value={cand1} onChange={setCand1} className="max-w-[220px]" />
+                                <TextInput value={cand2} onChange={setCand2} className="max-w-[220px]" />
+                                <TextInput value={cand3} onChange={setCand3} className="max-w-[220px]" />
+
+                                <div className="flex items-center gap-3 xl:ml-2">
+                                <button
+                                    type="button"
+                                    className="h-11 rounded-md bg-[#888] px-5 text-base text-white hover:bg-neutral-700"
+                                    onClick={() => setOpenCand(true)}
+                                >
+                                    후보지 조회
+                                </button>
+                                <button
+                                    type="button"
+                                    className="h-11 rounded-md bg-[#888] px-5 text-base text-white hover:bg-neutral-600"
+                                    onClick={() => {
+                                    // TODO: 유사사례 연결
+                                    console.log("유사사례");
+                                    }}
+                                >
+                                    유사사례
+                                </button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-              }
-              rightLabel="총질소(T-N)(mg/L)"
-              rightControl={
-                <InlineSuffixInput value={tn} onChange={setTn} suffix="이하" />
-              }
-            />
-            <Divider />
 
-            {/* 2행 */}
-            <QualityRow
-              leftLabel="결합잔류염소(mg/L)"
-              /* leftRequired */
-              leftControl={<TextInput value={residualCl} onChange={setResidualCl} />}
-              rightLabel="총인(T-P)(mg/L)"
-              rightControl={
-                <InlineSuffixInput value={tp} onChange={setTp} suffix="이하" />
-              }
-            />
-            <Divider />
-
-            {/* 3행 */}
-            <QualityRow
-              leftLabel="탁도(NTU)"
-              /* leftRequired */
-              leftControl={
-                <InlineSuffixInput value={turbidity} onChange={setTurbidity} suffix="이하" />
-              }
-              rightLabel="수소이온농도(pH)"
-              rightControl={
-                <div className="flex items-center gap-2">
-                  <TextInput
-                    value={ph.min}
-                    onChange={(v) => setPh((p) => ({ ...p, min: v }))}
-                    className="w-32"
-                  />
-                  <span className="text-neutral-500">~</span>
-                  <TextInput
-                    value={ph.max}
-                    onChange={(v) => setPh((p) => ({ ...p, max: v }))}
-                    className="w-32"
-                  />
-                </div>
-              }
-            />
-            <Divider />
-
-            {/* 4행 */}
-            <QualityRow
-              leftLabel={
-                <>
-                  생물화학적산소요구량
-                  <br />
-                  (BOD)(mg/L)
-                </>
-              }
-              /* leftRequired */
-              leftControl={<InlineSuffixInput value={bod} onChange={setBod} suffix="이하" />}
-              rightLabel="염화물(mgCL/L)"
-              rightControl={<InlineSuffixInput value={chloride} onChange={setChloride} suffix="이하" />}
-            />
-            <Divider />
-
-            {/* 5행 */}
-            <QualityRow
-              leftLabel="냄새"
-              /* leftRequired */
-              leftControl={
-                <select
-                  value={odor}
-                  onChange={(e) => setOdor(e.target.value)}
-                  className="h-11 w-full max-w-[200px] rounded-md border border-neutral-300 bg-white px-3 text-sm outline-none focus:border-neutral-500"
-                >
-                  <option>불쾌하지 않을 것</option>
-                  <option>약간 있음</option>
-                  <option>있음</option>
-                </select>
-              }
-              rightLabel="전기전도도(µs/cm)"
-              rightControl={<InlineSuffixInput value={ec} onChange={setEc} suffix={farmText} />}
-            />
-            <Divider />
-
-            {/* 6행 */}
-            <QualityRow
-              leftLabel="색도(도)"
-              /* leftRequired */
-              leftControl={<InlineSuffixInput value={color} onChange={setColor} suffix="이하" />}
-              rightLabel="비고"
-              rightControl={
-                <textarea
-                  value={remark}
-                  onChange={(e) => setRemark(e.target.value)}
-                  className="h-11 w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-sm outline-none focus:border-neutral-500"
-                />
-              }
-            />
-            <Divider />
-
-            {/* 후보지 선택 */}
-            <div className="grid grid-cols-12">
-              <LabelCell>
-                공급처 후보지 선택
-                <br />
-                (필수아님)
-              </LabelCell>
-
-              <div className="col-span-12 md:col-span-10 p-6">
-                <div className="flex flex-col gap-3 xl:flex-row xl:items-center xl:gap-4">
-                  <TextInput value={cand1} onChange={setCand1} className="max-w-[220px]" />
-                  <TextInput value={cand2} onChange={setCand2} className="max-w-[220px]" />
-                  <TextInput value={cand3} onChange={setCand3} className="max-w-[220px]" />
-
-                  <div className="flex items-center gap-3 xl:ml-2">
+                {/* 하단 버튼 */}
+                <div className="flex justify-center py-12">
                     <button
-                      type="button"
-                      className="h-11 rounded-md bg-[#888] px-5 text-base text-white hover:bg-neutral-700"
-                      onClick={(e) => {
-                        searchCandidate(e);
-
-                        //splyList => 해당객체가 대민에서 선택한 후보처 리스트
-                        //setLastSub => 해당 스테이트가 선택한 마지막 후보처를 넣어야하는 스테이트
-                      }}>
-                      후보지 조회
-                    </button>
-
-                    <button
-                      type="button"
-                      className="h-11 rounded-md bg-[#888] px-5 text-base text-white hover:bg-neutral-600"
-                      onClick={(e) => {
-                        // TODO: 유사사례 연결
-                        searchSimilarCase(e);
-                      }}
+                        type="button"
+                        className="h-11 rounded-md bg-[#0B4EA2] px-10 text-lg text-white hover:opacity-90"
+                        onClick={() => {
+                        // TODO: 저장 처리
+                        console.log("수요정보 등록");
+                        }}
                     >
-                      유사사례
+                        수요정보 등록
                     </button>
-                  </div>
                 </div>
-              </div>
+
             </div>
-          </div>
+        </main>
 
-          {/* 하단 버튼 */}
-          <div className="flex justify-center py-12">
-            <button
-              type="button"
-              className="h-11 rounded-md bg-[#0B4EA2] px-10 text-lg text-white hover:opacity-90"
-              onClick={() => {
-                // TODO: 저장 처리
-                saveInfo();
-              }}
-            >
-              수요정보 등록
-            </button>
-          </div>
-        </div>
-      </main>
+        <CandidateSiteModal
+            open={openCand}
+            onClose={() => setOpenCand(false)}
+            initialSelected={selectedCands}
+            onApply={(list) => {
+                setSelectedCands(list);
 
-      <SimilarCaseModal
-        open={openSimilar}
-        onClose={() => setOpenSimilar(false)}
-        rows={rows} // 실제 데이터
-        detailsByCaseId={detailsByCaseId}
-        onSearch={async (criterion) => {
-          const code = getCriterionCode(criterion);
-          if (!code) return;
-          // 값은 상황에 맞게 (예시: usePurpose)
-          console.log(code+' req: '+reqQty+' purpose :'+usePurpose);
-          await getSimilarCaseList(code, code == 'S' ? reqQty : code == 'U' ? usePurpose : '');
-        }}
-      />
+                // ✅ cand1~3 입력칸에 반영(시설명만 넣는 버전)
+                setCand1(list[0]?.name ?? "");
+                setCand2(list[1]?.name ?? "");
+                setCand3(list[2]?.name ?? "");
 
-      <CandidateSiteModal
-        open={openCand}
-        onClose={() => setOpenCand(false)}
-        initialSelected={selectedCands}
-        onApply={(list) => {
-          setSelectedCands(list);
-
-          // ✅ cand1~3 입력칸에 반영(시설명만 넣는 버전)
-          setCand1(list[0]?.name ?? "");
-          setCand2(list[1]?.name ?? "");
-          setCand3(list[2]?.name ?? "");
-
-          setOpenCand(false);
-        }}
-      />
+                setOpenCand(false);
+            }}
+        />
     </>
   );
 }
@@ -843,7 +448,7 @@ function DateInput({
   value: string;
   onChange: (v: string) => void;
 }) {
-
+  
   const ref = useRef<HTMLInputElement | null>(null);
 
   const openPicker = () => {
@@ -887,7 +492,7 @@ function DateInput({
         aria-label="달력 열기"
       >
         <svg width="18" height="18" viewBox="0 0 24 24" fill="none" aria-hidden="true">
-          <path d="M7.14286 7.99104H16.7812M6.48512 2.5625V4.19126M17.3125 2.5625V4.19106M20.5 7.19106L20.5 18.5625C20.5 20.2194 19.1569 21.5625 17.5 21.5625H6.5C4.84315 21.5625 3.5 20.2194 3.5 18.5625V7.19106C3.5 5.53421 4.84315 4.19106 6.5 4.19106H17.5C19.1569 4.19106 20.5 5.53421 20.5 7.19106Z" stroke="#1A1A1A" strokeWidth={2} strokeLinecap="round" strokeLinejoin="round" />
+            <path d="M7.14286 7.99104H16.7812M6.48512 2.5625V4.19126M17.3125 2.5625V4.19106M20.5 7.19106L20.5 18.5625C20.5 20.2194 19.1569 21.5625 17.5 21.5625H6.5C4.84315 21.5625 3.5 20.2194 3.5 18.5625V7.19106C3.5 5.53421 4.84315 4.19106 6.5 4.19106H17.5C19.1569 4.19106 20.5 5.53421 20.5 7.19106Z" stroke="#1A1A1A" strokeWidth={2} strokeLinecap="round" strokeLinejoin="round" />
         </svg>
       </button>
     </div>

apps/dm_new/app/(with-layout)/apply/status/page.tsx

@@ -1,12 +1,12 @@
 "use client";
 
+import { useEffect, useMemo, useRef, useState } from "react";
+import SubPageHeader from "@/components/SubPageHeader";
 import { useDmStore } from "@/app/store";
 import type { DemandCompBizType } from "@/app/store/sdmMng";
-import SubPageHeader from "@/components/SubPageHeader";
-import { useEffect, useMemo, useRef, useState } from "react";
 
-type TopField = { label: string; key: string, value: string; required?: boolean };
-type PairField = { label: string; key: string, value: string };
+type TopField = { label: string; value: string; required?: boolean };
+type PairField = { label: string; value: string };
 type SessionUser = { dmdInfoId?: string };
 
 const formatDate = (value: string | Date | "" | undefined) => {
@@ -35,95 +35,8 @@ function StatusBadge({ v }: { v: string }) {
   return <span className={["font-medium", cls].join(" ")}>{v || "-"}</span>;
 }
 
-function TextInput({
-  value,
-  onChange,
-  placeholder,
-  disabled,
-  className,
-}: {
-  value: string;
-  onChange: (v: string) => void;
-  placeholder?: string;
-  disabled?: boolean;
-  className?: string;
-}) {
-  return (
-    <input
-      value={value}
-      onChange={(e) => onChange(e.target.value)}
-      placeholder={placeholder}
-      disabled={disabled}
-      className={[
-        "h-11 w-full max-w-[200px] rounded-md border border-neutral-300 bg-white px-3 text-sm outline-none",
-        "focus:border-neutral-500",
-        disabled ? "cursor-not-allowed" : "",
-        className ?? "",
-      ].join(" ")}
-    />
-  );
-}
-
-function DateInput({
-  value,
-  onChange,
-}: {
-  value: string;
-  onChange: (v: string) => void;
-}) {
-  
-  const ref = useRef<HTMLInputElement | null>(null);
-
-  const openPicker = () => {
-    const el = ref.current;
-    if (!el) return;
-
-    // Chrome/Edge 등 지원
-    if (typeof (el as any).showPicker === "function") {
-      (el as any).showPicker();
-      return;
-    }
-
-    // fallback (일부 브라우저)
-    el.focus();
-    el.click();
-  };
-  return (
-    <div className="relative w-full max-w-[200px]">
-      <input
-        ref={ref}
-        type="date"
-        value={value}
-        onChange={(e) => onChange(e.target.value)}
-        className={[
-          "h-11 w-full rounded-md border border-neutral-300 bg-white px-3 pr-10 text-sm outline-none focus:border-neutral-500",
-          // ✅ 기본 달력 아이콘 숨김 (Tailwind arbitrary selector)
-          "[&::-webkit-calendar-picker-indicator]:opacity-0",
-          "[&::-webkit-calendar-picker-indicator]:absolute",
-          "[&::-webkit-calendar-picker-indicator]:right-0",
-          "[&::-webkit-calendar-picker-indicator]:w-10",
-          "[&::-webkit-calendar-picker-indicator]:h-full",
-          "[&::-webkit-calendar-picker-indicator]:cursor-pointer",
-        ].join(" ")}
-      />
-
-      {/* ✅ 클릭 가능한 아이콘 버튼 */}
-      <button
-        type="button"
-        onClick={openPicker}
-        className="absolute right-2 top-1/2 -translate-y-1/2 p-1 text-neutral-500 hover:text-neutral-700"
-        aria-label="달력 열기"
-      >
-        <svg width="18" height="18" viewBox="0 0 24 24" fill="none" aria-hidden="true">
-            <path d="M7.14286 7.99104H16.7812M6.48512 2.5625V4.19126M17.3125 2.5625V4.19106M20.5 7.19106L20.5 18.5625C20.5 20.2194 19.1569 21.5625 17.5 21.5625H6.5C4.84315 21.5625 3.5 20.2194 3.5 18.5625V7.19106C3.5 5.53421 4.84315 4.19106 6.5 4.19106H17.5C19.1569 4.19106 20.5 5.53421 20.5 7.19106Z" stroke="#1A1A1A" strokeWidth={2} strokeLinecap="round" strokeLinejoin="round" />
-        </svg>
-      </button>
-    </div>
-  );
-}
-
 export default function DemandStatusPage() {
-  const { getSdmInfoStatusList, updateSdmInfoData, Sdm, Common } = useDmStore((state) => state);
+  const { getSdmInfoStatusList, Sdm, Common } = useDmStore((state) => state);
   const { successLogin, sdmInfoStatusList } = Sdm;
   const { selectSidoData, selectSigunData } = Common;
 
@@ -133,16 +46,6 @@ export default function DemandStatusPage() {
   const [selectedDmdInfoSn, setSelectedDmdInfoSn] = useState<number | "" | null>(null);
   const [transformedSdmInfoStatusList, setTransformedSdmInfoStatusList] = useState<DemandCompBizType[]>([]);
 
-  // 수정 유무
-  const [ isEditMode, setIsEditMode ] = useState(false);
-  // 수정용 (UI에서 바뀌는 값)
-  const [editData, setEditData] = useState<any>(null);
-  // 원본 백업 (취소용)
-  const [originData, setOriginData] = useState<any>(null);
-  // 사용용도
-  const useTypesData = useDmStore((state) => state.Sdm.useTypesData);
-  const getUseTypesData = useDmStore((state) => state.getUseTypesData);
-
   useEffect(() => {
     const user = sessionStorage.getItem("user");
     if (user) {
@@ -150,10 +53,6 @@ export default function DemandStatusPage() {
     }
   }, []);
 
-  useEffect(() => {
-    getUseTypesData();
-  }, [getUseTypesData]);
-
   useEffect(() => {
     if (!successLogin && !isLoginStorageInfo) return;
 
@@ -213,10 +112,10 @@ export default function DemandStatusPage() {
     if (!selectedSdmInfoStatus) return [];
 
     return [
-      { label: "요구시기", key: "dmndTmng", value: formatDate(selectedSdmInfoStatus.dmndTmng), required: true },
-      { label: "요구수량(㎥/d)", key: "dmndQty", value: formatValue(selectedSdmInfoStatus.dmndQty) },
-      { label: "사용용도", key: "useUsgCd",  value: formatValue(selectedSdmInfoStatus.useUsgCd) },
-      { label: "희망단가(원/㎥)", key: "wntUntprc", value: formatValue(selectedSdmInfoStatus.wntUntprc) },
+      { label: "요구시기", value: formatDate(selectedSdmInfoStatus.dmndTmng), required: true },
+      { label: "요구수량(㎥/d)", value: formatValue(selectedSdmInfoStatus.dmndQty) },
+      { label: "사용용도", value: formatValue(selectedSdmInfoStatus.useUsgCd) },
+      { label: "희망단가(원/㎥)", value: formatValue(selectedSdmInfoStatus.wntUntprc) },
     ];
   }, [selectedSdmInfoStatus]);
 
@@ -224,110 +123,41 @@ export default function DemandStatusPage() {
     if (!selectedSdmInfoStatus) return [];
 
     return [
-      { label: "총대장균군수(개/100mL)", key: "grssClfg", value: formatBelow(selectedSdmInfoStatus.grssClfg) },
-      { label: "결합잔류염소(mg/L)", key:"combResdch", value: formatBelow(selectedSdmInfoStatus.combResdch) },
-      { label: "탁도(NTU)", key:"trbt", value: formatBelow(selectedSdmInfoStatus.trbt) },
+      { label: "총대장균군수(개/100mL)", value: formatBelow(selectedSdmInfoStatus.grssClfg) },
+      { label: "결합잔류염소(mg/L)", value: formatBelow(selectedSdmInfoStatus.combResdch) },
+      { label: "탁도(NTU)", value: formatBelow(selectedSdmInfoStatus.trbt) },
 
-      { label: "생물학적산소요구량(BOD)(mg/L)", key:"blgcOxygDmndQnt", value: formatBelow(selectedSdmInfoStatus.blgcOxygDmndQnt) },
-      { label: "냄새", key:"smll", value: formatValue(selectedSdmInfoStatus.smll) },
-      { label: "색도(도)", key:"crmty", value: formatBelow(selectedSdmInfoStatus.crmty) },
+      { label: "생물학적산소요구량(BOD)(mg/L)", value: formatBelow(selectedSdmInfoStatus.blgcOxygDmndQnt) },
+      { label: "냄새", value: formatValue(selectedSdmInfoStatus.smll) },
+      { label: "색도(도)", value: formatBelow(selectedSdmInfoStatus.crmty) },
 
-      { label: "총질소(T-N)(mg/L)", key:"tn", value: formatBelow(selectedSdmInfoStatus.tn) },
-      { label: "총인(T-P)(mg/L)", key:"tph", value: formatBelow(selectedSdmInfoStatus.tph) },
-      { label: "수소이온농도(pH)", key:"ph", value: formatValue(selectedSdmInfoStatus.ph) },
+      { label: "총질소(T-N)(mg/L)", value: formatBelow(selectedSdmInfoStatus.tn) },
+      { label: "총인(T-P)(mg/L)", value: formatBelow(selectedSdmInfoStatus.tph) },
+      { label: "수소이온농도(pH)", value: formatValue(selectedSdmInfoStatus.ph) },
 
-      { label: "염화물(mgCL/L)", key:"clIonQnt", value: formatBelow(selectedSdmInfoStatus.clIonQnt) },
-      { label: "전기전도도(μS/cm)", key:"cdtnv", value: formatBelow(selectedSdmInfoStatus.cdtnv) },
-      { label: "비고", key:"rmrk", value: formatValue(selectedSdmInfoStatus.rmrk) },
+      { label: "염화물(mgCL/L)", value: formatBelow(selectedSdmInfoStatus.clIonQnt) },
+      { label: "전기전도도(μS/cm)", value: formatBelow(selectedSdmInfoStatus.cdtnv) },
+      { label: "비고", value: formatValue(selectedSdmInfoStatus.rmrk) },
     ];
   }, [selectedSdmInfoStatus]);
 
   const candidateNames = useMemo(() => {
-    const list = isEditMode
-    ? editData?.splyCndtList ?? []
-    : selectedSdmInfoStatus?.splyCndtList ?? [];
+    const list = selectedSdmInfoStatus?.splyCndtList ?? [];
     return [
       list[0]?.ruseUtztnFcltNm ?? "",
       list[1]?.ruseUtztnFcltNm ?? "",
       list[2]?.ruseUtztnFcltNm ?? "",
     ];
-  }, [isEditMode, editData, selectedSdmInfoStatus]);
+  }, [selectedSdmInfoStatus]);
 
   const onSelectSdmInfoStatus = (dmdInfoSn: number | "") => {
-    if(isEditMode){
-      if(confirm('저장되지 않은 데이터는 사라집니다.\n진행하시겠습니까?')){
-        setIsEditMode(false);
-      }
-    }
     setSelectedDmdInfoSn(dmdInfoSn);
     requestAnimationFrame(() => {
       detailRef.current?.scrollIntoView({ behavior: "smooth", block: "start" });
     });
   };
 
-  // ph 전후로 나눔
-  const getRange = (val: string) => {
-    const a = val.split('~')[0]||''; const b = val.split('~')[1]||'';
-    return { a, b };
-  };
-
-  const searchCandidate = (e: React.MouseEvent) => {
-    e.preventDefault();
-    e.stopPropagation();
-    const dmdInfoId = JSON.parse(
-      sessionStorage.getItem("user") || "{}"
-    )?.dmdInfoId?.toString();
-
-    const url = `/map/popup?dmdInfoId=${encodeURIComponent(dmdInfoId)}`;
-    const width = window.screen.availWidth;
-    const height = window.screen.availHeight;
-    const left = 0;
-    const top = 0;
-    const popupOptions = `width=${width},height=${height},left=${left},top=${top},resizable=yes,scrollbars=yes`;
-    window.open(url, "candidatePopup", popupOptions);
-  };
-
-  const saveInfo = () => {
-    if(confirm('수정된 데이터를 저장하시겠습니까?')){
-      const payload = {
-        ...editData,
-        splyCndtList : editData.splyCndtList ?? []
-      };
-      
-      updateSdmInfoData(payload).then((res) => {
-        if (res) {
-          const user = JSON.parse(sessionStorage.getItem("user") || "{}");
-          if (user?.dmdInfoId) {
-            getSdmInfoStatusList(user.dmdInfoId);
-          }
-          setIsEditMode(false);
-        }
-      });
-    }
-  }
-
-  useEffect(() => {
-    const handler = (event: MessageEvent) => {
-      if (!event.data) return;
-
-      if (event.data.type === "SET_SUBS_INFO") {
-        const list = event.data.payload || [];
-        setEditData((prev) => ({
-          ...prev,
-          splyCndtList: list,
-        }));
-      }
-    };
-
-    window.addEventListener("message", handler);
-
-    return () => {
-      window.removeEventListener("message", handler);
-    };
-  }, []);
-
   return (
-    
     <main className="bg-white">
       <SubPageHeader
         title="수요신청현황"
@@ -354,9 +184,7 @@ export default function DemandStatusPage() {
                   <th className="w-[180px] px-3 py-3 text-center">회사명</th>
                   <th className="px-3 py-3 text-center">공장주소</th>
                   <th className="w-[140px] px-3 py-3 text-center">전화번호</th>
-                  <th className="w-[120px] px-3 py-3 text-center">요구시기</th>
-                  <th className="w-[120px] px-3 py-3 text-center">등록일자</th>
-                  <th className="w-[120px] px-3 py-3 text-center">수정일자</th>
+                  <th className="w-[120px] px-3 py-3 text-center">신청일자</th>
                   <th className="w-[110px] px-3 py-3 text-center">진행상태</th>
                 </tr>
               </thead>
@@ -380,7 +208,7 @@ export default function DemandStatusPage() {
                         onKeyDown={(e) => {
                           if (e.key === "Enter" || e.key === " ") {
                             onSelectSdmInfoStatus(sdmInfoStatus.dmdInfoSn);
-                          } 
+                          }
                         }}
                         className={[
                           "border-t border-neutral-200 outline-none",
@@ -397,8 +225,6 @@ export default function DemandStatusPage() {
                         <td className="px-3 py-3 text-center">{formatValue(sdmInfoStatus.daddr)}</td>
                         <td className="px-3 py-3 text-center">{formatValue(sdmInfoStatus.telno)}</td>
                         <td className="px-3 py-3 text-center">{formatDate(sdmInfoStatus.dmndTmng)}</td>
-                        <td className="px-3 py-3 text-center">{formatDate(sdmInfoStatus.regDt)}</td>
-                        <td className="px-3 py-3 text-center">{formatDate(sdmInfoStatus.mdfcnDt)}</td>
                         <td className="px-3 py-3 text-center">
                           <StatusBadge v={formatValue(sdmInfoStatus.status)} />
                         </td>
@@ -414,43 +240,12 @@ export default function DemandStatusPage() {
         <section className="mt-10 pb-16" ref={detailRef}>
           <div className="flex justify-between items-center">
             <div className="text-2xl font-bold text-slate-700">수요신청 상세현황</div>
-            {
-              !isEditMode ? (
-                <button
-                  type="button"
-                  className="h-8 rounded-md bg-[#888] px-4 text-base text-white hover:bg-neutral-700"
-                  onClick={() => {
-                    setOriginData(selectedSdmInfoStatus);
-                    setEditData({...selectedSdmInfoStatus});
-                    setIsEditMode(true)}
-                  }
-                >
-                  수정
-                </button>
-            ) : ( 
-               <div className="flex gap-2">
-                <button
-                  type="button"
-                  className="h-8 rounded-md bg-[#888] px-4 text-base text-white hover:bg-neutral-700"
-                  onClick={() => {
-                    saveInfo();
-                  }}
-                >
-                  저장
-                </button>
-                <button
-                  type="button"
-                  className="h-8 rounded-md bg-[#888] px-4 text-base text-white hover:bg-neutral-700"
-                  onClick={() => {
-                    setEditData(originData);
-                    setIsEditMode(false)
-                  }}
-                >
-                  취소
-                </button>
-              </div>
-            )
-          }
+            <button
+              type="button"
+              className="h-8 rounded-md bg-[#888] px-4 text-base text-white hover:bg-neutral-700"
+            >
+              수정
+            </button>
           </div>
 
           {!selectedSdmInfoStatus ? (
@@ -473,47 +268,9 @@ export default function DemandStatusPage() {
                       {field.label}
                       {field.required ? <span className="ml-1 text-red-500">*</span> : null}
                     </div>
-                    {
-                      !isEditMode ?
-                        <div className="col-span-8 px-4 py-4 flex items-center justify-center text-center">
-                          {field.key==='useUsgCd'? useTypesData.filter(item=>item.val===field.value)[0]?.text: field.value}
-                        </div>
-                      : <div className="col-span-8 px-4 py-4 flex items-center justify-center text-center">
-                          {field.key ==='dmndTmng'?
-                          <DateInput value={editData?.[field.key] ?? ""} onChange={(v) =>
-                              setEditData((prev) => ({
-                                ...prev,
-                                [field.key]: v,
-                              }))
-                            } />
-                          : field.key ==='useUsgCd'?
-                          <select
-                            value={editData?.[field.key] ?? ""}
-                            onChange={(e) =>
-                              setEditData((prev) => ({
-                                ...prev,
-                                [field.key]: e.target.value,
-                              }))
-                            }
-                            className="h-11 w-full max-w-[200px] rounded-md border border-neutral-300 bg-white px-3 text-sm outline-none focus:border-neutral-500"
-                          >
-                            <option value="">선택하세요</option>
-                              {useTypesData.map((item) => (
-                                <option key={item.val} value={item.val}>
-                                  {item.text}
-                                </option>
-                              ))}
-                          </select>
-
-                          : <TextInput value={editData?.[field.key] ?? ""} onChange={(v) =>
-                              setEditData((prev) => ({
-                                ...prev,
-                                [field.key]: v,
-                              }))
-                            }></TextInput> 
-                          }
-                        </div>
-                    }
+                    <div className="col-span-8 px-4 py-4 flex items-center justify-center text-center">
+                      {field.value}
+                    </div>
                   </div>
                 ))}
 
@@ -521,169 +278,25 @@ export default function DemandStatusPage() {
                   요구수질
                 </div>
 
-                {waterFields.map((field) => {
-                  const { a, b } = editData?.ph ? getRange(editData.ph) : { a: "", b: "" };
-                  return (
+                {waterFields.map((field) => (
                   <div
-                  key={field.label}
-                  className="col-span-12 md:col-span-4 grid grid-cols-12 border-b border-neutral-200"
+                    key={field.label}
+                    className="col-span-12 md:col-span-4 grid grid-cols-12 border-b border-neutral-200"
                   >
                     <div className="col-span-5 bg-sky-50 px-3 py-4 flex items-center justify-center text-center font-semibold text-slate-700">
                       {field.label}
                     </div>
                     <div className="col-span-7 px-3 py-4 flex items-center justify-center text-center">
-                      {
-                        !isEditMode ? field.value 
-                        :
-                          field.key === "grssClfg" ? (
-                            <div className="flex items-center gap-4">
-                              <TextInput
-                                value={
-                                  editData?.grssClfg === -1
-                                    ? ""
-                                    : editData?.grssClfg ?? ""
-                                }
-                                onChange={(v) =>
-                                  setEditData((prev) => ({
-                                    ...prev,
-                                    grssClfg: v,
-                                  }))
-                                }
-                                disabled={editData?.grssClfg === -1}
-                                className={
-                                  editData?.grssClfg === -1
-                                    ? "bg-neutral-100 text-neutral-400"
-                                    : ""
-                                }
-                              />
-                              <label className="flex items-center gap-2 w-3/4 text-sm text-neutral-700">
-                                <input
-                                  type="checkbox"
-                                  checked={editData?.grssClfg === -1}
-                                  onChange={(e) => {
-                                    const checked = e.target.checked;
-
-                                    setEditData((prev) => ({
-                                      ...prev,
-                                      grssClfg: checked ? -1 : "",
-                                    }));
-                                  }}
-                                  className="h-4 w-4 rounded border-neutral-300"
-                                />
-                                불검출
-                              </label>
-                            </div>
-                          ) : field.key === 'smll' ? (
-                            <select
-                              value={
-                                  editData?.smll === -1
-                                    ? ""
-                                    : editData?.smll ?? ""
-                                }
-                              onChange={(v) =>
-                                  setEditData((prev) => ({
-                                    ...prev,
-                                    grssClfg: v,
-                                  }))
-                                }
-                              className="h-11 w-full max-w-[200px] rounded-md border border-neutral-300 bg-white px-3 text-sm outline-none focus:border-neutral-500">
-                              <option>불쾌하지 않을 것</option>
-                              <option>약간 있음</option>
-                              <option>있음</option>
-                          </select>
-                          ) : field.key === 'ph' ? (
-                            <>
-                              <TextInput
-                                value={a}
-                                onChange={(v) =>
-                                  setEditData((prev) => ({
-                                    ...prev,
-                                    [field.key]: `${v}~${b}`,
-                                  }))
-                                }
-                              />
-                              ~
-                              <TextInput
-                                value={b}
-                                onChange={(v) =>
-                                  setEditData((prev) => ({
-                                    ...prev,
-                                    [field.key]: `${a}~${v}`,
-                                  }))
-                                }
-                              />
-                            </>
-                          ) : (
-                            <>
-                              <TextInput
-                                value={editData?.[field.key] ?? ""}
-                                onChange={(v) =>
-                                  setEditData((prev) => ({
-                                    ...prev,
-                                    [field.key]: v,
-                                  }))
-                                }
-                              />
-                            {
-                              field.key==='tn'||field.key === 'tph'||field.key === 'trbt'||field.key==='blgcOxygDmndQnt'||field.key==='clIonQnt'||field.key==='cdtnv'|| field.key=='crmty'
-                              ?<>이하</>:<></>
-                            }
-                            </>
-                          )
-                        }
+                      {field.value}
                     </div>
                   </div>
-                )})}
+                ))}
 
                 <div className="col-span-12 bg-sky-50 px-4 py-3 text-sm font-semibold text-slate-700 border-b border-neutral-200">
                   공급처 후보지
-                  {
-                    isEditMode &&
-                    <button
-                      type="button"
-                      className="h-8 w-25 ml-12 rounded-md bg-[#888] px-2 text-base text-white hover:bg-neutral-700"
-                      onClick={(e) => {
-                        searchCandidate(e);
-
-                        //splyList => 해당객체가 대민에서 선택한 후보처 리스트
-                        //setLastSub => 해당 스테이트가 선택한 마지막 후보처를 넣어야하는 스테이트
-                      }}>
-                      후보지 조회
-                    </button>
-                  }
-
                 </div>
 
                 {candidateNames.map((candidateName, index) => (
-                  isEditMode ? (
-                    <div
-                      key={`candidate-${index}`}
-                      className="col-span-12 md:col-span-4 grid grid-cols-12 border-b md:border-b-0 border-neutral-200"
-                    >
-                      <div className="col-span-5 bg-sky-50 px-3 py-4 flex items-center justify-center text-center font-semibold text-slate-700">
-                        후보지{index + 1}
-                      </div>
-                      <div className="col-span-7 px-3 py-4 flex items-center justify-center text-center">
-                        <TextInput
-                          value={candidateName}
-                          disabled={true}
-                          onChange={(v) => {
-                            setEditData((prev) => {
-                              const newList = [...(prev.splyCndtList || [])];
-                              newList[index] = {
-                                ...newList[index],
-                                ruseUtztnFcltNm: v,
-                              };
-                              return {
-                                ...prev,
-                                splyCndtList: newList,
-                              };
-                            });
-                          }}
-                        />
-                      </div>
-                    </div>
-                  ) :
                   <div
                     key={`candidate-${index}`}
                     className="col-span-12 md:col-span-4 grid grid-cols-12 border-b md:border-b-0 border-neutral-200"

apps/dm_new/app/commonOrigin.css

@@ -1,82 +0,0 @@
-@import "../../../packages/common/components/src/base.css";
-
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-@layer base {
-  :root {
-    --background: 0 0% 100%;
-    --foreground: 0 0% 3.9%;
-    --card: 0 0% 100%;
-    --card-foreground: 0 0% 3.9%;
-    --popover: 0 0% 100%;
-    --popover-foreground: 0 0% 3.9%;
-    --primary: 0 0% 9%;
-    --primary-foreground: 0 0% 98%;
-    --secondary: 0 0% 96.1%;
-    --secondary-foreground: 0 0% 9%;
-    --muted: 0 0% 96.1%;
-    --muted-foreground: 0 0% 45.1%;
-    --accent: 0 0% 96.1%;
-    --accent-foreground: 0 0% 9%;
-    --destructive: 0 84.2% 60.2%;
-    --destructive-foreground: 0 0% 98%;
-    --border: 0 0% 89.8%;
-    --input: 0 0% 89.8%;
-    --ring: 0 0% 3.9%;
-    --chart-1: 12 76% 61%;
-    --chart-2: 173 58% 39%;
-    --chart-3: 197 37% 24%;
-    --chart-4: 43 74% 66%;
-    --chart-5: 27 87% 67%;
-    --radius: 0.5rem
-  }
-  .dark {
-    --background: 0 0% 3.9%;
-    --foreground: 0 0% 98%;
-    --card: 0 0% 3.9%;
-    --card-foreground: 0 0% 98%;
-    --popover: 0 0% 3.9%;
-    --popover-foreground: 0 0% 98%;
-    --primary: 0 0% 98%;
-    --primary-foreground: 0 0% 9%;
-    --secondary: 0 0% 14.9%;
-    --secondary-foreground: 0 0% 98%;
-    --muted: 0 0% 14.9%;
-    --muted-foreground: 0 0% 63.9%;
-    --accent: 0 0% 14.9%;
-    --accent-foreground: 0 0% 98%;
-    --destructive: 0 62.8% 30.6%;
-    --destructive-foreground: 0 0% 98%;
-    --border: 0 0% 14.9%;
-    --input: 0 0% 14.9%;
-    --ring: 0 0% 83.1%;
-    --chart-1: 220 70% 50%;
-    --chart-2: 160 60% 45%;
-    --chart-3: 30 80% 55%;
-    --chart-4: 280 65% 60%;
-    --chart-5: 340 75% 55%
-  }
-}
-
-@layer base {
-  * {
-    @apply border-border;
-  }
-  body {
-    @apply bg-background text-foreground;
-  }
-}
-
-@font-face {
-  font-family: "NotoSansKR";
-  src: url("/fonts/NotoSansKR-Regular.woff2") format("woff2");
-  font-weight: 400;
-  font-style: normal;
-  font-display: swap;
-}
-
-body {
-  font-family: "NotoSansKR", sans-serif;
-}

apps/dm_new/app/store/sdmMng/index.tsx

@@ -1,4 +1,4 @@
-import { fetchType, getFetch, postFetch, getFetchWithCount } from "@/components/ui/api";
+import { fetchType, getFetch, postFetch } from "@/components/ui/api";
 import type { SelectDataType } from "@common/business_components/ui";
 import type { TableUpperProps } from "../common";
 import toast from "react-hot-toast";
@@ -10,27 +10,34 @@ import { z } from "zod";
 =====================================*/
 
 export const sdmInfoFormSchema = z.object({
-  dmdInfoId: z.string().optional(),
-  dmndTmng: z.date().optional(),
-  dmndQty: z.number().min(1, "요구수량을 입력해주세요"),
-  wntUntprc: z.number().min(1, "희망단가를 입력해주세요"),
-  useUsgCd: z.string().min(1, "사용용도를 선택해주세요"),
-  /** 수질 */
+  sdmNm: z.string().min(1, "수요처를 선택해주세요"),
+  demandYmd: z.date().optional(),
+  demandQnty: z
+    .string()
+    .min(1, "요구수량을 입력해주세요")
+    .regex(/^[0-9]+$/, "요구수량은 숫자만 입력 가능합니다"),
+  usePurpose: z.string().optional(),
+  money: z.string().regex(/^[0-9]+$/, "희망단가는 숫자만 입력 가능합니다"),
+  /**요구수질 */
+  reqWaterQlty: z.string().optional(),
   grssClfg: z.number().nullish(),
   tn: z.number().nullish(),
   combResdch: z.number().nullish(),
   tph: z.number().nullish(),
   trbt: z.number().nullish(),
   ph: z.string().nullish(),
-  blgcOxygDmndQnt: z.number().nullish(),
+  bod: z.number().nullish(),
+  /**컬럼확인필요 */
   clIonQnt: z.number().nullish(),
   smll: z.string(),
   cdtnv: z.number().nullish(),
   crmty: z.number().nullish(),
-
   rmrk: z.string().optional(),
-
-  splyCndtList: z
+  /* telno: z.string()
+    .min(8, "전화번호는 8자 이상 입력해주세요")
+    .max(12, "전화번호는 12자 이내로 입력해주세요")
+    .regex(/^[0-9-]+$/, "전화번호는 숫자와 하이픈(-)만 입력 가능합니다"), */
+  candidateTitle: z
     .array(
       z.object({
         ruseUtztnFcltNm: z.string(),
@@ -38,6 +45,58 @@ export const sdmInfoFormSchema = z.object({
       })
     )
     .optional(),
+}).superRefine((data, ctx) => {
+  const disabledFields = disableRules[data.usePurpose ?? ""] || [];
+  // 모든 수질 관련 필드
+  // 총대장균군수는 null 값을 불검출로 표시하기때문에 해당 검사에서 제외함.
+  const allFields: (keyof typeof data)[] = [
+    "tn", "combResdch", "tph",
+    "trbt", "ph", "bod", "clIonQnt",
+    "smll", "cdtnv", "crmty",
+  ];
+
+  const allFieldsName: Record<string, string> = {
+    tn: "총질소(T-N)(mg/L)",
+    combResdch: "결합잔류염소(mg/L)",
+    tph: "총인(T-P)(mg/L)",
+    trbt: "탁도(NTU)",
+    ph: "수소이온농도(pH)",
+    bod: "생물학적 산소요구량(BOD)(mg/L)",
+    clIonQnt: "염화물(mgCL/L)",
+    smll: "냄새",
+    cdtnv: "전기전도도(㎲/cm)",
+    crmty: "색도(도)",
+  };
+  allFields.forEach((field) => {
+    const isDisabled = disabledFields.includes(field);
+    if (!isDisabled) {
+      // disabled가 아닌 필드는 반드시 값이 있어야 함
+      const value = data[field];
+      if (typeof value === "string") {
+        if (value.trim().length === 0) {
+          ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: [field],
+            message: `${allFieldsName[field]} 을 입력해주세요.`,
+          });
+        }
+      } else if (typeof value === "number") {
+        if (value <= 0 || Number.isNaN(value)) {
+          ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: [field],
+            message: `${allFieldsName[field]} 을 입력해주세요.`,
+          });
+        }
+      } else if (value == null) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          path: [field],
+          message: `${allFieldsName[field]}  을 입력해주세요.`,
+        });
+      }
+    }
+  });
 });
 
 export type SdmInfoFormData = z.infer<typeof sdmInfoFormSchema>;
@@ -77,9 +136,8 @@ export type DemandCompBizType = {
   dmdInfoSn: number | '';
   status: string | '';
   splyCndtList: SupplyCandidate[] | [],
-  ruseUtztnFcltNm?: string | '';
-  regDt: string | '';
-  mdfcnDt : string | '';
+  ruseUtztnFcltNm?: string | ''
+
 }
 
 // 공급 후보자 타입 정의
@@ -336,7 +394,7 @@ const defaultRules: Record<string, object> = {
 
 // 사용용도
 const useTypesData: SelectDataType[] = [
-/*   { text: '청소', val: "청소" },
+  { text: '청소', val: "청소" },
   { text: "화장실용수", val: "화장실용수" },
   { text: "세척", val: "세척" },
   { text: "살수", val: "살수" },
@@ -344,7 +402,7 @@ const useTypesData: SelectDataType[] = [
   { text: "농업_간접용수", val: "농업_간접용수" },
   { text: "농업_직접용수", val: "농업_직접용수" },
   { text: "하천", val: "하천" },
-  { text: "공업", val: "공업" }, */
+  { text: "공업", val: "공업" },
 ];
 
 // 유사사례 모달 헤더
@@ -455,28 +513,13 @@ const postSdmData = async (data: DemandCompType) => {
 }
 
 // 수요정보 등록
-const postSdmInfoData = async (data: SdmInfoFormData): Promise<boolean> => {
+const postSdmInfoData = async (data: DemandCompBizType) => {
   try {
     await postFetch("/reuseFc/request/demandInfo", data);
-    alert('수요 정보 등록에 성공하였습니다.');
-    return true;
+    toast.success('수요 정보 등록에 성공하였습니다.');
   } catch (error) {
     console.log(error);
-    alert('수요 정보 등록에 실패하였습니다.');
-    return false;
-  }
-}
-
-// 수요정보 수정
-const fetchUpdateSdmInfoData = async (data: SdmInfoFormData): Promise<boolean> => {
-  try {
-    await postFetch("/reuseFc/request/updateDemandInfo", data);
-    alert('수요 정보 수정에 성공하였습니다.');
-    return true;
-  } catch (error) {
-    console.log(error);
-    alert('수요 정보 수정에 실패하였습니다.');
-    return false;
+    toast.error('수요 정보 등록에 실패하였습니다.');
   }
 }
 
@@ -552,15 +595,12 @@ const fetchGetSimilarCaseList = async (part: string, value: number | string) =>
 export type SdmActions = {
   initializeSdmData: () => void;
   insertSdmData: (data: DemandCompType) => Promise<void>;
-  insertSdmInfoData: (data: SdmInfoFormData) => Promise<boolean>;
-  updateSdmInfoData: (data: SdmInfoFormData) => Promise<boolean>;
+  insertSdmInfoData: (data: DemandCompBizType) => Promise<void>;
   getDemandCompList: (searchText: string, pageCnt: number) => Promise<void>;
   actionLogin: (data: DemandCompType) => Promise<void>;
   getSdmInfoStatusList: (dmdInfoId: string) => Promise<void>;
   getSimilarCaseList: (part: string, value: number | string) => Promise<void>;
   actionLogout: () => Promise<void>;
-
-  getUseTypesData: () => Promise<void>;
 }
 
 export type SdmType = {
@@ -628,12 +668,8 @@ export const SdmReducer = (set: any): SdmActions => {
       }
     },
 
-    insertSdmInfoData: async (data: SdmInfoFormData): Promise<boolean> => {
-      return await postSdmInfoData(data);
-    },
-
-    updateSdmInfoData: async (data: SdmInfoFormData): Promise<boolean> => {
-      return await fetchUpdateSdmInfoData(data);
+    insertSdmInfoData: async (data: DemandCompBizType) => {
+      postSdmInfoData(data);
     },
 
     // 수요처 정보
@@ -730,6 +766,7 @@ export const SdmReducer = (set: any): SdmActions => {
           ruseBizNm: maskedBizNm,
         };
       });
+      console.log(similarCaseList);
 
       if (similarCaseList && similarCaseList.length !== 0) {
         set((state: SdmType) => ({
@@ -758,24 +795,6 @@ export const SdmReducer = (set: any): SdmActions => {
           successLogin: false,
         }
       }))
-    },
-
-    getUseTypesData: async () => {
-      //http://dev.onasys.co.kr:3000/server/cms-service/api/v1/lwpo-cds?lwpoCdNm=&sort=regDt,desc&upCd=WR018&page=0&size=10
-
-      const upCd = await getFetchWithCount(
-        fetchType.CS,
-        "/cms-service/api/v1/lwpo-cds/?lwpoCdNm=&sort=regDt,desc&upCd=WR018&page=0&size=100"
-      );
-
-      const comUseTypes = upCd.content.filter(el=>el.lwpoCdNm != '친수용수').map((el: any) => ({ text: el.lwpoCdNm, val: el.lwpoCd }));
-
-      set((state: SdmType) => ({
-        Sdm: {
-          ...state.Sdm,
-          useTypesData: comUseTypes,
-        }
-      }));
     }
   }
 }

apps/dm_new/app/store/sdmMng/postcode-service.ts

@@ -48,16 +48,6 @@ type SuggestionSeed = {
   bldgNoMno: number;
 };
 
-/**
- * 주소 검색 API를 호출해 우편번호/주소 목록을 조회한다.
- * @param searchQuery 조회 조건 객체
- * @param searchQuery.roadNm 도로명
- * @param searchQuery.bldgNoMno 건물 본번
- * @param searchQuery.bldgNoSno 건물 부번
- * @param searchQuery.page 0부터 시작하는 페이지 번호
- * @param searchQuery.size 페이지당 조회 건수
- * @returns 주소 목록과 전체 건수를 포함한 응답 객체
- */
 async function findAddress(searchQuery: ZipSearchParams): Promise<ZipListResponse> {
   if (!searchQuery) return {};
 
@@ -78,12 +68,6 @@ async function findAddress(searchQuery: ZipSearchParams): Promise<ZipListRespons
   return (await response.json()) as ZipListResponse;
 }
 
-/**
- * 자동완성 후보를 만들기 위해 주소 항목에서 도로명과 건물 본번을 추출한다.
- * 우선 API 응답 필드의 값을 사용하고, 값이 없으면 표시 주소 문자열을 파싱해 보정한다.
- * @param item 주소 검색 결과 1건
- * @returns 자동완성 생성에 사용할 도로명/건물본번 또는 추출 실패 시 null
- */
 function extractSuggestionSeed(item: Zip): SuggestionSeed | null {
   const ext = item as Zip & {
     roadNm?: string;
@@ -113,11 +97,6 @@ function extractSuggestionSeed(item: Zip): SuggestionSeed | null {
   return { roadNm, bldgNoMno };
 }
 
-/**
- * 검색어에 허용되지 않는 특수문자나 SQL 예약어가 포함되어 있는지 검사한다.
- * @param search 사용자가 입력한 검색 문자열
- * @returns 검색 가능하면 true, 차단 대상이면 false
- */
 function searchFilter(search: string): boolean {
   if (search.length === 0) return true;
 
@@ -153,13 +132,6 @@ function searchFilter(search: string): boolean {
   return true;
 }
 
-/**
- * 단일 입력 주소 문자열을 "도로명 + 건물번호" 구조로 파싱해 API 조회 파라미터로 변환한다.
- * 예) "테헤란로 152-1" -> { roadNm: "테헤란로", bldgNoMno: 152, bldgNoSno: 1, page }
- * @param input 사용자가 입력한 주소 검색어
- * @param page 1부터 시작하는 요청 페이지 번호
- * @returns 파싱 성공 시 API 조회 파라미터와 정규화된 검색어, 실패 시 오류 메시지
- */
 export function parsePostcodeInput(
   input: string,
   page = 1,
@@ -233,12 +205,6 @@ export function parsePostcodeInput(
   };
 }
 
-/**
- * 전체 도로명 주소 문자열에서 재검색에 사용할 "도로명 건물번호" 입력값만 추출한다.
- * 예) "테헤란로 152, OO빌딩" -> "테헤란로 152"
- * @param roadAddr 화면에 표시된 도로명 주소 문자열
- * @returns 재검색 입력란에 넣을 수 있는 문자열, 추출 실패 시 빈 문자열
- */
 export function extractSearchInputFromRoadAddr(roadAddr: string): string {
   const firstSegment = roadAddr.split(",")[0]?.trim() ?? "";
   if (!firstSegment) return "";
@@ -250,12 +216,6 @@ export function extractSearchInputFromRoadAddr(roadAddr: string): string {
   return `${parts.slice(0, -1).join(" ")} ${bldgToken}`.trim();
 }
 
-/**
- * 사용자가 입력 중인 도로명을 기준으로 자동완성 후보를 조회한다.
- * 건물번호가 함께 입력된 경우에는 마지막 숫자 토큰을 제외한 도로명만으로 후보를 찾는다.
- * @param input 사용자가 입력창에 입력한 원본 문자열
- * @returns 최대 5개의 "도로명 건물본번" 자동완성 문자열 목록
- */
 export async function fetchPostcodeSuggestions(input: string): Promise<string[]> {
   const normalized = input.replace(/\s+/g, " ").trim();
   const parts = normalized.split(" ");
@@ -292,15 +252,6 @@ export async function fetchPostcodeSuggestions(input: string): Promise<string[]>
   return suggestions;
 }
 
-/**
- * 우편번호 검색 API를 호출해 화면 표시용 우편번호 목록 형태로 변환한다.
- * @param params 조회 조건 객체
- * @param params.roadNm 검색할 도로명
- * @param params.bldgNoMno 건물 본번
- * @param params.bldgNoSno 건물 부번
- * @param params.page 1부터 시작하는 화면 페이지 번호
- * @returns 전체 건수와 화면 표시용 주소 목록
- */
 export async function fetchPostcode(
   params: PostcodeSearchParams,
 ): Promise<PostcodeSearchResult> {

apps/dm_new/components/ui/api/index.ts

@@ -1,7 +1,6 @@
 //8880
 import { AUTH_USER_ID, CLAIM_NAME } from "@/src/shared/config";
 import { getCookie } from "@common/components/lib/cookie";
-import { DEV_URL_FO, DEV_URL_WR, LOCAL_URL } from "../config/";
 
 
 const tokenId = getCookie(AUTH_USER_ID);
@@ -11,9 +10,7 @@ export const fetchType = {
   COMMON: "common",
   WR: "wr",
   FO: "fo",
-  SN: "sn",
-  LOCAL: "LOCAL",
-  CS: "CS",
+  SN: "sn"
 };
 
 const API_VERSION = "/api/v1"
@@ -47,55 +44,6 @@ export const getFetch = async (type: string, url: string) => {
   return res;
 };
 
-export const getFetchWithCount = async (type: string, url: string) => {
-  const div =
-    type === fetchType.COMMON
-      ? DEV_URL_FO
-      : type === fetchType.LOCAL
-        ? LOCAL_URL
-        : type === fetchType.CS
-          ? ""
-          : DEV_URL_WR;
-  const apiUrl = div + url;
-
-  const response = await fetch(apiUrl, {
-    method: "GET",
-    headers: {
-      accept: "application/json",
-    },
-  });
-
-  if (!response.ok) {
-    console.log(`오류 발생: ${response.status}`);
-  }
-
-  const contentType = response.headers.get("content-type") ?? "";
-
-  if (contentType.includes("application/json")) {
-    // JSON 응답 처리
-    const res = await response.json();
-
-    return res;
-  } else if(contentType.includes('application/octet-stream')) {
-    // 파일 응답 처리 (ex. PDF, Excel 등)
-
-    console.log('contentType ' ,contentType)
-    const blob = await response.blob();
-    const blobUrl = window.URL.createObjectURL(blob);
-    const a = document.createElement("a");
-    const filename = "downloaded_file.PDF";
-
-    a.href = blobUrl;
-    a.download = filename;
-    a.click();
-    window.URL.revokeObjectURL(blobUrl);
-
-    return null; // 다운로드이므로 반환값 없음
-  }else{
-    throw Error('오류 발생')
-  } 
-};
-
 export const postFetch = async (url: string, params: RequestParams) => {
   const baseUrl = servers[fetchType.WR];
   const response = await fetch(baseUrl + url, {

apps/dm_new/components/ui/config/index.ts

@@ -1,6 +1,6 @@
 import { PROXY_HOST } from "@/src/shared/config/env";
 
 export const LOCAL_URL = PROXY_HOST;
-export const DEV_URL_FO = "/operation-service/api/v1";
-export const DEV_URL_WR = "/reuse-service/api/v1";
-export const DEV_URL_SN = "/sewerage-service/api/v1";
+export const DEV_URL_FO = "/operation-service";
+export const DEV_URL_WR = "/reuse-service";
+export const DEV_URL_SN = "/sewerage-service";

apps/dm_new/components/ui/map/SearchInputText/SearchInputText.tsx

@@ -94,7 +94,7 @@ export default function SearchInputText({
         value={textValue || ""}
         onChange={handleInputChange}
         onKeyDown={handleKeyDown}
-        className="w-full h-8 text-xs pl-2 pr-2 text-gray-600 border border-gray-300 rounded focus:outline-none focus:ring-1 focus:ring-blue-500"
+        className="w-full h-[3.2rem] !text-xl pl-3 text-gray-600 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"
         placeholder={`${label}을(를) 입력하세요`}
         onClick={() => {
           setTextValue("");
@@ -109,10 +109,10 @@ export default function SearchInputText({
               searchList.map((item, index) => (
                 <div
                   key={index}
-                  className={`w-full cursor-pointer px-3 py-2 text-left text-xs ${
+                  className={`w-full cursor-pointer overflow-auto px-5 py-3 text-left !text-xl ${
                     highlightIndex === index
-                      ? "bg-blue-50"
-                      : "hover:bg-gray-50"
+                      ? "bg-blue-100"
+                      : "hover:bg-gray-100"
                   }`}
                   onClick={() => handleSuggestionClick(item.bscFctNm)}
                   role="button"
@@ -127,7 +127,7 @@ export default function SearchInputText({
                 </div>
               ))
             ) : (
-              <div className="text-xs w-full px-3 py-2 hover:bg-gray-50 cursor-pointer text-gray-500">
+              <div className="!text-xl w-full px-5 py-3 hover:bg-gray-100 cursor-pointer overflow-auto">
                 검색 결과가 없습니다.
               </div>
             )}

apps/dm_new/components/ui/map/searchBar/searchBar.tsx

@@ -62,51 +62,50 @@ export function SearchBar({
   );
 
   return (
-    <div className="flex justify-center w-full px-4 py-2">
-      <div className="flex items-center w-auto shadow-md px-4 py-2 space-x-2 bg-white/95 backdrop-blur-sm rounded-lg text-sm border border-gray-200">
+    <div className="flex justify-center w-full px-4 py-3">
+      <div className="flex items-center w-full max-w-screen-lg rounded-xl bg-white shadow-md px-6 py-4 space-x-3">
         <SelectBox
-          labelClass="w-[50px] text-xs font-medium text-gray-700"
-          className="w-[110px]"
+          labelClass="w-[40px]"
+          className="w-[200px]"
           label="시도"
-          selectClass="rounded bg-white text-xs h-8"
+          selectClass="rounded-lg bg-white"
           selectArray={Common.selectSidoData || []}
           onSelectValue={(val) => onSelectValue(val.toString(), "ctpvCd")}
           value={sidoValue || Common.selectSidoData[0]?.val || ""}
         />
         <SelectBox
-          labelClass="w-[70px] text-xs font-medium text-gray-700"
-          className="w-[110px]"
+          labelClass="w-[65px]"
+          className="w-[200px]"
           label="시군구"
-          selectClass="rounded bg-white text-xs h-8"
+          selectClass="rounded-lg bg-white"
           selectArray={filteredSigunData || []}
           onSelectValue={(val) => onSelectValue(val.toString(), "sggCd")}
           value={sigunValue}
         />
-        <Label className="text-gray-700 text-xs font-medium pl-2 pr-1">하수재이용시설</Label>
-        <div className="w-[180px]">
-          <SearchInputText
-            label="시설명 입력"
-            initValue={undefined}
-            setValue={(searchNm?: string) => {
-              let sggOrCity = "";
-              if (searchNm) {
-                if (sigunValue === "0" || sigunValue === "") {
-                  sggOrCity = sidoValue;
-                } else {
-                  sggOrCity = sigunValue;
-                }
-                findRuseFclt(sggOrCity, searchNm);
+        <Label className="text-gray-600">하수재이용시설</Label>
+        <SearchInputText
+          label="시설명"
+          initValue={undefined}
+          setValue={(searchNm?: string) => {
+            let sggOrCity = "";
+            if (searchNm) {
+              if (sigunValue === "0" || sigunValue === "") {
+                sggOrCity = sidoValue;
+              } else {
+                sggOrCity = sigunValue;
               }
-            }}
-            setRtnData={(rtnData: any) => {
-              setHasuPk(rtnData);
-            }}
-            searchList={map.ruseFcltList || []}
-          />
-        </div>
+              findRuseFclt(sggOrCity, searchNm);
+            }
+          }}
+          setRtnData={(rtnData: any) => {
+            setHasuPk(rtnData);
+          }}
+          searchList={map.ruseFcltList || []}
+        />
         <Button
           color="sky"
-          className="ml-2 text-white !h-8 !py-0 !px-3 !text-xs font-semibold rounded"
+          className="ml-2 text-white"
+          size="sm"
           onClick={() => {
             onApply();
           }}

apps/dm_new/middleware.ts

@@ -8,7 +8,6 @@ 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 GATEWAY_URL = process.env.NEXT_PUBLIC_GATEWAY_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 || "";
 
@@ -29,6 +28,15 @@ export function middleware(req: NextRequest) {
   console.log(`[Middleware] Request URL: ${req.url}`);
   const searchParams = req.nextUrl.searchParams;
 
+  // if (pathname.startsWith("/server")) {
+  //   const queryParams = searchParams.toString();
+  //   const newUrl = `${serverApiUrl}${pathname.replace("/server", "")}${
+  //     queryParams ? `?${queryParams}` : ""
+  //   }`;
+  //   console.log(`[Middleware] Rewriting from '/server' path to: ${newUrl}`);
+  //   return NextResponse.rewrite(new URL(newUrl));
+  // }
+
   if (pathname.startsWith("/server")) {
     const decodedParams = Array.from(searchParams.entries())
       .map(([key, value]) => `${key}=${decodeURIComponent(value)}`)
@@ -73,8 +81,6 @@ export function middleware(req: NextRequest) {
   if (pathname.startsWith("/geoserver")) {
     let queryParams = searchParams.toString();
     const typename = searchParams.get("TYPENAME");
-    const startYmd = searchParams.get("START_YMD") ?? null;
-    const endYmd = searchParams.get("END_YMD") ?? null;
     console.log("typename  ", typename);
 
     let newUrl = `${GEOSERVER_URL}${pathname.replace("/geoserver", "")}${queryParams ? `?${queryParams}` : ""}`;
@@ -105,10 +111,8 @@ export function middleware(req: NextRequest) {
     ) {
       const url = req.nextUrl.clone();
       url.searchParams.set("TYPENAME", typename.replace("hasudo:", ""));
-      if (startYmd) url.searchParams.set("startYmd", startYmd);
-      if (endYmd) url.searchParams.set("endYmd", endYmd);
       queryParams = url.searchParams.toString();
-      newUrl = `${GATEWAY_URL}/sewerage-service/api/v1/map/geometry${queryParams ? `?${queryParams}` : ""}`;
+      newUrl = `${GATEWAY_URL}/api/v1/map/geometry${queryParams ? `?${queryParams}` : ""}`;
     }
 
     console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`);

apps/dm_new/package.json

@@ -29,8 +29,8 @@
     "@eslint/eslintrc": "^3",
     "@types/webpack": "^5.28.5",
     "eslint": "^9",
-    "eslint-config-next": "15.3.8",
-    "postcss": "^8",  
+    "eslint-config-next": "15.1.7",
+    "postcss": "^8",
     "tailwindcss": "^3.4.1",
     "typescript": "^5"
   }