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

5
WebRoot/page/detection/monitorData/monitorInfoListNewChild.jsp
View File

@@ -32,6 +32,9 @@
<c:set var="isHandShake" value="0"/>
</c:if>
<!-- 特种设备特殊标记 -->
<c:set var="specialServer" value="${rowData[18] }" />
<c:choose>
<c:when test="${ind.index eq 1}">
<td class="color_1_1" rowspan="${fn:length(detecInfoList)}"
@@ -40,7 +43,7 @@
<a
href="javascript:void(0);"
onclick="remoteConn('${nodeSysType }','${cellData}','${nodeType }', this)"><c:out
value="${cellData}" default="" /> </a>
value="${cellData}" default="" /> <c:if test="${not empty specialServer}"><span style="color:red">*</span></c:if></a>
</td>
</c:when>
<c:when test="${ind.index eq 2}">

16
WebRoot/page/detection/monitorData/serverMonitorInfoListChild.jsp
View File

@@ -26,6 +26,17 @@
<c:set var="charStateNum" value="${rowData[14] }" />
<c:set var="nodeType" value="${rowData[15] }" />
<c:set var="status" value="${rowData[4] }" />
<c:if test="${ctiId == 7}">
<c:set var="isHandShake" value="1"/>
</c:if>
<c:if test="${ctiId != 7}">
<c:set var="isHandShake" value="0"/>
</c:if>
<!-- 特种设备特殊标记 -->
<c:set var="specialServer" value="${rowData[18] }" />
<c:choose>
<c:when test="${ind.index eq 1}">
<td class="color_1_1" rowspan="${fn:length(detecInfoList)}"
@@ -34,6 +45,7 @@
<a href="javascript:void(0);" name="${cellData}"
onclick="remoteConn('${nodeSysType }','${cellData}','${nodeType }', this)">
<c:out value="${cellData}" default="" />
<c:if test="${not empty specialServer}"><span style="color:red">*</span></c:if>
</a>
</td>
</c:when>
@@ -151,7 +163,7 @@
</c:when>
<c:when test="${ind.index eq 4}">
<td class="color_1_1">
<c:if test="${!handshakeEr}">
<c:if test="${isHandShake == 0 || !handshakeEr}">
<c:if test="${fn:trim(cellData)=='1'}">
<img src="<c:url value='/images/yes.gif'/>" border="0"
align="middle" />
@@ -171,7 +183,7 @@
</c:when>
<c:when test="${ind.index eq 6}">
<td class="color_1_1" nowrap="nowrap">
<c:if test="${!handshakeEr && status !='3'}">
<c:if test="${isHandShake == 0 || (!handshakeEr && status !='3')}">
<c:out value="${cellData}" default="" />
</c:if>
</td>

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; // 最新状态信息集合