From 9e1664cbb6c02f8a9bfd5ed6fd7087014d73b2d3 Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.34>
Date: 星期三, 10 十月 2018 10:51:46 +0800
Subject: [PATCH] 配组
---
gx_tieta/src/com/fgkj/services/BattInfServices.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index 6687f85..b81a4fd 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/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.getBattGroupId()==brinf.getOld_battgroupid()){
+ sdata.setMon_num(-1);
+ break;
+ }
+ if((j+1)==brinf.getNew_monum()&&sdata.getBattGroupId()==brinf.getNew_battgroupid()){
+ sdata.setNote(brinf.getOld_battproducer());
+ break;
+ }
+ }
sdata.setTest_cap(binf.getMonCapStd());//娌℃湁鏀剧數榛樿涓烘爣绉�
sdata.setPercent(1f);
list_sdata.add(sdata);
@@ -857,7 +872,7 @@
b.setFbsDeviceIp_WG_old("192.168.0.1");
b.setStationName("");
b.setStationName1("");
- b.setStationName2("");
+ b.setStationName2("姝︽眽甯�");
b.setStationName9("");
b.setBattGroupName("");
b.setStationId("42070463");
@@ -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);
}
}
--
Gitblit v1.9.1