From ea7102bdbdb56abfc1201489de7ff51d0b42ff07 Mon Sep 17 00:00:00 2001 From: 星伟 <星伟@192.168.10.27> Date: 星期日, 30 九月 2018 08:47:15 +0800 Subject: [PATCH] 电池组删除添加修改时修改app——sys中值为1+配组管理 --- gx_tieta/src/com/fgkj/services/BattInfServices.java | 91 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 80 insertions(+), 11 deletions(-) diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java index a6c5028..0875b15 100644 --- a/gx_tieta/src/com/fgkj/services/BattInfServices.java +++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java @@ -4,21 +4,32 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.text.ParseException; +import java.util.ArrayList; import java.util.Date; import java.util.List; import com.fgkj.actions.ActionUtil; import com.fgkj.dao.BaseDAO; import com.fgkj.dao.BaseDAOFactory; +import com.fgkj.dao.BattCapFactory; +import com.fgkj.dao.BattTestData; import com.fgkj.dao.BattinfGroupFactory; import com.fgkj.dao.DAOHelper; import com.fgkj.dao.ProcessServerDao; +import com.fgkj.dao.impl.App_SysImpl; import com.fgkj.dao.impl.BattInfImpl; +import com.fgkj.dao.impl.Batt_param_lowImpl; +import com.fgkj.dao.impl.Batttestdata_infDAOImpl; +import com.fgkj.dao.impl.BatttestdatastopDAOImpl; import com.fgkj.dao.impl.Process_surveyImpl; import com.fgkj.dao.impl.ram.Fbs9100_setparamImpl; import com.fgkj.db.DBUtil; +import com.fgkj.dto.App_Sys; import com.fgkj.dto.BattInf; import com.fgkj.dto.Batt_Maint_Dealarm; +import com.fgkj.dto.Batt_param_low; +import com.fgkj.dto.Batttestdata_inf; +import com.fgkj.dto.Batttestdatastop; import com.fgkj.dto.Page; import com.fgkj.dto.Process_survey; import com.fgkj.dto.ServiceModel; @@ -35,10 +46,13 @@ public ServiceModel add(Object obj) { Boolean bl=dao.add(obj); if(bl){ - //灏嗕富绋嬪簭鐨勬湇鍔¤涓洪噸鍚� + /*//灏嗕富绋嬪簭鐨勬湇鍔¤涓洪噸鍚� Process_survey process=new Process_survey(); process.setProcessName(ProcessServerDao.BMS_FBSDEV); - Boolean b=(new Process_surveyImpl()).update(process); + Boolean b=(new Process_surveyImpl()).update(process);*/ + App_Sys as=new App_Sys(); + as.setAppServer_Reinit_BattGroupData_EN(BattTestData.AppServer_Reinit_BattGroupData_EN); + Boolean b=(new App_SysImpl()).update(as); model.setCode(1); model.setMsg("娣诲姞鎴愬姛!"); } @@ -53,10 +67,13 @@ public ServiceModel update(Object obj) { Boolean bl=dao.update(obj); if(bl){ - //灏嗕富绋嬪簭鐨勬湇鍔¤涓洪噸鍚� + /*//灏嗕富绋嬪簭鐨勬湇鍔¤涓洪噸鍚� Process_survey process=new Process_survey(); process.setProcessName(ProcessServerDao.BMS_FBSDEV); - Boolean b=(new Process_surveyImpl()).update(process); + Boolean b=(new Process_surveyImpl()).update(process);*/ + App_Sys as=new App_Sys(); + as.setAppServer_Reinit_BattGroupData_EN(BattTestData.AppServer_Reinit_BattGroupData_EN); + Boolean b=(new App_SysImpl()).update(as); model.setCode(1); model.setMsg("淇敼鎴愬姛!"); } @@ -82,7 +99,7 @@ model.setCode(1); model.setMsg("淇敼鎴愬姛!"); }else{ - System.out.println(bl); + //System.out.println(bl); binf.setFbsDeviceIp(binf.getFbsDeviceIp_old()); binf.setFbsDeviceIp_WG(binf.getFbsDeviceIp_WG_old()); binf.setFbsDeviceIp_YM(binf.getFbsDeviceIp_YM_old()); @@ -101,10 +118,13 @@ public ServiceModel delete(Object obj) { Boolean bl=dao.del(obj); if(bl){ - //灏嗕富绋嬪簭鐨勬湇鍔¤涓洪噸鍚� + /*//灏嗕富绋嬪簭鐨勬湇鍔¤涓洪噸鍚� Process_survey process=new Process_survey(); process.setProcessName(ProcessServerDao.BMS_FBSDEV); - Boolean b=(new Process_surveyImpl()).update(process); + Boolean b=(new Process_surveyImpl()).update(process);*/ + App_Sys as=new App_Sys(); + as.setAppServer_Reinit_BattGroupData_EN(BattTestData.AppServer_Reinit_BattGroupData_EN); + Boolean b=(new App_SysImpl()).update(as); model.setCode(1); model.setMsg("鍒犻櫎鎴愬姛!"); } @@ -722,7 +742,47 @@ //System.out.println(model); return model; } - + //鐢垫睜閰嶇粍绠$悊(閲嶈) + public ServiceModel serchMakeGroup(Object obj){ + List<BattInf> list=((BattInfImpl)dao).serchMakeGroup(obj); + Batt_param_low capLow=new Batt_param_low(); + capLow.setLow_type(BattCapFactory.CapType_type);//2瀹归噺 + capLow.setLow_nametype(BattCapFactory.CapType_name);//1娆′綆 + capLow.setLow_method(BattCapFactory.CapType_method);//0 + List<Batt_param_low> listp=(new Batt_param_lowImpl()).serchByLow(capLow); + float param=0f;//闃堝�� + if(listp!=null&&listp.size()>0){ + param=listp.get(listp.size()-1).getLow_value();//0.1 + } + if(list!=null&&list.size()>0){ + for (int i = 0; i < list.size(); i++) { + BattInf binf=list.get(i); + List<Batttestdatastop> list_sdata=new ArrayList(); + //绛涢�夊嚭鐢垫睜缁勬湁鏁堢殑鑺傝兘鏀剧數璁板綍 + List<Batttestdata_inf> list_tinf=(new Batttestdata_infDAOImpl()).Batt_selecteffectiveBatt(binf, param); + if(list_tinf!=null&&list_tinf.size()>0){ + Batttestdata_inf tinf=list_tinf.get(list_tinf.size()-1); + //姹傚嚭鍗曚綋鐨勫疄闄呭閲� + list_sdata=(new BatttestdatastopDAOImpl().serchMakeGroup(binf, tinf)); + }else{ + for (int j = 0; j <binf.getMonCount(); j++) { + Batttestdatastop sdata=new Batttestdatastop(); + sdata.setMon_num(j+1); + sdata.setTest_cap(binf.getMonCapStd()/binf.getMonCount());//娌℃湁鏀剧數榛樿涓烘爣绉� + list_sdata.add(sdata); + } + } + binf.setObj(list_sdata); + } + model.setCode(1); + model.setData(list); + model.setMsg("鏌ヨ鎴愬姛!"); + }else{ + model.setCode(0); + model.setMsg("鏌ヨ澶辫触!"); + } + return model; + } public static void main(String[] args) { //new BattInfServices().findMenu(); BattInf b=new BattInf(); @@ -737,11 +797,12 @@ b.setFbsDeviceIp_WG_old("192.168.0.1"); b.setStationName(""); b.setStationName1(""); + b.setStationName2(""); b.setStationName9(""); b.setBattGroupName(""); b.setStationId("42070463"); //b.setBattGroupName1("寮�鍏崇數婧愮郴缁�"); - //b.setBattProducer("鍏夊畤"); + b.setBattProducer("1"); b.setMonCapStd(100f); b.setMonVolStd(12f); BattInfServices bs=new BattInfServices(); @@ -765,6 +826,14 @@ bmd.setPage(page); //bs.searchInform(bmd); //bs.serchByBattGroupName(b); - bs.updateIp(b); + //bs.updateIp(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); + } + } + } } -} -- Gitblit v1.9.1