From 71e433a2a5e0b847fa8f66db40a79bc924e7541d Mon Sep 17 00:00:00 2001 From: eastargh Date: Thu, 13 Aug 2026 10:50:42 +0900 Subject: [PATCH] =?UTF-8?q?IIM=EC=97=B0=EB=8F=99=EC=8B=9C=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rule/layoutsync/LayoutSyncController.java | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/rule/layoutsync/LayoutSyncController.java b/src/main/java/com/eactive/eai/rms/onl/manage/rule/layoutsync/LayoutSyncController.java index 9125937..4b38bbe 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/rule/layoutsync/LayoutSyncController.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/rule/layoutsync/LayoutSyncController.java @@ -1231,19 +1231,10 @@ public class LayoutSyncController extends OnlBaseAnnotationController implements param.put("command", command); param.put("recvAmndHMS", recvTime); - if (command.equals("delete")) { - JSONObject layout = (JSONObject) layoutObject; - String loutName = (String) layout.get("id"); - String[] parts = loutName.split("_"); - interfaceId = parts[1]; - } - - //interfaceId 9번째 글자가 D가 아니면 interfaceId의 8번째 자리에 D를 추가하여 insert한다 - boolean isDevMake = !"D".equals(interfaceId.substring(7,8)); if (command.equals("insert")) { insertInterfaceDjb(interfaceId, body); - if (isDevMake) { + if (this.isDevMake(interfaceId)) { interfaceId = interfaceId.substring(0,8) + "D" + interfaceId.substring(8); insertInterfaceDjb(interfaceId, body); } @@ -1256,7 +1247,7 @@ public class LayoutSyncController extends OnlBaseAnnotationController implements JSONObject layout = (JSONObject) layoutArray.get(i); syncLayout(param, body, command, layout); - if (isDevMake) { + if (this.isDevMake(layout)) { String layoutName = (String) layout.get("id"); layoutName = layoutName.substring(0,12) + "D" + layoutName.substring(12); layout.put("id", layoutName); @@ -1267,7 +1258,7 @@ public class LayoutSyncController extends OnlBaseAnnotationController implements JSONObject layout = (JSONObject) layoutObject; syncLayout(param, body, command, layout); - if (isDevMake) { + if (this.isDevMake(layout)) { String layoutName = (String) layout.get("id"); layoutName = layoutName.substring(0,12) + "D" + layoutName.substring(12); layout.put("id", layoutName); @@ -1276,6 +1267,18 @@ public class LayoutSyncController extends OnlBaseAnnotationController implements } } + private boolean isDevMake(String interfaceId) { + //interfaceId 9번째 글자가 D가 아니면 interfaceId의 8번째 자리에 D를 추가하여 insert한다 + return !"D".equals(interfaceId.substring(7,8)); + } + + private boolean isDevMake(JSONObject layout) { + String loutName = (String) layout.get("id"); + String[] parts = loutName.split("_"); + String interfaceId = parts[1]; + return isDevMake(interfaceId); + } + private void insertInterfaceDjb(String interfaceId, JSONObject body) throws Exception { HashMap param = new HashMap();