From a888eee8a25c9bb2dafeaead4f69e5e64e38f640 Mon Sep 17 00:00:00 2001 From: zhangdongxu Date: Thu, 6 Sep 2018 18:05:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9F=9F=E9=85=8D=E7=BD=AEop?= =?UTF-8?q?time=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=AA=8C?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/CompileVal.java | 18 +++++++++++++++++- src/main/java/com/nis/util/GroupReuseVal.java | 12 ++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/nis/util/CompileVal.java b/src/main/java/com/nis/util/CompileVal.java index 972157f..b523bfc 100644 --- a/src/main/java/com/nis/util/CompileVal.java +++ b/src/main/java/com/nis/util/CompileVal.java @@ -593,6 +593,10 @@ public class CompileVal { throw new RestServiceException("编译配置id为" + compileId + "的编译配置中的ip类域配置id为" + regionId + "的配置isValid不能为空", RestBusinessCode.IsValidIsNull.getValue()); } + if (null == ipRegion.getOpTime()) { + throw new RestServiceException("编译配置id为" + compileId + "的编译配置中的ip类域配置id为" + regionId + "的配置opTime不能为空", + RestBusinessCode.OpTimeIsNull.getValue()); + } } public static void valNumRegion(NumRegion numRegion, Long compileId) throws Exception { @@ -613,6 +617,10 @@ public class CompileVal { throw new RestServiceException("编译配置id为" + compileId + "的编译配置中的数值类域配置id为" + regionId + "的配置upBoundary不能为空", RestBusinessCode.UpBoundaryIsNull.getValue()); } + if (null == numRegion.getOpTime()) { + throw new RestServiceException("编译配置id为" + compileId + "的编译配置中的数值类域配置id为" + regionId + "的配置opTime不能为空", + RestBusinessCode.OpTimeIsNull.getValue()); + } } public static void valStrRegion(StrRegion strRegion, Long compileId, boolean isDirtrict) throws Exception { @@ -649,6 +657,10 @@ public class CompileVal { throw new RestServiceException("编译配置id为" + compileId + "的编译配置中的字符串类域配置id为" + regionId + "的配置isHexbin不能为空", RestBusinessCode.MatchMethodIsNull.getValue()); } + if (null == strRegion.getOpTime()) { + throw new RestServiceException("编译配置id为" + compileId + "的编译配置中的字符串类域配置id为" + regionId + "的配置opTime不能为空", + RestBusinessCode.OpTimeIsNull.getValue()); + } } public static void valDigestRegion(DigestRegion digestRegion, Long compileId) throws Exception { @@ -670,9 +682,13 @@ public class CompileVal { RestBusinessCode.DigestIsNull.getValue()); } if (null == digestRegion.getCfdsLevel()) { - throw new RestServiceException("编译配置id为" + compileId + "的编译配置中的字符串类域配置id为" + regionId + "的配置cfdsLevel不能为空", + throw new RestServiceException("编译配置id为" + compileId + "的编译配置中的摘要类域配置id为" + regionId + "的配置cfdsLevel不能为空", RestBusinessCode.CfdsLevelIsNull.getValue()); } + if (null == digestRegion.getOpTime()) { + throw new RestServiceException("编译配置id为" + compileId + "的编译配置中的摘要类域配置id为" + regionId + "的配置opTime不能为空", + RestBusinessCode.OpTimeIsNull.getValue()); + } } private static void validateIpAndMask(IpRegion ipRegion, Long compileId, String listName) throws Exception { diff --git a/src/main/java/com/nis/util/GroupReuseVal.java b/src/main/java/com/nis/util/GroupReuseVal.java index 6548f5c..28b99f7 100644 --- a/src/main/java/com/nis/util/GroupReuseVal.java +++ b/src/main/java/com/nis/util/GroupReuseVal.java @@ -202,6 +202,10 @@ public class GroupReuseVal { throw new RestServiceException("ipRegionList中id为" + regionId + "的配置isValid不能为空", RestBusinessCode.IsValidIsNull.getValue()); } + if (null == ipRegion.getOpTime()) { + throw new RestServiceException("ipRegionList中id为" + regionId + "的配置opTime不能为空", + RestBusinessCode.OpTimeIsNull.getValue()); + } } public static void valNumRegion(NumRegion numRegion) @@ -223,6 +227,10 @@ public class GroupReuseVal { throw new RestServiceException("数值类域配置id为" + regionId + "的配置upBoundary不能为空", RestBusinessCode.UpBoundaryIsNull.getValue()); } + if (null == numRegion.getOpTime()) { + throw new RestServiceException("数值类域配置中id为" + regionId + "的配置opTime不能为空", + RestBusinessCode.OpTimeIsNull.getValue()); + } } public static void valStrRegion(StrRegion strRegion) throws Exception { @@ -255,6 +263,10 @@ public class GroupReuseVal { throw new RestServiceException("strRegionList中id为" + regionId + "的配置isHexbin不能为空", RestBusinessCode.MatchMethodIsNull.getValue()); } + if (null == strRegion.getOpTime()) { + throw new RestServiceException("strRegionList中id为" + regionId + "的配置opTime不能为空", + RestBusinessCode.OpTimeIsNull.getValue()); + } }