Merge branch 'feature-traffic-log' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into feature-traffic-log

src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.java

@@ -29,4 +29,6 @@ public interface AsnGroupInfoDao extends CrudDao<AsnGroupInfo> {
 	List<AsnGroupInfo> findAsnGroupInfos();
 	Long getCount();
 	void modifyIssuedIp(AsnGroupInfo info);
+	void updateIpNum(@Param("v4Num")long v4Num,@Param("v6Num")long v6Num,@Param("groupId")Integer groupId);
+	List<Object[]> getASNIPNum(@Param("asnNo")Integer asnNo);
 }

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

@@ -285,4 +285,10 @@
       	</if>
     </trim>
   </select>
+ 	<update id="updateIpNum" >
+   		update asn_group_info set v4_num=#{v4Num},v6_num=#{v6Num} where group_id=#{groupId}
+ 	</update>
+ 	<select id="getASNIPNum" resultType="map">
+   		select v4_num,v6_num from asn_group_info where asn_id=#{asnNo}
+ 	</select>
 </mapper>

src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java

@@ -32,4 +32,5 @@ public interface AsnIpCfgDao extends CrudDao<AsnIpCfg>{
 	public int hasValidAsnIp(@Param("asnId")Long asnNo);
 	public AsnIpCfg getOne(AsnIpCfg cfg);
 	public void updateAsn(@Param("asnId")String asnNo,@Param("organization")String organization,@Param("country")String country,@Param("detail")String detail);
+	public List<Object[]> findAllAsnIpCfgList();
 }

src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml

@@ -630,6 +630,11 @@
 		<!-- left join policy_group_info d on r.asn_ip_group = d.service_group_id -->
     	where r.CFG_ID in (${ids})
     </select>
-    
-	
+
+   	<select id="findAllAsnIpCfgList" resultType="map">
+    	select 
+    		<include refid="columns"></include>
+    	from asn_ip_cfg r
+    	where r.is_valid !=-1
+    </select>
 </mapper>