From b6013186d3ef9228a55be1b5b8f72d040196d93e Mon Sep 17 00:00:00 2001
From: zhangdongxu <zhangdongxu@intranet.com>
Date: Mon, 27 Aug 2018 16:28:25 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81maat=E9=85=8D=E7=BD=AEuserRegion?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA=EF=BC=9B=202=E3=80=81?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E7=B1=BB=E9=85=8D=E7=BD=AE=E9=83=BD=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8AopTime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/restful/RestBusinessCode.java      | 5 ++++-
 src/main/java/com/nis/util/CompileVal.java               | 9 +++++----
 .../resources/commonSources/applicationConfig-parser.xml | 5 +++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/nis/restful/RestBusinessCode.java b/src/main/java/com/nis/restful/RestBusinessCode.java
index 332c71a..5d77111 100644
--- a/src/main/java/com/nis/restful/RestBusinessCode.java
+++ b/src/main/java/com/nis/restful/RestBusinessCode.java
@@ -107,7 +107,10 @@ public enum RestBusinessCode {
 	 * 编译配置的的endTime不能为空
 	 */
 	EndTimeIsNull(4001011, "Maat配置的endTime不能为空"),
-	
+	/**
+	 * 配置的userRegion不能为空
+	 */
+	UserRegionIsNull(4001012, "配置userRegion属性不能为空"),
 	/**
 	 * 配置的isValid不能为空
 	 */
diff --git a/src/main/java/com/nis/util/CompileVal.java b/src/main/java/com/nis/util/CompileVal.java
index 54a93e3..19c73b4 100644
--- a/src/main/java/com/nis/util/CompileVal.java
+++ b/src/main/java/com/nis/util/CompileVal.java
@@ -489,10 +489,11 @@ public class CompileVal {
 			throw new RestServiceException("编译配置id为" + compileId + "的编译配置中endTime不能为空",
 					RestBusinessCode.EndTimeIsNull.getValue());
 		}
-		// if (null == configCompile.getUserRegion() ||
-		// configCompile.getUserRegion().equals("")) {
-		// return "编译配置id为" + compileId + "的编译配置中userRegion不能为空";
-		// }
+		if (null == configCompile.getUserRegion() ||
+			configCompile.getUserRegion().equals("")) {
+			throw new RestServiceException("编译配置id为" + compileId + "的编译配置中userRegion不能为空",
+					RestBusinessCode.UserRegionIsNull.getValue());
+		}
 		if (null == configCompile.getIsValid()) {
 			throw new RestServiceException("编译配置id为" + compileId + "的编译配置中isValid不能为空",
 					RestBusinessCode.IsValidIsNull.getValue());
diff --git a/src/main/resources/commonSources/applicationConfig-parser.xml b/src/main/resources/commonSources/applicationConfig-parser.xml
index 24eb9b5..361fa7b 100644
--- a/src/main/resources/commonSources/applicationConfig-parser.xml
+++ b/src/main/resources/commonSources/applicationConfig-parser.xml
@@ -63,6 +63,7 @@
 		<t:field fieldType="String" srcName="description" dstName="description"  isRequired="true"/>
 		<t:field fieldType="Number" srcName="level" dstName="level" range="0-100" defaultVal="0"/>
 		<t:field fieldType="Number" srcName="isValid" dstName="is_valid" isRequired="true" regexp="[1]"/>
+		<t:field fieldType="Date" srcName="opTime" dstName="op_time" isRequired="true"/>
 	</t:commonSource>
 	<!--
 		 #0x340	IP复用地址池配置（回调）	832=0:IR_STATIC_IP_POOL_CB
@@ -141,7 +142,7 @@
 		<t:field fieldType="String" srcName="publicKeyAlgo" dstName="public_key_algo"  isRequired="true"/>
 		<t:field fieldType="String" srcName="crl" dstName="crl" defaultVal=""/>
 		<t:field fieldType="Number" srcName="isValid" dstName="is_valid" isRequired="true" regexp="[1]"/>
-		<!-- <t:field fieldType="Date" srcName="opTime" dstName="op_time" isRequired="true"/> -->
+		<t:field fieldType="Date" srcName="opTime" dstName="op_time" isRequired="true"/>
 	</t:commonSource>
 	
 	<!-- # 0x260	PXY 管控文件策略 	608=0:PXY_OBJ_FILE -->
@@ -153,7 +154,7 @@
 		<t:field fieldType="Number" srcName="contentLength" dstName="content_length"  isRequired="true"/>
 		<t:field fieldType="String" srcName="filePath" dstName="file_path"  isRequired="true"/>
 		<t:field fieldType="Number" srcName="isValid" dstName="is_valid" isRequired="true" regexp="[1]"/>
-		<!-- <t:field fieldType="Date" srcName="opTime" dstName="op_time" isRequired="true"/> -->
+		<t:field fieldType="Date" srcName="opTime" dstName="op_time" isRequired="true"/>
 	</t:commonSource>
 </t:commonSources>