From bb65f33c9fdff40844f17e95e3e75aed2b42bda2 Mon Sep 17 00:00:00 2001 From: hdw <496960745@qq.com> Date: 星期四, 25 十月 2018 14:47:33 +0800 Subject: [PATCH] 修改内容 --- gx_tieta/src/com/fgkj/services/BattInfServices.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 1 deletions(-) diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java index b81a4fd..83f7256 100644 --- a/gx_tieta/src/com/fgkj/services/BattInfServices.java +++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java @@ -15,6 +15,7 @@ import com.fgkj.dao.BattTestData; import com.fgkj.dao.BattinfGroupFactory; import com.fgkj.dao.DAOHelper; +import com.fgkj.dao.FBS9100_ComBase; import com.fgkj.dao.ProcessServerDao; import com.fgkj.dao.impl.App_SysImpl; import com.fgkj.dao.impl.BattInfImpl; @@ -93,7 +94,7 @@ PreparedStatement ps=null; boolean b=((BattInfImpl)dao).updateIp(obj); if(b){ - boolean bl=(new Fbs9100_setparamImpl()).sendCmdToFBS9100Dev(binf.getNum(), binf.getFBSDeviceId()); + boolean bl=(new Fbs9100_setparamImpl()).sendCmdToFBS9100Dev(binf.getNum(),FBS9100_ComBase.CMD_TESTCMD_NULL, binf.getFBSDeviceId()); if(bl){ //灏�6185鐨勬湇鍔¤涓洪噸鍚� Process_survey process=new Process_survey(); @@ -141,6 +142,20 @@ //鏍规嵁缁存姢鍖哄拰鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁勪俊鎭� public ServiceModel searchInform(Object obj) { List<BattInf> list=((BattInfImpl)dao).searchInform(obj); + if (list != null && list.size() > 0) { + model.setCode(1); + model.setData(list); + model.setMsg("鏌ヨ鎴愬姛!"); + } + else{ + model.setCode(0); + model.setMsg("鏌ヨ澶辫触!"); + } + return model; + } + //鏍规嵁缁存姢鍖哄拰鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁勪俊鎭� + public ServiceModel searchInform1(Object obj) { + List<BattInf> list=((BattInfImpl)dao).searchInform1(obj); if (list != null && list.size() > 0) { model.setCode(1); model.setData(list); @@ -858,6 +873,47 @@ } return model; } + //鐢垫睜閰嶇粍绠$悊(閲嶈) + public ServiceModel serchGroupByInfor(Object obj){ + List<BattInf> list=((BattInfImpl)dao).serchGroupByInfor(obj); + List list_b=new ArrayList(); + if(list!=null&&list.size()>0){ + for(int i=0;i<list.size();i++){ + BattInf binf=list.get(i); + List<BattInf_Rebuild> listr=(List<BattInf_Rebuild>) binf.getObj(); + for (int j = 0; j <binf.getMonCount(); j++) { + BattInf b=new BattInf(); + b.setBattGroupId(binf.getBattGroupId()); + b.setBattProducer(binf.getBattProducer()); + b.setStationName(binf.getStationName()); + b.setBattGroupName(binf.getBattGroupName()); + b.setMonVolStd(binf.getMonVolStd()); + b.setMonCapStd(binf.getMonCapStd()); + b.setStationId(binf.getStationId()); + b.setMonNum(j+1); + for (int z = 0; z < listr.size(); z++) { + BattInf_Rebuild brinf=(BattInf_Rebuild) listr.get(z); + if((j+1)==brinf.getNew_monum()&&b.getBattGroupId()==brinf.getNew_battgroupid()){ + b.setBattProducer(brinf.getOld_battproducer()); + b.setNum(1); + } + if((j+1)==brinf.getOld_monum()&&b.getBattGroupId()==brinf.getOld_battgroupid()){ + b.setNum(0); + } + } + list_b.add(b); + } + } + model.setCode(1); + model.setData(list_b); + model.setMsg("鏌ヨ鎴愬姛!"); + }else{ + model.setCode(0); + model.setMsg("鏌ヨ澶辫触!"); + } + return model; + } + public static void main(String[] args) { //new BattInfServices().findMenu(); BattInf b=new BattInf(); -- Gitblit v1.9.1