From b0433dbdf74457deed81b44767513baa55d4ae73 Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.28>
Date: 星期二, 09 十月 2018 16:07:40 +0800
Subject: [PATCH] 包机组中4层筛选
---
gx_tieta/src/com/fgkj/services/BattInfServices.java | 76 ++++++++++++++++++++++++++++++++++----
1 files changed, 68 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index 9561969..6687f85 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -50,9 +50,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 +72,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 +124,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 +694,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 +750,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);
@@ -828,13 +887,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