From e4f5c6f5605b2c272f3d0db3588ccd8addeb6f2e Mon Sep 17 00:00:00 2001
From: zhangdongxu <zhangdongxu@intranet.com>
Date: Tue, 5 Jun 2018 12:47:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=9Emaat=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/commonSources/commonSources.xml |  8 +-
 src/main/resources/maatXml/maat.xml           | 73 ++++++++++++-------
 2 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/src/main/resources/commonSources/commonSources.xml b/src/main/resources/commonSources/commonSources.xml
index 2738f5a..dbde8bc 100644
--- a/src/main/resources/commonSources/commonSources.xml
+++ b/src/main/resources/commonSources/commonSources.xml
@@ -13,10 +13,10 @@
 		<t:field fieldType="IP" srcName="maskDstIp" dstName="mask_dst_ip"  isRequired="true"/>
 		<t:field fieldType="Port" srcName="dstPort" dstName="dst_port" isRequired="true" range="0-65535"/>
 		<t:field fieldType="Port" srcName="maskDstPort" dstName="mask_dst_port" isRequired="true" range="0-65535"/>
+		<t:field fieldType="Number" srcName="protocol" dstName="protocol" isRequired="true" regexp="[0|6|17]"/>
 		<t:field fieldType="Number" srcName="direction" dstName="direction" isRequired="true" range="0-1"/>
 		<t:field fieldType="Number" srcName="isValid" dstName="is_valid" isRequired="true" range="0-1"/>
-		<t:field fieldType="Date" srcName="opTime" dstName="time_stamp" isRequired="true"/>
-		<t:field fieldType="Number" srcName="" dstName="file_id" defaultVal="[cfgId]"/>
+		<t:field fieldType="Date" srcName="opTime" dstName="op_time" isRequired="true"/>
 	</t:commonSource>
 	<t:commonSource serviceIds="261,262,263,264,389,390,391,392">
 		<t:field fieldType="String" srcName="service" dstName="service" isRequired="true"/>
@@ -25,8 +25,8 @@
 		<t:field fieldType="String" srcName="dstFileMd5" dstName="dst_file_md5"  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" range="0-1"/>
-		<t:field fieldType="Date" srcName="opTime" dstName="time_stamp" isRequired="true"/>
-		<t:field fieldType="Number" srcName="" dstName="file_id" defaultVal="[cfgId]"/>
+		<t:field fieldType="Date" srcName="opTime" dstName="op_time" isRequired="true"/>
+		<t:field fieldType="Number" srcName="" dstName="file_id" defaultVal="[dstFile]"/>
 	</t:commonSource>
 	<t:commonSource serviceIds="265,266,393,394">
 		<t:field fieldType="String" srcName="service" dstName="service" isRequired="true"/>
diff --git a/src/main/resources/maatXml/maat.xml b/src/main/resources/maatXml/maat.xml
index 4bcb4c1..45e4073 100644
--- a/src/main/resources/maatXml/maat.xml
+++ b/src/main/resources/maatXml/maat.xml
@@ -3,10 +3,10 @@
 	xsi:schemaLocation="http://www.w3school.com.cn maat.xsd">
 
 
-	<p:maatType service="96;97;98;99;160;161;162;163">
+	<p:maatType service="261;261;263;264;389;390;391;392">
 		<p:expressions>
 			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
-			<p:valueExpression>[cfg_id];\t;[is_valid];\t;[dst_file];\t;[dst_file_md5];\t;[time_stamp];&amp;nbsp;[level];\t;[file_id];\n</p:valueExpression>
+			<p:valueExpression>[cfg_id];\t;[is_valid];\t;[dst_file];\t;[dst_file_md5];\t;[op_time];&amp;nbsp;[level];\t;[file_id];\n</p:valueExpression>
 		</p:expressions>
 		<p:sequences>
 			<p:operation>1</p:operation>
@@ -23,7 +23,49 @@
 			<p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression>
 		</p:expressions>
 	</p:maatType>
+	
+	<p:maatType service="265;266;393;394">
+		<p:expressions>
+			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
+			<p:valueExpression>[cfg_id];\t;[service];\t;[level];\t;[description];\t;[is_valid]</p:valueExpression>
+		</p:expressions>
+		<p:sequences>
+			<p:operation>1</p:operation>
+			<p:sequenceKey>MAAT_VERSION</p:sequenceKey>
+		</p:sequences>
+		<p:expressions>
+			<p:keyExpression>MAAT_UPDATE_STATUS</p:keyExpression>
+		</p:expressions>
 
+		<p:expressions>
+			<p:keyExpression>MAAT_RULE_TIMER</p:keyExpression>
+		</p:expressions>
+		<p:expressions>
+			<p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression>
+		</p:expressions>
+	</p:maatType>
+	
+	<p:maatType service="3;4;25;28;29">
+		<p:expressions>
+			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
+			<p:valueExpression>[cfg_id];\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[op_time]</p:valueExpression>
+		</p:expressions>
+		<p:sequences>
+			<p:operation>1</p:operation>
+			<p:sequenceKey>MAAT_VERSION</p:sequenceKey>
+		</p:sequences>
+		<p:expressions>
+			<p:keyExpression>MAAT_UPDATE_STATUS</p:keyExpression>
+		</p:expressions>
+
+		<p:expressions>
+			<p:keyExpression>MAAT_RULE_TIMER</p:keyExpression>
+		</p:expressions>
+		<p:expressions>
+			<p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression>
+		</p:expressions>
+	</p:maatType>
+	
 	<p:maatType service="1;2;16;17;18;19;20;21;22;23;24;26;27;30;31;128;129;130;131;132;133;134;135;136;137;138;139;140;141;256;257;258;259;260;384;385;386;387;388;512;513;528;529;544;545;560;561">
 		<p:expressions>
 			<p:keyExpression>EFFECTIVE_RULE;:;{compile_table_name};,;[compile_id]</p:keyExpression>
@@ -31,7 +73,7 @@
 		</p:expressions>
 		<p:expressions>
 			<p:keyExpression>EFFECTIVE_RULE;:;{group_table_name};,;[group_id]</p:keyExpression>
-			<p:valueExpression>[group_id];\t;[compile_id];\t;[is_valid];\t;[op_time]</p:valueExpression>
+			<p:valueExpression>[group_id];\t;[compile_id];\t;[is_valid];\t;[op_time];&amp;nbsp;0;\n</p:valueExpression>
 		</p:expressions>
 		<p:expressions>
 			<p:keyExpression>EFFECTIVE_RULE;:;{ip_region_table_name};,;[region_id]</p:keyExpression>
@@ -72,29 +114,8 @@
 			<p:sequenceKey>MAAT_VERSION</p:sequenceKey>
 		</p:sequences>
 	</p:maatType>
-
-
-<!-- 	<p:maatType service="100;101;164;165">
-		<p:expressions>
-			<p:keyExpression>EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id]</p:keyExpression>
-			<p:valueExpression>[cfg_id];\t;[service];\t;[level];\t;[description];\t;[is_valid]</p:valueExpression>
-		</p:expressions>
-		<p:sequences>
-			<p:operation>1</p:operation>
-			<p:sequenceKey>MAAT_VERSION</p:sequenceKey>
-		</p:sequences>
-		<p:expressions>
-			<p:keyExpression>MAAT_UPDATE_STATUS</p:keyExpression>
-		</p:expressions>
-
-		<p:expressions>
-			<p:keyExpression>MAAT_RULE_TIMER</p:keyExpression>
-		</p:expressions>
-		<p:expressions>
-			<p:keyExpression>MAAT_VERSION_TIMER</p:keyExpression>
-		</p:expressions>
-	</p:maatType>
-
+ 	
+<!--
 	<p:maatType service="17;1;256;258;260;384;386;388">
 		<p:expressions>
 			<p:keyExpression>EFFECTIVE_RULE;:;{compile_table_name};,;[compile_id]</p:keyExpression>