From fcab67e023f1f47b820685ef292175320b25f601 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 10 Jan 2025 12:42:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=80=BC=E6=95=B0=E6=8D=AE=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1252134266306560]表单值数据转换 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1252134266306560 --- .../service/cientity/CiEntityServiceImpl.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/main/java/neatlogic/module/cmdb/service/cientity/CiEntityServiceImpl.java b/src/main/java/neatlogic/module/cmdb/service/cientity/CiEntityServiceImpl.java index b0afc027..938e5c85 100644 --- a/src/main/java/neatlogic/module/cmdb/service/cientity/CiEntityServiceImpl.java +++ b/src/main/java/neatlogic/module/cmdb/service/cientity/CiEntityServiceImpl.java @@ -417,6 +417,45 @@ public class CiEntityServiceImpl implements CiEntityService, ICiEntityCrossoverS return new ArrayList<>(); } + @Override + public List ciEntityBuilderForSuZhouBank(CiEntityVo ciEntityVo, List> resultList) { + + CiVo ciVo = ciMapper.getCiById(ciEntityVo.getCiId()); + if (ciVo == null) { + throw new CiNotFoundException(ciEntityVo.getCiId()); + } + List ciList = ciMapper.getUpwardCiListByLR(ciVo.getLft(), ciVo.getRht()); + List attrList = attrMapper.getAttrByCiId(ciVo.getId()); + List relList = RelUtil.ClearRepeatRel(relMapper.getRelByCiId(ciVo.getId())); + + if (CollectionUtils.isNotEmpty(ciEntityVo.getExcludeRelIdList())) { + relList.removeIf(d -> ciEntityVo.getExcludeRelIdList().contains(d.getId())); + } + //把条件的最大限制设到关系里 + for (RelVo relVo : relList) { + relVo.setMaxRelEntityCount(ciEntityVo.getMaxRelEntityCount()); + } + for (AttrVo attrVo : attrList) { + attrVo.setMaxAttrEntityCount(ciEntityVo.getMaxAttrEntityCount()); + } + + ciEntityVo.setCiList(ciList); + ciEntityVo.setAttrList(attrList); + ciEntityVo.setRelList(relList); + + Boolean isLimitRelEntity = ciEntityVo.isLimitRelEntity(); + Boolean isLimitAttrEntity = ciEntityVo.isLimitAttrEntity(); + + ciEntityVo.setLimitRelEntity(isLimitRelEntity != null ? isLimitRelEntity : true); + ciEntityVo.setLimitAttrEntity(isLimitAttrEntity != null ? isLimitAttrEntity : true); +// List> resultList = ciEntityMapper.searchCiEntity(ciEntityVo); + +// ciEntityVo.setIdList(null);//清除id列表，避免ciEntityVo重用时数据没法更新 + List ciEntityList = new CiEntityBuilder.Builder(ciEntityVo, resultList, ciVo, ciEntityVo.getAttrList(), ciEntityVo.getRelList()).build().getCiEntityList(); + + return ciEntityList; + } + @Override public List searchCiEntityBaseInfo(CiEntityVo ciEntityVo) { List ciEntityList = ciEntityMapper.searchCiEntityBaseInfo(ciEntityVo); -- Gitee From 0388bd660e597d2604d20beb8131c4489d02ee9f Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 10 Jan 2025 13:04:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=80=BC=E6=95=B0=E6=8D=AE=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1252134266306560]表单值数据转换 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1252134266306560 --- .../module/cmdb/service/cientity/CiEntityServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/module/cmdb/service/cientity/CiEntityServiceImpl.java b/src/main/java/neatlogic/module/cmdb/service/cientity/CiEntityServiceImpl.java index 938e5c85..5b3db881 100644 --- a/src/main/java/neatlogic/module/cmdb/service/cientity/CiEntityServiceImpl.java +++ b/src/main/java/neatlogic/module/cmdb/service/cientity/CiEntityServiceImpl.java @@ -418,7 +418,7 @@ public class CiEntityServiceImpl implements CiEntityService, ICiEntityCrossoverS } @Override - public List ciEntityBuilderForSuZhouBank(CiEntityVo ciEntityVo, List> resultList) { + public List ciEntityBuilder(CiEntityVo ciEntityVo, List> resultList) { CiVo ciVo = ciMapper.getCiById(ciEntityVo.getCiId()); if (ciVo == null) { -- Gitee