diff --git a/src/main/java/neatlogic/framework/cmdb/dto/transaction/CiEntityTransactionVo.java b/src/main/java/neatlogic/framework/cmdb/dto/transaction/CiEntityTransactionVo.java index 4ae8cf487cac772573fbd3e890f3a5d602e36c80..fc919a0519f07d3614b2ac6e3709f8fda7f89051 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/transaction/CiEntityTransactionVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/transaction/CiEntityTransactionVo.java @@ -96,6 +96,10 @@ public class CiEntityTransactionVo implements Serializable { private String description; @EntityField(name = "唯一属性列表", type = ApiParamType.LONG) private List uniqueAttrIdList; + /** 配置路径列表 **/ + private List configurationPathList; + /** 实际路径列表 **/ + private List actualPathList; public CiEntityTransactionVo() { @@ -793,4 +797,20 @@ public class CiEntityTransactionVo implements Serializable { } return hash; } + + public List getConfigurationPathList() { + return configurationPathList; + } + + public void setConfigurationPathList(List configurationPathList) { + this.configurationPathList = configurationPathList; + } + + public List getActualPathList() { + return actualPathList; + } + + public void setActualPathList(List actualPathList) { + this.actualPathList = actualPathList; + } } 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 9163560eed65e3799e780424b20cd9bfabb4e3b8..9cadc88c3402f8b70da8200610ed7beb3c45887b 100644 --- a/src/main/java/neatlogic/framework/cmdb/exception/attr/AttrValueIrregularException.java +++ b/src/main/java/neatlogic/framework/cmdb/exception/attr/AttrValueIrregularException.java @@ -22,7 +22,11 @@ import neatlogic.framework.exception.core.ApiRuntimeException; public class AttrValueIrregularException extends ApiRuntimeException { public AttrValueIrregularException(AttrVo attrVo, String value) { - super("模型“{0}({1})”属性“{2}({3})”的值“{4}”不是合法的{3}类型", attrVo.getCiLabel(), attrVo.getCiName(), attrVo.getLabel(), attrVo.getName(), value, attrVo.getTypeText()); + 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); } } 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 8077a7b79793cde0a7a89e12ed010cda43e39368..6ffa1658b633de7d113c7ac7ca8283715061a10b 100644 --- a/src/main/java/neatlogic/framework/cmdb/exception/ci/CiIsAbstractedException.java +++ b/src/main/java/neatlogic/framework/cmdb/exception/ci/CiIsAbstractedException.java @@ -16,6 +16,7 @@ package neatlogic.framework.cmdb.exception.ci; +import neatlogic.framework.cmdb.dto.ci.CiVo; import neatlogic.framework.exception.core.ApiRuntimeException; import neatlogic.framework.util.$; @@ -29,6 +30,10 @@ 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 de46275a1b25dda637c36ef2127c5d7bb6ec8f23..d429d7f1604c3249854ff5dacd9ef5bb8c6e63fb 100644 --- a/src/main/java/neatlogic/framework/cmdb/exception/ci/CiNotFoundException.java +++ b/src/main/java/neatlogic/framework/cmdb/exception/ci/CiNotFoundException.java @@ -20,11 +20,15 @@ import neatlogic.framework.exception.core.ApiRuntimeException; public class CiNotFoundException extends ApiRuntimeException { public CiNotFoundException(Long ciId) { - super("配置项模型“{0}”不存在", ciId); + super("nfcec.cinotfoundexception.cinotfoundexception_a", ciId); } public CiNotFoundException(String ciName) { - super("配置项模型“{0}”不存在", 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 5e612b836d670551218a85135ffc31f1ee55b823..625fbabeb37996a450c2a9dde165aaa131bfceb0 100644 --- a/src/main/java/neatlogic/framework/cmdb/exception/ci/CiUniqueAttrNotFoundException.java +++ b/src/main/java/neatlogic/framework/cmdb/exception/ci/CiUniqueAttrNotFoundException.java @@ -38,6 +38,10 @@ 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 e3af37bb22223bc839210f2e2edc1e498fabd1aa..8aabce43d24128688592fae23b035f8b7f22d9ce 100644 --- a/src/main/java/neatlogic/framework/cmdb/exception/ci/CiUniqueRuleAttrTypeIrregularException.java +++ b/src/main/java/neatlogic/framework/cmdb/exception/ci/CiUniqueRuleAttrTypeIrregularException.java @@ -28,4 +28,8 @@ 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 cdbe631008e38d57cf7563415ed88225df146f99..b9fd45fbbfd47c151aa7f54a01d5d6c9d54be0b8 100644 --- a/src/main/java/neatlogic/framework/cmdb/exception/ci/DownwardCiNotFoundException.java +++ b/src/main/java/neatlogic/framework/cmdb/exception/ci/DownwardCiNotFoundException.java @@ -8,4 +8,8 @@ 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/cientity/AttrEntityValueEmptyException.java b/src/main/java/neatlogic/framework/cmdb/exception/cientity/AttrEntityValueEmptyException.java index 0760f8d29bf6e6622122348557c8fbdef2886913..a55d0e5bc0ec5e5a48b6dea9851c5e4cb362d693 100644 --- a/src/main/java/neatlogic/framework/cmdb/exception/cientity/AttrEntityValueEmptyException.java +++ b/src/main/java/neatlogic/framework/cmdb/exception/cientity/AttrEntityValueEmptyException.java @@ -16,11 +16,16 @@ package neatlogic.framework.cmdb.exception.cientity; +import neatlogic.framework.cmdb.dto.ci.AttrVo; +import neatlogic.framework.cmdb.dto.ci.CiVo; import neatlogic.framework.exception.core.ApiRuntimeException; public class AttrEntityValueEmptyException extends ApiRuntimeException { public AttrEntityValueEmptyException(String msg) { - super("属性“{0}”值不能为空", msg); + super("nfcec.attrentityvalueemptyexception.attrentityvalueemptyexception_a", msg); } + public AttrEntityValueEmptyException(CiVo ciVo, AttrVo attrVo) { + super("nfcec.attrentityvalueemptyexception.attrentityvalueemptyexception_b", ciVo.getLabel(), ciVo.getName(), attrVo.getLabel(), attrVo.getName()); + } }