diff options
| author | doufenghu <[email protected]> | 2019-01-22 14:11:02 +0600 |
|---|---|---|
| committer | doufenghu <[email protected]> | 2019-01-22 14:11:02 +0600 |
| commit | b45649fcc59c28e71df7ed4ada6ed59aa1871753 (patch) | |
| tree | 7469137df92ccc2a5e0fecd78a6517ee581cb46c /src | |
| parent | fb6dc6b706c413a286b3a0ee1eeff0af45eae13c (diff) | |
fix（协议配置）：解决配置业务描述未出现的bug。关闭推最近数据复现该bug
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/nis/galaxy/web/service/impl/BlockingServiceImp.java | 2 | ||||
| -rw-r--r-- | src/main/resources/mybatis/mapper/MonitorMapper.xml | 3 |
2 files changed, 3 insertions, 2 deletions
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 b04b471..88b7483 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 @@ -501,7 +501,7 @@ public class BlockingServiceImp implements BlockingService { } catch (Exception e) { logger.error(logMark + "\t查询异常\tserviceImpl", e); } - if (!ListUtils.isEmptyList(list) && ConfigUtil.recentData) { + if (!ListUtils.isEmptyList(list)) { for (CfgTypeCount cfgTypeCount : list) { NtcServiceDict ntcServiceDict = listNtcService.get(cfgTypeCount.getType()); if (ntcServiceDict == null) { diff --git a/src/main/resources/mybatis/mapper/MonitorMapper.xml b/src/main/resources/mybatis/mapper/MonitorMapper.xml index a1bd692..c8b125d 100644 --- a/src/main/resources/mybatis/mapper/MonitorMapper.xml +++ b/src/main/resources/mybatis/mapper/MonitorMapper.xml @@ -43,7 +43,8 @@ where stat_time=(SELECT stat_time FROM traffic_trans_statistic WHERE entrance_id=2 and stat_time > DATE_SUB(now(), INTERVAL 15 MINUTE) ORDER BY stat_time DESC LIMIT 0,1 ) and entrance_id=2 and direction=0 group by area - UNION ALL + + UNION ALL SELECT entrance_id AS area,'IN' AS type,ifnull(sum(c2s_byte_len + s2c_byte_len),0) AS count,#{push} AS time FROM traffic_trans_statistic |