Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	关键字日志转http url配置功能完成

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

@@ -1056,7 +1056,7 @@
   </update>
   <!-- update av_voip_ip_cfg表信息 -->
   <update id="updateAvVoipIp" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
-    update av_voip_ip_cfg
+    update ip_port_cfg
     <set >
       <trim suffixOverrides=",">
       <if test="cfgDesc != null and cfgDesc != ''" >

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

@@ -28,12 +28,14 @@ import com.nis.web.dao.MyBatisDao;
 @MyBatisDao
 public interface WebsiteCfgDao extends CrudDao<CfgIndexInfo>{
 
+	public List<CfgIndexInfo> getCfgIndexInfos(CfgIndexInfo entity);
 	public CfgIndexInfo getCfgIndexInfo(Long id);
 	public List<CfgIndexInfo> getWebsiteList(CfgIndexInfo entity);
 	public List<IpPortCfg> getIpPortList(CfgIndexInfo entity);
 	public List<HttpUrlCfg> getHttpUrlList(CfgIndexInfo entity);
 	public List<HttpResHeadCfg> getHttpResHdrList(CfgIndexInfo entity);
 	public List<HttpBodyCfg> getHttpResBodyList(CfgIndexInfo entity);
+	public List<HttpBodyCfg> getHttpBodyList(CfgIndexInfo entity);
 	public List<HttpReqHeadCfg> getHttpReqHdrList(CfgIndexInfo entity);
 	public List<HttpBodyCfg> getHttpReqBodyList(CfgIndexInfo entity);
 	public void saveCfgIndex(CfgIndexInfo entity);

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

@@ -31,6 +31,8 @@
     <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="source_compile_id" property="sourceCompileId" jdbcType="INTEGER" />
+    <result column="cancel_request_id" property="cancelRequestId" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -130,7 +132,7 @@
     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.dns_strategy_id,a.user_region1,
-    a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log
+    a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log,a.source_compile_id,a.cancel_request_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
@@ -328,6 +330,25 @@
 	    <include refid="ConfigIndex_Column" />
 	    FROM cfg_index_info a where cfg_id=#{cfgId}
   </select>
+  <select id="getCfgIndexInfos" resultMap="CfgIndexInfoMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
+		 SELECT 
+	    <include refid="ConfigIndex_Column" />
+	    FROM cfg_index_info a 
+	    <where>
+	    	<if test="cfgId != null">
+	    		and cfg_id=#{cfgId}
+	    	</if>
+	    	<if test="compileId != null">
+	    		and compileId=#{compileId}
+	    	</if>
+	    	<if test="functionId != null">
+	    		and function_id=#{functionId}
+	    	</if>
+	    	<if test="sourceCompileId != null">
+	    		and source_compile_id=#{sourceCompileId}
+	    	</if>
+	    </where>
+  </select>
   <select id="getIpPortList" resultMap="ipPortMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
 		 SELECT 
 	     <include refid="IpCfg_Column" />
@@ -336,7 +357,32 @@
   <select id="getHttpUrlList" resultMap="stringCfgMap">
 		 SELECT 
 	     <include refid="StrCfg_Column" />
-	    FROM http_url_cfg a where compile_id=#{compileId} and function_id=#{functionId}
+	    FROM http_url_cfg a 
+	    <where>
+		    <if test="compileId != null">
+	    		AND a.compile_id =#{compileId}
+	    	</if>
+		    <if test="functionId != null">
+	    		AND a.function_id =#{functionId}
+	    	</if>
+	    </where>
+	   
+  </select>
+  <select id="getHttpBodyList" resultMap="stringCfgMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
+		 SELECT 
+	     <include refid="StrCfg_Column" />
+	    FROM http_body_cfg a 
+	    <where>
+		    <if test="compileId != null">
+	    		AND a.compile_id =#{compileId}
+	    	</if>
+		    <if test="functionId != null">
+	    		AND a.function_id =#{functionId}
+	    	</if>
+		    <if test="cfgType != null and cfgType !='' ">
+	    		AND a.cfg_type =#{cfgType}
+	    	</if>
+	    </where>
   </select>
   <select id="getHttpReqBodyList" resultMap="stringCfgMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
 		 SELECT 
@@ -407,7 +453,8 @@
     user_region3,
     user_region4,
     user_region5,
-    do_log
+    do_log,
+    source_compile_id
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
@@ -434,7 +481,8 @@
     	#{userRegion3,jdbcType=VARCHAR},
     	#{userRegion4,jdbcType=VARCHAR},
     	#{userRegion5,jdbcType=VARCHAR},
-    	#{doLog,jdbcType=INTEGER}
+    	#{doLog,jdbcType=INTEGER},
+    	#{sourceCompileId,jdbcType=INTEGER}
     )
   </insert>
   <!-- insert ip_port_cfg表信息 -->
@@ -883,6 +931,9 @@
     update ${tableName} set is_valid = #{isValid,jdbcType=INTEGER},
     editor_id = #{editorId,jdbcType=INTEGER} , 
     edit_time = #{editTime,jdbcType=TIMESTAMP} 
+    <if test="isAudit !=null ">
+		,is_audit = #{isAudit,jdbcType=BIGINT}
+	</if>
     <trim prefix="WHERE" prefixOverrides="AND |OR ">
 		<if test="cfgId !=null ">
 		AND cfg_id = #{cfgId,jdbcType=BIGINT}

src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.java

@@ -18,4 +18,5 @@ public interface ConfigureStatisticsDao {
 	public List<Object[]> getConfigStatisticTime();
 	public List<Object[]> getRequestStatisticTime();
 	public List<Object[]> getRequestStateStatistics(@Param("requestList")List<RequestInfo> requestList,@Param("serviceList")List<FunctionServiceDict> serviceList) ;
+	public Integer getEffectiveCfgNum(@Param("serviceId")Integer serviceId);
 }

src/main/java/com/nis/web/dao/configuration/statistics/ConfigureStatisticsDao.xml

@@ -45,4 +45,7 @@
 				from request_num_statistics c
 				group by request_id)
   </select> -->
+  <select id="getEffectiveCfgNum" resultType="Integer">
+		select count(distinct c.compile_id) from cfg_num_statistics c where c.service_id=#{serviceId} and c.cfg_state=1;
+  </select>
 </mapper>