DNS reject增加策略分组功能

src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml

@@ -60,7 +60,10 @@
 		left join sys_user e on r.editor_id=e.id
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
-    	<where>
+    	<trim prefix="WHERE" prefixOverrides="AND |OR ">
+    		<if test="page !=null and page.where != null and page.where != ''">
+				 AND ${page.where}
+			</if>
     		<if test="cfgId != null">
     			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
     		</if>
@@ -163,14 +166,25 @@
 	    	<if test="functionId != null">
 	    		AND r.FUNCTION_ID=#{functionId,jdbcType=INTEGER}
 	    	</if>
-    	</where>
+    		
+	    	<!-- 数据范围过滤 -->
+			${sqlMap.dsf}
+	    </trim>
+	    <choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY r.CFG_ID desc
+			</otherwise>
+		</choose>
     </select>
     
     <select id="getDnsIpCfg" resultMap="dnsIpCfgMap">
     	select 
-    		<include refid="columns"></include>,
-    	from dns_ip_cfg dic
-    	where dic.cfg_id=#{cfgId}
+    		<include refid="columns"></include>
+    	from dns_ip_cfg r
+    	where r.cfg_id=#{cfgId}
     </select>
     
   <insert id="insert" parameterType="com.nis.domain.configuration.DnsIpCfg" >

src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.java

@@ -11,6 +11,8 @@ import com.nis.web.dao.MyBatisDao;
 @MyBatisDao
 public interface DnsResStrategyDao extends CrudDao<DnsResStrategy> {
 	List<DnsResStrategy> findPage(DnsResStrategy dnsResStrategy);
-	List<DnsResStrategy> findList(@Param("cfgId")Long cfgId,@Param("isValid")Integer isValid);
+	List<DnsResStrategy> findList(@Param("cfgId")Long cfgId
+			,@Param("isAudit")Integer isAudit
+			,@Param("isValid")Integer isValid);
 	
 }

src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml

@@ -145,15 +145,22 @@
    			AND r.is_valid !=-1
    		</if>
 	   	 <if test="isValid == 1">
-   			AND r.is_valid ==1
+   			AND r.is_valid =1
    		</if>
 	   	 <if test="isValid == 0">
-   			AND r.is_valid ==0
+   			AND r.is_valid =0
+   		</if>
+	   	 <if test="isAudit == 0">
+   			AND r.is_audit =0
+   		</if>
+	   	 <if test="isAudit == 1">
+   			AND r.is_audit =1
    		</if>
 	   	 <if test="cfgId != null">
    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
    		</if>
 	    </where>
+	    order by cfg_Id
 	</select>
 	<insert id="insert" parameterType="com.nis.domain.configuration.DnsResStrategy" >
     insert into dns_res_strategy (

src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml

@@ -23,6 +23,8 @@
     <result column="lable" property="lable" jdbcType="VARCHAR" />
     <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="dns_strategy_id" property="dnsStrategyId" jdbcType="INTEGER" />
+    <result column="dns_strategy_name" property="dnsStrategyName" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -121,7 +123,7 @@
     a.CFG_ID,a.CFG_DESC,a.ACTION,a.IS_VALID,a.IS_AUDIT,
     a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
     a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
-    a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id
+    a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.dns_strategy_id
   </sql>
   <sql id="IpCfg_Column" >
     a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
@@ -148,9 +150,10 @@
 	    <include refid="ConfigIndex_Column" />
 	    <trim prefix="," prefixOverrides=",">
 			, s.name as creator_name,e.name as editor_name,u.name as auditor_name
-			,ri.request_title as requestName
+			,ri.request_title as requestName,dns.cfg_desc as dns_strategy_name
 		</trim>
 	    FROM cfg_index_info a
+	    left join dns_res_strategy dns on a.dns_strategy_id=dns.cfg_id
 	    left join sys_user s on a.creator_id=s.id
 		left join sys_user e on a.editor_id=e.id
 		left join sys_user u on a.auditor_id=u.id
@@ -388,7 +391,8 @@
     ATTRIBUTE,
     LABLE,
     AREA_EFFECTIVE_IDS,
-    function_id
+    function_id,
+    dns_strategy_id
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
@@ -408,7 +412,8 @@
     	#{attribute,jdbcType=VARCHAR},
     	#{lable,jdbcType=VARCHAR},    
    	 	#{areaEffectiveIds,jdbcType=VARCHAR},
-    	#{functionId,jdbcType=INTEGER}
+    	#{functionId,jdbcType=INTEGER},
+    	#{dnsStrategyId,jdbcType=INTEGER}
     )
   </insert>
   <!-- insert ip_port_cfg表信息 -->
@@ -774,6 +779,7 @@
       <if test="functionId != null" >
         function_id =  #{functionId,jdbcType=INTEGER},
       </if>
+        dns_strategy_id =  #{dnsStrategyId,jdbcType=INTEGER},
       </trim>
     </set>
     where cfg_id = #{cfgId,jdbcType=BIGINT}