diff options
| author | wangwei <[email protected]> | 2018-10-26 15:11:27 +0800 |
|---|---|---|
| committer | wangwei <[email protected]> | 2018-10-26 15:11:27 +0800 |
| commit | a9ebba883fdfef00697ec854c7fd7dd4dd2b8181 (patch) | |
| tree | 7f49a6041242011568a873c2035dc6ed005174c4 | |
| parent | 6b89fb65284af3e7ce1949cee2e557f5430f7ab3 (diff) | |
在热力图接口、封堵信息分布显示lastTime的查询中添加(service条件范围)、将bean中相关数字字段修改为long类型(除1h、24h、7day互联网流量TOP10对应的bean)
53 files changed, 274 insertions, 372 deletions
diff --git a/config/application.properties b/config/application.properties index 3fcb9ef..db3a067 100644 --- a/config/application.properties +++ b/config/application.properties @@ -6,15 +6,15 @@ REST_URL_PREFIX_CHECK=http://127.0.0.1:${server.port} #REST_URL_PREFIX_PUSH=http://58.56.56.170:11000 REST_URL_PREFIX_PUSH=http://127.0.0.1:${server.port} #互联网监控接口 true表示开启 -scheduled.netflow.topn.enable=false -scheduled.netflow.enable=false +scheduled.netflow.topn.enable=true +scheduled.netflow.enable=true #封堵信息接口 true表示开启 scheduled.block.enable=true -scheduled.block.topn.enable=false +scheduled.block.topn.enable=true #监控接口 true表示开启 -scheduled.monitor.enable=false +scheduled.monitor.enable=true #事件接口 -scheduled.events.enable=false +scheduled.events.enable=true #每个整10s触发一次 10s.scheduled.cron.plan=*/10 * * * * * #每分钟整点触发 @@ -38,7 +38,7 @@ SERVICE_PATH_EVENTS=/v1/events #定时任务线程池 SCHEDULED.THREAD.POOL=5 #等待字典表的加载时间 -DICT.WAIT=1000 +DICT.WAIT=5000 #restTemplate配置 #建立连接时间ms RestTemplate.ConnectTimeout=20000 diff --git a/config/application.yml b/config/application.yml index 4e97330..950c0ac 100644 --- a/config/application.yml +++ b/config/application.yml @@ -7,6 +7,6 @@ mybatis: spring: datasource: driver-class-name: org.mariadb.jdbc.Driver # mariadb驱动包 - url: jdbc:mariadb://192.168.10.204:3306/galaxy # 数据库名称 + url: jdbc:mariadb://192.168.10.204:3306/galaxy-dev # 数据库名称 username: ENC(L0d9FkUJX6BIaxPyy57bqQ==) password: ENC(0WPm6y8me4cavVjpk2BuBQ==) diff --git a/config/log4j2.yml b/config/log4j2.yml index 6b3dcdd..be453cc 100644 --- a/config/log4j2.yml +++ b/config/log4j2.yml @@ -3,7 +3,7 @@ Properties: - name: log.level.galaxy value: info - name: log.path - value: F:/log/1022/idea + value: F:/log/1026/idea - name: project.name value: galaxy-push-service Appenders: diff --git a/src/main/java/com/nis/galaxy/config/MyLoad.java b/src/main/java/com/nis/galaxy/config/MyLoad.java index 43ca1e2..410bd80 100644 --- a/src/main/java/com/nis/galaxy/config/MyLoad.java +++ b/src/main/java/com/nis/galaxy/config/MyLoad.java @@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.annotation.Order; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -39,11 +40,10 @@ public class MyLoad { //运营商表 public HashMap<String, UiCarrierDictInfo> listUiCarrierDictInfo = new HashMap<>(); - - public HashMap<String, UiCarrierDictInfo> getListUiCarrierDictInfo() { return listUiCarrierDictInfo; } + public HashMap<String, UiAreaDictInfo> getListUiAreaDicInfo() { return listUiAreaDicInfo; } @@ -65,38 +65,37 @@ public class MyLoad { logger.info("执行初始化字典表：地域表\t运营商表\t业务表\t协议表\t标签表"); - //地域表的预加载 List<UiAreaDictInfo> uiAreaDictInfo = new ArrayList<>(); try { uiAreaDictInfo = dictService.getUiAreaDictInfo(); } catch (Exception e) { - logger.info("地域表预加载出现异常",e); + logger.error("地域表预加载出现异常", e); } for (UiAreaDictInfo areaDictInfo : uiAreaDictInfo) { - listUiAreaDicInfo.put(areaDictInfo.getAreaId(),areaDictInfo); + listUiAreaDicInfo.put(areaDictInfo.getAreaId(), areaDictInfo); } - logger.info("地域表的预加载结果\t"+listUiAreaDicInfo); + logger.info("地域表的预加载结果\t" + listUiAreaDicInfo); //运营商表的预加载 List<UiCarrierDictInfo> uiCarrierDictInfo = new ArrayList<>(); try { uiCarrierDictInfo = dictService.getUiCarrierDictInfo(); } catch (Exception e) { - logger.info("运营商表预加载出现异常",e); + logger.error("运营商表预加载出现异常", e); } for (UiCarrierDictInfo carrierDictInfo : uiCarrierDictInfo) { - listUiCarrierDictInfo.put(carrierDictInfo.getCarrierId(),carrierDictInfo); + listUiCarrierDictInfo.put(carrierDictInfo.getCarrierId(), carrierDictInfo); } - logger.info("运营商表的预加载结果\t"+listUiCarrierDictInfo); + logger.info("运营商表的预加载结果\t" + listUiCarrierDictInfo); //业务表的预加载(中英俄) List<NtcServiceDict> ntcServiceDict = new ArrayList<>(); try { ntcServiceDict = dictService.getNtcServiceDict(); } catch (Exception e) { - logger.info("业务表预加载出现异常", e); + logger.error("业务表预加载出现异常", e); } if (!ntcServiceDict.isEmpty()) { for (NtcServiceDict serviceDict : ntcServiceDict) { @@ -110,7 +109,7 @@ public class MyLoad { try { protocolDict = dictService.getProtocolDict(); } catch (Exception e) { - logger.info("协议表的预加载出现异常", e); + logger.error("协议表的预加载出现异常", e); } if (!protocolDict.isEmpty()) { for (ProtocolDict dict : protocolDict) { @@ -124,7 +123,7 @@ public class MyLoad { try { uiTagDicInfo = dictService.getUiTagDicInfo(); } catch (Exception e) { - logger.info("标签表的预加载出现异常", e); + logger.error("标签表的预加载出现异常", e); } if (!uiTagDicInfo.isEmpty()) { for (UiTagDictInfo tagDicInfo : uiTagDicInfo) { @@ -134,7 +133,6 @@ public class MyLoad { logger.info("标签表的预加载结果为\t" + listUiTagDicInfo); logger.info("初始化字典表操作执行完成"); } - @Scheduled(fixedRate = 999999999) public void run() { if (a++ > 1) { diff --git a/src/main/java/com/nis/galaxy/config/WebMvcConfig.java b/src/main/java/com/nis/galaxy/config/WebMvcConfig.java index d4946ab..c25bd27 100644 --- a/src/main/java/com/nis/galaxy/config/WebMvcConfig.java +++ b/src/main/java/com/nis/galaxy/config/WebMvcConfig.java @@ -14,7 +14,7 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter { private String IMAGEPATH; @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { - if (IMAGEPATH == null || IMAGEPATH.equals("")) { + if (IMAGEPATH == null || "".equals(IMAGEPATH)) { try { IMAGEPATH = new File("").getCanonicalPath() + "/image/"; } catch (IOException e) { diff --git a/src/main/java/com/nis/galaxy/domain/AreaBPSTime.java b/src/main/java/com/nis/galaxy/domain/AreaBPSTime.java index 31daa5f..04aa1a2 100644 --- a/src/main/java/com/nis/galaxy/domain/AreaBPSTime.java +++ b/src/main/java/com/nis/galaxy/domain/AreaBPSTime.java @@ -13,6 +13,6 @@ import lombok.experimental.Accessors; @Accessors(chain=true) public class AreaBPSTime { private String area; - private int bps; + private long bps; private String time; } diff --git a/src/main/java/com/nis/galaxy/domain/AreaBlockProtocol.java b/src/main/java/com/nis/galaxy/domain/AreaBlockProtocol.java index 24885b7..eeadc20 100644 --- a/src/main/java/com/nis/galaxy/domain/AreaBlockProtocol.java +++ b/src/main/java/com/nis/galaxy/domain/AreaBlockProtocol.java @@ -20,5 +20,5 @@ public class AreaBlockProtocol { private String time;// 时间 private String area; // 区域 private String type; // 协议类型 - private int count; // 流量 + private long count; // 流量 }
\ No newline at end of file diff --git a/src/main/java/com/nis/galaxy/domain/AreaCount.java b/src/main/java/com/nis/galaxy/domain/AreaCount.java index 3687b55..f51a54e 100644 --- a/src/main/java/com/nis/galaxy/domain/AreaCount.java +++ b/src/main/java/com/nis/galaxy/domain/AreaCount.java @@ -18,5 +18,5 @@ import lombok.experimental.Accessors; public class AreaCount { private String time; private String area; - private int count; + private long count; } diff --git a/src/main/java/com/nis/galaxy/domain/CfgTypeCount.java b/src/main/java/com/nis/galaxy/domain/CfgTypeCount.java index bc169e6..fcbb600 100644 --- a/src/main/java/com/nis/galaxy/domain/CfgTypeCount.java +++ b/src/main/java/com/nis/galaxy/domain/CfgTypeCount.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; public class CfgTypeCount { private String time; private String type; - private int count; + private long count; public String getTime() { return time= DateUtils.getRangeOfday(DateUtils.getDateTime()); } diff --git a/src/main/java/com/nis/galaxy/domain/CountryMonitorProxy.java b/src/main/java/com/nis/galaxy/domain/CountryMonitorProxy.java deleted file mode 100644 index 1740044..0000000 --- a/src/main/java/com/nis/galaxy/domain/CountryMonitorProxy.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.nis.galaxy.domain; - - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -import java.math.BigInteger; - -@SuppressWarnings("serial") -@NoArgsConstructor -@AllArgsConstructor -@Data -@Accessors(chain=true) -public class CountryMonitorProxy { - private BigInteger monitorNum; - private BigInteger rejectNum; - private BigInteger replaceNum; -} diff --git a/src/main/java/com/nis/galaxy/domain/EventsAppMonitor.java b/src/main/java/com/nis/galaxy/domain/EventsAppMonitor.java index 311c73c..5c04ab0 100644 --- a/src/main/java/com/nis/galaxy/domain/EventsAppMonitor.java +++ b/src/main/java/com/nis/galaxy/domain/EventsAppMonitor.java @@ -14,5 +14,5 @@ import lombok.experimental.Accessors; public class EventsAppMonitor { private String time; private String name; - private int num; + private long num; } diff --git a/src/main/java/com/nis/galaxy/domain/EventsAudioMonitor.java b/src/main/java/com/nis/galaxy/domain/EventsAudioMonitor.java index 1053709..04e9163 100644 --- a/src/main/java/com/nis/galaxy/domain/EventsAudioMonitor.java +++ b/src/main/java/com/nis/galaxy/domain/EventsAudioMonitor.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class EventsAudioMonitor { private long audioId; // 节目id - private int num; // 次数 + private long num; // 次数 private String url; // 现场片段url } diff --git a/src/main/java/com/nis/galaxy/domain/EventsBlock.java b/src/main/java/com/nis/galaxy/domain/EventsBlock.java index a4b5ff0..3ebe808 100644 --- a/src/main/java/com/nis/galaxy/domain/EventsBlock.java +++ b/src/main/java/com/nis/galaxy/domain/EventsBlock.java @@ -13,10 +13,10 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class EventsBlock { private String event; // 事件 - private int ipNum; // ip数量 - private int httpNum; // http数量 - private int mailNum; // 邮件数量 - private int vedioNum; // 视频次数 - private int agentNum; // 代理次数 + private long ipNum; // ip数量 + private long httpNum; // http数量 + private long mailNum; // 邮件数量 + private long vedioNum; // 视频次数 + private long agentNum; // 代理次数 private String time; // 时间 } diff --git a/src/main/java/com/nis/galaxy/domain/EventsDeviceNum.java b/src/main/java/com/nis/galaxy/domain/EventsDeviceNum.java index ec06f7d..5940700 100644 --- a/src/main/java/com/nis/galaxy/domain/EventsDeviceNum.java +++ b/src/main/java/com/nis/galaxy/domain/EventsDeviceNum.java @@ -14,6 +14,6 @@ import lombok.experimental.Accessors; public class EventsDeviceNum { private String time; // 时间 private String type; // 业务分类 - private int num; //数量 + private long num; //数量 } diff --git a/src/main/java/com/nis/galaxy/domain/EventsImageMonitor.java b/src/main/java/com/nis/galaxy/domain/EventsImageMonitor.java index 5d9d9c4..1331884 100644 --- a/src/main/java/com/nis/galaxy/domain/EventsImageMonitor.java +++ b/src/main/java/com/nis/galaxy/domain/EventsImageMonitor.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class EventsImageMonitor { private long imageId; // 节目id - private int num; // 次数 + private long num; // 次数 private String url; // 现场片段url } diff --git a/src/main/java/com/nis/galaxy/domain/EventsKeyPointSafaguardThing.java b/src/main/java/com/nis/galaxy/domain/EventsKeyPointSafaguardThing.java index d6f77c2..1c3c4b4 100644 --- a/src/main/java/com/nis/galaxy/domain/EventsKeyPointSafaguardThing.java +++ b/src/main/java/com/nis/galaxy/domain/EventsKeyPointSafaguardThing.java @@ -15,8 +15,8 @@ public class EventsKeyPointSafaguardThing { private String time; private String taskName; private String taskTime; - private int letterNum;// 来函件数 - private int configNum;// 配置总数 - private int monitorNum;// 监测数量 - private int controlNum; // 管控数量 + private long letterNum;// 来函件数 + private long configNum;// 配置总数 + private long monitorNum;// 监测数量 + private long controlNum; // 管控数量 } diff --git a/src/main/java/com/nis/galaxy/domain/EventsLetterCount.java b/src/main/java/com/nis/galaxy/domain/EventsLetterCount.java index 2a2ca5e..71029f0 100644 --- a/src/main/java/com/nis/galaxy/domain/EventsLetterCount.java +++ b/src/main/java/com/nis/galaxy/domain/EventsLetterCount.java @@ -14,6 +14,6 @@ import lombok.experimental.Accessors; public class EventsLetterCount { private String time; // 时间 private String letter; // 来函 - private int num; + private long num; } diff --git a/src/main/java/com/nis/galaxy/domain/EventsMonitor.java b/src/main/java/com/nis/galaxy/domain/EventsMonitor.java index 1411d90..de10ccc 100644 --- a/src/main/java/com/nis/galaxy/domain/EventsMonitor.java +++ b/src/main/java/com/nis/galaxy/domain/EventsMonitor.java @@ -13,11 +13,11 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class EventsMonitor { private String event; // 事件 - private int ipNum; // ip数量 - private int httpNum; // http数量 - private int mailNum; // 邮件数量 - private int vedioNum; // 视频次数 - private int agentNum; // 代理次数 + private long ipNum; // ip数量 + private long httpNum; // http数量 + private long mailNum; // 邮件数量 + private long vedioNum; // 视频次数 + private long agentNum; // 代理次数 private String time; // 时间 } diff --git a/src/main/java/com/nis/galaxy/domain/EventsRunningState.java b/src/main/java/com/nis/galaxy/domain/EventsRunningState.java index 5d24eed..089fc7b 100644 --- a/src/main/java/com/nis/galaxy/domain/EventsRunningState.java +++ b/src/main/java/com/nis/galaxy/domain/EventsRunningState.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class EventsRunningState { - private int visitsNum;// 访问次数 - private int controlNum; // 管控次数 - private int replaceNum; // 替换次数 + private long visitsNum;// 访问次数 + private long controlNum; // 管控次数 + private long replaceNum; // 替换次数 } diff --git a/src/main/java/com/nis/galaxy/domain/EventsServiceCount.java b/src/main/java/com/nis/galaxy/domain/EventsServiceCount.java index d4a7d13..edb3328 100644 --- a/src/main/java/com/nis/galaxy/domain/EventsServiceCount.java +++ b/src/main/java/com/nis/galaxy/domain/EventsServiceCount.java @@ -14,5 +14,5 @@ import lombok.experimental.Accessors; public class EventsServiceCount { private String time; // 时间 private String type; // 业务分类 - private int num; //数量 + private long num; //数量 } diff --git a/src/main/java/com/nis/galaxy/domain/EventsSpecificWebsites.java b/src/main/java/com/nis/galaxy/domain/EventsSpecificWebsites.java index 185687f..2bbe2cd 100644 --- a/src/main/java/com/nis/galaxy/domain/EventsSpecificWebsites.java +++ b/src/main/java/com/nis/galaxy/domain/EventsSpecificWebsites.java @@ -14,6 +14,6 @@ import lombok.experimental.Accessors; public class EventsSpecificWebsites { private String time; // 时间 private String name; // 网站名称 - private int num; //数量 + private long num; //数量 } diff --git a/src/main/java/com/nis/galaxy/domain/EventsVedioMonitor.java b/src/main/java/com/nis/galaxy/domain/EventsVedioMonitor.java index 2f59892..0d1bcc4 100644 --- a/src/main/java/com/nis/galaxy/domain/EventsVedioMonitor.java +++ b/src/main/java/com/nis/galaxy/domain/EventsVedioMonitor.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class EventsVedioMonitor { private long vedioId; // 节目id - private int num; // 次数 + private long num; // 次数 private String url; // 现场片段url } diff --git a/src/main/java/com/nis/galaxy/domain/EventsVoipMonitor.java b/src/main/java/com/nis/galaxy/domain/EventsVoipMonitor.java index 0208334..7ef596e 100644 --- a/src/main/java/com/nis/galaxy/domain/EventsVoipMonitor.java +++ b/src/main/java/com/nis/galaxy/domain/EventsVoipMonitor.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) public class EventsVoipMonitor { - private int phonenum;// 电话号码 + private long phonenum;// 电话号码 private long num; // 次数 private String url; // 现场片段url diff --git a/src/main/java/com/nis/galaxy/domain/EvevtsTargetNetwork.java b/src/main/java/com/nis/galaxy/domain/EvevtsTargetNetwork.java index 27e1879..6a66376 100644 --- a/src/main/java/com/nis/galaxy/domain/EvevtsTargetNetwork.java +++ b/src/main/java/com/nis/galaxy/domain/EvevtsTargetNetwork.java @@ -14,6 +14,6 @@ import lombok.experimental.Accessors; public class EvevtsTargetNetwork { private String account; // 账号 private String nas_ip; // 接入IP - private int num; // 次数 + private long num; // 次数 private String time; // 时间 } diff --git a/src/main/java/com/nis/galaxy/domain/ForTestBean.java b/src/main/java/com/nis/galaxy/domain/ForTestBean.java deleted file mode 100644 index fd4678e..0000000 --- a/src/main/java/com/nis/galaxy/domain/ForTestBean.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.nis.galaxy.domain; - - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -@SuppressWarnings("serial") -@NoArgsConstructor -@AllArgsConstructor -@Data -@Accessors(chain = true) -public class ForTestBean { - private int id; - private String name; -} diff --git a/src/main/java/com/nis/galaxy/domain/HotStatistic.java b/src/main/java/com/nis/galaxy/domain/HotStatistic.java index b3f3863..4589a78 100644 --- a/src/main/java/com/nis/galaxy/domain/HotStatistic.java +++ b/src/main/java/com/nis/galaxy/domain/HotStatistic.java @@ -23,5 +23,5 @@ public class HotStatistic { private String src_ip; // 源IP private String dst_ip; // 目的IP private String type; // 类型，如：url封堵、网站封堵等 - private int count; + private long count; } diff --git a/src/main/java/com/nis/galaxy/domain/IpActiveInt.java b/src/main/java/com/nis/galaxy/domain/IpActiveInt.java index f40cbda..608d7b9 100644 --- a/src/main/java/com/nis/galaxy/domain/IpActiveInt.java +++ b/src/main/java/com/nis/galaxy/domain/IpActiveInt.java @@ -16,5 +16,5 @@ public class IpActiveInt { private String time;// 时间 private String area;// 区域 private String IP;// 活跃IP - private Integer count;// 流量 + private long count;// 流量 } diff --git a/src/main/java/com/nis/galaxy/domain/NetWaterMonitor.java b/src/main/java/com/nis/galaxy/domain/NetWaterMonitor.java index f0da124..c56dd44 100644 --- a/src/main/java/com/nis/galaxy/domain/NetWaterMonitor.java +++ b/src/main/java/com/nis/galaxy/domain/NetWaterMonitor.java @@ -15,5 +15,5 @@ public class NetWaterMonitor { private String time; private String area; private String type; - private int count; + private long count; } diff --git a/src/main/java/com/nis/galaxy/domain/NetflowMonitor.java b/src/main/java/com/nis/galaxy/domain/NetflowMonitor.java index e5a2a2f..7163769 100644 --- a/src/main/java/com/nis/galaxy/domain/NetflowMonitor.java +++ b/src/main/java/com/nis/galaxy/domain/NetflowMonitor.java @@ -17,6 +17,10 @@ public class NetflowMonitor { private String time; // 时间 public void setTime(String time) { - this.time = time.substring(0, time.indexOf(".")); + if (time != null && time.indexOf(".") > -1) { + this.time = time.substring(0, time.indexOf(".")); + }else { + this.time=time; + } } } diff --git a/src/main/java/com/nis/galaxy/domain/NmsServerBean.java b/src/main/java/com/nis/galaxy/domain/NmsServerBean.java index bc2070d..da49971 100644 --- a/src/main/java/com/nis/galaxy/domain/NmsServerBean.java +++ b/src/main/java/com/nis/galaxy/domain/NmsServerBean.java @@ -15,18 +15,24 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @Data -@Accessors(chain=true) +@Accessors(chain = true) public class NmsServerBean { private String time; private String system; private String area; - private int total; - private int normal; - private int abnormal; + private long total; + private long normal; + private long abnormal; private List<AbnormalBean> abnormalmachines; + public void setTime(String time) { - this.time = time.substring(0,time.indexOf(".")); + if (time != null && time.indexOf(".") > -1) { + this.time = time.substring(0, time.indexOf(".")); + }else { + this.time=time; + } } + public String getSystem() { return this.system = "ntc"; } diff --git a/src/main/java/com/nis/galaxy/domain/NmsServiceBeanTmp.java b/src/main/java/com/nis/galaxy/domain/NmsServiceBeanTmp.java index f180e92..2c80c7d 100644 --- a/src/main/java/com/nis/galaxy/domain/NmsServiceBeanTmp.java +++ b/src/main/java/com/nis/galaxy/domain/NmsServiceBeanTmp.java @@ -22,5 +22,5 @@ public class NmsServiceBeanTmp { private String total; private String normal; private String abnormal; - private int id; + private long id; } diff --git a/src/main/java/com/nis/galaxy/domain/NtcDisReport.java b/src/main/java/com/nis/galaxy/domain/NtcDisReport.java index 9c14d0c..ac42629 100644 --- a/src/main/java/com/nis/galaxy/domain/NtcDisReport.java +++ b/src/main/java/com/nis/galaxy/domain/NtcDisReport.java @@ -1,7 +1,6 @@ package com.nis.galaxy.domain; -import com.nis.galaxy.util.DateUtils; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -16,5 +15,5 @@ public class NtcDisReport { private String time; private String area;//局点名 private String type;//业务类型 - private int count; + private long count; } diff --git a/src/main/java/com/nis/galaxy/domain/NtcEntranceReport.java b/src/main/java/com/nis/galaxy/domain/NtcEntranceReport.java index 6abb813..ae29e56 100644 --- a/src/main/java/com/nis/galaxy/domain/NtcEntranceReport.java +++ b/src/main/java/com/nis/galaxy/domain/NtcEntranceReport.java @@ -13,5 +13,5 @@ import lombok.experimental.Accessors; public class NtcEntranceReport { private String time; private String area; - private int count; + private long count; }
\ No newline at end of file diff --git a/src/main/java/com/nis/galaxy/domain/NtcRejectUrlStatistic.java b/src/main/java/com/nis/galaxy/domain/NtcRejectUrlStatistic.java index c34db0c..6c0c091 100644 --- a/src/main/java/com/nis/galaxy/domain/NtcRejectUrlStatistic.java +++ b/src/main/java/com/nis/galaxy/domain/NtcRejectUrlStatistic.java @@ -16,5 +16,5 @@ import java.util.Date; public class NtcRejectUrlStatistic { private String time; private String type; - private Integer count; + private long count; } diff --git a/src/main/java/com/nis/galaxy/domain/NtcRejectWebsiteStatistic.java b/src/main/java/com/nis/galaxy/domain/NtcRejectWebsiteStatistic.java index 22991df..f991414 100644 --- a/src/main/java/com/nis/galaxy/domain/NtcRejectWebsiteStatistic.java +++ b/src/main/java/com/nis/galaxy/domain/NtcRejectWebsiteStatistic.java @@ -15,6 +15,6 @@ import lombok.experimental.Accessors; public class NtcRejectWebsiteStatistic { private String time; private String type; - private int count; + private long count; } diff --git a/src/main/java/com/nis/galaxy/domain/NtcTagReport.java b/src/main/java/com/nis/galaxy/domain/NtcTagReport.java index e43ce57..02e604e 100644 --- a/src/main/java/com/nis/galaxy/domain/NtcTagReport.java +++ b/src/main/java/com/nis/galaxy/domain/NtcTagReport.java @@ -15,5 +15,5 @@ import lombok.experimental.Accessors; public class NtcTagReport { private String time; private String type; - private int count; + private long count; } diff --git a/src/main/java/com/nis/galaxy/domain/NtcTotalReport.java b/src/main/java/com/nis/galaxy/domain/NtcTotalReport.java index 2e29856..f4a96e8 100644 --- a/src/main/java/com/nis/galaxy/domain/NtcTotalReport.java +++ b/src/main/java/com/nis/galaxy/domain/NtcTotalReport.java @@ -14,14 +14,14 @@ import java.io.Serializable; @Accessors(chain=true) public class NtcTotalReport implements Serializable { - private int rejectNum;//封堵数量 - private int monitorNum;//监测数量 - private int c2sByteLen;//字节数 - private int s2cByteLen; - private int newUniConnNum;//新建连接数 - private int liveConnNum;//活跃连接数 - private int dropConnNum;//丢弃连接数 + private long rejectNum;//封堵数量 + private long monitorNum;//监测数量 + private long c2sByteLen;//字节数 + private long s2cByteLen; + private long newUniConnNum;//新建连接数 + private long liveConnNum;//活跃连接数 + private long dropConnNum;//丢弃连接数 private String reportTime;//统计时间 - private int loopConnNum;//回流数 + private long loopConnNum;//回流数 } diff --git a/src/main/java/com/nis/galaxy/domain/NtcTypeCount.java b/src/main/java/com/nis/galaxy/domain/NtcTypeCount.java index a69a4fc..44749ac 100644 --- a/src/main/java/com/nis/galaxy/domain/NtcTypeCount.java +++ b/src/main/java/com/nis/galaxy/domain/NtcTypeCount.java @@ -12,32 +12,11 @@ import lombok.experimental.Accessors; @SuppressWarnings("serial") @NoArgsConstructor +@AllArgsConstructor @Data -@Accessors(chain=true) +@Accessors(chain = true) public class NtcTypeCount { private String type; - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public int getCount() { - return count; - } - - public void setCount(int count) { - this.count = count; - } - - public NtcTypeCount(String type, int count) { - this.type = type; - this.count = count; - } - - private int count; + private long count; } diff --git a/src/main/java/com/nis/galaxy/domain/NtcUrlIpCount.java b/src/main/java/com/nis/galaxy/domain/NtcUrlIpCount.java index 245b226..322e81b 100644 --- a/src/main/java/com/nis/galaxy/domain/NtcUrlIpCount.java +++ b/src/main/java/com/nis/galaxy/domain/NtcUrlIpCount.java @@ -21,5 +21,5 @@ public class NtcUrlIpCount { private String time; private String ip; private String type; - private int count; + private long count; } diff --git a/src/main/java/com/nis/galaxy/domain/PointMap.java b/src/main/java/com/nis/galaxy/domain/PointMap.java index c5a6f94..7016696 100644 --- a/src/main/java/com/nis/galaxy/domain/PointMap.java +++ b/src/main/java/com/nis/galaxy/domain/PointMap.java @@ -15,14 +15,19 @@ import lombok.experimental.Accessors; @NoArgsConstructor @AllArgsConstructor @Data -@Accessors(chain=true) +@Accessors(chain = true) public class PointMap { private String time; // 时间 private String src_ip; // 源IP private String dst_ip;// 目的IP private String type; // 类型 - private int count; + private long count; + public void setTime(String time) { - this.time = time.substring(0,time.indexOf("."));; + if (time != null && time.indexOf(".") > -1) { + this.time = time.substring(0, time.indexOf(".")); + }else { + this.time=time; + }; } } diff --git a/src/main/java/com/nis/galaxy/domain/PortBPSTime.java b/src/main/java/com/nis/galaxy/domain/PortBPSTime.java index 5070ebb..5040127 100644 --- a/src/main/java/com/nis/galaxy/domain/PortBPSTime.java +++ b/src/main/java/com/nis/galaxy/domain/PortBPSTime.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; @Accessors(chain=true) public class PortBPSTime { - private int port; - private int bps; + private long port; + private long bps; private String time; } diff --git a/src/main/java/com/nis/galaxy/domain/SystemTotal.java b/src/main/java/com/nis/galaxy/domain/SystemTotal.java index 29722f5..cb943c8 100644 --- a/src/main/java/com/nis/galaxy/domain/SystemTotal.java +++ b/src/main/java/com/nis/galaxy/domain/SystemTotal.java @@ -12,10 +12,10 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) public class SystemTotal { - private int totalNum; // 总流量 - private int configNum; // 配置总数 - private int blockNum; // 阻断数量 - private int monitorNum; // 监测数量 - private int discardedNum; // 丢弃数量 - private int refluxNum;//回流数量 + private long totalNum; // 总流量 + private long configNum; // 配置总数 + private long blockNum; // 阻断数量 + private long monitorNum; // 监测数量 + private long discardedNum; // 丢弃数量 + private long refluxNum;//回流数量 } diff --git a/src/main/java/com/nis/galaxy/domain/TimeTypeCount.java b/src/main/java/com/nis/galaxy/domain/TimeTypeCount.java index 7f0cddc..34f68bc 100644 --- a/src/main/java/com/nis/galaxy/domain/TimeTypeCount.java +++ b/src/main/java/com/nis/galaxy/domain/TimeTypeCount.java @@ -14,6 +14,5 @@ import lombok.experimental.Accessors; public class TimeTypeCount { private String time; private String type; - private int count; - + private long count; } diff --git a/src/main/java/com/nis/galaxy/domain/dict/UiSysDictInfo.java b/src/main/java/com/nis/galaxy/domain/dict/UiSysDictInfo.java deleted file mode 100644 index 0e85f1a..0000000 --- a/src/main/java/com/nis/galaxy/domain/dict/UiSysDictInfo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.nis.galaxy.domain.dict; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -/** - * @author GouGe - * @data 2018/8/30 16:22 - */ - -@NoArgsConstructor -@AllArgsConstructor -@Data -@Accessors(chain=true) -public class UiSysDictInfo { - private int sysDictId;//字典ID - private int itemType;//字典类型 - private String itemDesc;//汉语描述信息 - private String itemValue;//英文 -} diff --git a/src/main/java/com/nis/galaxy/web/dao/BlockingDao.java b/src/main/java/com/nis/galaxy/web/dao/BlockingDao.java index 78e7e16..2d68dda 100644 --- a/src/main/java/com/nis/galaxy/web/dao/BlockingDao.java +++ b/src/main/java/com/nis/galaxy/web/dao/BlockingDao.java @@ -26,7 +26,7 @@ public interface BlockingDao { String getAllBlockInformationLastTime(@Param("end") String end); - String getDisBlockInformationLastTime(@Param("end") String end); + String getDisBlockInformationLastTime(@Param("end") String end,@Param("a") int a, @Param("b") int b, @Param("c") int c, @Param("d") int d, @Param("e") int e, @Param("f") int f); String getDNSDeceiveInformationLastTime(@Param("end") String end); @@ -34,5 +34,6 @@ public interface BlockingDao { String getAllHotStatistisLastTime(@Param("end") String end); - String getDisBlockMapLastTime(@Param("end") String end); + String getDisBlockMapLastTime(@Param("end") String end,@Param("a") int a, @Param("b") int b, @Param("c") int c, @Param("d") int d, @Param("e") int e, @Param("f") int f); + } diff --git a/src/main/java/com/nis/galaxy/web/dao/BlockingTopNDao.java b/src/main/java/com/nis/galaxy/web/dao/BlockingTopNDao.java index f768c1d..344da17 100644 --- a/src/main/java/com/nis/galaxy/web/dao/BlockingTopNDao.java +++ b/src/main/java/com/nis/galaxy/web/dao/BlockingTopNDao.java @@ -3,6 +3,7 @@ package com.nis.galaxy.web.dao; import com.nis.galaxy.domain.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; + import java.util.List; @Mapper @@ -11,18 +12,12 @@ public interface BlockingTopNDao { List<NtcRejectWebsiteStatistic> getBlockTop10WebsiteOf1h(@Param("start") String start, @Param("end") String end); - List<NtcUrlIpCount> getBlockTop10URLOf5m(@Param("start") String start, @Param("end") String end); List<NtcUrlIpCount> getBlockTop10WebsiteOf5m(@Param("start") String start, @Param("end") String end); - - List<AreaBlockProtocol> getAreaBlockTop10ProtocolOf24hDayOnly(@Param("start") String start, @Param("end") String end); - List<AreaBlockProtocol> getAreaBlockTop10ProtocolOf24hOnly(@Param("start") String start, @Param("end") String end); - List<NtcTagReport> getBlockTop10Tag24hOnly(@Param("start") String start, @Param("end") String end); - List<NtcTagReport> getBlockTop10Tag5mOnly(@Param("start") String start, @Param("end") String end); String getAreaBlockTop10ProtocolOf24hLastTime(@Param("end") String end); @@ -31,8 +26,6 @@ public interface BlockingTopNDao { String getBlockTop10WebsiteOf1hLastTime(@Param("end") String end); - String getBlockTop10Tag24hLastTime(@Param("end") String end); - String getBlockTop10URLOf5mLastTime(@Param("end") String end); String getBlockTop10WebsiteOf5mLastTime(@Param("end") String end); diff --git a/src/main/java/com/nis/galaxy/web/dao/MonitorDao.java b/src/main/java/com/nis/galaxy/web/dao/MonitorDao.java index 37ad34c..f99e731 100644 --- a/src/main/java/com/nis/galaxy/web/dao/MonitorDao.java +++ b/src/main/java/com/nis/galaxy/web/dao/MonitorDao.java @@ -16,11 +16,11 @@ import java.util.List; public interface MonitorDao { NmsServiceBeanTmp getMonitorOf1m01(); - List<AbnormalBean> getMonitorOf1m02(int id); + List<AbnormalBean> getMonitorOf1m02(long id); List<NetWaterMonitor> getNetWaterMonitor(@Param("start") String start, @Param("end") String end, @Param("before") String before); - String getNetWaterMonitorLastTime(@Param("end")String end); + String getNetWaterMonitorLastTime(@Param("end") String end); } diff --git a/src/main/java/com/nis/galaxy/web/service/impl/BlockingServiceImp.java b/src/main/java/com/nis/galaxy/web/service/impl/BlockingServiceImp.java index 20432e5..3b66a07 100644 --- a/src/main/java/com/nis/galaxy/web/service/impl/BlockingServiceImp.java +++ b/src/main/java/com/nis/galaxy/web/service/impl/BlockingServiceImp.java @@ -105,7 +105,7 @@ public class BlockingServiceImp implements BlockingService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("封堵信息整体显示------->假数据"); + logger.info("封堵信息整体显示------->测试数据"); int a = (int) (Math.random() * 1000); int b = (int) (Math.random() * 1000); int c = (int) (Math.random() * 1000); @@ -182,9 +182,9 @@ public class BlockingServiceImp implements BlockingService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("DNS欺骗信息显示------->假数据"); - list.add(new NtcEntranceReport(start, "Kazakhtelecom", (int) (Math.random() * 1000))); - list.add(new NtcEntranceReport(start, "Transtelecom", (int) (Math.random() * 1000))); + logger.info("DNS欺骗信息显示------->测试数据"); + list.add(new NtcEntranceReport(start, "Kazakhtelecom", (int) (Math.random() * 100))); + list.add(new NtcEntranceReport(start, "Transtelecom", (int) (Math.random() * 100))); } return list; @@ -240,9 +240,9 @@ public class BlockingServiceImp implements BlockingService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("24小时全国范围阻断协议信息------->假数据"); - list.add(new TimeTypeCount(start, "mail_monit", (int) (Math.random()))); - list.add(new TimeTypeCount(start, "ctrl_http_monit", (int) (Math.random()))); + logger.info("24小时全国范围阻断协议信息------->测试数据"); + list.add(new TimeTypeCount(start, "ip_monit", (int) (Math.random()*100))); + list.add(new TimeTypeCount(start, "website_http_monit", (int) (Math.random()*100))); } return list; } @@ -268,12 +268,12 @@ public class BlockingServiceImp implements BlockingService { } if (list.isEmpty()) { try { - String lastTime = blockingDao.getDisBlockInformationLastTime(end); + String lastTime = blockingDao.getDisBlockInformationLastTime(end,a, b, c, d, e, f); String time = DateUtils.getSubstringTime(lastTime); time = DateUtils.getRangeOf5min(time); list = blockingDao.getDisBlockInformationOnly(time, DateUtils.getAfter5min(time), a, b, c, d, e, f); } catch (Exception e) { - logger.error("整体封堵数量\t最近数据\t查询异常\tserviceImpl", e); + logger.error("封堵信息分布显示\t最近数据\t查询异常\tserviceImpl", e); } } if (!list.isEmpty()) { @@ -298,11 +298,11 @@ public class BlockingServiceImp implements BlockingService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("封堵信息分布显示------->假数据"); - list.add(new NtcDisReport(start, "Almaty", "website_http_reject", (int) (Math.random() * 100))); - list.add(new NtcDisReport(start, "Almaty", "ssl_reject", (int) (Math.random() * 100))); - list.add(new NtcDisReport(start, "Atyrau", "socks_reject", (int) (Math.random() * 100))); - list.add(new NtcDisReport(start, "Atyrau", "basic_protocol_reject", (int) (Math.random() * 100))); + logger.info("封堵信息分布显示------->测试数据"); + list.add(new NtcDisReport(start, "Kazakhtelecom", "website_http_reject", (int) (Math.random() * 100))); + list.add(new NtcDisReport(start, "kazTransCom", "ssl_reject", (int) (Math.random() * 100))); + list.add(new NtcDisReport(start, "Kazakhtelecom", "socks_reject", (int) (Math.random() * 100))); + list.add(new NtcDisReport(start, "kazTransCom", "basic_protocol_reject", (int) (Math.random() * 100))); } return list; } @@ -354,10 +354,10 @@ public class BlockingServiceImp implements BlockingService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("24小时内全国热力图------->假数据"); - list.add(new HotStatistic(start, "Kazakhtelecom", "103.227.81.43", "10.11.36.42", "", (int) (Math.random() * 1000))); - list.add(new HotStatistic(start, "kazTransCom", "103.227.81.1", "10.11.36.12", "", (int) (Math.random() * 1000))); - list.add(new HotStatistic(start, "Transtelecom", "103.227.81.36", "10.11.36.11", "", (int) (Math.random() * 1000))); + logger.info("24小时内全国热力图------->测试数据"); + list.add(new HotStatistic(start, "Kazakhtelecom", "103.227.81.43", "10.11.36.42", "ip_monit", (int) (Math.random() * 100))); + list.add(new HotStatistic(start, "kazTransCom", "103.227.81.1", "10.11.36.12", "dst_ip", (int) (Math.random() * 100))); + list.add(new HotStatistic(start, "Transtelecom", "103.227.81.36", "10.11.36.11", "website_dns_reject", (int) (Math.random() * 100))); } return list; } @@ -397,7 +397,7 @@ public class BlockingServiceImp implements BlockingService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("实时打点图------->假数据"); + logger.info("实时打点图------->测试数据"); String time = DateUtils.getDateTime(); list.add(new PointMap(time, "103.227.81.43", "10.11.36.42", "website_http_monit", (int) (Math.random()))); list.add(new PointMap(time, "103.227.81.33", "10.11.36.4", "website_http_monit", (int) (Math.random()))); @@ -425,7 +425,7 @@ public class BlockingServiceImp implements BlockingService { //如果此次没有查询到数据查上一个5min的数据 if (list.isEmpty()) { try { - String lastTime = blockingDao.getDisBlockMapLastTime(end); + String lastTime = blockingDao.getDisBlockMapLastTime(end, a, b, c, d, e, f); String time = DateUtils.getSubstringTime(lastTime); time = DateUtils.getRangeOf5min(time); list = blockingDao.getDisBlockMapOnly(time, DateUtils.getAfter5min(time), a, b, c, d, e, f); @@ -444,10 +444,9 @@ public class BlockingServiceImp implements BlockingService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("热力图接口------->假数据"); - list.add(new AreaCount(start, "Almaty", (int) (Math.random() * 1000))); - list.add(new AreaCount(start, "Aktau", (int) (Math.random() * 1000))); - list.add(new AreaCount(start, "Aktubinsk", (int) (Math.random() * 1000))); + logger.info("热力图接口------->测试数据"); + list.add(new AreaCount(start, "Kazakhtelecom", (int) (Math.random() * 1000))); + list.add(new AreaCount(start, "kazTransCom", (int) (Math.random() * 1000))); } return list; } @@ -484,11 +483,12 @@ public class BlockingServiceImp implements BlockingService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("全国协议配置信息------->假数据"); + logger.info("全国协议配置信息------->测试数据"); String time = DateUtils.getRangeOfday(DateUtils.getDateTime()); - list.add(new CfgTypeCount(time, "audio_sample_reject", (int) (Math.random() * 20))); - list.add(new CfgTypeCount(time, "video_sample_reject", (int) (Math.random() * 20))); - list.add(new CfgTypeCount(time, "voip_sample_reject", (int) (Math.random() * 20))); + list.add(new CfgTypeCount(time, "av_content_url_reject", (int) (Math.random() * 20))); + list.add(new CfgTypeCount(time, "ctrl_http_replace", (int) (Math.random() * 20))); + list.add(new CfgTypeCount(time, "app_protocol_ip_monit", (int) (Math.random() * 20))); + list.add(new CfgTypeCount(time, "ip_drop", (int) (Math.random() * 20))); } return list; } diff --git a/src/main/java/com/nis/galaxy/web/service/impl/BlockingTopNServiceImpl.java b/src/main/java/com/nis/galaxy/web/service/impl/BlockingTopNServiceImpl.java index ae76989..3f7d623 100644 --- a/src/main/java/com/nis/galaxy/web/service/impl/BlockingTopNServiceImpl.java +++ b/src/main/java/com/nis/galaxy/web/service/impl/BlockingTopNServiceImpl.java @@ -77,7 +77,7 @@ public class BlockingTopNServiceImpl implements BlockingTopNService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("1小时内全国阻断URLTOP10------->假数据"); + logger.info("1小时内全国阻断URLTOP10------->测试数据"); int i = (int) (Math.random() * 200); list.add(new NtcRejectUrlStatistic(start, "www.bing.com/fd/ls/lsp.aspx", i + 20)); list.add(new NtcRejectUrlStatistic(start, "www.bing.com/fd/ls/lsp.aspx?", i + 18)); @@ -120,7 +120,7 @@ public class BlockingTopNServiceImpl implements BlockingTopNService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("1小时内全国阻断网站TOP10------->假数据"); + logger.info("1小时内全国阻断网站TOP10------->测试数据"); int i = (int) (Math.random() * 200); list.add(new NtcRejectWebsiteStatistic(start, "7.au.download.windowsupdate.com", i + 40)); list.add(new NtcRejectWebsiteStatistic(start, "3.au.download.windowsupdate.com", i + 33)); @@ -188,31 +188,17 @@ public class BlockingTopNServiceImpl implements BlockingTopNService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("24小时区域阻断协议TOP10------->假数据"); + logger.info("24小时区域阻断协议TOP10------->测试数据"); int i = (int) (Math.random() * 400); - if (languageChose == 2) { - list.add(new AreaBlockProtocol(start, "Almaty", "ssl_reject", i + 40)); - list.add(new AreaBlockProtocol(start, "Almaty", "file_transfer_digest_reject", i + 31)); - list.add(new AreaBlockProtocol(start, "Akmola", "p2p_reject", i + 20)); - list.add(new AreaBlockProtocol(start, "Almaty", "encrypted_tunnel_behavior_reject", i + 18)); - list.add(new AreaBlockProtocol(start, "Akmola", "website_dns_monit", i + 17)); - list.add(new AreaBlockProtocol(start, "Akmola", "mail_monit", i + 16)); - list.add(new AreaBlockProtocol(start, "Almaty", "ipsec_monit", i + 10)); - list.add(new AreaBlockProtocol(start, "Akmola", "socks_monit", i + 8)); - list.add(new AreaBlockProtocol(start, "Almaty", "bgp_monit", i + 7)); - } else { - list.add(new AreaBlockProtocol(start, "алматы", "ssl_reject", i + 40)); - list.add(new AreaBlockProtocol(start, "Ақмолаоблысы", "p2p_monit", i)); - list.add(new AreaBlockProtocol(start, "алматы", "file_transfer_digest_reject", i + 31)); - list.add(new AreaBlockProtocol(start, "Ақмолаоблысы", "p2p_reject", i + 20)); - list.add(new AreaBlockProtocol(start, "алматы", "encrypted_tunnel_behavior_reject", i + 18)); - list.add(new AreaBlockProtocol(start, "Ақмолаоблысы", "website_dns_monit", i + 17)); - list.add(new AreaBlockProtocol(start, "Ақмолаоблысы", "mail_monit", i + 16)); - list.add(new AreaBlockProtocol(start, "алматы", "ipsec_monit", i + 10)); - list.add(new AreaBlockProtocol(start, "Ақмолаоблысы", "socks_monit", i + 8)); - list.add(new AreaBlockProtocol(start, "алматы", "bgp_monit", i + 7)); - list.add(new AreaBlockProtocol(start, "Ақмолаоблысы", "p2p_monit", i)); - } + list.add(new AreaBlockProtocol(start, "Kazakhtelecom", "ssl_reject", i + 40)); + list.add(new AreaBlockProtocol(start, "kazTransCom", "file_transfer_digest_reject", i + 31)); + list.add(new AreaBlockProtocol(start, "Kazakhtelecom", "p2p_reject", i + 20)); + list.add(new AreaBlockProtocol(start, "kazTransCom", "encrypted_tunnel_behavior_reject", i + 18)); + list.add(new AreaBlockProtocol(start, "Kazakhtelecom", "website_dns_monit", i + 17)); + list.add(new AreaBlockProtocol(start, "Kazakhtelecom", "mail_monit", i + 16)); + list.add(new AreaBlockProtocol(start, "kazTransCom", "ipsec_monit", i + 10)); + list.add(new AreaBlockProtocol(start, "Kazakhtelecom", "socks_monit", i + 8)); + list.add(new AreaBlockProtocol(start, "kazTransCom", "bgp_monit", i + 7)); } return list; } @@ -245,7 +231,7 @@ public class BlockingTopNServiceImpl implements BlockingTopNService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("5分钟内全国阻断URLTOP10------->假数据"); + logger.info("5分钟内全国阻断URLTOP10------->测试数据"); int i = (int) (Math.random() * 100); list.add(new NtcUrlIpCount(start, "204.79.197.200", "www.bing.com/fd/ls/lsp.aspx", i + 70)); list.add(new NtcUrlIpCount(start, "204.79.197.200", "www.bing.com/fd/ls/lsp.aspx?", i + 64)); @@ -288,7 +274,7 @@ public class BlockingTopNServiceImpl implements BlockingTopNService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("5分钟内全国阻断website------->假数据"); + logger.info("5分钟内全国阻断website------->测试数据"); int i = (int) (Math.random() * 100); list.add(new NtcUrlIpCount(start, "204.79.197.200", "www.bing.com/fd/ls/ls", i + 10)); list.add(new NtcUrlIpCount(start, "204.79.197.200", "www.bing.com/fd/ls/ldfs", i + 9)); @@ -297,9 +283,9 @@ public class BlockingTopNServiceImpl implements BlockingTopNService { list.add(new NtcUrlIpCount(start, "204.79.197.200", "www.bing.com/cnhp/lg345if", i + 5)); list.add(new NtcUrlIpCount(start, "204.79.197.200", "www.bing.com/fd/lif7e?", i + 4)); list.add(new NtcUrlIpCount(start, "204.79.197.200", "www.bing.com/xg/d4564d", i + 3)); - list.add(new NtcUrlIpCount(start, "204.79.197.200", "www.bing.com/cnhp/567ww", i + 2)); + list.add(new NtcUrlIpCount(start, "204.79.197.200", "p3.qhimgs0.com", i + 2)); list.add(new NtcUrlIpCount(start, "204.79.197.200", "www.bing.com/cnhp/4t78t", i + 1)); - list.add(new NtcUrlIpCount(start, "204.79.197.200", "www.bing.com/cnhp/dre565t", i)); + list.add(new NtcUrlIpCount(start, "204.79.197.200", "7.au.download.windowsupdate.com", i)); list.add(new NtcUrlIpCount(start, "204.79.197.200", "www.bing.com/cnhp/rde23t", i)); } return list; @@ -342,14 +328,13 @@ public class BlockingTopNServiceImpl implements BlockingTopNService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("1h内全国阻断标签TOP100------->假数据"); + logger.info("1h内全国阻断标签TOP100------->测试数据"); int i = (int) (Math.random() * 200); list.add(new NtcTagReport(start, "News", i + 30)); list.add(new NtcTagReport(start, "kill", i + 30)); - list.add(new NtcTagReport(start, "金三胖", i + 30)); + list.add(new NtcTagReport(start, "golden Three fat", i + 30)); list.add(new NtcTagReport(start, "SaDam", i + 30)); - list.add(new NtcTagReport(start, "两会", i + 30)); - list.add(new NtcTagReport(start, "袁大头", i + 30)); + list.add(new NtcTagReport(start, "Two Sessions", i + 30)); } return list; } diff --git a/src/main/java/com/nis/galaxy/web/service/impl/EventsServiceImpl.java b/src/main/java/com/nis/galaxy/web/service/impl/EventsServiceImpl.java index 4e63e50..4b518a4 100644 --- a/src/main/java/com/nis/galaxy/web/service/impl/EventsServiceImpl.java +++ b/src/main/java/com/nis/galaxy/web/service/impl/EventsServiceImpl.java @@ -69,9 +69,9 @@ public class EventsServiceImpl implements EventsService { logger.error("系统总计\t最近数据\t查询异常\tserviceImpl", e); } } - //假数据 + //测试数据 if (list.isEmpty() && OPENFALSEDATA) { - logger.info("系统总计------->假数据"); + logger.info("系统总计------->测试数据"); int i = (int) (Math.random() * 20); list.add(new SystemTotal(i + 182, i + 2836, i + 3026, i + 442688, i + 4565, i + 463)); } @@ -103,14 +103,14 @@ public class EventsServiceImpl implements EventsService { logger.error("特定APP访问监控\t最近数据\t查询异常\tserviceImpl", e); } } - //假数据 + //测试数据 if (list.isEmpty() && OPENFALSEDATA) { - logger.info("特定APP访问监控------->假数据"); + logger.info("特定APP访问监控------->测试数据"); int i = (int) (Math.random() * 100); list.add(new EventsAppMonitor(start, "Youtube", i + 66)); list.add(new EventsAppMonitor(start, "Periscope", i + 45)); list.add(new EventsAppMonitor(start, "Viber", i + 41)); - list.add(new EventsAppMonitor(start, "Twitter", i + 34)); + list.add(new EventsAppMonitor(start, "Teamviewer", i + 34)); list.add(new EventsAppMonitor(start, "Vkontakte", i + 30)); list.add(new EventsAppMonitor(start, "Telegram", i + 26)); } @@ -130,9 +130,9 @@ public class EventsServiceImpl implements EventsService { } catch (Exception e) { logger.error("来函统计报表\t查询异常\tserviceImpl", e); } - //假数据 + //测试数据 if (list.isEmpty() && OPENFALSEDATA) { - logger.info("来函统计报表------->假数据"); + logger.info("来函统计报表------->测试数据"); int i = (int) (Math.random() * 100); list.add(new EventsLetterCount("2018-04-05", "Request Title", 12 + i)); list.add(new EventsLetterCount("2018-07-19", "test letter num", 19 + i)); @@ -185,11 +185,11 @@ public class EventsServiceImpl implements EventsService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("业务类型统计报表------->假数据"); - list.add(new EventsServiceCount(start, "ip_monit", (int) (Math.random() * 100))); + logger.info("业务类型统计报表------->测试数据"); + list.add(new EventsServiceCount(start, "video_sample_reject", (int) (Math.random() * 100))); list.add(new EventsServiceCount(start, "file_transfer_digest_reject", (int) (Math.random() * 100))); list.add(new EventsServiceCount(start, "pptp_monit", (int) (Math.random() * 100))); - list.add(new EventsServiceCount(start, "ANS_POLICY_REJECT", (int) (Math.random() * 100))); + list.add(new EventsServiceCount(start, "ctrl_http_monit", (int) (Math.random() * 100))); } return list; } @@ -208,12 +208,12 @@ public class EventsServiceImpl implements EventsService { } catch (Exception e) { logger.error("重点保障事件总览\t查询异常\tserviceImpl", e); } - //假数据 + //测试数据 if (list.isEmpty() && OPENFALSEDATA) { - logger.info("重点保障事件总览------->假数据"); - list.add(new EventsKeyPointSafaguardThing(end, "双面间谍", end, (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100))); - list.add(new EventsKeyPointSafaguardThing(end, "第二个任务", end, (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100))); - list.add(new EventsKeyPointSafaguardThing(end, "测试专项", end, (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100))); + logger.info("重点保障事件总览------->测试数据"); + list.add(new EventsKeyPointSafaguardThing(end, "double agent", end, (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100))); + list.add(new EventsKeyPointSafaguardThing(end, "Second task", end, (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100))); + list.add(new EventsKeyPointSafaguardThing(end, "Subject Tests", end, (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100))); } return list; } @@ -231,9 +231,9 @@ public class EventsServiceImpl implements EventsService { } catch (Exception e) { logger.error("特定网站监控\t查询异常\tserviceImpl", e); } - //假数据 + //测试数据 if (list.isEmpty() && OPENFALSEDATA) { - logger.info("特定网站监控------->假数据"); + logger.info("特定网站监控------->测试数据"); int i = (int) (Math.random() * 100); list.add(new EventsSpecificWebsites(end, "Facebook", i + 100)); list.add(new EventsSpecificWebsites(end, "Wikipedia", i + 90)); @@ -264,13 +264,13 @@ public class EventsServiceImpl implements EventsService { logger.error("事件监测\t查询异常\tserviceImpl", e); } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("事件监测------->假数据"); - list.add(new EventsMonitor("双面间谍", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); - list.add(new EventsMonitor("两会", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); - list.add(new EventsMonitor("测试专项", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); - list.add(new EventsMonitor("一个假任务", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); - list.add(new EventsMonitor("测试删除", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); - list.add(new EventsMonitor("测试", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); + logger.info("事件监测------->测试数据"); + list.add(new EventsMonitor("double agent", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); + list.add(new EventsMonitor("nuclear program", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); + list.add(new EventsMonitor("Subject Tests", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); + list.add(new EventsMonitor("fake task", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); + list.add(new EventsMonitor("savage", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); + list.add(new EventsMonitor("satellite", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); list.add(new EventsMonitor("taskName", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); } return list; @@ -291,15 +291,14 @@ public class EventsServiceImpl implements EventsService { logger.error("事件封堵\t查询异常\tserviceImpl", e); } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("事件封堵------->假数据"); - list.add(new EventsBlock("间谍", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); - list.add(new EventsBlock("测试", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); - list.add(new EventsBlock("第二任务", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); - list.add(new EventsBlock("两会", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); - list.add(new EventsBlock("会议", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); + logger.info("事件封堵------->测试数据"); + list.add(new EventsBlock("spy", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); + list.add(new EventsBlock("test", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); + list.add(new EventsBlock("second task", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); + list.add(new EventsBlock("Two Sessions", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); list.add(new EventsBlock("taskName", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); - list.add(new EventsBlock("某事件", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); - list.add(new EventsBlock("会面事件", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); + list.add(new EventsBlock("ACTIVATING EVENT", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); + list.add(new EventsBlock("Meeting event", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end)); } return list; } @@ -330,7 +329,7 @@ public class EventsServiceImpl implements EventsService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("音频监控------->假数据"); + logger.info("音频监控------->测试数据"); int i = (int) (Math.random() * 100); list.add(new EventsAudioMonitor((int) (Math.random() * 50), i + 160, "http://baidu/video/er/h66")); list.add(new EventsAudioMonitor((int) (Math.random() * 50), i + 152, "http://360/video/eefrev/fj=4")); @@ -372,7 +371,7 @@ public class EventsServiceImpl implements EventsService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("视频监控------->假数据"); + logger.info("视频监控------->测试数据"); int i = (int) (Math.random() * 100); list.add(new EventsVedioMonitor((int) (Math.random() * 50), i + 320, "http://baidu/video/eefv/h66")); list.add(new EventsVedioMonitor((int) (Math.random() * 50), i + 311, "http://sougou/dig/86/ty")); @@ -414,7 +413,7 @@ public class EventsServiceImpl implements EventsService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("图片监控------->假数据"); + logger.info("图片监控------->测试数据"); int i = (int) (Math.random() * 100); list.add(new EventsImageMonitor((int) (Math.random() * 50), i + 320, "http://baidu/dfedf/h66")); list.add(new EventsImageMonitor((int) (Math.random() * 50), i + 310, "http://souhu/users/sign_in")); @@ -456,7 +455,7 @@ public class EventsServiceImpl implements EventsService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("VOIP监控------->假数据"); + logger.info("VOIP监控------->测试数据"); int i = (int) (Math.random() * 100); list.add(new EventsVoipMonitor((int) (Math.random() * 10000) + 1982345254, i + 560, "http://baidu/iphi/picture/grennd/efd=3")); list.add(new EventsVoipMonitor((int) (Math.random() * 10000) + 1760145025, i + 230, "http://sougoole/news/vedio/id=3")); @@ -482,7 +481,7 @@ public class EventsServiceImpl implements EventsService { @Override public List<EventsDdosAlarm> getDdosAlarm(String start, String end) { List<EventsDdosAlarm> list = new ArrayList<>(); - logger.info("网络行为预警------->假数据"); + logger.info("网络行为预警------->测试数据"); list.add(new EventsDdosAlarm("DDOS Attack", start, "Level 1")); list.add(new EventsDdosAlarm("DOS Attack", start, "Level 2")); list.add(new EventsDdosAlarm("CC Attack", start, "Level 3")); @@ -515,7 +514,7 @@ public class EventsServiceImpl implements EventsService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("目标行为网络监测------->假数据"); + logger.info("目标行为网络监测------->测试数据"); int i = (int) (Math.random() * 100); list.add(new EvevtsTargetNetwork("admin", "10.25.6." + (int) (Math.random() * 50), i + 10, start)); list.add(new EvevtsTargetNetwork("root", "192.78.7.." + (int) (Math.random() * 50), i + 6, start)); @@ -568,9 +567,9 @@ public class EventsServiceImpl implements EventsService { logger.error("运行状态\t最近数据\t查询异常\tserviceImpl", e); } } - //假数据 + //测试数据 if (list.isEmpty() && OPENFALSEDATA) { - logger.info("运行状态------->假数据"); + logger.info("运行状态------->测试数据"); list.add(new EventsRunningState((int) (Math.random() * 300), (int) (Math.random() * 200), (int) (Math.random() * 300))); } return list; diff --git a/src/main/java/com/nis/galaxy/web/service/impl/MonitorServiceImpl.java b/src/main/java/com/nis/galaxy/web/service/impl/MonitorServiceImpl.java index e4e29c2..eb17d63 100644 --- a/src/main/java/com/nis/galaxy/web/service/impl/MonitorServiceImpl.java +++ b/src/main/java/com/nis/galaxy/web/service/impl/MonitorServiceImpl.java @@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; @@ -40,7 +41,7 @@ public class MonitorServiceImpl implements MonitorService { } List<AbnormalBean> abnormalBean = new ArrayList<>(); if (nmsServerBeanTmp != null) { - int id = nmsServerBeanTmp.getId(); + long id = nmsServerBeanTmp.getId(); abnormalBean = monitorDao.getMonitorOf1m02(id); //结果的封装 NmsServerBean nmsServerBean = new NmsServerBean(); @@ -48,25 +49,25 @@ public class MonitorServiceImpl implements MonitorService { nmsServerBean.setArea(nmsServerBeanTmp.getArea()); nmsServerBean.setTotal(Integer.parseInt(nmsServerBeanTmp.getTotal())); nmsServerBean.setNormal(Integer.parseInt(nmsServerBeanTmp.getNormal())); - nmsServerBean.setAbnormal(Integer.parseInt(nmsServerBeanTmp.getNormal())); + nmsServerBean.setAbnormal(Integer.parseInt(nmsServerBeanTmp.getAbnormal())); + nmsServerBean.setAbnormalmachines(abnormalBean); + list.add(nmsServerBean); + list.remove(null); + } + if (list.isEmpty() && OPENFALSEDATA) { + logger.info("系统监控------->测试数据"); + nmsServerBeanTmp = new NmsServiceBeanTmp(DateUtils.getDateTime(), "Region Center6", "" + (int) (Math.random() * 5000), (int) (Math.random() * 5000) + "", "2", 22); + abnormalBean.add(new AbnormalBean("competer1", "120.213." + (int) (Math.random() * 50))); + abnormalBean.add(new AbnormalBean("competer2", "120.213." + (int) (Math.random() * 20))); + //结果的封装 + NmsServerBean nmsServerBean = new NmsServerBean(); + nmsServerBean.setTime(nmsServerBeanTmp.getTime()); + nmsServerBean.setArea(nmsServerBeanTmp.getArea()); + nmsServerBean.setTotal(Integer.parseInt(nmsServerBeanTmp.getTotal())); + nmsServerBean.setNormal(Integer.parseInt(nmsServerBeanTmp.getNormal())); + nmsServerBean.setAbnormal(Integer.parseInt(nmsServerBeanTmp.getAbnormal())); nmsServerBean.setAbnormalmachines(abnormalBean); list.add(nmsServerBean); - } else { - if (list.isEmpty() && OPENFALSEDATA) { - logger.info("系统监控------->假数据"); - nmsServerBeanTmp = new NmsServiceBeanTmp(DateUtils.getDateTime(), "Region Center6", "" + (int) (Math.random() * 5000), (int) (Math.random() * 5000) + "", "2", 22); - abnormalBean.add(new AbnormalBean("competer1", "120.213." + (int) (Math.random() * 50))); - abnormalBean.add(new AbnormalBean("competer2", "120.213." + (int) (Math.random() * 20))); - //结果的封装 - NmsServerBean nmsServerBean = new NmsServerBean(); - nmsServerBean.setTime(nmsServerBeanTmp.getTime()); - nmsServerBean.setArea(nmsServerBeanTmp.getArea()); - nmsServerBean.setTotal(Integer.parseInt(nmsServerBeanTmp.getTotal())); - nmsServerBean.setNormal(Integer.parseInt(nmsServerBeanTmp.getNormal())); - nmsServerBean.setAbnormal(Integer.parseInt(nmsServerBeanTmp.getNormal())); - nmsServerBean.setAbnormalmachines(abnormalBean); - list.add(nmsServerBean); - } } return list; } @@ -105,15 +106,26 @@ public class MonitorServiceImpl implements MonitorService { logger.error("网络流量监控\t最近数据\t查询异常\tserviceImpl", e); } } - //假数据 + if (!list.isEmpty()) { + List<NetWaterMonitor> result = new ArrayList<>(); + if (languageChose == 3) { + result.add(new NetWaterMonitor(list.get(0).getTime(), "Ақмолаоблысы", "INOCTETS", list.get(0).getCount())); + result.add(new NetWaterMonitor(list.get(1).getTime(), "Ақмолаоблысы", "INOCTETS", list.get(1).getCount())); + } else { + result.add(new NetWaterMonitor(list.get(0).getTime(), "Akmola", "INOCTETS", list.get(0).getCount())); + result.add(new NetWaterMonitor(list.get(1).getTime(), "Akmola", "OUTOCTETS", list.get(1).getCount())); + } + return result; + } + //测试数据 if (list.isEmpty() && OPENFALSEDATA) { - logger.info("网络流量监控------->假数据"); - if (languageChose == 2) { + logger.info("网络流量监控------->测试数据"); + if (languageChose == 3) { + list.add(new NetWaterMonitor(start, "Ақмолаоблысы", "INOCTETS", (int) (Math.random() * 20000))); + list.add(new NetWaterMonitor(start, "Ақмолаоблысы", "OUTOCTETS", (int) (Math.random() * 20000))); + } else { list.add(new NetWaterMonitor(start, "Akmola", "OUTOCTETS", (int) (Math.random() * 20000))); list.add(new NetWaterMonitor(start, "Akmola", "INOCTETS", (int) (Math.random() * 20000))); - } else { - list.add(new NetWaterMonitor(start, "Ақмолаоблысы", "OUTOCTETS", (int) (Math.random() * 20000))); - list.add(new NetWaterMonitor(start, "Ақмолаоблысы", "INOCTETS", (int) (Math.random() * 20000))); } } return list; diff --git a/src/main/java/com/nis/galaxy/web/service/impl/NetflowServiceImpl.java b/src/main/java/com/nis/galaxy/web/service/impl/NetflowServiceImpl.java index 503d64f..0072dc1 100644 --- a/src/main/java/com/nis/galaxy/web/service/impl/NetflowServiceImpl.java +++ b/src/main/java/com/nis/galaxy/web/service/impl/NetflowServiceImpl.java @@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; + import java.net.InetAddress; import java.net.UnknownHostException; import java.util.ArrayList; @@ -87,9 +88,9 @@ public class NetflowServiceImpl implements NetflowService { } } } - //假数据 + //测试数据 if (list.isEmpty() && OPENFALSEDATA) { - logger.info("5分钟内网络流量统计------->假数据"); + logger.info("5分钟内网络流量统计------->测试数据"); int i = (int) (Math.random() * 1000); list.add(new TimeTypeCount(start, "HTTP", 3600 + i)); list.add(new TimeTypeCount(start, "IPSE", 38621 + i)); @@ -142,9 +143,9 @@ public class NetflowServiceImpl implements NetflowService { } } } - //假数据 + //测试数据 if (list.isEmpty() && OPENFALSEDATA) { - logger.info("1小时内网络协议统计------->假数据"); + logger.info("1小时内网络协议统计------->测试数据"); int i = (int) (Math.random() * 5000); list.add(new NetflowProtocol(start, "GRE", 2100 + i, 25000 + i, 4000 + i)); list.add(new NetflowProtocol(start, "HTTP", 300 + i, 2520 + i, 78 + i)); @@ -195,22 +196,14 @@ public class NetflowServiceImpl implements NetflowService { } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("5分钟内活跃IP信息------->假数据"); + logger.info("5分钟内活跃IP信息------->测试数据"); long c = (long) (Math.random() * 5000000); long b = (long) (Math.random() * 5000); long a = (long) (Math.random() * 5000); - - if (languageChose == 2) { - list.add(new IpActiveInfo(start, "10.11.36.44", "Akmola", a + 1, b + 10, c + 435)); - list.add(new IpActiveInfo(start, "183.138.59.73", "Almaty", a + 32, b + 3, c + 67)); - list.add(new IpActiveInfo(start, "10.11.36.126", "Akmola", a + 3, b + 34, c + 56)); - list.add(new IpActiveInfo(start, "119.108.229.153", "Almaty", a + 45, b + 5, c + 45)); - } else { - list.add(new IpActiveInfo(start, "10.11.36.44", "Ақмолаоблысы", a + 1, b + 10, c + 435)); - list.add(new IpActiveInfo(start, "183.138.59.73", "Победителю предоставляется", a + 32, b + 3, c + 67)); - list.add(new IpActiveInfo(start, "10.11.36.126", "Ақмолаоблысы", a + 3, b + 34, c + 56)); - list.add(new IpActiveInfo(start, "119.108.229.153", "Победителю предоставляется", a + 45, b + 5, c + 45)); - } + list.add(new IpActiveInfo(start, "10.11.36.44", "Kazakhtelecom", a + 1, b + 10, c + 435)); + list.add(new IpActiveInfo(start, "183.138.59.73", "kazTransCom", a + 32, b + 3, c + 67)); + list.add(new IpActiveInfo(start, "10.11.36.126", "Kazakhtelecom", a + 3, b + 34, c + 56)); + list.add(new IpActiveInfo(start, "119.108.229.153", "kazTransCom", a + 45, b + 5, c + 45)); } return list; } @@ -241,23 +234,23 @@ public class NetflowServiceImpl implements NetflowService { } } if (!list.isEmpty()) { - int bps = 0; + long bps = 0; for (AreaBPSTime areaBPSTime : list) { bps = areaBPSTime.getBps() + bps; } list = new ArrayList<>(); - if (languageChose == 2) { - list.add(new AreaBPSTime("Akmola", bps, start)); - } else { + if (languageChose == 3) { list.add(new AreaBPSTime("Ақмолаоблысы", bps, start)); + } else { + list.add(new AreaBPSTime("Akmola", bps, start)); } } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("地域流量------->假数据"); - if (languageChose == 2) { - list.add(new AreaBPSTime("Akmola", (int) (Math.random() * 10000), DateUtils.getDateTime())); - } else { + logger.info("地域流量------->测试数据"); + if (languageChose == 3) { list.add(new AreaBPSTime("Ақмолаоблысы", (int) (Math.random() * 10000), DateUtils.getDateTime())); + } else { + list.add(new AreaBPSTime("Akmola", (int) (Math.random() * 10000), DateUtils.getDateTime())); } } return list; @@ -288,10 +281,10 @@ public class NetflowServiceImpl implements NetflowService { logger.error("端口流量\t最近数据\t查询异常\tserviceImpl", e); } } - //假数据 + //测试数据 if (list.isEmpty() && OPENFALSEDATA) { list = new ArrayList<>(); - logger.info("端口流量------->假数据"); + logger.info("端口流量------->测试数据"); list.add(new PortBPSTime((int) (Math.random() * 100), (int) (Math.random() * 150), start)); list.add(new PortBPSTime((int) (Math.random() * 100), (int) (Math.random() * 200), start)); list.add(new PortBPSTime((int) (Math.random() * 100), (int) (Math.random() * 200), start)); @@ -329,7 +322,7 @@ public class NetflowServiceImpl implements NetflowService { } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("文本------->假数据"); + logger.info("文本------->测试数据"); String rangeOfday = DateUtils.getRangeOfday(DateUtils.getDateTime()); list.add(new NetflowMonitor("WEBSITE", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0965.jpg", rangeOfday)); list.add(new NetflowMonitor("URL", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0966.jpg", rangeOfday)); @@ -362,7 +355,7 @@ public class NetflowServiceImpl implements NetflowService { logger.error("音视频\t查询异常\tserviceImpl", e); } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("音视频------->假数据"); + logger.info("音视频------->测试数据"); String rangeOfday = DateUtils.getRangeOfday(DateUtils.getDateTime()); list.add(new NetflowMonitor("VIDEO", "http://192.168.10.2/group2/M00/00/06/AUDIO-UIYjkjrg-MP4.jpg", rangeOfday)); list.add(new NetflowMonitor("AUDIO", "http://192.168.10.2/group2/M00/00/06/AUDIO-UIYjkjrg-AVI.jpg", rangeOfday)); @@ -387,7 +380,7 @@ public class NetflowServiceImpl implements NetflowService { logger.error("APP\t查询异常\tserviceImpl", e); } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("APP------->假数据"); + logger.info("APP------->测试数据"); String rangeOfday = DateUtils.getRangeOfday(DateUtils.getDateTime()); list.add(new NetflowMonitor("Telegram", "http://192.168.10.2/group3/M00/00/06/APP-TYILOkjUO3-Telegram.jpg", rangeOfday)); list.add(new NetflowMonitor("Odnoklassniki", "http://192.168.10.2/group3/M00/00/06/APP-TYILOkjUO3-Odnoklassniki.jpg", rangeOfday)); @@ -414,7 +407,7 @@ public class NetflowServiceImpl implements NetflowService { logger.error("加密类型\t查询异常\tserviceImpl", e); } if (list.isEmpty() && OPENFALSEDATA) { - logger.info("加密类型------->假数据"); + logger.info("加密类型------->测试数据"); String rangeOfday = DateUtils.getRangeOfday(DateUtils.getDateTime()); list.add(new NetflowMonitor("PROXY INTERCEPT", "http://192.168.10.2/group4/M00/00/06/PASS-YIHK-MMPE.jpg", rangeOfday)); list.add(new NetflowMonitor("PROXY RATELIMIT", "http://192.168.10.2/group4/M00/00/06/PASS-YIHK-IPSEC.jpg", rangeOfday)); diff --git a/src/main/java/com/nis/galaxy/web/service/impl/NetflowTopNServiceImpl.java b/src/main/java/com/nis/galaxy/web/service/impl/NetflowTopNServiceImpl.java index 9b62dbd..3cb7c17 100644 --- a/src/main/java/com/nis/galaxy/web/service/impl/NetflowTopNServiceImpl.java +++ b/src/main/java/com/nis/galaxy/web/service/impl/NetflowTopNServiceImpl.java @@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -78,30 +79,17 @@ public class NetflowTopNServiceImpl implements NetflowTopNService { } if (list.isEmpty() && OPENFALSEDATA) { int i = (int) (Math.random() * 200); - logger.info("5分钟内活跃IP流量TOP10------->假数据"); - if (languageChose == 2) { - list.add(new IpActiveInt(start, "Akmola", "119.108.229.153", i + 20)); - list.add(new IpActiveInt(start, "Almaty", "121.236.4.78", i + 16)); - list.add(new IpActiveInt(start, "Akmola", "192.158.229.15", i + 15)); - list.add(new IpActiveInt(start, "Almaty", "192.168.99.153", i + 14)); - list.add(new IpActiveInt(start, "Akmola", "119.188.29.125", i + 12)); - list.add(new IpActiveInt(start, "Almaty", "119.168.229.45", i + 6)); - list.add(new IpActiveInt(start, "Almaty", "119.168.229.11", i + 5)); - list.add(new IpActiveInt(start, "Akmola", "119.168.229.1", i + 3)); - list.add(new IpActiveInt(start, "Almaty", "119.168.229.6", i + 2)); - list.add(new IpActiveInt(start, "Akmola", "119.168.229.8", i)); - } else { - list.add(new IpActiveInt(start, "Ақмолаоблысы", "119.108.229.153", i + 20)); - list.add(new IpActiveInt(start, "алматы", "121.236.4.78", i + 16)); - list.add(new IpActiveInt(start, "Ақмолаоблысы", "192.158.229.15", i + 15)); - list.add(new IpActiveInt(start, "алматы", "192.168.99.153", i + 14)); - list.add(new IpActiveInt(start, "Ақмолаоблысы", "119.188.29.125", i + 12)); - list.add(new IpActiveInt(start, "алматы", "119.168.229.45", i + 6)); - list.add(new IpActiveInt(start, "алматы", "119.168.229.11", i + 5)); - list.add(new IpActiveInt(start, "Ақмолаоблысы", "119.168.229.1", i + 3)); - list.add(new IpActiveInt(start, "алматы", "119.168.229.6", i + 2)); - list.add(new IpActiveInt(start, "Ақмолаоблысы", "119.168.229.8", i)); - } + logger.info("5分钟内活跃IP流量TOP10------->测试数据"); + list.add(new IpActiveInt(start, "Kazakhtelecom", "119.108.229.153", i + 20)); + list.add(new IpActiveInt(start, "kazTransCom", "121.236.4.78", i + 16)); + list.add(new IpActiveInt(start, "Kazakhtelecom", "192.158.229.15", i + 15)); + list.add(new IpActiveInt(start, "kazTransCom", "192.168.99.153", i + 14)); + list.add(new IpActiveInt(start, "Kazakhtelecom", "119.188.29.125", i + 12)); + list.add(new IpActiveInt(start, "Kazakhtelecom", "119.168.229.45", i + 6)); + list.add(new IpActiveInt(start, "Kazakhtelecom", "119.168.229.11", i + 5)); + list.add(new IpActiveInt(start, "kazTransCom", "119.168.229.1", i + 3)); + list.add(new IpActiveInt(start, "Kazakhtelecom", "119.168.229.6", i + 2)); + list.add(new IpActiveInt(start, "kazTransCom", "119.168.229.8", i)); } return list; } @@ -164,14 +152,14 @@ public class NetflowTopNServiceImpl implements NetflowTopNService { } return resule; } - //假数据 + //测试数据 if (list.isEmpty() && OPENFALSEDATA) { list = new ArrayList<>(); - logger.info("互联网流量TOP10------->假数据"); - if (languageChose == 2) { - list.add(new NetFlowWater(start, "Akmola", (int) (Math.random() * 1000))); - } else { + logger.info("互联网流量TOP10------->测试数据"); + if (languageChose == 3) { list.add(new NetFlowWater(start, "Ақмолаоблысы", (int) (Math.random() * 1000))); + } else { + list.add(new NetFlowWater(start, "Akmola", (int) (Math.random() * 1000))); } } return list; |