From 93dd3c4309ba5fedbbef64783734b6f121875d6c Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Mon, 25 Dec 2023 19:14:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E7=BB=84=E5=90=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E9=85=8D=E7=BD=AE=E8=B5=84=E4=BA=A7=E6=9D=83?= =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86=E7=9A=84=E4=BF=AE=E6=94=B9=20#[1044?= =?UTF-8?q?873413623808]=E8=87=AA=E5=8A=A8=E5=8C=96--=E7=BB=84=E5=90=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E9=85=8D=E7=BD=AE=E8=B5=84=E4=BA=A7=E6=9D=83?= =?UTF-8?q?=E9=99=90=E7=AE=A1=E7=90=86=E7=9A=84=E4=BF=AE=E6=94=B9=20http:/?= =?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/?= =?UTF-8?q?939050947543042/1044873413623808?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/cmdb/crossover/IResourceCrossoverMapper.java | 4 +++- .../java/neatlogic/framework/cmdb/dto/group/GroupVo.java | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCrossoverMapper.java b/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCrossoverMapper.java index c562a03..f33cc97 100644 --- a/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCrossoverMapper.java +++ b/src/main/java/neatlogic/framework/cmdb/crossover/IResourceCrossoverMapper.java @@ -62,6 +62,8 @@ public interface IResourceCrossoverMapper extends ICrossoverService { List getResourceByIdList(List idList); + List getAuthResourceList(ResourceSearchVo searchVo); + ResourceVo getResourceById(Long id); int checkResourceIsExists(Long id); @@ -88,7 +90,7 @@ public interface IResourceCrossoverMapper extends ICrossoverService { List getResourceAppSystemListByResourceIdList(List id); - List getResourceListByResourceVoList(@Param("resourceList") List resourceList); + List getResourceListByResourceVoList(@Param("resourceList") List resourceList,@Param("searchVo") ResourceSearchVo searchVo); Long getAppSystemIdByResourceId(Long id); diff --git a/src/main/java/neatlogic/framework/cmdb/dto/group/GroupVo.java b/src/main/java/neatlogic/framework/cmdb/dto/group/GroupVo.java index 9df7f1f..51e22eb 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/group/GroupVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/group/GroupVo.java @@ -16,11 +16,13 @@ package neatlogic.framework.cmdb.dto.group; +import neatlogic.framework.cmdb.enums.CmdbTenantConfig; import neatlogic.framework.cmdb.enums.group.GroupType; import neatlogic.framework.cmdb.enums.group.Status; import neatlogic.framework.common.config.Config; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.BaseEditorVo; +import neatlogic.framework.config.ConfigManager; import neatlogic.framework.restful.annotation.EntityField; import neatlogic.framework.util.SnowflakeUtil; import com.alibaba.fastjson.annotation.JSONField; @@ -195,4 +197,8 @@ public class GroupVo extends BaseEditorVo { this.type = type; } + public String getIsResourcecenterAuth() { + return ConfigManager.getConfig(CmdbTenantConfig.IS_RESOURCECENTER_AUTH); + } + } -- Gitee From 0d087da1cd77654a02f850b03807124b22f51114 Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Thu, 4 Jan 2024 19:26:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96--=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=B5=84=E4=BA=A7=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9=20#[1044873413623808]=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96--=E7=BB=84=E5=90=88=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B5=84=E4=BA=A7=E6=9D=83=E9=99=90=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=9A=84=E4=BF=AE=E6=94=B9=20http://192.168.0.96:8090?= =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/10?= =?UTF-8?q?44873413623808?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/cmdb/dto/resourcecenter/ResourceSearchVo.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java index 151e4a3..bedd5c3 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/ResourceSearchVo.java @@ -110,6 +110,12 @@ public class ResourceSearchVo extends ConditionConfigVo { public ResourceSearchVo(JSONObject jsonObj) { super(jsonObj); } + + public ResourceSearchVo(ResourceVo resourceVo) { + this.ip = resourceVo.getIp(); + this.port = resourceVo.getPort() != null ? resourceVo.getPort().toString() : null; + } + public ResourceSearchVo(List tagIdList) { this.tagIdList = tagIdList; } -- Gitee