（1）avCfgService暂时继承BaseService

（2）BaseCfg字段调整，加入functionId字段，去掉maatTable字段
（3）删除SystemService相关代码
（4）字符串，增强字符串配置加入字段cfgType
（5）邮件，ssl，Ftp pojo调整，删除多余的，新增keywordCfg
(6)spring-mvc.xml注释redisDao

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

@@ -6,6 +6,7 @@
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="district" property="district" jdbcType="VARCHAR" />
     <result column="keywords" property="keywords" jdbcType="VARCHAR" />
+    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
     <result column="action" property="action" jdbcType="INTEGER" />
     <result column="is_valid" property="isValid" jdbcType="INTEGER" />
     <result column="is_audit" property="isAudit" jdbcType="INTEGER" />
@@ -26,6 +27,7 @@
     <result column="match_method" property="matchMethod" jdbcType="INTEGER" />
     <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
     <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
+    <result column="function_id" property="functionId" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="ComplexStringMapWithUser" type="com.nis.domain.configuration.ComplexkeywordCfg" extends="ComplexStringMap">
     <result column="creator_name" property="creatorName" jdbcType="VARCHAR" />

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

@@ -33,6 +33,7 @@
     <result column="attribute" property="attribute" jdbcType="VARCHAR" />
     <result column="lable" property="lable" jdbcType="VARCHAR" />
     <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
+    <result column="function_id" property="functionId" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="BaseIpMapWithUser" type="com.nis.domain.configuration.BaseIpCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -62,6 +63,7 @@
     <result column="request_id" property="requestId" jdbcType="INTEGER" />
     <result column="compile_id" property="compileId" jdbcType="INTEGER" />
     <result column="is_area_effective" property="isAreaEffective" jdbcType="INTEGER" />
+    <result column="function_id" property="functionId" jdbcType="INTEGER" />
     <result column="classify" property="classify" jdbcType="VARCHAR" />
     <result column="attribute" property="attribute" jdbcType="VARCHAR" />
     <result column="lable" property="lable" jdbcType="VARCHAR" />
@@ -70,19 +72,6 @@
     <result column="auditor_name" property="auditorName" jdbcType="VARCHAR" />
     <result column="editor_name" property="editorName" jdbcType="VARCHAR" />
   </resultMap>
-  <resultMap id="FtpIpMap" type="com.nis.domain.configuration.FtpIpCfg" extends="BaseIpMap" />
-  <resultMap id="HttpIpMap" type="com.nis.domain.configuration.HttpIpCfg" extends="BaseIpMap" />
-  <resultMap id="L2tpIpMap" type="com.nis.domain.configuration.L2tpIpCfg" extends="BaseIpMap" />
-  <resultMap id="MailIpMap" type="com.nis.domain.configuration.MailIpCfg" extends="BaseIpMap" />
-  <resultMap id="MmsIpMap" type="com.nis.domain.configuration.MmsIpCfg" extends="BaseIpMap" />
-  <resultMap id="OpenvpnIpMap" type="com.nis.domain.configuration.OpenvpnIpCfg" extends="BaseIpMap" />
-  <resultMap id="PptpIpMap" type="com.nis.domain.configuration.PptpIpCfg" extends="BaseIpMap" />
-  <resultMap id="RtmpIpMap" type="com.nis.domain.configuration.RtmpIpCfg" extends="BaseIpMap" />
-  <resultMap id="RtpIpMap" type="com.nis.domain.configuration.RtpIpCfg" extends="BaseIpMap" />
-  <resultMap id="RtspIpMap" type="com.nis.domain.configuration.RtspIpCfg" extends="BaseIpMap" />
-  <resultMap id="SipIpMap" type="com.nis.domain.configuration.SipIpCfg" extends="BaseIpMap" />
-  <resultMap id="SshIpMap" type="com.nis.domain.configuration.SshIpCfg" extends="BaseIpMap" />
-  <resultMap id="SslIpMap" type="com.nis.domain.configuration.SslIpCfg" extends="BaseIpMap" />
   
   <sql id="BaseIpCfg_Column_List_with_id" >
     CFG_ID, CFG_DESC, IP_TYPE, SRC_IP, SRC_IP_MASK, SRC_PORT, 

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

@@ -5,6 +5,7 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="cfg_keywords" property="cfgKeywords" jdbcType="VARCHAR" />
+    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
     <result column="action" property="action" jdbcType="INTEGER" />
     <result column="is_valid" property="isValid" jdbcType="INTEGER" />
     <result column="is_audit" property="isAudit" jdbcType="INTEGER" />
@@ -25,11 +26,13 @@
     <result column="expr_type" property="exprType" jdbcType="INTEGER" />
     <result column="match_method" property="matchMethod" jdbcType="INTEGER" />
     <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
+     <result column="function_id" property="functionId" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="BaseStringMapWithUser" type="com.nis.domain.configuration.BaseStringCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="cfg_keywords" property="cfgKeywords" jdbcType="VARCHAR" />
+    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
     <result column="action" property="action" jdbcType="INTEGER" />
     <result column="is_valid" property="isValid" jdbcType="INTEGER" />
     <result column="is_audit" property="isAudit" jdbcType="INTEGER" />
@@ -47,6 +50,7 @@
     <result column="attribute" property="attribute" jdbcType="VARCHAR" />
     <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="expr_type" property="exprType" jdbcType="INTEGER" />
     <result column="match_method" property="matchMethod" jdbcType="INTEGER" />
     <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />

src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.java

@@ -1,15 +0,0 @@
-package com.nis.web.dao.systemService;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.nis.domain.SystemServiceInfo;
-import com.nis.web.dao.CrudDao;
-import com.nis.web.dao.MyBatisDao;
-
-@MyBatisDao
-public interface SystemServiceInfoDao extends CrudDao<SystemServiceInfo> {
-
-	List<SystemServiceInfo> getSystemServiceByServiceId(String serviceId);
-}

src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml

@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.nis.web.dao.systemService.SystemServiceInfoDao">
-
-	<resultMap id="systemServiceInfoMap" type="com.nis.domain.SystemServiceInfo">
-		<id column="id" property="id"/>
-	    <result column="service_id" property="serviceId"/>
-	    <result column="service_name" property="serviceName"/>
-	    <result column="service_desc" property="serviceDesc"/>
-	    <result column="action" property="action"/>
-	    <result column="is_valid" property="isValid"/>
-	    <result column="service_type" property="serviceType"/>
-	    <result column="creator_id" property="creator.id"/>
-	    <result column="create_time" property="createTime"/>
-	    <result column="editor_id" property="editor.id"/>
-	    <result column="edit_time" property="editTime"/>
-	    <collection property="serviceConfigInfoList" column="{service_id=service_id}" select="findSysServiceConfigInfo"/>
-	</resultMap>
-	
-	<select id="findList" resultMap="systemServiceInfoMap" parameterType="systemServiceInfo">
-		select
-			ssi.id,
-			ssi.service_id,
-			ssi.service_name,
-			ssi.service_desc,
-			ssi.action,
-			ssi.is_valid,
-			ssi.service_type,
-			ssi.creator_id as "creator.id",
-			suc.login_id as "creator.loginId",
-			suc.name as "creator.name",
-			ssi.create_time,
-			ssi.editor_id as "editor.id",
-			sue.login_id as "editor.login_id",
-			sue.name as "editor.name",
-			ssi.edit_time,
-			ssi.is_initianlize
-		from system_service_info ssi
-		left join sys_user suc on suc.id=ssi.creator_id
-		left join sys_user sue on sue.id=ssi.editor_id
-		where 1=1
-			<if test="serviceName != null and serviceName != ''">
-				and ssi.service_name like CONCAT('%', #{serviceName}, '%')
-			</if>
-			<if test="serviceId != null and serviceId != ''">
-				and ssi.service_id like CONCAT('%', #{serviceId}, '%')
-			</if>
-			<if test="action != null">
-				and ssi.action=#{action}
-			</if>
-			<if test="serviceType != null">
-				and ssi.service_type=#{serviceType}
-			</if>
-			<if test="serviceIdPre != null">
-				and ssi.service_id like concat(#{serviceIdPre}, '%')
-			</if>
-			<if test="isValid != null">
-				and ssi.is_valid=#{isValid}
-			</if>
-		order by ssi.service_id asc
-	</select>
-	
-	<select id="get" resultMap="systemServiceInfoMap">
-		select
-			ssi.id,
-			ssi.service_id,
-			ssi.service_name,
-			ssi.service_desc,
-			ssi.action,
-			ssi.is_valid,
-			ssi.service_type,
-			ssi.creator_id as "creator.id",
-			suc.login_id as "creator.login_id",
-			suc.name as "creator.name",
-			ssi.create_time,
-			ssi.editor_id as "editor.id",
-			sue.login_id as "editor.login_id",
-			sue.name as "editor.name",
-			ssi.edit_time,
-			ssi.is_initianlize
-		from system_service_info ssi
-		left join sys_user suc on suc.id=ssi.creator_id
-		left join sys_user sue on sue.id=ssi.editor_id
-		where ssi.id=#{id}
-	</select>
-	
-	<select id="findSysServiceConfigInfo" resultType="serviceConfigInfo">
-		select
-			id,
-			table_name,
-			table_desc,
-			table_type,
-			maat_table,
-			service_id,
-			is_valid,
-			is_initianlize
-		from
-			service_config_info
-		where
-			service_id=#{service_id} and is_valid=1
-	</select>
-	
-	<select id="getSystemServiceByServiceId" resultType="systemServiceInfo">
-		select 
-			id, is_valid
-		from
-			system_service_info
-		where
-			service_id=#{serviceId}
-	</select>
-	
-	<insert id="insert">
-		insert into system_service_info (
-			service_id, service_name, service_desc, action, is_valid, service_type, 
-			creator_id, create_time, is_initianlize
-		) values(
-			#{serviceId}, #{serviceName}, #{serviceDesc}, #{action}, #{isValid}, #{serviceType}, 
-			#{creator.id}, #{createTime}, #{isInitianlize}
-		)
-	</insert>
-	
-	<update id="update">
-		update
-			system_service_info
-		set
-			service_id=#{serviceId},
-			service_name=#{serviceName},
-			service_desc=#{serviceDesc},
-			action=#{action},
-			service_type=#{serviceType},
-			editor_id=#{editor.id},
-			edit_time=#{editTime}
-		where id=#{id}
-	</update>
-	
-	<update id="delete">
-		update
-			system_service_info
-		set
-			is_valid=0
-		where id=#{id}
-	</update>
-	
-</mapper>