From 9305659f5b7fbc0cb1e2404b3de5ce6d8f64ceb4 Mon Sep 17 00:00:00 2001 From: renkaige Date: Fri, 9 Nov 2018 17:00:02 +0800 Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9jsp-api=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E5=AF=BC=E8=87=B4swagger=E6=97=A5=E5=BF=97=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=87=BA=E7=8E=B0jsp=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=202:=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=B8=BA=E5=85=88=E6=9F=A5=E8=AF=A2=E6=80=BB=E9=87=8F?= =?UTF-8?q?=E5=9C=A8=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 +++ src/main/java/com/nis/domain/Page.java | 2 +- .../com/nis/web/service/LogDataService.java | 32 ++++++++++--------- src/main/resources/jdbc.properties | 14 ++++---- 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 781a7df..13263a7 100644 --- a/pom.xml +++ b/pom.xml @@ -498,6 +498,10 @@ org.mortbay.jetty jsp-2.1 + + org.mortbay.jetty + jsp-api-2.1 + diff --git a/src/main/java/com/nis/domain/Page.java b/src/main/java/com/nis/domain/Page.java index fa864f4..733c2fb 100644 --- a/src/main/java/com/nis/domain/Page.java +++ b/src/main/java/com/nis/domain/Page.java @@ -518,7 +518,7 @@ public class Page { */ public Page setList(List list) { this.list = list; -// initialize(); + initialize(); return this; } diff --git a/src/main/java/com/nis/web/service/LogDataService.java b/src/main/java/com/nis/web/service/LogDataService.java index f40a552..875bd37 100644 --- a/src/main/java/com/nis/web/service/LogDataService.java +++ b/src/main/java/com/nis/web/service/LogDataService.java @@ -11,6 +11,8 @@ import java.util.Map; import org.apache.ibatis.mapping.ResultMap; import org.apache.ibatis.mapping.ResultMapping; import org.apache.ibatis.session.SqlSessionFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,9 +30,8 @@ import com.zdjizhi.utils.StringUtil; */ @Service public class LogDataService { - // private final static Logger logger = - // LoggerFactory.getLogger(LogDataService.class); - + private final static Logger logger = LoggerFactory.getLogger(LogDataService.class); + @Autowired private LogJDBCByDruid logJDBCByDruid; private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -186,13 +187,14 @@ public class LogDataService { Integer startNum = (page.getPageNo() - 1) * page.getPageSize(); StringBuffer foundTimeSql = new StringBuffer(); foundTimeSql.append("select found_time from " + tableName + " where "); + Integer limitCount = startNum + page.getPageSize(); if (whereSB.length() == 0) {// 没有其他查询条件只有默认的found_time条件 if (whereFoundTime.length() > 0) { int indexOf = whereFoundTime.indexOf("and") + "and".length(); countSql.append(whereFoundTime.substring(indexOf)); - foundTimeSql.append(whereFoundTime.substring(indexOf) + orderBy.toLowerCase() + " limit " + startNum - + "," + page.getPageSize()); + foundTimeSql + .append(whereFoundTime.substring(indexOf) + orderBy.toLowerCase() + " limit " + limitCount); sql.append(" found_time in(" + foundTimeSql + ") "); } else { throw new RuntimeException("从clickhouse的" + tableName + "表查询时,必须要有一个where条件"); @@ -200,9 +202,8 @@ public class LogDataService { } else { int foundIndexOf = whereFoundTime.append(whereSB).indexOf("and") + "and".length(); countSql.append(whereFoundTime.substring(foundIndexOf)); - - foundTimeSql.append(whereFoundTime.substring(foundIndexOf) + orderBy.toLowerCase() + " limit " + startNum - + "," + page.getPageSize()); + foundTimeSql + .append(whereFoundTime.substring(foundIndexOf) + orderBy.toLowerCase() + " limit " + limitCount); int indexOf = whereSB.indexOf("and") + "and".length(); sql.append(whereSB.substring(indexOf) + " and found_time in(" + foundTimeSql + ") "); @@ -241,7 +242,7 @@ public class LogDataService { } else { sql.append(showColmun); } - String sqlTrim= sql.toString().trim(); + String sqlTrim = sql.toString().trim(); if (sqlTrim.endsWith(",")) { sqlTrim = sqlTrim.substring(0, sqlTrim.length() - 1); } @@ -361,12 +362,13 @@ public class LogDataService { */ private void searchFromDataCenter(Page page, Object bean, StringBuffer selSql, StringBuffer countSql) throws Exception { -// new LogJDBCByDruid().getTableData(page, selSql.toString(), bean.getClass()); - logJDBCByDruid.getTableData(page, selSql.toString(), bean.getClass()); - if (Constants.ISOPENLOGCOUNTANDLAST) { - if (page.getList() != null && page.getList().size() > 0) { - logJDBCByDruid.getCount(page, countSql.toString().toLowerCase()); - } +// if (Constants.ISOPENLOGCOUNTANDLAST) { + logJDBCByDruid.getCount(page, countSql.toString().toLowerCase()); +// } + if (page.getCount() > 0) { + logJDBCByDruid.getTableData(page, selSql.toString(), bean.getClass()); + } else { + logger.info("没有查询到数据,sql={}",countSql.toString().toLowerCase()); } } diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties index b953efd..b57d605 100644 --- a/src/main/resources/jdbc.properties +++ b/src/main/resources/jdbc.properties @@ -187,11 +187,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