gfwleak/nms-nmsweb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.服务器监测sql增加brand_id排序

Browse Source 
2.修复服务器监测child漏加星号的问题
This commit is contained in:
chenjinsong
2018-11-16 15:00:20 +08:00
parent 23b24b9ca8
commit df8215fedd
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nis/nms/web/actions/detection/MonitorDataAction.java
View File

@@ -1909,7 +1909,7 @@ public class MonitorDataAction extends BaseAction {
sqlBuffer.append(" left join check_type_info cti");
sqlBuffer.append(" on dsi.check_type_id = cti.id");
sqlBuffer.append(
" left join (select distinct node_ip,seq_id,node_system_type,node_type,node_state,system_id ,ipn,special_server_type from NODE_TABLE ");
" left join (select distinct node_ip,seq_id,node_system_type,node_type,node_state,system_id ,ipn,special_server_type,brand_id from NODE_TABLE ");
if (nodeGroupStr != null && !"".equals(nodeGroupStr) && !"null".equals(nodeGroupStr)) {
// 节点组模糊名称不为空，则根据节点组名称，模糊查询所有节点组，再依次查找其下面的节点，得到节点id
// @2018-3-9 fang 修改 首先查询符合条件的id，在拼接sql，适配mysql
@@ -1993,7 +1993,7 @@ public class MonitorDataAction extends BaseAction {
sqlBuffer.append(" or (dsi.view_level=4 )");
sqlBuffer.append(") and dsi.detection_set_state=1 and cti.crete_state=0 ");
}
sqlBuffer.append(" order by ipn ASC,ctiId1 ASC, dsi.id ASC");
sqlBuffer.append(" order by nt.brand_id ASC,ipn ASC,ctiId1 ASC, dsi.id ASC");
System.out.println("sqlBuffer:" + sqlBuffer.toString());
page = this.commonService.findByPageForSql(sqlBuffer.toString(), pageNo, pageSize, null);
List<Object[]> detectionInfoList; // 最新状态信息集合
@@ -2079,7 +2079,7 @@ public class MonitorDataAction extends BaseAction {
sqlBuffer.append(" left join check_type_info cti");
sqlBuffer.append(" on dsi.check_type_id = cti.id");
sqlBuffer.append(
" left join (select distinct node_ip,seq_id,node_system_type,node_type,node_state,system_id ,ipn from NODE_TABLE ");
" left join (select distinct node_ip,seq_id,node_system_type,node_type,node_state,system_id ,ipn, brand_id from NODE_TABLE ");
if (nodeGroupStr != null && !"".equals(nodeGroupStr) && !"null".equals(nodeGroupStr)) {
// 节点组模糊名称不为空，则根据节点组名称，模糊查询所有节点组，再依次查找其下面的节点，得到节点id
// @2018-3-9 fang 修改 首先查询符合条件的id，在拼接sql，适配mysql
@@ -2147,7 +2147,7 @@ public class MonitorDataAction extends BaseAction {
sqlBuffer.append(" or (dsi.view_level=4 )");
sqlBuffer.append(") and dsi.detection_set_state=1 and cti.crete_state=0 ");
}
sqlBuffer.append(" order by ipn ASC,ctiId1 ASC, dsi.id ASC");
sqlBuffer.append(" order by nt.brand_id,ipn ASC,ctiId1 ASC, dsi.id ASC");
System.out.println("sqlBuffer:" + sqlBuffer.toString());
page = this.commonService.findByPageForSql(sqlBuffer.toString(), pageNo, pageSize, null);
List<Object[]> detectionInfoList; // 最新状态信息集合