Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management

backend-node/src/controllers/DashboardController.ts

@@ -632,6 +632,9 @@ export class DashboardController {
         validateStatus: () => true, // 모든 상태 코드 허용 (에러도 응답으로 처리)
       };
 
+      // 연결 정보 (응답에 포함용)
+      let connectionInfo: { saveToHistory?: boolean } | null = null;
+
       // 외부 커넥션 ID가 있는 경우, 해당 커넥션의 인증 정보(DB 토큰 등)를 적용
       if (externalConnectionId) {
         try {
@@ -652,6 +655,11 @@ export class DashboardController {
           if (connectionResult.success && connectionResult.data) {
             const connection = connectionResult.data;
 
+            // 연결 정보 저장 (응답에 포함)
+            connectionInfo = {
+              saveToHistory: connection.save_to_history === "Y",
+            };
+
             // 인증 헤더 생성 (DB 토큰 등)
             const authHeaders =
               await ExternalRestApiConnectionService.getAuthHeaders(
@@ -709,9 +717,9 @@ export class DashboardController {
       }
 
       // 기상청 API 등 EUC-KR 인코딩을 사용하는 경우 arraybuffer로 받아서 디코딩
-      const isKmaApi = urlObj.hostname.includes('kma.go.kr');
+      const isKmaApi = urlObj.hostname.includes("kma.go.kr");
       if (isKmaApi) {
-        requestConfig.responseType = 'arraybuffer';
+        requestConfig.responseType = "arraybuffer";
       }
 
       const response = await axios(requestConfig);
@@ -727,18 +735,22 @@ export class DashboardController {
 
       // 기상청 API 인코딩 처리 (UTF-8 우선, 실패 시 EUC-KR)
       if (isKmaApi && Buffer.isBuffer(data)) {
-        const iconv = require('iconv-lite');
+        const iconv = require("iconv-lite");
         const buffer = Buffer.from(data);
-        const utf8Text = buffer.toString('utf-8');
-        
+        const utf8Text = buffer.toString("utf-8");
+
         // UTF-8로 정상 디코딩되었는지 확인
-        if (utf8Text.includes('특보') || utf8Text.includes('경보') || utf8Text.includes('주의보') || 
-            (utf8Text.includes('#START7777') && !utf8Text.includes('<27>'))) {
-          data = { text: utf8Text, contentType, encoding: 'utf-8' };
+        if (
+          utf8Text.includes("특보") ||
+          utf8Text.includes("경보") ||
+          utf8Text.includes("주의보") ||
+          (utf8Text.includes("#START7777") && !utf8Text.includes("<22>"))
+        ) {
+          data = { text: utf8Text, contentType, encoding: "utf-8" };
         } else {
           // EUC-KR로 디코딩
-          const eucKrText = iconv.decode(buffer, 'EUC-KR');
-          data = { text: eucKrText, contentType, encoding: 'euc-kr' };
+          const eucKrText = iconv.decode(buffer, "EUC-KR");
+          data = { text: eucKrText, contentType, encoding: "euc-kr" };
         }
       }
       // 텍스트 응답인 경우 포맷팅
@@ -749,6 +761,7 @@ export class DashboardController {
       res.status(200).json({
         success: true,
         data,
+        connectionInfo, // 외부 연결 정보 (saveToHistory 등)
       });
     } catch (error: any) {
       const status = error.response?.status || 500;

backend-node/src/controllers/dynamicFormController.ts

@@ -492,7 +492,7 @@ export const saveLocationHistory = async (
   res: Response
 ): Promise<Response | void> => {
   try {
-    const { companyCode, userId } = req.user as any;
+    const { companyCode, userId: loginUserId } = req.user as any;
     const {
       latitude,
       longitude,
@@ -508,10 +508,17 @@ export const saveLocationHistory = async (
       destinationName,
       recordedAt,
       vehicleId,
+      userId: requestUserId, // 프론트엔드에서 보낸 userId (차량 번호판 등)
     } = req.body;
 
+    // 프론트엔드에서 보낸 userId가 있으면 그것을 사용 (차량 번호판 등)
+    // 없으면 로그인한 사용자의 userId 사용
+    const userId = requestUserId || loginUserId;
+
     console.log("📍 [saveLocationHistory] 요청:", {
       userId,
+      requestUserId,
+      loginUserId,
       companyCode,
       latitude,
       longitude,

backend-node/src/services/externalRestApiConnectionService.ts

@@ -209,8 +209,8 @@ export class ExternalRestApiConnectionService {
           connection_name, description, base_url, endpoint_path, default_headers,
           default_method, default_request_body,
           auth_type, auth_config, timeout, retry_count, retry_delay,
-          company_code, is_active, created_by
-        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15)
+          company_code, is_active, created_by, save_to_history
+        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16)
         RETURNING *
       `;
 
@@ -230,6 +230,7 @@ export class ExternalRestApiConnectionService {
         data.company_code || "*",
         data.is_active || "Y",
         data.created_by || "system",
+        data.save_to_history || "N",
       ];
 
       // 디버깅: 저장하려는 데이터 로깅
@@ -377,6 +378,12 @@ export class ExternalRestApiConnectionService {
         paramIndex++;
       }
 
+      if (data.save_to_history !== undefined) {
+        updateFields.push(`save_to_history = $${paramIndex}`);
+        params.push(data.save_to_history);
+        paramIndex++;
+      }
+
       if (data.updated_by !== undefined) {
         updateFields.push(`updated_by = $${paramIndex}`);
         params.push(data.updated_by);

backend-node/src/types/externalRestApiTypes.ts

@@ -53,6 +53,9 @@ export interface ExternalRestApiConnection {
   retry_delay?: number;
   company_code: string;
   is_active: string;
+  
+  // 위치 이력 저장 설정 (지도 위젯용)
+  save_to_history?: string; // 'Y' 또는 'N' - REST API에서 가져온 위치 데이터를 vehicle_location_history에 저장
   created_date?: Date;
   created_by?: string;
   updated_date?: Date;