From 8c88334ba4d4b377baceac3bbc669425dfb6d3fe Mon Sep 17 00:00:00 2001 From: renkaige Date: Tue, 8 Jan 2019 19:11:50 +0600 Subject: [PATCH] =?UTF-8?q?=E4=B8=BAasn=E5=8D=95=E5=90=91=E6=B5=81?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=B7=BB=E5=8A=A0=E8=BF=90=E8=90=A5=E5=95=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/web/service/LogDataService.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/nis/web/service/LogDataService.java b/src/main/java/com/nis/web/service/LogDataService.java index a6a4803..42041ed 100644 --- a/src/main/java/com/nis/web/service/LogDataService.java +++ b/src/main/java/com/nis/web/service/LogDataService.java @@ -63,7 +63,7 @@ public class LogDataService { } long second = endTime - startTime; StringBuffer sql = new StringBuffer(); - sql.append("SELECT SUM(s2c_pkt_num + s2c_pkt_num)/"); + sql.append("SELECT SUM(s2c_pkt_num + c2s_pkt_num)/"); sql.append(second); sql.append(" AS pps , SUM(c2s_byte_num + s2c_byte_num)*8/1024/1024/1024/"); sql.append(second); @@ -74,8 +74,17 @@ public class LogDataService { sql.append(endTime); StringBuffer totalSql = new StringBuffer(); totalSql.append(sql); - totalSql.append(" and stream_dir in(1,2,3)) and stream_dir in(1,2,3)"); - sql.append(" and stream_dir in(1,2) ) and stream_dir in(1,2)"); + if (ntcConnRecordPercent.getSearchEntranceId() != null + && !ntcConnRecordPercent.getSearchEntranceId().trim().equals("")) { + totalSql.append(" and stream_dir in(1,2,3) and entrance_id =" + ntcConnRecordPercent.getSearchEntranceId() + + " ) and stream_dir in(1,2,3) and entrance_id =" + ntcConnRecordPercent.getSearchEntranceId()); + sql.append(" and stream_dir in(1,2) and entrance_id =" + ntcConnRecordPercent.getSearchEntranceId() + + " ) and stream_dir in(1,2) and entrance_id =" + ntcConnRecordPercent.getSearchEntranceId()); + } else { + totalSql.append(" and stream_dir in(1,2,3)) and stream_dir in(1,2,3)"); + sql.append(" and stream_dir in(1,2) ) and stream_dir in(1,2) "); + } + localLogJDBCByDruid.getNtcConnRecordPercentData(ntcConnRecordPercent, sql.toString(), false); localLogJDBCByDruid.getNtcConnRecordPercentData(ntcConnRecordPercent, totalSql.toString(), true); return ntcConnRecordPercent;