diff --git a/src/main/java/neatlogic/framework/cmdb/annotation/ResourceType.java b/src/main/java/neatlogic/framework/cmdb/annotation/ResourceType.java index f5f53dbc9a915aceee40741e2e3a41f579cefb4e..2db428eac4b2064e3674dc95f51080f912a6fa26 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 a56657eb3f77707fb59820dc684c6d4214aadd2e..f7c0d75966b4666c6400e7b9824b3677cabb57bc 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 9e07fda1135ee4fa1a7edf4034c5c7cd2763949c..4fe18feaf5dfeab86bf36fb8ac74c1a4369669ab 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 39cbf5d8c375b5e6b6e9bf8a3bc1bb1644014002..31f9ff1dad3d46df2223ff1794a2d4c51560a991 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 1480c0619482804bb9883d62f8e0958dcb35b8fe..d075e5f7e54849083148a4d06684274461351255 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 d4f587192528225df4a80800ccfe1ea7afc246d8..69c9fa24e68776b861c68f2990408491296272cf 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 61d2e43fce9775bbb99aa96992e1be4fce609b59..2014dcff6f684bb6332ad802639b0d6956fefe3c 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 6fa2e4e8192be361d1f36c32b5cc2a4f7e17ac56..3cfd6f58ab94d40ff4dd83d468c06778fab1bcc6 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 c9c119c10bbcc7e84917a701dbe3c6974b5ce1a7..15cb941f4f4089b3f21e05b8d3abdcfad041ecc7 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 cdc28994e926bf9b07a5e38143f341c0cc5cc7d1..d45f97eadbf3c01a3716d4c55a12465f85c814da 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")