diff --git a/src/main/java/com/nis/domain/restful/NtcIpRangeReport.java b/src/main/java/com/nis/domain/restful/NtcIpRangeReport.java index 8f4ad3a..11c56e1 100644 --- a/src/main/java/com/nis/domain/restful/NtcIpRangeReport.java +++ b/src/main/java/com/nis/domain/restful/NtcIpRangeReport.java @@ -1,14 +1,10 @@ package com.nis.domain.restful; import java.io.Serializable; -import java.util.Map; import javax.xml.bind.annotation.XmlTransient; -import org.apache.poi.ss.formula.functions.T; - import com.fasterxml.jackson.annotation.JsonIgnore; -import com.google.common.collect.Maps; import com.nis.domain.Page; public class NtcIpRangeReport implements Serializable { @@ -24,10 +20,18 @@ public class NtcIpRangeReport implements Serializable { private Long ipEndNum; private String ipSub; private String country; - private Integer areaType; - private String searchType; - private String searchCountry; + + private String desc; + private String searchDesc;// 界面上的desc查询条件 + private String searchIp;// 界面上的ip查询条件 + private String searchType;// 界面上的境内,境外查询条件 + private String searchCountry;// 界面上的城市查询条件 + + /** + * 当前实体分页对象 + */ + protected Page page; public String getIpStart() { return ipStart; @@ -103,4 +107,43 @@ public class NtcIpRangeReport implements Serializable { this.searchCountry = searchCountry; } + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + @JsonIgnore + public String getSearchDesc() { + return searchDesc; + } + + public void setSearchDesc(String searchDesc) { + this.searchDesc = searchDesc; + } + + @JsonIgnore + public String getSearchIp() { + return searchIp; + } + + public void setSearchIp(String searchIp) { + this.searchIp = searchIp; + } + + @JsonIgnore + @XmlTransient + public Page getPage() { + if (page == null) { + page = new Page(); + } + return page; + } + + public Page setPage(Page page) { + this.page = page; + return page; + } + } diff --git a/src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java b/src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java index 451bba1..74a21a2 100644 --- a/src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java +++ b/src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java @@ -1,5 +1,6 @@ package com.nis.web.controller.restful; +import java.text.ParseException; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -490,14 +491,29 @@ public class SingleDimensionReport extends BaseRestController { AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, null); try { -// List list=new ArrayList<>(); -// ntcIpRangeReport.setIpStart("192.168.10.121"); -// ntcIpRangeReport.setIpEnd("192.168.10.122"); -// ntcIpRangeReport.setIpEndNum(3232238202l); -// ntcIpRangeReport.setIpStartNum(3232238201l); -// ntcIpRangeReport.setIpSub("255.255.255.252"); -// list.add(ntcIpRangeReport); - page.setList( ntcReportService.findNtcIpRangeReport(ntcIpRangeReport)); + + try { + if (!StringUtil.isBlank(ntcIpRangeReport.getSearchIp())) { + ntcIpRangeReport.setSearchIp(IPUtil.getIpHostDesimal(ntcIpRangeReport.getSearchIp()) + ""); + } + } catch (Exception e) { + throw new RestServiceException("searchIp参数错误", RestBusinessCode.param_formate_error.getValue()); + } + + try { + if (!StringUtil.isBlank(ntcIpRangeReport.getSearchType())) { + if (!ntcIpRangeReport.getSearchType().trim().equals("1") + && !ntcIpRangeReport.getSearchType().trim().equals("2")) { + throw new RestServiceException("searchType参数错误", + RestBusinessCode.param_formate_error.getValue()); + } + } + } catch (Exception e) { + throw new RestServiceException("searchType参数错误,值只能为1(境内)或2(境外)", + RestBusinessCode.param_formate_error.getValue()); + } + + ntcReportService.findNtcIpRangeReport(page, ntcIpRangeReport); } catch (Exception e) { saveLogThread.setExceptionInfo("ip范围段统计查询失败:" + e.getMessage()); logger.error("ip范围段统计查询失败:" + ExceptionUtil.getExceptionMsg(e)); diff --git a/src/main/java/com/nis/web/dao/NtcReportDao.xml b/src/main/java/com/nis/web/dao/NtcReportDao.xml index 01e053b..2aed162 100644 --- a/src/main/java/com/nis/web/dao/NtcReportDao.xml +++ b/src/main/java/com/nis/web/dao/NtcReportDao.xml @@ -98,6 +98,8 @@ property="ipEndNum" /> + + @@ -856,7 +858,7 @@ diff --git a/src/main/java/com/nis/web/dao/impl/LocalLogJDBCByDruid.java b/src/main/java/com/nis/web/dao/impl/LocalLogJDBCByDruid.java index 2d733cd..810b360 100644 --- a/src/main/java/com/nis/web/dao/impl/LocalLogJDBCByDruid.java +++ b/src/main/java/com/nis/web/dao/impl/LocalLogJDBCByDruid.java @@ -149,7 +149,9 @@ public class LocalLogJDBCByDruid { if (!allPps.equals("0")) { ntcConnRecordPercent.setPpsPercent( num.format(Double.valueOf(ntcConnRecordPercent.getPps()) / Double.valueOf(allPps))); - ntcConnRecordPercent.setPps(subStr(ntcConnRecordPercent.getPps())); + int idx = ntcConnRecordPercent.getPps().lastIndexOf(".");//查找小数点的位置 + String strNum = ntcConnRecordPercent.getPps().substring(0,idx);//截取从字符串开始到小数点位置的字符串，就是整数部分 + ntcConnRecordPercent.setPps(strNum); } else { ntcConnRecordPercent.setPpsPercent("0%"); } diff --git a/src/main/java/com/nis/web/service/LogDataService.java b/src/main/java/com/nis/web/service/LogDataService.java index 9a2e2a7..78c1059 100644 --- a/src/main/java/com/nis/web/service/LogDataService.java +++ b/src/main/java/com/nis/web/service/LogDataService.java @@ -66,7 +66,7 @@ public class LogDataService { StringBuffer sql = new StringBuffer(); sql.append("SELECT SUM(s2c_pkt_num + s2c_pkt_num)*8/"); sql.append(second); - sql.append(" AS pps , SUM(c2s_byte_num + s2c_byte_num)*8/"); + sql.append(" AS pps , SUM(c2s_byte_num + s2c_byte_num)*8/1024/1024/1024/"); sql.append(second); sql.append( " AS bps FROM tbs_ods_ntc_conn_record_log_local t WHERE found_time IN ( SELECT DISTINCT found_time FROM tbs_ods_ntc_conn_record_log_local WHERE found_time >= "); diff --git a/src/main/java/com/nis/web/service/restful/NtcReportService.java b/src/main/java/com/nis/web/service/restful/NtcReportService.java index 6908327..786eccf 100644 --- a/src/main/java/com/nis/web/service/restful/NtcReportService.java +++ b/src/main/java/com/nis/web/service/restful/NtcReportService.java @@ -156,11 +156,10 @@ public class NtcReportService extends BaseLogService { } - - - public List findNtcIpRangeReport(NtcIpRangeReport entity) throws Exception { - List list = dao.findNtcIpRangeReport(entity); - return list; + public Page findNtcIpRangeReport(Page page, NtcIpRangeReport entity) throws Exception { + entity.setPage(page); + page.setList(dao.findNtcIpRangeReport(entity)); + return page; } }