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 | 89 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 82 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index 9561969..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;
@@ -50,9 +51,10 @@
Process_survey process=new Process_survey();
process.setProcessName(ProcessServerDao.BMS_FBSDEV);
Boolean b=(new Process_surveyImpl()).update(process);*/
- App_Sys as=new App_Sys();
+ /*App_Sys as=new App_Sys();
as.setAppServer_Reinit_BattGroupData_EN(BattTestData.AppServer_Reinit_BattGroupData_EN);
- Boolean b=(new App_SysImpl()).update(as);
+ Boolean b=(new App_SysImpl()).update(as);*/
+ BattTestData.run_cmd();
model.setCode(1);
model.setMsg("娣诲姞鎴愬姛!");
}
@@ -71,9 +73,10 @@
Process_survey process=new Process_survey();
process.setProcessName(ProcessServerDao.BMS_FBSDEV);
Boolean b=(new Process_surveyImpl()).update(process);*/
- App_Sys as=new App_Sys();
+ /*App_Sys as=new App_Sys();
as.setAppServer_Reinit_BattGroupData_EN(BattTestData.AppServer_Reinit_BattGroupData_EN);
- Boolean b=(new App_SysImpl()).update(as);
+ Boolean b=(new App_SysImpl()).update(as);*/
+ BattTestData.run_cmd();
model.setCode(1);
model.setMsg("淇敼鎴愬姛!");
}
@@ -122,9 +125,10 @@
Process_survey process=new Process_survey();
process.setProcessName(ProcessServerDao.BMS_FBSDEV);
Boolean b=(new Process_surveyImpl()).update(process);*/
- App_Sys as=new App_Sys();
+ /*App_Sys as=new App_Sys();
as.setAppServer_Reinit_BattGroupData_EN(BattTestData.AppServer_Reinit_BattGroupData_EN);
- Boolean b=(new App_SysImpl()).update(as);
+ Boolean b=(new App_SysImpl()).update(as);*/
+ BattTestData.run_cmd();
model.setCode(1);
model.setMsg("鍒犻櫎鎴愬姛!");
}
@@ -691,9 +695,37 @@
}
return model;
}
+ //鏌ヨ鎵�鏈夌殑鐪佷唤(宸︿晶瀵艰埅绗竴灞傦紝鏌ユ墍鏈夌殑鐪佷唤)
+ public ServiceModel serchAllStation_all(Object obj){
+ List list=((BattInfImpl)dao).serchAllStation_all(obj);
+ if (list != null && list.size() > 0) {
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setData(list);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
//鏌ヨ绠＄悊鐨勫競(宸︿晶瀵艰埅绗簩灞傦紝鏌ユ墍鏈夌殑甯�,num涓瓨鏀緐id)
public ServiceModel serchStationName2(Object obj){
List list=((BattInfImpl)dao).serchStationName2(obj);
+ if (list != null && list.size() > 0) {
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setData(list);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
+ //鏌ヨ绠＄悊鐨勫競(宸︿晶瀵艰埅绗簩灞傦紝鏌ユ墍鏈夌殑甯�)
+ public ServiceModel serchStationName2_all(Object obj){
+ List list=((BattInfImpl)dao).serchStationName2_all(obj);
if (list != null && list.size() > 0) {
model.setCode(1);
model.setData(list);
@@ -719,9 +751,37 @@
}
return model;
}
+ //鏌ヨ绠＄悊鐨勬満鎴�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鏈烘埧)
+ public ServiceModel serchStationName3_all(Object obj){
+ List list=((BattInfImpl)dao).serchStationName3_all(obj);
+ if (list != null && list.size() > 0) {
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setData(list);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
//鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗洓灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍,num涓瓨鏀緐id)
public ServiceModel serchBattByStation(Object obj){
List list=((BattInfImpl)dao).serchBattByStation(obj);
+ if (list != null && list.size() > 0) {
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setData(list);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
+ //鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗洓灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍)
+ public ServiceModel serchBattByStation_all(Object obj){
+ List list=((BattInfImpl)dao).serchBattByStation_all(obj);
if (list != null && list.size() > 0) {
model.setCode(1);
model.setData(list);
@@ -765,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);
@@ -798,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");
@@ -836,5 +910,6 @@
System.out.println(s);
}
}
+ //BattTestData.run_cmd(BattTestData.STRCMD);
}
}
--
Gitblit v1.9.1