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

ASN分组逻辑调整，配置使用ANS号对应组织的分组改为使用ANS号新增的唯一分组

Browse Source
This commit is contained in:
dongxiaoyan
2019-02-18 10:39:49 +08:00
parent e2292598e9
commit 5b49bf1d80
13 changed files with 214 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.java
View File

@@ -37,5 +37,5 @@ public interface AsnGroupInfoDao extends CrudDao<AsnGroupInfo> {
void insertWithId(AsnGroupInfo asnGroupInfo);
void insertWithoutId(AsnGroupInfo asnGroupInfo);
void updateIpNum(@Param("v4Num")long v4Num,@Param("v6Num")long v6Num,@Param("groupId")Integer groupId);
List<Object[]> getASNIPNum(@Param("asnNo")Integer asnNo);
List<Object[]> getASNIPNum(@Param("asnNo")Long asnNo);
}

14
src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.xml
View File

@@ -21,7 +21,7 @@
</resultMap>
<sql id="AsnGroupInfoColumns">
r.id,r.group_id,r.compile_id,r.organization,r.country,r.detail,r.is_valid,r.create_time,r.edit_time,
r.creator_id,r.editor_id,r.asn_id,r.issued_ips,r.is_used,r.region_id,r.org_group_id
r.creator_id,r.editor_id,r.asn_id,r.issued_ips,r.is_used,r.region_id,r.org_group_id,r.only_group_id
</sql>
<!-- 查出所有 有效数据-->
@@ -107,7 +107,8 @@
asn_id,
is_used,
region_id,
org_group_id
org_group_id,
only_group_id
)values (
#{groupId,jdbcType=INTEGER},
#{compileId,jdbcType=INTEGER},
@@ -122,7 +123,8 @@
#{asnId,jdbcType=INTEGER},
#{isUsed,jdbcType=INTEGER},
#{regionId,jdbcType=INTEGER},
#{orgGroupId,jdbcType=INTEGER}
#{orgGroupId,jdbcType=INTEGER},
#{onlyGroupId,jdbcType=INTEGER}
)
</insert>
<insert id="insertWithoutId" parameterType="com.nis.domain.basics.AsnGroupInfo" >
@@ -174,7 +176,8 @@
asn_id,
is_used,
region_id,
org_group_id
org_group_id,
only_group_id
)values (
#{id,jdbcType=INTEGER},
#{groupId,jdbcType=INTEGER},
@@ -190,7 +193,8 @@
#{asnId,jdbcType=INTEGER},
#{isUsed,jdbcType=INTEGER},
#{regionId,jdbcType=INTEGER},
#{orgGroupId,jdbcType=INTEGER}
#{orgGroupId,jdbcType=INTEGER},
#{onlyGroupId,jdbcType=INTEGER}
)
</insert>
<update id="update" parameterType="com.nis.domain.basics.AsnGroupInfo" >