星伟
2018-10-10 2c592928efe30b98538befb7f12471a2f95741b5
gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -26,6 +26,7 @@
import com.fgkj.db.DBUtil;
import com.fgkj.dto.App_Sys;
import com.fgkj.dto.BattInf;
import com.fgkj.dto.BattInf_Rebuild;
import com.fgkj.dto.Batt_Maint_Dealarm;
import com.fgkj.dto.Batt_param_low;
import com.fgkj.dto.Batttestdata_inf;
@@ -824,9 +825,23 @@
                //求出单体的实际容量
                 list_sdata=(new BatttestdatastopDAOImpl().serchMakeGroup(binf, tinf));
             }else{
                List listr=(List) binf.getObj();
                for (int j = 0; j <binf.getMonCount(); j++) {
                   Batttestdatastop sdata=new Batttestdatastop();
                   sdata.setBattGroupId(binf.getBattGroupId());
                   sdata.setNote(binf.getBattProducer());
                   sdata.setMon_num(j+1);
                   for (int z = 0; z < listr.size(); z++) {
                      BattInf_Rebuild brinf=(BattInf_Rebuild) listr.get(z);
                     if((j+1)==brinf.getOld_monum()){
                        sdata.setMon_num(-1);
                        break;
                     }
                     if((j+1)==brinf.getNew_monum()){
                        sdata.setNote(brinf.getOld_battproducer());
                        break;
                     }
                  }
                   sdata.setTest_cap(binf.getMonCapStd());//没有放电默认为标称
                   sdata.setPercent(1f);
                   list_sdata.add(sdata);
@@ -887,14 +902,14 @@
      //bs.searchInform(bmd);
      //bs.serchByBattGroupName(b);
      //bs.updateIp(b);
      /*ServiceModel model=bs.serchMakeGroup(b);
      ServiceModel model=bs.serchMakeGroup(b);
      List<BattInf> list=(List) model.getData();
      for (BattInf binf : list) {
         List<Batttestdatastop> list_sdata=(List) binf.getObj();
         for (Batttestdatastop s : list_sdata) {
            System.out.println(s);
         }
       }*/
       }
      //BattTestData.run_cmd(BattTestData.STRCMD);
      }
   }