From abd7168d82886c0a70c28a35017eaddff36e8b7f Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 11 Apr 2025 16:51:36 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=B7=A1=E6=A3=80=E9=9C=80=E5=AF=B9=E6=89=80=E6=9C=89=E8=AF=A5?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=B8=8B=E8=B5=84=E4=BA=A7=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E5=AF=B9=E6=9C=89=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9A=84=E8=B5=84=E4=BA=A7=E5=B7=A1=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1397023939461120]应用巡检需对所有该应用下资产巡检而不是对有问题的资产巡检 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1397023939461120 --- .../cmdb/dto/resourcecenter/AppModuleVo.java | 12 ++++++++++++ .../exception/attr/AttrValueIrregularException.java | 4 ---- .../cmdb/exception/ci/CiIsAbstractedException.java | 5 ----- .../cmdb/exception/ci/CiNotFoundException.java | 4 ---- .../exception/ci/CiUniqueAttrNotFoundException.java | 4 ---- .../ci/CiUniqueRuleAttrTypeIrregularException.java | 4 ---- .../exception/ci/DownwardCiNotFoundException.java | 4 ---- .../GlobalAttrValueIrregularException.java | 4 ---- .../datasource/core/IResourceCenterDataSource.java | 2 +- 9 files changed, 13 insertions(+), 30 deletions(-) diff --git a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/AppModuleVo.java b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/AppModuleVo.java index e2cb717..7acbbe7 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/AppModuleVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/resourcecenter/AppModuleVo.java @@ -15,10 +15,12 @@ along with this program. If not, see .*/ package neatlogic.framework.cmdb.dto.resourcecenter; +import neatlogic.framework.cmdb.dto.ci.CiVo; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.restful.annotation.EntityField; import java.io.Serializable; +import java.util.List; public class AppModuleVo implements Serializable { private static final long serialVersionUID = 3794860793337591802L; @@ -34,6 +36,9 @@ public class AppModuleVo implements Serializable { @EntityField(name = "term.cmdb.ishasenv", type = ApiParamType.INTEGER) private Integer isHasEnv = 0; + @EntityField(name = "term.cmdb.cilist", type = ApiParamType.JSONARRAY) + private List ciList; + public Long getId() { return id; } @@ -74,4 +79,11 @@ public class AppModuleVo implements Serializable { this.isHasEnv = isHasEnv; } + public List getCiList() { + return ciList; + } + + public void setCiList(List ciList) { + this.ciList = ciList; + } } diff --git a/src/main/java/neatlogic/framework/cmdb/exception/attr/AttrValueIrregularException.java b/src/main/java/neatlogic/framework/cmdb/exception/attr/AttrValueIrregularException.java index 9fb5f7b..f2c3868 100644 --- a/src/main/java/neatlogic/framework/cmdb/exception/attr/AttrValueIrregularException.java +++ b/src/main/java/neatlogic/framework/cmdb/exception/attr/AttrValueIrregularException.java @@ -24,10 +24,6 @@ public class AttrValueIrregularException extends ApiRuntimeException { super("nfcea.attrvalueirregularexception.attrvalueirregularexception_a", attrVo.getCiLabel(), attrVo.getCiName(), attrVo.getLabel(), attrVo.getName(), value, attrVo.getTypeText()); } - public AttrValueIrregularException(AttrVo attrVo, String value, String configurationPath, String actualPath) { - super("nfcea.attrvalueirregularexception.attrvalueirregularexception_b", attrVo.getCiLabel(), attrVo.getCiName(), attrVo.getLabel(), attrVo.getName(), value, attrVo.getTypeText(), configurationPath, actualPath); - } - public AttrValueIrregularException(AttrVo attrVo, IllegalArgumentException error) { super("模型“{0}({1})”属性“{2}({3})”的值格式异常：{4}", attrVo.getCiLabel(), attrVo.getCiName(), attrVo.getLabel(), attrVo.getName(), error.getMessage()); } diff --git a/src/main/java/neatlogic/framework/cmdb/exception/ci/CiIsAbstractedException.java b/src/main/java/neatlogic/framework/cmdb/exception/ci/CiIsAbstractedException.java index cbaeeea..e97def8 100644 --- a/src/main/java/neatlogic/framework/cmdb/exception/ci/CiIsAbstractedException.java +++ b/src/main/java/neatlogic/framework/cmdb/exception/ci/CiIsAbstractedException.java @@ -15,7 +15,6 @@ along with this program. If not, see .*/ package neatlogic.framework.cmdb.exception.ci; -import neatlogic.framework.cmdb.dto.ci.CiVo; import neatlogic.framework.exception.core.ApiRuntimeException; import neatlogic.framework.util.$; @@ -29,10 +28,6 @@ public class CiIsAbstractedException extends ApiRuntimeException { super(getMessage(type, ciName)); } - public CiIsAbstractedException(CiVo ciVo, String configurationPath, String actualPath) { - super("nfcec.ciisabstractedexception.ciisabstractedexception_a", ciVo.getLabel(), ciVo.getName(), configurationPath, actualPath); - } - private static String getMessage(Type type, String ciName) { if (type == Type.DATA) { return $.t("nfcec.ciisabstractedexception.data", ciName); diff --git a/src/main/java/neatlogic/framework/cmdb/exception/ci/CiNotFoundException.java b/src/main/java/neatlogic/framework/cmdb/exception/ci/CiNotFoundException.java index b541ac1..b6207b7 100644 --- a/src/main/java/neatlogic/framework/cmdb/exception/ci/CiNotFoundException.java +++ b/src/main/java/neatlogic/framework/cmdb/exception/ci/CiNotFoundException.java @@ -29,8 +29,4 @@ public class CiNotFoundException extends ApiRuntimeException { public CiNotFoundException(String ciName) { super("nfcec.cinotfoundexception.cinotfoundexception_a", ciName); } - - public CiNotFoundException(String ciName, String configurationPath, String actualPath) { - super("nfcec.cinotfoundexception.cinotfoundexception_b", ciName, configurationPath, actualPath); - } } diff --git a/src/main/java/neatlogic/framework/cmdb/exception/ci/CiUniqueAttrNotFoundException.java b/src/main/java/neatlogic/framework/cmdb/exception/ci/CiUniqueAttrNotFoundException.java index dd1f1a4..8f7083c 100644 --- a/src/main/java/neatlogic/framework/cmdb/exception/ci/CiUniqueAttrNotFoundException.java +++ b/src/main/java/neatlogic/framework/cmdb/exception/ci/CiUniqueAttrNotFoundException.java @@ -37,10 +37,6 @@ public class CiUniqueAttrNotFoundException extends ApiRuntimeException { super("nfcec.ciuniqueattrnotfoundexception.ciuniqueattrnotfoundexception_c", attrVo.getCiLabel(), attrVo.getCiName(), attrVo.getLabel(), attrVo.getName()); } - public CiUniqueAttrNotFoundException(AttrVo attrVo, String configurationPath, String actualPath) { - super("nfcec.ciuniqueattrnotfoundexception.ciuniqueattrnotfoundexception_f", attrVo.getCiLabel(), attrVo.getCiName(), attrVo.getLabel(), attrVo.getName(), configurationPath, actualPath); - } - public CiUniqueAttrNotFoundException(Long ciId, Long attrId) { super("nfcec.ciuniqueattrnotfoundexception.ciuniqueattrnotfoundexception_d", ciId, attrId); } diff --git a/src/main/java/neatlogic/framework/cmdb/exception/ci/CiUniqueRuleAttrTypeIrregularException.java b/src/main/java/neatlogic/framework/cmdb/exception/ci/CiUniqueRuleAttrTypeIrregularException.java index f5c7fb9..84e6fd3 100644 --- a/src/main/java/neatlogic/framework/cmdb/exception/ci/CiUniqueRuleAttrTypeIrregularException.java +++ b/src/main/java/neatlogic/framework/cmdb/exception/ci/CiUniqueRuleAttrTypeIrregularException.java @@ -27,8 +27,4 @@ public class CiUniqueRuleAttrTypeIrregularException extends ApiRuntimeException public CiUniqueRuleAttrTypeIrregularException(AttrVo attrVo) { super("nfcec.ciuniqueruleattrtypeirregularexception.ciuniqueruleattrtypeirregularexception_b", attrVo.getCiLabel(), attrVo.getCiName(), attrVo.getLabel(), attrVo.getName()); } - - public CiUniqueRuleAttrTypeIrregularException(AttrVo attrVo, String configurationPath, String actualPath) { - super("nfcec.ciuniqueruleattrtypeirregularexception.ciuniqueruleattrtypeirregularexception_c", attrVo.getCiLabel(), attrVo.getCiName(), attrVo.getLabel(), attrVo.getName(), configurationPath, actualPath); - } } diff --git a/src/main/java/neatlogic/framework/cmdb/exception/ci/DownwardCiNotFoundException.java b/src/main/java/neatlogic/framework/cmdb/exception/ci/DownwardCiNotFoundException.java index b9fd45f..cdbe631 100644 --- a/src/main/java/neatlogic/framework/cmdb/exception/ci/DownwardCiNotFoundException.java +++ b/src/main/java/neatlogic/framework/cmdb/exception/ci/DownwardCiNotFoundException.java @@ -8,8 +8,4 @@ public class DownwardCiNotFoundException extends ApiRuntimeException { public DownwardCiNotFoundException(CiVo rootCi, String ciName) { super("nfcec.downwardcinotfoundexception.downwardcinotfoundexception", rootCi.getLabel(), rootCi.getName(), ciName); } - - public DownwardCiNotFoundException(CiVo rootCi, String ciName, String configurationPath, String actualPath) { - super("nfcec.downwardcinotfoundexception.downwardcinotfoundexception_b", rootCi.getLabel(), rootCi.getName(), ciName, configurationPath, actualPath); - } } diff --git a/src/main/java/neatlogic/framework/cmdb/exception/globalattr/GlobalAttrValueIrregularException.java b/src/main/java/neatlogic/framework/cmdb/exception/globalattr/GlobalAttrValueIrregularException.java index 2842604..a29bcfd 100644 --- a/src/main/java/neatlogic/framework/cmdb/exception/globalattr/GlobalAttrValueIrregularException.java +++ b/src/main/java/neatlogic/framework/cmdb/exception/globalattr/GlobalAttrValueIrregularException.java @@ -9,10 +9,6 @@ public class GlobalAttrValueIrregularException extends ApiRuntimeException { super("nfceg.globalattrvalueirregularexception.globalattrvalueirregularexception", globalAttrVo.getLabel(), globalAttrVo.getName(), value); } - public GlobalAttrValueIrregularException(String ciLabel, String ciName, GlobalAttrVo globalAttrVo, String value, String configurationPath, String actualPath) { - super("nfceg.globalattrvalueirregularexception.globalattrvalueirregularexception_b", ciLabel, ciName, globalAttrVo.getLabel(), globalAttrVo.getName(), value, configurationPath, actualPath); - } - static public class MultipleException extends ApiRuntimeException { public MultipleException(GlobalAttrVo globalAttrVo) { super("全局属性“" + globalAttrVo.getLabel() + "”不支持多选"); diff --git a/src/main/java/neatlogic/framework/cmdb/resourcecenter/datasource/core/IResourceCenterDataSource.java b/src/main/java/neatlogic/framework/cmdb/resourcecenter/datasource/core/IResourceCenterDataSource.java index c54b8f6..c71b536 100644 --- a/src/main/java/neatlogic/framework/cmdb/resourcecenter/datasource/core/IResourceCenterDataSource.java +++ b/src/main/java/neatlogic/framework/cmdb/resourcecenter/datasource/core/IResourceCenterDataSource.java @@ -67,7 +67,7 @@ public interface IResourceCenterDataSource { List getAppEnvListForSelect(BasePageVo searchVo, boolean needPage); - List getAppEnvListByAppSystemIdAndInspectStatusList(Long appSystemId, List inspectStatusList); + List getAppEnvListByAppSystemIdAndAppModuleIdAndInspectStatusList(Long appSystemId, Long appModuleId, List inspectStatusList); List getStateListForSelect(BasePageVo searchVo); -- Gitee