Merge branch 'dev' of http://192.168.10.125/nms/nmsweb.git into dev

WebRoot/css/nav.css

@@ -1,49 +1,49 @@
-@charset "utf-8";
+@charset "utf-8";
-/* 以下实际使用若已初始化可删除 .nav height父级需逐级设置为100%*/
+/* 以下实际使用若已初始化可删除 .nav height父级需逐级设置为100%*/
-
+
-/* 以上实际使用若已初始化可删除 */
+/* 以上实际使用若已初始化可删除 */
-
+
-/* nav */
+/* nav */
-.nav{width: 220px;height: 100%;background: #263238;transition: all .3s;text-transform: capitalize;}
+.nav{width: 210px;height: 100%;background: #263238;transition: all .3s;text-transform: capitalize;}
-.nav a{display: block;overflow: hidden;padding-left: 10px;line-height: 46px;max-height: 46px;color: #ABB1B7;transition: all .3s;}
+.nav a{display: block;overflow: hidden;padding-left: 10px;line-height: 46px;color: #ABB1B7;transition: all .3s;word-wrap:break-word;text-align: left;margin-right:10px;}
-.nav a span{margin-left: 30px;}
+.nav a span{margin-left: 30px;}
-.nav-item{position: relative;}
+.nav-item{position: relative;}
-.nav-item + .nav-item{
+.nav-item + .nav-item{
-	border-top: 2px solid #545454;
+	border-top: 2px solid #545454;
-}
+}
-.nav-item.nav-show{border-bottom: none;}
+.nav-item.nav-show{border-bottom: none;}
-.nav-item ul{display: none;background: #C4C4C4;}
+.nav-item ul{display: none;background: #C4C4C4;}
-.nav-item ul a{color:#111;}
+.nav-item ul a{color:#111;}
-.nav-item ul li + li {border-top: 1px solid #eee;}
+.nav-item ul li + li {border-top: 1px solid #eee;}
-.nav-item.nav-show ul{display: block;}
+.nav-item.nav-show ul{display: block;}
-.nav-item>a:before{content: "";position: absolute;left: 0px;width: 5px;height: 46px;background: #A31C31;opacity:0;transition: all .3s;}
+.nav-item>a:before{content: "";position: absolute;left: 0px;width: 5px;height: 46px;background: #A31C31;opacity:0;transition: all .3s;}
-.nav .nav-icon{font-size: 20px;position: absolute;margin-left:-1px;}
+.nav .nav-icon{font-size: 20px;position: absolute;margin-left:-1px;}
-/* 此处修改导航图标 可自定义iconfont 替换*/
+/* 此处修改导航图标 可自定义iconfont 替换*/
-.icon_1::after{content: "\e62b";}
+.icon_1::after{content: "\e62b";}
-.icon_2::after{content: "\e669";}
+.icon_2::after{content: "\e669";}
-.icon_3::after{content: "\e61d";}
+.icon_3::after{content: "\e61d";}
-/*---------------------*/
+/*---------------------*/
-.nav-more{float:right;margin-right: 10px;font-size: 12px;transition: transform .3s;}
+.nav-more{float:right;margin-right: 10px;font-size: 12px;transition: transform .3s;}
-/* 此处为导航右侧箭头 如果自定义iconfont 也需要替换*/
+/* 此处为导航右侧箭头 如果自定义iconfont 也需要替换*/
-.nav-more::after{content: "\e621";}
+.nav-more::after{content: "\e621";}
-/*---------------------*/
+/*---------------------*/
-.nav-show .nav-more{transform:rotate(90deg);}
+.nav-show .nav-more{transform:rotate(90deg);}
-.nav-show,.nav-item>a:hover{color: #FFF;background:rgba(0,0,0,.1);}
+.nav-show,.nav-item>a:hover{color: #FFF;background:rgba(0,0,0,.1);}
-.nav-show>a:before,.nav-item>a:hover:before{opacity:1;}
+.nav-show>a:before,.nav-item>a:hover:before{opacity:1;}
-.nav-item li:hover a{color: #A81E32;background: rgba(0, 0, 0,.1);}
+.nav-item li:hover a{color: #A81E32;background: rgba(0, 0, 0,.1);}
-
+
-/* nav-mini */
+/* nav-mini */
-.nav-mini.nav{width: 60px;}
+.nav-mini.nav{width: 60px;}
-.nav-mini.nav .nav-icon{/* margin-left:-2px; */}
+.nav-mini.nav .nav-icon{/* margin-left:-2px; */}
-.nav-mini.nav .nav-item>a span{display: none;}
+.nav-mini.nav .nav-item>a span{display: none;}
-.nav-mini.nav .nav-more{margin-right: -20px;}
+.nav-mini.nav .nav-more{margin-right: -20px;}
-.nav-mini.nav .nav-item ul{position: absolute;top:0px;left:60px;width: 180px;z-index: 99;background:#3C474C;overflow: hidden;}
+.nav-mini.nav .nav-item ul{position: absolute;top:0px;left:60px;width: 180px;z-index: 99;background:#3C474C;overflow: hidden;}
-.nav-mini.nav .nav-item:hover{background:rgba(255,255,255,.1);}
+.nav-mini.nav .nav-item:hover{background:rgba(255,255,255,.1);}
-.nav-mini.nav .nav-item:hover .nav-item a{color:#FFF;}
+.nav-mini.nav .nav-item:hover .nav-item a{color:#FFF;}
-.nav-mini.nav .nav-item:hover a:before{opacity:1;}
+.nav-mini.nav .nav-item:hover a:before{opacity:1;}
-.nav-mini.nav .nav-item:hover ul{display: block;}
+.nav-mini.nav .nav-item:hover ul{display: block;}
-
+
-
+
-
+
-
+
-
+

WebRoot/main.jsp

@@ -420,24 +420,17 @@ html, body {
 	_overflow-x:hidden;
 	_overflow-y:hidden;
 }
-.nav{
-	width:200px;
-}
-
-.nav a{
-	text-align: left;
-}
 
 .nav a span{
 	margin-left: 40px;
 }
 
 .middle_tab{
-	left: 180px;
+	left: 210px;
 }
 
 .middle_right{
-	left : 185px;
+	left : 215px;
 }
 
 
@@ -571,7 +564,7 @@ html, body {
 			<table>
 				<tr valign="buttom" id="titles">
 						<td width="100%" height="18" background="<c:url value='/images/main_58.png'/>">
-							<div align="center" style="width: 180px;background-color: #a81e32">
+							<div align="center" style="width: 210px;background-color: #a81e32">
 								<span id="show" class="STYLE1" 
 									style="color: rgb(242, 229, 229);cursor:pointer; font-weight: bold;width: 100%">▽i18n_main.text.show1_n81i▽</span>
 							</div>

WebRoot/page/show/showNodeRoom.jsp

@@ -478,6 +478,7 @@ body {
 			var thisheight = $(document).height()*0.9;
 			var thiswidth = $(document).width()*0.9;
 			window.top.layer.open({
+				title: 'i18n_main.text.show1_n81i',
 		 		type: 1,
 		 		area: [thiswidth + 'px', thisheight + 'px'],
 		 		scrollbar: true,

src/com/nms/thread/DetectDatasTimeoutAlarmThread.java

@@ -19,6 +19,7 @@ import nis.nms.util.ConnectionOracle;
 public class DetectDatasTimeoutAlarmThread implements Runnable{
 	private Logger logger = Logger.getLogger(DetectDatasTimeoutAlarmThread.class);
 	private Date startTime = Calendar.getInstance().getTime();
+	private boolean detectDatasTimeoutOthers = false;//监测超时 是否 过滤 握手监测 节点
 	@Override
 	public void run() {
 //		Thread.currentThread().setName("监测数据超时告警线程");
@@ -35,10 +36,15 @@ public class DetectDatasTimeoutAlarmThread implements Runnable{
 			inStream = new FileInputStream(url2.getPath().replace("%20", " "));
 			properties.load(inStream);
 			String checkTypeName = properties.getProperty("detec.nmsclient.str");
+			String detectOthers = properties.getProperty("detec.datastimeout.others");//监测超时 是否 过滤 握手监测 节点
 //			String checkTypeName = Constants.NMS_CLIENT_CHECKTYPENAME;
 			if(StringUtils.isEmpty(checkTypeName)){
 				checkTypeName = "NMSClient";
-			}			
+			}
+			//过滤 握手监测 超时 告警
+			if(StringUtils.isNotBlank(detectOthers) && "1".equalsIgnoreCase(detectOthers.trim())){
+				detectDatasTimeoutOthers = true;
+			}
 			SetInfo nmsClientSet = service.getSetInfoByCheckName(1,checkTypeName);	//查询握手监测相关信息		
 			
 			List<String[]> alarm = new ArrayList<String[]>();
@@ -73,7 +79,7 @@ public class DetectDatasTimeoutAlarmThread implements Runnable{
 			
 			List<SetInfo> setInfoList = service.getAllSetInfo(1,null);	//查询有效SetInfo信息				
 			for(SetInfo setInfo : setInfoList){
-				List<String []> alarmInfoList  = service.detectDatasTimeoutCheck(setInfo,startTime,errorSeqIds);//监测当前监测是否超时无数据
+				List<String []> alarmInfoList  = service.detectDatasTimeoutCheck(setInfo,startTime,detectDatasTimeoutOthers?errorSeqIds:null);//监测当前监测是否超时无数据
 				if(alarmInfoList != null && alarmInfoList.size()>0){
 					alarm.addAll(alarmInfoList);
 					/*for(String [] datas: alarmInfoList){

src/com/nms/thread/service/ThreadService.java

@@ -1253,11 +1253,11 @@ public class ThreadService {
 				+ "performace_data  ,current_times  ,start_time  ,"
 				+ "police_level   ,data_check_time  ,data_arrive_time  ,detectioned_state  ,"
 				+ "status_change_time  ,seq_id  ,detection_info_id,data_check_time_digital,data_arrive_time_digital      ,"
-				+ "POLICE_EMERGENT  ) VALUES"
+				+ "POLICE_EMERGENT,NEXT_CHECK_TIME  ) VALUES"
 				+"(?,?,"
 				+ "?,?,?,"
 				+ "?,?,?,?,"
-				+ "?,?,?,?,?,?)";
+				+ "?,?,?,?,?,?,null)";
 		return sql;
 	}
 	
@@ -1287,6 +1287,7 @@ public class ThreadService {
            +" ,data_arrive_time_digital = ?"
 
            +" ,POLICE_EMERGENT = ?"
+           +" ,NEXT_CHECK_TIME = NULL"
 
           +"  where din.detection_set_info_id = ?"