1:修改业务类型642的direction值为0-2

2:修改trafficTopicList和trafficTopicAndDomainChart接口的返回值
3:修改asn统计的返回值单位(兆)
4:修改ip范围查询使用end>=searchIp and start<=searchIp
This commit is contained in:
renkaige
2018-12-18 06:05:16 +06:00
parent 2d9404f63b
commit 579cd007c2
5 changed files with 178 additions and 134 deletions

View File

@@ -76,7 +76,6 @@
<result column="url" jdbcType="VARCHAR" property="url" />
<result column="ipCount" jdbcType="BIGINT" property="ipCount" />
<result column="connCount" jdbcType="BIGINT" property="connCount" />
<result column="reportTime" jdbcType="TIMESTAMP" property="reportTime" />
</resultMap>
<resultMap id="NtcRadiusReportMap"
@@ -756,13 +755,12 @@
${page.fields}
</when>
<otherwise>
url, ipCount,connCount,reportTime
url, ipCount,connCount
</otherwise>
</choose>
FROM (SELECT url,
count(distinct ip_addr) ipCount,
sum(sum) connCount,
stat_time reportTime
sum(sum) connCount
FROM ntc_reject_url_statistic
<where>
@@ -775,17 +773,11 @@
<![CDATA[AND STAT_TIME < STR_TO_DATE(#{searchReportEndTime},'%Y-%m-%d %H:%i:%s')]]>
</if>
<if test="searchUrl != null and searchUrl !=''">
AND url = #{searchUrl}
AND url like concat(concat('%',#{searchUrl}),'%')
</if>
</where>
GROUP BY url,stat_time
) ntc_reject_url_statistic
<choose>
<when
test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
</when>
</choose>
GROUP BY url
) ntc_reject_url_statistic ORDER BY ipcount desc,connCount desc
</select>