1、用户行为统计Bug修改；

2、pom.xml删除resources引用

pom.xml

@@ -36,42 +36,6 @@
 
 
     <build>
-
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                    <include>**/*.xml</include>
-                    <include>**/*.xsd</include>
-                    <include>**/*.yml</include>
-                </includes>
-                <filtering>true</filtering>
-            </resource>
-
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>false</filtering>
-                <includes>
-                    <include>**/*.mmdb</include>
-                    <include>**/*.dat</include>
-                    <include>**/*.sh</include>
-                    <include>**/*.bat</include>
-                    <include>**/*.sql</include>
-                </includes>
-            </resource>
-
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                    <include>**/*.xml</include>
-                </includes>
-                <filtering>true</filtering>
-            </resource>
-
-    </resources>
-
         <plugins>
             <!-- <plugin> -->
             <!-- <groupId>org.mybatis.generator</groupId> -->

src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java

@@ -433,7 +433,7 @@ public class SingleDimensionReport extends BaseRestController {
 		String groupType ="hour";
 		if (!(StringUtil.isEmpty(ntcRadiusReport.getSearchReportStartTime())&&StringUtil.isEmpty(ntcRadiusReport.getSearchReportEndTime()))) {
 			Long times = DateUtil.convertStringToTimestamp(ntcRadiusReport.getSearchReportEndTime(), DateUtil.YYYY_MM_DD_HH24_MM_SS)-DateUtil.convertStringToTimestamp(ntcRadiusReport.getSearchReportStartTime(), DateUtil.YYYY_MM_DD_HH24_MM_SS);
-			if (times>0&&times<=30*24*60*60L) {
+			if (times>24*60*60L&&times<=30*24*60*60L) {
 				groupType ="day";
 			}else if(times>30*24*60*60L){
 				groupType ="month";

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

@@ -645,12 +645,8 @@
 	<select id="findNtcRadiusReport" parameterType="com.nis.domain.restful.NtcRadiusReport"
 		resultMap="NtcRadiusReportMap">
 		SELECT
-			<if test="searchAccount != null and searchAccount !=''">
 				nas_ip,
-			</if>
-			<if test="searchNasIp != null and searchNasIp !=''">
 				account,
-			</if>
 			<choose>
 				<when test="groupType!= null and groupType!='' and groupType == 'day'">
 					DATE_FORMAT(REPORT_TIME, '%Y-%m-%d')
@@ -665,10 +661,10 @@
 			REPORT_TIME,sum(num) num
 		FROM ntc_radius_report
 		<where>
-			<if test="searchAccount != null and searchAccount !=''">
+			<if test="searchBusinessType !=null and searchBusinessType != '' and searchBusinessType == 2 and searchAccount != null and searchAccount !=''">
 				<![CDATA[AND account =#{searchAccount}]]>
 			</if>
-			<if test="searchNasIp != null and searchNasIp !=''">
+			<if test="searchBusinessType !=null and searchBusinessType != '' and searchBusinessType == 3 and searchNasIp != null and searchNasIp !=''">
 				<![CDATA[AND nas_ip =#{searchNasIp}]]>
 			</if>
 			<choose>
@@ -682,11 +678,11 @@
 		</where>
 			
 		GROUP BY
-			<if test="searchAccount != null and searchAccount !=''">
+			<if test="searchBusinessType !=null and searchBusinessType != '' and searchBusinessType == 2">
-				<![CDATA[nas_ip]]>
+				<![CDATA[account,nas_ip]]>
 			</if>
-			<if test="searchNasIp != null and searchNasIp !=''">
+			<if test="searchBusinessType !=null and searchBusinessType != '' and searchBusinessType == 3 ">
-				<![CDATA[account]]>
+				<![CDATA[nas_ip,account]]>
 			</if>
 			,
 			<choose>