1.基础协议添加关键字域，dolog，配置id查询

2018-08-22 15:20:14 +08:00
parent 82a5d6696b
commit 8087741d05
8 changed files with 376 additions and 89 deletions
--- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
@@ -28,13 +28,13 @@
    <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
    <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
    <result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
-    <result column="do_log" property="doLog" jdbcType="INTEGER" />
    <result column="function_id" property="functionId" jdbcType="INTEGER" />
    <result column="user_region1" property="userRegion1" jdbcType="VARCHAR" />
    <result column="user_region2" property="userRegion2" jdbcType="VARCHAR" />
    <result column="user_region3" property="userRegion3" jdbcType="VARCHAR" />
    <result column="user_region4" property="userRegion4" jdbcType="VARCHAR" />
    <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
+    <result column="do_log" property="doLog" jdbcType="INTEGER" />
  </resultMap>
  
  <resultMap id="AppIpCfgMap" type="com.nis.domain.configuration.AppIpCfg" >
@@ -71,7 +71,6 @@
    <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
    <result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
    <result column="function_id" property="functionId" jdbcType="INTEGER" />
-    <result column="do_log" property="doLog" jdbcType="INTEGER" />
  </resultMap>
  
  <resultMap id="AppHttpCfgMap" type="com.nis.domain.configuration.AppHttpCfg" >
@@ -104,7 +103,6 @@
    <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
    <result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
    <result column="function_id" property="functionId" jdbcType="INTEGER" />
-    <result column="do_log" property="doLog" jdbcType="INTEGER" />
  </resultMap>
  <resultMap id="AppDomainCfgMap" type="com.nis.domain.configuration.AppDomainCfg" >
    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -135,7 +133,6 @@
    <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
    <result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
    <result column="function_id" property="functionId" jdbcType="INTEGER" />
-    <result column="do_log" property="doLog" jdbcType="INTEGER" />
  </resultMap>
  <resultMap id="AppByteCfgMap" type="com.nis.domain.configuration.AppByteCfg" >
    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -166,7 +163,6 @@
    <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
    <result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
    <result column="function_id" property="functionId" jdbcType="INTEGER" />
-    <result column="do_log" property="doLog" jdbcType="INTEGER" />
  </resultMap>
  <resultMap id="AppInnerRuleCfgMap" type="com.nis.domain.configuration.AppInnerRuleCfg" >
    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -304,7 +300,7 @@
    r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
    r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.RATELIMIT,r.FUNCTION_ID,
    r.CFG_TYPE,r.CFG_REGION_CODE,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN,r.USER_REGION1,r.USER_REGION2,
-    r.USER_REGION3,r.USER_REGION4,r.USER_REGION5
+    r.USER_REGION3,r.USER_REGION4,r.USER_REGION5,r.do_log
  </sql>
  
  <sql id="AppIpCfg_Column" >
@@ -313,7 +309,7 @@
    r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
    r.ATTRIBUTE,r.LABLE,AREA_EFFECTIVE_IDS,r.RATELIMIT,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE,
    r.IP_TYPE, r.IP_PATTERN, r.SRC_IP_ADDRESS,r.DEST_IP_ADDRESS, r.PORT_PATTERN,r.SRC_PORT,DEST_PORT,
-    r.DIRECTION,r.PROTOCOL,r.DO_LOG
+    r.DIRECTION,r.PROTOCOL
  </sql>
  
  <sql id="AppHttpCfg_Column" >
@@ -321,7 +317,7 @@
    r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME,
    r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
    r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.RATELIMIT,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE,
-    r.DISTRICT,r.CFG_KEYWORDS,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN,r.DO_LOG
+    r.DISTRICT,r.CFG_KEYWORDS,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN
  </sql>
  
  <sql id="AppDomainCfg_Column" >
@@ -329,7 +325,7 @@
    r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME,
    r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
    r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.RATELIMIT,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE,
-    r.DOMAIN,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN,r.DO_LOG
+    r.DOMAIN,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN
  </sql>

  <sql id="AppByteCfg_Column" >
@@ -337,7 +333,7 @@
    r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME,
    r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
    r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.RATELIMIT,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE,
-    r.BYTES,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN,r.DO_LOG
+    r.BYTES,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN
  </sql>
  
  <sql id="AppInnerRuleCfg_Column" >
@@ -481,6 +477,9 @@
 	    	</if>
  			<if test="cfgId != null">
    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+    		</if>
+  			<if test="compileId != null">
+    			AND r.COMPILE_ID=#{compileId,jdbcType=BIGINT}
    		</if>
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
@@ -619,9 +618,6 @@
 	    	</if>
  			<if test="cfgId != null">
    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
-    		</if>
-  			<if test="compileId != null">
-    			AND r.compile_id=#{compileId,jdbcType=BIGINT}
    		</if>
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
@@ -744,9 +740,6 @@
 	    	</if>
  			<if test="cfgId != null">
    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
-    		</if>
-  			<if test="compileId != null">
-    			AND r.compile_id=#{compileId,jdbcType=BIGINT}
    		</if>
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
@@ -847,9 +840,6 @@
 	    	</if>
  			<if test="cfgId != null">
    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
-    		</if>
-  			<if test="compileId != null">
-    			AND r.compile_id=#{compileId,jdbcType=BIGINT}
    		</if>
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
@@ -947,9 +937,6 @@
 	    	</if>
  			<if test="cfgId != null">
    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
-    		</if>
-  			<if test="compileId != null">
-    			AND r.compile_id=#{compileId,jdbcType=BIGINT}
    		</if>
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
@@ -1140,9 +1127,6 @@
 	    	</if>
  			<if test="cfgId != null">
    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
-    		</if>
-  			<if test="compileId != null">
-    			AND r.compile_id=#{compileId,jdbcType=INTEGER}
    		</if>
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
@@ -1244,9 +1228,6 @@
 	    	</if>
  			<if test="cfgId != null">
    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
-    		</if>
-  			<if test="compileId != null">
-    			AND r.compile_id=#{compileId,jdbcType=BIGINT}
    		</if>
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
@@ -1340,12 +1321,12 @@
    SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
    ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,
    CFG_TYPE,CFG_REGION_CODE,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,USER_REGION1
-    ,USER_REGION2,USER_REGION3,USER_REGION4,USER_REGION5
+    ,USER_REGION2,USER_REGION3,USER_REGION4,USER_REGION5,DO_LOG
    )values (
     <include refid="AppCommonCfg_Value_List" />,
     #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER}
     ,#{userRegion1,jdbcType=VARCHAR} ,#{userRegion2,jdbcType=VARCHAR} ,#{userRegion3,jdbcType=VARCHAR}
-     ,#{userRegion4,jdbcType=VARCHAR} ,#{userRegion5,jdbcType=VARCHAR}
+     ,#{userRegion4,jdbcType=VARCHAR} ,#{userRegion5,jdbcType=VARCHAR} ,#{doLog,jdbcType=INTEGER}
    )
  </insert>
  <insert id="insertAppIpCfg" parameterType="com.nis.domain.configuration.AppIpCfg" >
@@ -1358,12 +1339,12 @@
    SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
    ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
    IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT,
-    DIRECTION,PROTOCOL,DO_LOG
+    DIRECTION,PROTOCOL
    )values (
     <include refid="AppCommonCfg_Value_List" />,
     #{ipType,jdbcType=INTEGER}, #{ipPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
    #{portPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
-    #{protocol,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER}
+    #{protocol,jdbcType=INTEGER}
    )
  </insert>
  <insert id="insertAppHttpCfg" parameterType="com.nis.domain.configuration.AppHttpCfg" >
@@ -1375,11 +1356,11 @@
    CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
    SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
    ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
-    DISTRICT,CFG_KEYWORDS,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,DO_LOG
+    DISTRICT,CFG_KEYWORDS,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN
    )values (
     <include refid="AppCommonCfg_Value_List" />,
-    #{district,jdbcType=VARCHAR},#{cfgKeywords,jdbcType=VARCHAR},#{exprType,jdbcType=INTEGER},
-    #{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER}
+    #{district,jdbcType=VARCHAR},#{cfgKeywords,jdbcType=VARCHAR},
+    #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER}
    )
  </insert>
  <insert id="insertAppDomainCfg" parameterType="com.nis.domain.configuration.AppDomainCfg" >
@@ -1391,11 +1372,11 @@
    CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
    SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
    ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
-    DOMAIN,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,DO_LOG
+    DOMAIN,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN
    )values (
     <include refid="AppCommonCfg_Value_List" />,
-   	#{domain,jdbcType=VARCHAR},#{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},
-   	#{isHexbin,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER}
+   	#{domain,jdbcType=VARCHAR},
+    #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER}
    )
  </insert>
  <insert id="insertAppByteCfg" parameterType="com.nis.domain.configuration.AppByteCfg" >
@@ -1407,11 +1388,11 @@
    CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
    SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
    ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
-    BYTES,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,DO_LOG
+    BYTES,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN
    )values (
     <include refid="AppCommonCfg_Value_List" />,
-   	#{bytes,jdbcType=VARCHAR},#{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},
-   	#{isHexbin,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER}
+   	#{bytes,jdbcType=VARCHAR},
+    #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER}
    )
  </insert>
  <insert id="insertAppInnerRuleCfg" parameterType="com.nis.domain.configuration.AppInnerRuleCfg" >
@@ -1629,6 +1610,7 @@
   	  <if test="userRegion5 != null and userRegion5 != ''"> -->
   		USER_REGION1 =#{userRegion5,jdbcType=VARCHAR},
      <!-- </if> -->
+      	DO_LOG=#{doLog,jdbcType=INTEGER}
      </trim>
    </set>
    where cfg_id = #{cfgId,jdbcType=BIGINT}
@@ -1740,9 +1722,6 @@
      <if test="protocol != null" >
        protocol = #{protocol,jdbcType=INTEGER},
      </if>
-      <if test="doLog != null" >
-        do_log = #{doLog,jdbcType=INTEGER},
-      </if>
      </trim>
    </set>
    where cfg_id = #{cfgId,jdbcType=BIGINT}
@@ -1841,9 +1820,6 @@
      <if test="isHexbin != null">
    	is_hexbin=#{isHexbin,jdbcType=INTEGER},
      </if>
-      <if test="doLog != null">
-    	do_log=#{doLog,jdbcType=INTEGER},
-      </if>
      </trim>
    </set>
    where cfg_id = #{cfgId,jdbcType=BIGINT}
@@ -1939,9 +1915,6 @@
      <if test="isHexbin != null">
    	is_hexbin=#{isHexbin,jdbcType=INTEGER},
      </if>
-      <if test="doLog != null">
-    	do_log=#{doLog,jdbcType=INTEGER},
-      </if>
      </trim>
    </set>
    where cfg_id = #{cfgId,jdbcType=BIGINT}
@@ -2037,9 +2010,6 @@
      <if test="isHexbin != null">
    	is_hexbin=#{isHexbin,jdbcType=INTEGER},
      </if>
-      <if test="doLog != null">
-    	do_log=#{doLog,jdbcType=INTEGER},
-      </if>
      </trim>
    </set>
    where cfg_id = #{cfgId,jdbcType=BIGINT}