mail,dns,ssl,http冲突文件提交

This commit is contained in:
duandongmei
2018-08-23 09:30:37 +08:00
parent e458363886
commit 96217e2910
5 changed files with 125 additions and 78 deletions

View File

@@ -182,7 +182,7 @@
r.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable
,r.area_effective_ids,r.function_id,r.cfg_region_code
</sql>
<sql id="BaseStringCfg_Column" >
<sql id="BaseStringCfg_Column" >
r.cfg_id,r.cfg_desc,r.cfg_keywords,r.cfg_type,
r.action,r.is_valid,r.is_audit,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,
@@ -481,26 +481,7 @@
</where>
</select>
<!-- 根据compileId获取avVoipAccountCfg信息 -->
<select id="findSubscribeIdCfgList" resultMap="BaseStringCfgMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
select
<include refid="BaseStringCfg_Column" />
from ntc_subscribe_id_cfg r
<where>
<if test="compileId != null">
and r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<choose>
<when test="isValid != null">
and r.is_valid=#{isValid,jdbcType=INTEGER}
</when>
<otherwise>
and r.is_valid != -1
</otherwise>
</choose>
</where>
</select>
<!-- 根据Id获取cfgIndexInfo信息 -->
<select id="getCfgIndexInfo" resultMap="CfgIndexInfoMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
SELECT
@@ -1121,21 +1102,6 @@
</if>
</where>
</delete>
<!-- 删除voip subscribe信息 -->
<delete id="deleteAvVoipKeywordCfg" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
delete from ntc_subscribe_id_cfg
<where>
<if test="ntcSubscribeIdCfg != null and ntcSubscribeIdCfg.cfgId != null" >
and cfg_id = #{ntcSubscribeIdCfg.cfgId,jdbcType=INTEGER}
</if>
<if test="compileId != null" >
and compile_id = #{compileId,jdbcType=INTEGER}
</if>
<if test="functionId != null" >
and function_id = #{functionId,jdbcType=INTEGER}
</if>
</where>
</delete>
<!-- 删除voipIp信息 -->
<delete id="deleteAvVoipAccountCfg" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
delete from av_voip_account_cfg