Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java

@@ -603,6 +603,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 					totalLink+=Long.parseLong(lf.format(m.get("linkNum")));
 					totalPackets+=Long.parseLong(lf.format(m.get("packets")));
 					totalGByte+=Double.parseDouble(lf.format(m.get("count")));
+					m.remove("domainData");
 					Double value1=0d;
 					if(StringUtil.isBlank(m.get("topicId").toString())){
 						value1=268435455d;
@@ -616,6 +617,8 @@ public class TrafficStatisticsInfoController extends BaseController {
 							break;
 						}
 					}
+					
+					
 				}
 				//将总数据赋值给每个实体 方便计算百分比 如果数据都为空 则不返回给页面展示
 				for(int i=list.size()-1;i>=0;i--) {

src/main/java/com/nis/web/security/CacheSessionDAO.java

@@ -149,7 +149,7 @@ public class CacheSessionDAO extends RedisSessionDAO {
 		for (Session session : getActiveSessions()){
 			boolean isActiveSession = false;
 			// 不包括离线并符合最后访问时间小于等于3分钟条件。
-			if (includeLeave || DateUtils.pastMinutes(session.getLastAccessTime()) <= 3){
+			if (includeLeave || (session!=null&&DateUtils.pastMinutes(session.getLastAccessTime()) <= 3)){
 				isActiveSession = true;
 			}
 			// 符合登陆者条件。