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

fix:修正查询isp查询条件无对应数据，导致条件未使用且出现结果的bug

Browse Source
This commit is contained in:
doufenghu
2019-01-22 19:21:09 +06:00
parent cffbc5edd7
commit 58580d7d4e
2 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/com/nis/web/service/LogDataService.java
View File

@@ -1,22 +1,5 @@
package com.nis.web.service;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringEscapeUtils;
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;
import com.nis.domain.Page;
import com.nis.domain.restful.NtcConnRecordPercent;
import com.nis.domain.restful.dashboard.TrafficAsnStatistic;
@@ -28,6 +11,22 @@ import com.nis.web.dao.IspInfoDao;
import com.nis.web.dao.impl.LocalLogJDBCByDruid;
import com.nis.web.dao.impl.LogJDBCByDruid;
import com.zdjizhi.utils.StringUtil;
import org.apache.commons.lang3.StringEscapeUtils;
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;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 从clickhouse或者hive中查询数据并set到page.list返回给界面
@@ -840,7 +839,7 @@ public class LogDataService {
* 利用反射查询一个对象中是否存在某个属性
*
* @param obj
* @param fieldName
* @param filedName
* @throws Exception
*/
private static boolean ifExistFiledName(Object obj, String filedName)
@@ -1130,7 +1129,9 @@ public class LogDataService {
*/
private String getIspNum(String ispCode) {
List<String> ispNum = ispInfoDao.getIspNum(ispCode);
if (ispNum != null && ispNum.size() > 0) {
String result = "'NA'";
if (StringUtil.isNotEmpty(ispNum)) {
StringBuffer sb = new StringBuffer();
for (String ispNumStr : ispNum) {
sb.append("'");
@@ -1138,9 +1139,9 @@ public class LogDataService {
sb.append("'");
sb.append(",");
}
return sb.substring(0, sb.length() - 1);
result= sb.substring(0, sb.length() - 1);
}
return null;
return result;
}
}

13
src/main/java/com/nis/web/service/restful/DashboardService.java
View File

@@ -309,8 +309,7 @@ public class DashboardService extends BaseService {
/**
* 日期格式字符串转换成时间戳
*
* @param date 字符串日期
* @param format 如：yyyy-MM-dd HH:mm:ss
* @param date_str 字符串日期
* @return
*/
@Deprecated
@@ -327,8 +326,7 @@ public class DashboardService extends BaseService {
/**
* 时间戳 换成日期格式字符串转
*
* @param 时间 1544602212000
* @param format 如：yyyy-MM-dd HH:mm:ss
* @param timeStamp 1544602212000
* @return
*/
@Deprecated
@@ -1784,6 +1782,7 @@ public class DashboardService extends BaseService {
* @return
*/
public String getIspNum(String ispCode) {
String result = "'NA'";
List<String> ispNum = ispInfoDao.getIspNum(ispCode);
if (ispNum != null && ispNum.size() > 0) {
StringBuffer sb = new StringBuffer();
@@ -1793,9 +1792,11 @@ public class DashboardService extends BaseService {
sb.append("'");
sb.append(",");
}
return sb.substring(0, sb.length() - 1);
result= sb.substring(0, sb.length() - 1);
}
return null;
return result;
}
public List<SysDeviceInfo> getIspListByIspNum(String ispNum) {