From df8215fedd2b59ac194c99017934755ee1b313d4 Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@nismail.iie.ac.cn>
Date: Fri, 16 Nov 2018 15:00:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=9B=91=E6=B5=8B?=
 =?UTF-8?q?sql=E5=A2=9E=E5=8A=A0brand=5Fid=E6=8E=92=E5=BA=8F=202.=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=9B=91=E6=B5=8Bchild?=
 =?UTF-8?q?=E6=BC=8F=E5=8A=A0=E6=98=9F=E5=8F=B7=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitorData/monitorInfoListNewChild.jsp      |  5 ++++-
 .../monitorData/serverMonitorInfoListChild.jsp   | 16 ++++++++++++++--
 .../web/actions/detection/MonitorDataAction.java |  8 ++++----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/WebRoot/page/detection/monitorData/monitorInfoListNewChild.jsp b/WebRoot/page/detection/monitorData/monitorInfoListNewChild.jsp
index 7b7f7b4..2b6f17b 100644
--- a/WebRoot/page/detection/monitorData/monitorInfoListNewChild.jsp
+++ b/WebRoot/page/detection/monitorData/monitorInfoListNewChild.jsp
@@ -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}">
diff --git a/WebRoot/page/detection/monitorData/serverMonitorInfoListChild.jsp b/WebRoot/page/detection/monitorData/serverMonitorInfoListChild.jsp
index 7596496..e210815 100644
--- a/WebRoot/page/detection/monitorData/serverMonitorInfoListChild.jsp
+++ b/WebRoot/page/detection/monitorData/serverMonitorInfoListChild.jsp
@@ -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>
diff --git a/src/nis/nms/web/actions/detection/MonitorDataAction.java b/src/nis/nms/web/actions/detection/MonitorDataAction.java
index e6b59c2..c34822d 100644
--- a/src/nis/nms/web/actions/detection/MonitorDataAction.java
+++ b/src/nis/nms/web/actions/detection/MonitorDataAction.java
@@ -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; // 最新状态信息集合