From 8bac899542d70d1a54e91c3a67fe212c6d3a8021 Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Sat, 11 Nov 2023 20:30:14 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=8F=8F=E8=BF=B0=E8=A1=A5=E5=85=85=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1020123538751488]视图设置描述补充引用方 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1020123538751488 --- .../framework/cmdb/annotation/ResourceType.java | 2 ++ .../dto/resourcecenter/config/SceneEntityVo.java | 13 +++++++++++-- .../AppInstanceDetailClusterVo.java | 4 ++-- .../sceneviewfielddeclare/AppSystemAppModuleVo.java | 2 +- .../sceneviewfielddeclare/AppSystemVo.java | 2 +- .../resourcecenter/sceneviewfielddeclare/EnvVo.java | 2 +- .../sceneviewfielddeclare/IpObjectDetailVo.java | 2 +- .../IpObjectEnvAppModuleAppSystemVo.java | 2 +- .../sceneviewfielddeclare/OsDetailClusterVo.java | 2 +- .../OsSoftwareServiceEnvAppModuleAppSystemVo.java | 2 +- 10 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/main/java/neatlogic/framework/cmdb/annotation/ResourceType.java b/src/main/java/neatlogic/framework/cmdb/annotation/ResourceType.java index f5f53db..2db428e 100644 --- a/src/main/java/neatlogic/framework/cmdb/annotation/ResourceType.java +++ b/src/main/java/neatlogic/framework/cmdb/annotation/ResourceType.java @@ -31,4 +31,6 @@ public @interface ResourceType { String label(); String ciName() default ""; + + String[] functionPathList() default {}; } diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/config/SceneEntityVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/config/SceneEntityVo.java index a56657e..f7c0d75 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/config/SceneEntityVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/config/SceneEntityVo.java @@ -16,15 +16,14 @@ limitations under the License. package neatlogic.framework.cmdb.dto.resourcecenter.config; +import com.alibaba.fastjson.annotation.JSONField; import neatlogic.framework.cmdb.dto.ci.CiVo; import neatlogic.framework.cmdb.enums.resourcecenter.Status; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.restful.annotation.EntityField; -import com.alibaba.fastjson.annotation.JSONField; import java.util.Date; import java.util.List; -import java.util.Set; public class SceneEntityVo { @EntityField(name = "对象唯一标识（视图名）", type = ApiParamType.STRING) @@ -47,6 +46,8 @@ public class SceneEntityVo { private Date initTime; @EntityField(name = "关联模型id", type = ApiParamType.LONG) private Long ciId; + @EntityField(name = "描述", type = ApiParamType.STRING) + private String description; public String getName() { return name; @@ -130,4 +131,12 @@ public class SceneEntityVo { public void setCiId(Long ciId) { this.ciId = ciId; } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } } diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/AppInstanceDetailClusterVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/AppInstanceDetailClusterVo.java index 9e07fda..4fe18fe 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/AppInstanceDetailClusterVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/AppInstanceDetailClusterVo.java @@ -23,8 +23,8 @@ import neatlogic.framework.restful.annotation.EntityField; import java.util.Date; -@ResourceType(name = "scence_appinstance_detail_cluster", label = "应用实例详情及集群场景") -@ResourceType(name = "scence_dbinstance_detail_cluster", label = "DB实例详情及集群场景") +@ResourceType(name = "scence_appinstance_detail_cluster", label = "应用实例详情及集群场景", functionPathList = {"配置管理/应用清单"}) +@ResourceType(name = "scence_dbinstance_detail_cluster", label = "DB实例详情及集群场景", functionPathList = {"配置管理/应用清单"}) public class AppInstanceDetailClusterVo { @EntityField(name = "ID", type = ApiParamType.LONG) @ResourceField(name = "id") diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/AppSystemAppModuleVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/AppSystemAppModuleVo.java index 39cbf5d..31f9ff1 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/AppSystemAppModuleVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/AppSystemAppModuleVo.java @@ -21,7 +21,7 @@ import neatlogic.framework.cmdb.annotation.ResourceType; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.restful.annotation.EntityField; -@ResourceType(name = "scence_appsystem_appmodule", label = "应用系统和应用模块场景") +@ResourceType(name = "scence_appsystem_appmodule", label = "应用系统和应用模块场景", functionPathList = {"配置管理/应用清单"}) public class AppSystemAppModuleVo { @EntityField(name = "ID", type = ApiParamType.LONG) @ResourceField(name = "id") diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/AppSystemVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/AppSystemVo.java index 1480c06..d075e5f 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/AppSystemVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/AppSystemVo.java @@ -23,7 +23,7 @@ import neatlogic.framework.restful.annotation.EntityField; import java.util.Date; -@ResourceType(name = "scence_appsystem", label = "应用系统场景") +@ResourceType(name = "scence_appsystem", label = "应用系统场景", functionPathList = {"配置管理/应用清单"}) @ResourceType(name = "scence_appmodule", label = "应用模块场景") public class AppSystemVo { @EntityField(name = "ID", type = ApiParamType.LONG) diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/EnvVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/EnvVo.java index d4f5871..69c9fa2 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/EnvVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/EnvVo.java @@ -21,7 +21,7 @@ import neatlogic.framework.cmdb.annotation.ResourceType; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.restful.annotation.EntityField; -@ResourceType(name = "scence_env", label = "环境场景") +@ResourceType(name = "scence_env", label = "环境场景", functionPathList = {"配置管理/应用清单"}) public class EnvVo { @EntityField(name = "ID", type = ApiParamType.LONG) @ResourceField(name = "id") diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/IpObjectDetailVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/IpObjectDetailVo.java index 61d2e43..2014dcf 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/IpObjectDetailVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/IpObjectDetailVo.java @@ -23,7 +23,7 @@ import neatlogic.framework.restful.annotation.EntityField; import java.util.Date; -@ResourceType(name = "scence_ipobject_detail", label = "资产清单视图") +@ResourceType(name = "scence_ipobject_detail", label = "资产清单视图", functionPathList = {"配置管理/资产清单"}) public class IpObjectDetailVo { @EntityField(name = "ID", type = ApiParamType.LONG) @ResourceField(name = "id") diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/IpObjectEnvAppModuleAppSystemVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/IpObjectEnvAppModuleAppSystemVo.java index 6fa2e4e..3cfd6f5 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/IpObjectEnvAppModuleAppSystemVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/IpObjectEnvAppModuleAppSystemVo.java @@ -21,7 +21,7 @@ import neatlogic.framework.cmdb.annotation.ResourceType; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.restful.annotation.EntityField; -@ResourceType(name = "scence_ipobject_env_appmodule_appsystem", label = "IP软硬件环境和模块及应用场景") +@ResourceType(name = "scence_ipobject_env_appmodule_appsystem", label = "IP软硬件环境和模块及应用场景", functionPathList = {"配置管理/应用清单"}) public class IpObjectEnvAppModuleAppSystemVo { @EntityField(name = "ID", type = ApiParamType.LONG) @ResourceField(name = "id") diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/OsDetailClusterVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/OsDetailClusterVo.java index c9c119c..15cb941 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/OsDetailClusterVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/OsDetailClusterVo.java @@ -23,7 +23,7 @@ import neatlogic.framework.restful.annotation.EntityField; import java.util.Date; -@ResourceType(name = "scence_os_detail_cluster", label = "操作系统详情及集群场景") +@ResourceType(name = "scence_os_detail_cluster", label = "操作系统详情及集群场景", functionPathList = {"配置管理/应用清单"}) public class OsDetailClusterVo { @EntityField(name = "ID", type = ApiParamType.LONG) @ResourceField(name = "id") diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/OsSoftwareServiceEnvAppModuleAppSystemVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/OsSoftwareServiceEnvAppModuleAppSystemVo.java index cdc2899..d45f97e 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/OsSoftwareServiceEnvAppModuleAppSystemVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/sceneviewfielddeclare/OsSoftwareServiceEnvAppModuleAppSystemVo.java @@ -20,7 +20,7 @@ import neatlogic.framework.cmdb.annotation.ResourceField; import neatlogic.framework.cmdb.annotation.ResourceType; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.restful.annotation.EntityField; -@ResourceType(name = "scence_os_softwareservice_env_appmodule_appsystem", label = "操作系统与软件服务、环境、模块及应用场景") +@ResourceType(name = "scence_os_softwareservice_env_appmodule_appsystem", label = "操作系统与软件服务、环境、模块及应用场景", functionPathList = {"配置管理/应用清单"}) public class OsSoftwareServiceEnvAppModuleAppSystemVo { @EntityField(name = "ID", type = ApiParamType.LONG) @ResourceField(name = "id") -- Gitee