1:合并0x200,0x201为0x200.

2:合并0x202,0x203为0x202.
3:修改NtcConnRecordLogClickHouseTable对应的clickhouse名称
4:修改TrafficReportDao.xml.findNtcRadiusReport中字段为小写
5:修改保存traffic_ip_identify时添加desc_detail字段
6:修改ip范围段的计算方法

src/main/java/com/nis/web/dao/NtcReportDao.xml

@@ -876,14 +876,16 @@
 	<insert id="insertNtcIpRangeBatch"
 		parameterType="com.nis.domain.restful.NtcIpRangeReport">
 		INSERT INTO traffic_ip_identify
-		(ip_start,ip_end,ip_start_num,ip_end_num,ip_sub,area_type,country)
+		(ip_start,ip_end,ip_start_num,ip_end_num,ip_sub,area_type,country,desc_detail)
 		VALUES
 		<foreach collection="list" item="ipRange" separator=",">
 			(#{ipRange.ipStart}, #{ipRange.ipEnd},
 			#{ipRange.ipStartNum},
 			#{ipRange.ipEndNum},
 			#{ipRange.ipSub}, #{ipRange.areaType},
-			#{ipRange.country})
+			#{ipRange.country},
+			#{ipRange.desc}
+			)
 		</foreach>
 	</insert>
 

src/main/java/com/nis/web/dao/TrafficReportDao.xml

@@ -840,15 +840,12 @@
 			<choose>
 				<when
 					test="searchReportStartTime != null and searchReportStartTime !=''">
-					<![CDATA[AND REPORT_TIME >= STR_TO_DATE(#{searchReportStartTime},'%Y-%m-%d %H:%i:%s') AND REPORT_TIME < STR_TO_DATE(#{searchReportEndTime},'%Y-%m-%d %H:%i:%s')]]>
+					<![CDATA[AND report_time >= #{searchReportStartTime} AND report_time < #{searchReportEndTime}]]>
 				</when>
-				<otherwise>
-					<![CDATA[AND REPORT_TIME>DATE_SUB(now(), INTERVAL 1 HOUR) ]]>
-				</otherwise>
 			</choose>
 		</where>
 		ORDER BY
-		REPORT_TIME ASC
+		report_time ASC
 	</select>
 
 	<select id="findNtcIpRangeReport"