gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(1)asn导入加入组织国家，asn号验证，组织国家不能为空，asn号不能为两个组织所有

Browse Source 
(2)新增asn_keyword_cfg表，用于保存并下发有效且含审核通过asn ip的 asn号
(3)asn 导入去除条数限制
(4)页面asn select选项还是会影响加载页面速度，现在改为input
(5)asn_group_info 修改org_group_id为issued_ips，用于保存审核通过的asn ip
(6)分组复用url配置文件补全v1
This commit is contained in:
wangxin
2019-01-06 11:24:49 +08:00
parent 9979bb26b2
commit f56a0fe09a
37 changed files with 968 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,8 @@
<result column="creator_name" property="creatorName" jdbcType="VARCHAR" />
<result column="auditor_name" property="auditorName" jdbcType="VARCHAR" />
<result column="editor_name" property="editorName" jdbcType="VARCHAR" />
</resultMap>
<resultMap id="AsnKeywordMap" type="com.nis.domain.configuration.AsnKeywordCfg" extends="BaseStringMap">
</resultMap>
<resultMap id="SubscribeIdCfgMap" type="com.nis.domain.configuration.NtcSubscribeIdCfg" >
<id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -77,6 +79,12 @@
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,
r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,r.cfg_region_code
</sql>
<sql id="AsnKeywordCfg_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,
r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,r.cfg_region_code,r.user_region1,r.user_region2,r.user_region3,r.user_region4,r.user_region5
</sql>
<!-- <sql id="BaseStringCfg_Column_List_with_id_alias" >
r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.CFG_KEYWORDS as cfgKeywords, r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit,
@@ -716,6 +724,19 @@
</where>
</select>
<select id="findAsnKeywordCfgList" resultMap="AsnKeywordMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
select
<include refid="AsnKeywordCfg_Column" />
from asn_keyword_cfg r
<where>
<if test="functionId != null">
and r.FUNCTION_ID=#{functionId,jdbcType=INTEGER}
</if>
<if test="compileId != null">
and r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
</where>
</select>
<!-- 删除voip subscribe信息 -->
<delete id="deleteSubscribeIdCfgByCfgIndexInfo" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
delete from ntc_subscribe_id_cfg
@@ -731,6 +752,17 @@
</if>
</where>
</delete>
<delete id="deleteAsnKeyword" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
delete from asn_keyword_cfg
<where>
<if test="compileId != null" >
and compile_id = #{compileId,jdbcType=INTEGER}
</if>
<if test="functionId != null" >
and function_id = #{functionId,jdbcType=INTEGER}
</if>
</where>
</delete>
<!-- =====================NtcSubscribeIdCfg end======================== -->
<insert id="saveStringCfgBatch" parameterType="com.nis.domain.configuration.BaseStringCfg" >