gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Release-1.2' of http://10.0.6.99/common/maat_service.git

Browse Source 
into Release-1.2

Conflicts:
	src/main/resources/applicationConfig-rule.properties
This commit is contained in:
RenKaiGe-Office
2018-09-11 18:22:11 +08:00
parent 50211f4ea7 aea321f207
commit 7090756b8f
6 changed files with 78 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/nis/restful/RestBusinessCode.java
View File

@@ -139,6 +139,31 @@ public enum RestBusinessCode {
*/
OpTimeIsNull(4001019, "Maat配置的opTime不能为空"),
/**
* 编译配置的contType不能为空
*/
ContTypeIsNull(4001020, "Maat配置的contType不能为空"),
/**
* 编译配置的attrType不能为空
*/
AttrTypeIsNull(4001021, "Maat配置的attrType不能为空"),
/**
* 编译配置的taskId不能为空
*/
TaskIdIsNull(4001022, "Maat配置的taskId不能为空"),
/**
* 编译配置的contLabel不能为空
*/
ContLabelIsNull(4001023, "Maat配置的contLabel不能为空"),
/**
* 编译配置的affairId不能为空
*/
AffairIdIsNull(4001024, "Maat配置的affairId不能为空"),
//分组配置数据完整性业务码10100~
/**

22
src/main/java/com/nis/util/CompileVal.java
View File

@@ -469,6 +469,28 @@ public class CompileVal {
throw new RestServiceException("编译配置id为" + compileId + "的编译配置中action不能为空",
RestBusinessCode.ActionIsNull.getValue());
}
if (StringUtil.isEmpty(configCompile.getContType())) {
throw new RestServiceException("编译配置id为" + compileId + "的编译配置中contType不能为空",
RestBusinessCode.ContTypeIsNull.getValue());
}
if (StringUtil.isEmpty(configCompile.getAttrType())) {
throw new RestServiceException("编译配置id为" + compileId + "的编译配置中attrType不能为空",
RestBusinessCode.AttrTypeIsNull.getValue());
}
if (StringUtil.isEmpty(configCompile.getTaskId())) {
throw new RestServiceException("编译配置id为" + compileId + "的编译配置中taskId不能为空",
RestBusinessCode.TaskIdIsNull.getValue());
}
if (StringUtil.isEmpty(configCompile.getContLabel())) {
throw new RestServiceException("编译配置id为" + compileId + "的编译配置中contLabel不能为空",
RestBusinessCode.ContLabelIsNull.getValue());
}
if (StringUtil.isEmpty(configCompile.getAffairId())) {
throw new RestServiceException("编译配置id为" + compileId + "的编译配置中affairId不能为空",
RestBusinessCode.AffairIdIsNull.getValue());
}
if (null == configCompile.getDoBlacklist()) {
throw new RestServiceException("编译配置id为" + compileId + "的编译配置中doBlacklist不能为空",
RestBusinessCode.DoBlacklistIsNull.getValue());