From e91b12f2d7b5c753c0bbad2f5acb249c12be4a2e Mon Sep 17 00:00:00 2001 From: eastargh Date: Wed, 29 Jul 2026 15:04:54 +0900 Subject: [PATCH] =?UTF-8?q?IIM=EC=97=B0=EB=8F=99=EC=8B=9C=20=EB=B0=98?= =?UTF-8?q?=EB=B3=B5=EC=B0=B8=EC=A1=B0=ED=95=84=EB=93=9C=EC=97=90=20.?= =?UTF-8?q?=EC=9E=88=EC=9C=BC=EB=A9=B4=20=EC=9D=B4=ED=9B=84=20=EA=B0=92?= =?UTF-8?q?=EB=A7=8C=20=EC=A0=80=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rms/onl/manage/rule/layout/LayoutDao.java | 22 +++++++++++++++++-- .../rule/layoutsync/LayoutSyncController.java | 8 +++---- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/rule/layout/LayoutDao.java b/src/main/java/com/eactive/eai/rms/onl/manage/rule/layout/LayoutDao.java index 33ad7dd..26299f7 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/rule/layout/LayoutDao.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/rule/layout/LayoutDao.java @@ -19,6 +19,7 @@ import com.eactive.eai.rms.data.entity.onl.bzwkdstcd.UserBusinessService; import com.eactive.eai.rms.data.entity.onl.layout.LayoutItemEMSRepository; import com.eactive.eai.rms.data.entity.onl.layout.LayoutService; import com.eactive.eai.rms.onl.manage.rule.layoutsync.LayoutSyncVo; +import com.eactive.eai.transformer.layout.Item; @Repository("layoutDao") @SuppressWarnings("unchecked") @@ -122,8 +123,25 @@ public class LayoutDao extends SqlMapClientTemplateDao { entity.setLoutitempathname((String) param.get("loutItemPathName")); entity.setLoutitemlencnt((Integer) param.get("loutItemLenCnt")); entity.setLoutitemrefinfo((String) param.get("loutItemRefInfo")); - entity.setLoutitemrefinfo2((String) param.get("loutItemRefInfo2")); - entity.setLoutitemoccurptrndstcd((String) param.get("loutItemOccurPtrnDstcd")); + + // djb cumstom : 반복 참조 필드에 .이 포함되서 오면 .이후의 값만 저장 + String loutItemRefInfo2 = (String) param.get("loutItemRefInfo2"); + if (loutItemRefInfo2 != null && loutItemRefInfo2.indexOf(".") > -1) { + loutItemRefInfo2 = loutItemRefInfo2.substring(loutItemRefInfo2.lastIndexOf(".")+1); + } + entity.setLoutitemrefinfo2(loutItemRefInfo2); + + // djb custom : GROUP이고 반복횟수=1 일때는 반복횟수 넣지않는다. ==> GROUP으로 처리 + Integer loutItemNodePtrnIDName = (Integer) param.get("loutItemNodePtrnIDName"); + String loutItemOccurPtrnDstcd = (String) param.get("loutItemOccurPtrnDstcd"); + if (loutItemNodePtrnIDName != null) { + if (loutItemNodePtrnIDName == Item.NODE_GROUP && "1".equals(loutItemOccurPtrnDstcd)) { + loutItemOccurPtrnDstcd = ""; + } + } + entity.setLoutitemoccurptrndstcd(loutItemOccurPtrnDstcd); + + entity.setLoutitemmaxoccurnoitm((Integer) param.get("loutItemMaxOccurNoitm")); entity.setLoutitemminoccurnoitm((Integer) param.get("loutItemMinOccurNoitm")); entity.setLoutitembascval((String) param.get("loutItemBascVal")); 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 9b4174f..0081870 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 @@ -934,9 +934,9 @@ public class LayoutSyncController extends OnlBaseAnnotationController implements service.deleteLayout(vo); - CommonCommand commonCommand = new CommonCommand("com.eactive.eai.agent.transformer.RemoveLayoutCommand",vo.get("loutName")); - HashMap result = AgentParserUtils.parse(commonCommand, agentUtilService,"prcssRslt","prcssRsltCmnt"); - param.putAll(result); +// CommonCommand commonCommand = new CommonCommand("com.eactive.eai.agent.transformer.RemoveLayoutCommand",vo.get("loutName")); +// HashMap result = AgentParserUtils.parse(commonCommand, agentUtilService,"prcssRslt","prcssRsltCmnt"); +// param.putAll(result); service.addLayoutSyncLog(param); } else { @@ -1024,7 +1024,7 @@ public class LayoutSyncController extends OnlBaseAnnotationController implements service.insertLayout(vo, list); //FIXME : 스키마 변경 룰 적용해야 함 - //Djb custom 서버연동 제외 2026.07.22 jwh + //Djb custom 서버연동 제외 // CommonCommand commonCommand = new CommonCommand("com.eactive.eai.agent.transformer.ReloadLayoutCommand",vo.get("loutName")); // HashMap result = AgentParserUtils.parse(commonCommand, agentUtilService,"prcssRslt","prcssRsltCmnt"); // param.putAll(result);