Merge branch 'feature/v2-renewal' of http://39.117.244.52:3000/kjs/ERP-node into jskim-node

backend-node/src/controllers/adminController.ts

@@ -1443,13 +1443,7 @@ async function collectAllChildMenuIds(parentObjid: number): Promise<number[]> {
  * 메뉴 및 관련 데이터 정리 헬퍼 함수
  */
 async function cleanupMenuRelatedData(menuObjid: number): Promise<void> {
-  // 1. category_column_mapping에서 menu_objid를 NULL로 설정
-  await query(
-    `UPDATE category_column_mapping SET menu_objid = NULL WHERE menu_objid = $1`,
-    [menuObjid]
-  );
-  
-  // 2. code_category에서 menu_objid를 NULL로 설정
+  // 1. code_category에서 menu_objid를 NULL로 설정
   await query(
     `UPDATE code_category SET menu_objid = NULL WHERE menu_objid = $1`,
     [menuObjid]

backend-node/src/controllers/screenManagementController.ts

@@ -787,6 +787,78 @@ export const updateLayerCondition = async (req: AuthenticatedRequest, res: Respo
   }
 };
 
+// ========================================
+// 조건부 영역(Zone) 관리
+// ========================================
+
+// Zone 목록 조회
+export const getScreenZones = async (req: AuthenticatedRequest, res: Response) => {
+  try {
+    const { screenId } = req.params;
+    const { companyCode } = req.user as any;
+    const zones = await screenManagementService.getScreenZones(parseInt(screenId), companyCode);
+    res.json({ success: true, data: zones });
+  } catch (error) {
+    console.error("Zone 목록 조회 실패:", error);
+    res.status(500).json({ success: false, message: "Zone 목록 조회에 실패했습니다." });
+  }
+};
+
+// Zone 생성
+export const createZone = async (req: AuthenticatedRequest, res: Response) => {
+  try {
+    const { screenId } = req.params;
+    const { companyCode } = req.user as any;
+    const zone = await screenManagementService.createZone(parseInt(screenId), companyCode, req.body);
+    res.json({ success: true, data: zone });
+  } catch (error) {
+    console.error("Zone 생성 실패:", error);
+    res.status(500).json({ success: false, message: "Zone 생성에 실패했습니다." });
+  }
+};
+
+// Zone 업데이트 (위치/크기/트리거)
+export const updateZone = async (req: AuthenticatedRequest, res: Response) => {
+  try {
+    const { zoneId } = req.params;
+    const { companyCode } = req.user as any;
+    await screenManagementService.updateZone(parseInt(zoneId), companyCode, req.body);
+    res.json({ success: true, message: "Zone이 업데이트되었습니다." });
+  } catch (error) {
+    console.error("Zone 업데이트 실패:", error);
+    res.status(500).json({ success: false, message: "Zone 업데이트에 실패했습니다." });
+  }
+};
+
+// Zone 삭제
+export const deleteZone = async (req: AuthenticatedRequest, res: Response) => {
+  try {
+    const { zoneId } = req.params;
+    const { companyCode } = req.user as any;
+    await screenManagementService.deleteZone(parseInt(zoneId), companyCode);
+    res.json({ success: true, message: "Zone이 삭제되었습니다." });
+  } catch (error) {
+    console.error("Zone 삭제 실패:", error);
+    res.status(500).json({ success: false, message: "Zone 삭제에 실패했습니다." });
+  }
+};
+
+// Zone에 레이어 추가
+export const addLayerToZone = async (req: AuthenticatedRequest, res: Response) => {
+  try {
+    const { screenId, zoneId } = req.params;
+    const { companyCode } = req.user as any;
+    const { conditionValue, layerName } = req.body;
+    const result = await screenManagementService.addLayerToZone(
+      parseInt(screenId), companyCode, parseInt(zoneId), conditionValue, layerName
+    );
+    res.json({ success: true, data: result });
+  } catch (error) {
+    console.error("Zone 레이어 추가 실패:", error);
+    res.status(500).json({ success: false, message: "Zone에 레이어를 추가하지 못했습니다." });
+  }
+};
+
 // ========================================
 // POP 레이아웃 관리 (모바일/태블릿)
 // ========================================