监控运营 ->告警监控 告警明细页面

src/main/java/com/hp/cmsz/web/monitoroperation/AssociateDiagosisDetailController.java

@@ -101,7 +101,13 @@ public class AssociateDiagosisDetailController {
         String timestamp1 = getLastMonth();//getOld();
         String timestamp2 = getNow();//getNew();
         List<AssociateDiagosisDetail> associateDiagosisDetails = associateDiagosisDetailService.findAssociateDiagosisDetailByWarnTimeBeginAndEnd(timestamp1, timestamp2);
-
+        Iterator<AssociateDiagosisDetail>iterator=associateDiagosisDetails.iterator();
+        while (iterator.hasNext()){
+            AssociateDiagosisDetail detail=iterator.next();
+            if(detail.getWarningNum().compareTo(BigInteger.ZERO)<=0){
+                iterator.remove();
+            }
+        }
         model.put("provinceList", provinceList);
         Gson gson = new Gson();
         model.put("diagosisDetails", gson.toJson(associateDiagosisDetails));
@@ -142,6 +148,15 @@ public class AssociateDiagosisDetailController {
         List<AssociateDiagosisDetail> diagosisDetails = associateDiagosisDetailService.
                 findLastMathAssociateDiagosisDetailByWarnTimeBeginAndEndAndDimesionAndProvinceList(warnBeginTime, warnEndTime, dimension, provinceList);
 
+        //--
+        Iterator<AssociateDiagosisDetail>iterator=diagosisDetails.iterator();
+        while (iterator.hasNext()){
+            AssociateDiagosisDetail detail=iterator.next();
+            if(detail.getWarningNum().compareTo(BigInteger.ZERO)<=0){
+                iterator.remove();
+            }
+        }
+        //--
         Gson gson = new Gson();
         return gson.toJson(diagosisDetails);
     }
@@ -288,6 +303,15 @@ public class AssociateDiagosisDetailController {
                 list1.add(detail);
             }*/
             list1 = associateDiagosisDetailService.findDetailByProvinceIdAndoccurTimeAndCloseTime(provinceId, occurTimes, closeTimes);
+            //--
+            Iterator<AssociateDiagosisDetail>iterator=list1.iterator();
+            while (iterator.hasNext()){
+                AssociateDiagosisDetail detail=iterator.next();
+                if(detail.getWarningNum().compareTo(BigInteger.ZERO)<=0){
+                    iterator.remove();
+                }
+            }
+            //--
             Gson gson = new Gson();
             model.put("diagosisDetails", gson.toJson(list1));
             return PageURLController.AssociateDiagosisDetail;

src/main/webapp/WEB-INF/views/MonitorOperation/AssociateDiagosisDetail.jsp

@@ -31,7 +31,6 @@
             //初始化界面
             initTable();
             var v=document.getElementById('gzfxDetail').value;
-            console.log("v    "+v);
         });
         function goClick(e,id){
             var beginTime="";
@@ -272,8 +271,7 @@
         var str="";
         var period=getPeriod();
         str=str+period[0]+"~"+period[1];
-        console.log("str "+str);
-        console.log("str leng "+str.length);
+
         return str;
     }
 
@@ -290,9 +288,7 @@
         }else{
             var detailProvince = getDetailProvinceCheckedValueString();
             var dimension=getDetailCheckeddDimension();
-            console.log("detailProvince  "+detailProvince);
-            console.log("dimension  "+dimension);
-            console.log("detailtime  "+detailtime);
+
             //alert(dimension+"-pi-");
 //            alert(detailProvince);
             var href="${ctx}/MonitorOperation/AssociateDiagosisDetail/tableList?detailProvince="+detailProvince+"&detailtime="+detailtime+"&dimension="+dimension;

src/main/webapp/static/js/associatediagosisdetail.js

@@ -175,7 +175,8 @@ table_pagging.prototype={
                                 }
                                 tdContext = context;
 
-                            } else {
+                            }
+                            else {
 
                                 if(tdContext==null){
                                     tdContext = " ";
@@ -198,7 +199,8 @@ table_pagging.prototype={
                                     var et=this.getData(this.objectlist[i],this.header[6][1]);
                                     // tdContext="<a  onclick='goClick("+id+","+new Date(st).getTime()+","+new Date(et).getTime()+")'>详-情</a>";
                                     tdContext="<a  onclick='goClick(this"+","+id+")'>详-情</a>";
-                                }else{
+                                }
+                                else{
                                     tdContext = this.getData(this.objectlist[i],this.header[k][1]);
                                 }