gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1:删除37与149对14:APP_SUBSCRIBE_ID表的支持

Browse Source 
2:为日志查询的url字段做左匹配处理
3:修改测试程序打印表达式
4:加配置同步到集群库的定时任务
This commit is contained in:
RenKaiGe-Office
2018-09-11 18:18:56 +08:00
parent a8b1c53d76
commit 50211f4ea7
10 changed files with 349 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/nis/web/service/HiveSqlService.java
View File

@@ -127,10 +127,15 @@ public class HiveSqlService {
key = key.replace("search", "");
key = key.substring(0, 1).toLowerCase() + key.substring(1);
}
if (!Constants.ISUSECLICKHOUSE) {//hive写法
if (!Constants.ISUSECLICKHOUSE) {// hive写法
if (typeName.equals("java.lang.String")) {
whereSB.append(" and " + filedAndColumnMap.get(key) + "='"
+ value.toString().trim() + "'");
String field = filedAndColumnMap.get(key);
if (field.equals("url")) {
whereSB.append(
" and " + field + " like '" + value.toString().trim() + "%'");
} else {
whereSB.append(" and " + field + "='" + value.toString().trim() + "'");
}
} else if (typeName.equals("java.lang.Integer") || typeName.equals("int")) {
whereSB.append(
" and " + filedAndColumnMap.get(key) + "=" + value.toString().trim());
@@ -139,11 +144,16 @@ public class HiveSqlService {
whereSB.append(" and " + filedAndColumnMap.get(key) + "="
+ value.toString().trim() + "L");
}
} else {//clickhouse写法
} else {// clickhouse写法
String type = filedsType.get(key).trim();
if (type.equals("java.lang.String")) {
whereSB.append(" and " + filedAndColumnMap.get(key).toLowerCase() + "='"
+ value.toString().trim() + "'");
String field = filedAndColumnMap.get(key).toLowerCase();
if (field.equals("url")) {
whereSB.append(
" and " + field + " like '" + value.toString().trim() + "%'");
} else {
whereSB.append(" and " + field + "='" + value.toString().trim() + "'");
}
} else if (type.equals("java.lang.Integer") || type.equals("int")
|| type.equals("java.lang.Long") || type.equals("long")) {
whereSB.append(" and " + filedAndColumnMap.get(key).toLowerCase() + "="
@@ -170,8 +180,8 @@ public class HiveSqlService {
}
if (whereSB.length() > 0) {
int indexOf = whereSB.indexOf("and")+"and".length();
sql.append(" where "+whereSB.substring(indexOf));
int indexOf = whereSB.indexOf("and") + "and".length();
sql.append(" where " + whereSB.substring(indexOf));
}
if (Constants.ISUSECLICKHOUSE) {
// Integer startNum = (page.getPageNo() - 1) * page.getPageSize() + 1;