From e47230aff0ae571f5257999bfd090b6210280315 Mon Sep 17 00:00:00 2001
From: zhangdongxu <zhangdongxu@nismail.iie.ac>
Date: Tue, 6 Nov 2018 11:43:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81=E7=94=A8=E6=88=B7=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=BA=E7=BB=9F=E8=AE=A1Bug=E4=BF=AE=E6=94=B9=EF=BC=9B=202?=
 =?UTF-8?q?=E3=80=81pom.xml=E5=88=A0=E9=99=A4resources=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 36 -------------------
 .../restful/SingleDimensionReport.java        |  2 +-
 .../java/com/nis/web/dao/NtcReportDao.xml     | 16 ++++-----
 3 files changed, 7 insertions(+), 47 deletions(-)

diff --git a/pom.xml b/pom.xml
index ded490f..fcae2ab 100644
--- a/pom.xml
+++ b/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> -->
diff --git a/src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java b/src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java
index b3fcb89..0408102 100644
--- a/src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java
+++ b/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";
diff --git a/src/main/java/com/nis/web/dao/NtcReportDao.xml b/src/main/java/com/nis/web/dao/NtcReportDao.xml
index 65b0ca3..de38634 100644
--- a/src/main/java/com/nis/web/dao/NtcReportDao.xml
+++ b/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 !=''">
-				<![CDATA[nas_ip]]>
+			<if test="searchBusinessType !=null and searchBusinessType != '' and searchBusinessType == 2">
+				<![CDATA[account,nas_ip]]>
 			</if>
-			<if test="searchNasIp != null and searchNasIp !=''">
-				<![CDATA[account]]>
+			<if test="searchBusinessType !=null and searchBusinessType != '' and searchBusinessType == 3 ">
+				<![CDATA[nas_ip,account]]>
 			</if>
 			,
 			<choose>

From 74a8cd2879c8d0b73586cff077019475b66bf062 Mon Sep 17 00:00:00 2001
From: renkaige <renkaige@nismail.iie.ac.cn>
Date: Tue, 6 Nov 2018 17:03:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9redis=E9=9B=86=E7=BE=A4?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/applicationContext-redis.xml | 12 ++++++------
 src/main/resources/jdbc.properties              | 14 ++++++--------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/applicationContext-redis.xml b/src/main/resources/applicationContext-redis.xml
index 7b58b76..0644880 100644
--- a/src/main/resources/applicationContext-redis.xml
+++ b/src/main/resources/applicationContext-redis.xml
@@ -61,16 +61,16 @@
 					<constructor-arg index="1" value="${redis.cluster.port3}"></constructor-arg>
 				</bean>
 				<bean class="redis.clients.jedis.HostAndPort">
-					<constructor-arg index="0" value="${redis.cluster.host1}"></constructor-arg>
-					<constructor-arg index="1" value="${redis.cluster.port4}"></constructor-arg>
+					<constructor-arg index="0" value="${redis.cluster.host2}"></constructor-arg>
+					<constructor-arg index="1" value="${redis.cluster.port1}"></constructor-arg>
 				</bean>
 				<bean class="redis.clients.jedis.HostAndPort">
-					<constructor-arg index="0" value="${redis.cluster.host1}"></constructor-arg>
-					<constructor-arg index="1" value="${redis.cluster.port5}"></constructor-arg>
+					<constructor-arg index="0" value="${redis.cluster.host2}"></constructor-arg>
+					<constructor-arg index="1" value="${redis.cluster.port2}"></constructor-arg>
 				</bean>
 				<bean class="redis.clients.jedis.HostAndPort">
-					<constructor-arg index="0" value="${redis.cluster.host1}"></constructor-arg>
-					<constructor-arg index="1" value="${redis.cluster.port6}"></constructor-arg>
+					<constructor-arg index="0" value="${redis.cluster.host2}"></constructor-arg>
+					<constructor-arg index="1" value="${redis.cluster.port3}"></constructor-arg>
 				</bean>
 			</set>
 		</constructor-arg>
diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties
index d96834a..80b5bf4 100644
--- a/src/main/resources/jdbc.properties
+++ b/src/main/resources/jdbc.properties
@@ -168,11 +168,9 @@ redis.timeout=100000
 #一般当此值设置过大时，容易报：Too many Cluster redirections
 redis.maxRedirects=3
 
-#3A-redis集群配置
-redis.cluster.host1=192.168.10.205
-redis.cluster.port1:7031
-redis.cluster.port2:7032
-redis.cluster.port3:7033
-redis.cluster.port4:7034
-redis.cluster.port5:7035
-redis.cluster.port6:7036
\ No newline at end of file
+#3A-redis集群配置,如果需要执行数据同步需要在集群中执行LPUSH SyncRedisToCluster "1"
+redis.cluster.host1=192.168.10.192
+redis.cluster.host2=192.168.10.193
+redis.cluster.port1=7001
+redis.cluster.port2=7002
+redis.cluster.port3=7003