This commit is contained in:
@@ -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.LayoutItemEMSRepository;
|
||||||
import com.eactive.eai.rms.data.entity.onl.layout.LayoutService;
|
import com.eactive.eai.rms.data.entity.onl.layout.LayoutService;
|
||||||
import com.eactive.eai.rms.onl.manage.rule.layoutsync.LayoutSyncVo;
|
import com.eactive.eai.rms.onl.manage.rule.layoutsync.LayoutSyncVo;
|
||||||
|
import com.eactive.eai.transformer.layout.Item;
|
||||||
|
|
||||||
@Repository("layoutDao")
|
@Repository("layoutDao")
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@@ -122,8 +123,25 @@ public class LayoutDao extends SqlMapClientTemplateDao {
|
|||||||
entity.setLoutitempathname((String) param.get("loutItemPathName"));
|
entity.setLoutitempathname((String) param.get("loutItemPathName"));
|
||||||
entity.setLoutitemlencnt((Integer) param.get("loutItemLenCnt"));
|
entity.setLoutitemlencnt((Integer) param.get("loutItemLenCnt"));
|
||||||
entity.setLoutitemrefinfo((String) param.get("loutItemRefInfo"));
|
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.setLoutitemmaxoccurnoitm((Integer) param.get("loutItemMaxOccurNoitm"));
|
||||||
entity.setLoutitemminoccurnoitm((Integer) param.get("loutItemMinOccurNoitm"));
|
entity.setLoutitemminoccurnoitm((Integer) param.get("loutItemMinOccurNoitm"));
|
||||||
entity.setLoutitembascval((String) param.get("loutItemBascVal"));
|
entity.setLoutitembascval((String) param.get("loutItemBascVal"));
|
||||||
|
|||||||
+4
-4
@@ -934,9 +934,9 @@ public class LayoutSyncController extends OnlBaseAnnotationController implements
|
|||||||
|
|
||||||
service.deleteLayout(vo);
|
service.deleteLayout(vo);
|
||||||
|
|
||||||
CommonCommand commonCommand = new CommonCommand("com.eactive.eai.agent.transformer.RemoveLayoutCommand",vo.get("loutName"));
|
// CommonCommand commonCommand = new CommonCommand("com.eactive.eai.agent.transformer.RemoveLayoutCommand",vo.get("loutName"));
|
||||||
HashMap<String,String> result = AgentParserUtils.parse(commonCommand, agentUtilService,"prcssRslt","prcssRsltCmnt");
|
// HashMap<String,String> result = AgentParserUtils.parse(commonCommand, agentUtilService,"prcssRslt","prcssRsltCmnt");
|
||||||
param.putAll(result);
|
// param.putAll(result);
|
||||||
|
|
||||||
service.addLayoutSyncLog(param);
|
service.addLayoutSyncLog(param);
|
||||||
} else {
|
} else {
|
||||||
@@ -1024,7 +1024,7 @@ public class LayoutSyncController extends OnlBaseAnnotationController implements
|
|||||||
|
|
||||||
service.insertLayout(vo, list); //FIXME : 스키마 변경 룰 적용해야 함
|
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"));
|
// CommonCommand commonCommand = new CommonCommand("com.eactive.eai.agent.transformer.ReloadLayoutCommand",vo.get("loutName"));
|
||||||
// HashMap<String,String> result = AgentParserUtils.parse(commonCommand, agentUtilService,"prcssRslt","prcssRsltCmnt");
|
// HashMap<String,String> result = AgentParserUtils.parse(commonCommand, agentUtilService,"prcssRslt","prcssRsltCmnt");
|
||||||
// param.putAll(result);
|
// param.putAll(result);
|
||||||
|
|||||||
Reference in New Issue
Block a user