From 6e72af3a3ae098cb7ddc26f4240e102815fcf9c5 Mon Sep 17 00:00:00 2001 From: chenqw Date: Thu, 17 Jul 2025 11:54:51 +0800 Subject: [PATCH] =?UTF-8?q?-[=E4=BF=AE=E5=A4=8D]=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=B4=A2=E5=BC=95=E6=97=B6=E5=AF=B9=E5=85=B3?= =?UTF-8?q?=E8=81=94=E9=85=8D=E7=BD=AE=E9=A1=B9=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenqw --- .../module/cmdb/dao/mapper/ci/CiMapper.xml | 4 +- .../dao/mapper/cientity/CiEntityMapper.java | 2 + .../dao/mapper/cientity/CiEntityMapper.xml | 52 +++++++++++-------- .../handler/CiEntityFullTextIndexHandler.java | 21 ++++++-- .../service/cientity/CiEntityService.java | 2 + .../service/cientity/CiEntityServiceImpl.java | 13 +++++ 6 files changed, 67 insertions(+), 27 deletions(-) diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/ci/CiMapper.xml b/src/main/java/neatlogic/module/cmdb/dao/mapper/ci/CiMapper.xml index 962c0990..6cca1aeb 100644 --- a/src/main/java/neatlogic/module/cmdb/dao/mapper/ci/CiMapper.xml +++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/ci/CiMapper.xml @@ -116,7 +116,9 @@ along with this program. If not, see .--> select id, name, label, - type_id as typeId, + type_id as typeId, + is_virtual as isVirtual, + is_abstract as isAbstract, icon, lft, rht diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.java b/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.java index dea95cc5..cdc298df 100644 --- a/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.java +++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.java @@ -200,6 +200,8 @@ public interface CiEntityMapper extends ICiEntityCrossoverMapper { */ List getAttrListByToCiEntityId(Long toCiEntityId); + List getCiEntityNameByIdList(@Param("idList") List idList); + List> searchCiEntity(CiEntityVo ciEntityVo); List searchCiEntityId(CiEntityVo ciEntityVo); diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.xml b/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.xml index cac19958..74340156 100644 --- a/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.xml +++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.xml @@ -163,11 +163,11 @@ along with this program. If not, see .--> left join cmdb_relentity `rel_${idx}` on cientity.id = `rel_${idx}`.from_cientity_id and `rel_${idx}`.rel_id = #{rel.id} - and ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = - `rel_${idx}`.to_cientity_id) or exists - (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = - `rel_${idx}`.to_cientity_id - and xx.expired_time >= NOW())) + and ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = + `rel_${idx}`.to_cientity_id) or exists + (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = + `rel_${idx}`.to_cientity_id + and xx.expired_time >= NOW())) and @@ -190,11 +190,11 @@ along with this program. If not, see .--> left join cmdb_relentity `rel_${idx}` on cientity.id = `rel_${idx}`.to_cientity_id and `rel_${idx}`.rel_id = #{rel.id} - and ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = - `rel_${idx}`.from_cientity_id) or exists - (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = - `rel_${idx}`.from_cientity_id - and xx.expired_time >= NOW())) + and ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = + `rel_${idx}`.from_cientity_id) or exists + (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = + `rel_${idx}`.from_cientity_id + and xx.expired_time >= NOW())) and @@ -222,11 +222,11 @@ along with this program. If not, see .--> `rel_${idx}`.from_cientity_id and `rel_${idx}`.rel_id = #{rel.id} - and ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = - `rel_${idx}`.to_cientity_id) - or exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = - `rel_${idx}`.to_cientity_id - and xx.expired_time >= NOW())) + and ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = + `rel_${idx}`.to_cientity_id) + or exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = + `rel_${idx}`.to_cientity_id + and xx.expired_time >= NOW())) and @@ -250,11 +250,11 @@ along with this program. If not, see .--> `rel_${idx}`.to_cientity_id and `rel_${idx}`.rel_id = #{rel.id} - and ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = - `rel_${idx}`.from_cientity_id) or exists - (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = - `rel_${idx}`.from_cientity_id - and xx.expired_time >= NOW())) + and ( not exists (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = + `rel_${idx}`.from_cientity_id) or exists + (select 1 from cmdb_cientity_expiredtime xx where xx.cientity_id = + `rel_${idx}`.from_cientity_id + and xx.expired_time >= NOW())) and @@ -674,7 +674,8 @@ along with this program. If not, see .--> - JOIN ${ci.ciTableName} FORCE INDEX(PRIMARY) ON `ci_base`.id = ${ci.ciTableName}.cientity_id + JOIN ${ci.ciTableName} FORCE INDEX(PRIMARY) ON `ci_base`.id = + ${ci.ciTableName}.cientity_id JOIN ${ci.ciTableName} ON `ci_base`.id = ${ci.ciTableName}.id @@ -1575,6 +1576,15 @@ along with this program. If not, see .--> + +