Merge remote-tracking branch 'origin/moly'

src/main/java/com/hp/cmsz/service/monitoroperation/AssociateDiagosisConfigurationService.java

@@ -39,8 +39,6 @@ public class AssociateDiagosisConfigurationService {
         DimKpiAssociationRelInfo d = dimKpiAssociationRelInfoDao.findOne(1L);
         System.out.println(d.getDimAssociationAnaInfo().getAssociationType());
         DimAssociationAnaInfo info = dimAssociationAnaInfoDao.findOne(1l);
-        System.out.println(d.toString());
-        System.out.println(info.toString());
 
     }
 
@@ -131,20 +129,28 @@ public class AssociateDiagosisConfigurationService {
         List<Object> objList = businessDao.findBusinessIdListBychannelDataSourceMapId(channelDataSourceMapId);
         List<Long> longList = new ArrayList<Long>();
 
-        System.out.println(objList == null ? "null" : "size  " + objList.size());
-        for (Object o : objList) {
-            longList.add((Long) o);
+        if (objList == null || objList.size() < 1) {
+            return longList;
+        } else {
+            for (Object o : objList) {
+                longList.add((Long) o);
+            }
+            return longList;
         }
-        return longList;
     }
 
     public List<Long> findBusinessIdListBychannelDataSourceMapIdList(List<Long> channelDataSourceMapIdList) {
         List<Object> objList = businessDao.findBusinessIdListBychannelDataSourceMapIdList(channelDataSourceMapIdList);
         List<Long> longList = new ArrayList<Long>();
-        for (Object o : objList) {
-            longList.add((Long) o);
+        if (objList == null || objList.size() < 1) {
+            return longList;
+        } else {
+            for (Object o : objList) {
+                longList.add((Long) o);
+            }
+            return longList;
         }
-        return longList;
+
     }
 
     //
@@ -162,10 +168,8 @@ public class AssociateDiagosisConfigurationService {
 
         //1 删除 指标表 数据
         int n = dimKpiAssociationRelInfoDao.deleteByAssociationId(associationIdL);
-        System.out.println("n==" + n);
         //更新 指标表和 配置表
         List<DimKpiAssociationRelInfo> relInfos = (List<DimKpiAssociationRelInfo>) dimKpiAssociationRelInfoDao.save(dimKpiAssociationRelInfoList);
-        System.out.println("*** " + relInfos.size());
 
 
     }
@@ -177,13 +181,11 @@ public class AssociateDiagosisConfigurationService {
 //        System.out.println("n===="+n);
         //更新 指标表和 配置表
         DimAssociationAnaInfo info = dimAssociationAnaInfoDao.save(dimAssociationAnaInfo);
-        System.out.println("_-_ " + info.getAssociationId());
 
     }
 
     public void deleteAssociDigConfig(Long associationId) {
         dimAssociationAnaInfoDao.delete(associationId);
-        System.out.println("delete---");
 
     }
 

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

@@ -374,6 +374,8 @@
             return;
         }
 
+        $("#updateAnaInfo").attr("disabled","disabled");
+
         $.ajax({
             type: 'GET',
             async: true,
@@ -396,6 +398,7 @@
             }
 
         });
+        //$("#updateAnaInfo").removeAttr("disabled");
 
         /*$.ajax({
             type: 'GET',

src/main/webapp/static/js/associatediagosisconfiguration.js

@@ -25,7 +25,6 @@ function failureDelete(){
 function radioChoose(e){
     $("#updateIndicatorsBtn").removeAttr("disabled");
     $("#anaInfoSelected").val(e.id);
-    console.log(e.id);
 }
 
 
@@ -205,7 +204,6 @@ table_pagging.prototype={
                                 tdContext = context;
 
                             } else {
-                                console.log(this.objectlist);
 
                                 if(k==1){
                                     tdContext = this.getProviceData(this.objectlist[i],this.header[k][1]);
@@ -227,7 +225,6 @@ table_pagging.prototype={
                         }
                         if(k==0) {
                             tdContext="<input type='radio' name='update'id='"+this.getData(this.objectlist[i],this.header[0][1])+"' onclick='radioChoose(this);'/>";
-                            console.log(tdContext)
 
                         }
                         if(k==4){