From 2e02c136d0daa8e9fd9154b99569435278873b1f Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.20>
Date: 星期五, 23 十一月 2018 16:31:19 +0800
Subject: [PATCH] 查询设备的进程信息
---
gx_tieta/src/com/fgkj/services/BattInfServices.java | 241 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 228 insertions(+), 13 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index 0875b15..eb5a36f 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;
@@ -22,10 +23,12 @@
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.Bts_station_stateImpl;
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.BattInf_Rebuild;
import com.fgkj.dto.Batt_Maint_Dealarm;
import com.fgkj.dto.Batt_param_low;
import com.fgkj.dto.Batttestdata_inf;
@@ -33,6 +36,7 @@
import com.fgkj.dto.Page;
import com.fgkj.dto.Process_survey;
import com.fgkj.dto.ServiceModel;
+import com.fgkj.dto.User_inf;
public class BattInfServices {
private ServiceModel model;
@@ -50,9 +54,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 +76,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("淇敼鎴愬姛!");
}
@@ -90,7 +96,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();
@@ -114,6 +120,19 @@
//System.out.println(model);
return model;
}
+
+ //璁剧疆鐢垫睜缁勫厖鐢电數娴侀槇鍊�
+ public ServiceModel update_charge(Object obj){
+ boolean bl=((BattInfImpl)dao).update_charge(obj);
+ if(bl){
+ model.setCode(1);
+ model.setMsg("淇敼鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("淇敼澶辫触!");
+ }
+ return model;
+ }
//鍒犻櫎鐢垫睜缁�
public ServiceModel delete(Object obj) {
Boolean bl=dao.del(obj);
@@ -122,9 +141,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("鍒犻櫎鎴愬姛!");
}
@@ -137,6 +157,34 @@
//鏍规嵁缁存姢鍖哄拰鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁勪俊鎭�
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 searchInform_ky() {
+ List<BattInf> list=((BattInfImpl)dao).searchInform_ky();
+ 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);
@@ -691,6 +739,20 @@
}
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);
@@ -705,7 +767,49 @@
}
return model;
}
- //鏌ヨ绠＄悊鐨勬満鎴�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鏈烘埧,num涓瓨鏀緐id)
+ //鏌ヨ绠＄悊鐨勫競(宸︿晶瀵艰埅绗簩灞傦紝鏌ユ墍鏈夌殑甯�)
+ 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);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setData(list);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
+ //鏌ヨ绠＄悊鐨勫幙/鍖�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鍘�/鍖�)
+ public ServiceModel serchStationName5(Object obj){
+ List list=((BattInfImpl)dao).serchStationName5(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 serchStationName5_all(Object obj){
+ List list=((BattInfImpl)dao).serchStationName5_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 serchStationName3(Object obj){
List list=((BattInfImpl)dao).serchStationName3(obj);
if (list != null && list.size() > 0) {
@@ -719,9 +823,37 @@
}
return model;
}
- //鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗洓灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍,num涓瓨鏀緐id)
+ //鏌ヨ绠＄悊鐨勬満鎴�(宸︿晶瀵艰埅绗洓灞傦紝鏌ユ墍鏈夌殑鏈烘埧)
+ 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,10 +897,25 @@
//姹傚嚭鍗曚綋鐨勫疄闄呭閲�
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);
- sdata.setTest_cap(binf.getMonCapStd()/binf.getMonCount());//娌℃湁鏀剧數榛樿涓烘爣绉�
+ 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);
}
}
@@ -783,6 +930,69 @@
}
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;
+ }
+
+ //棣栭〉涓婃牴鎹畇tationid鏌ヨ鐢垫睜缁勭殑鏈哄巻鍗�
+ public ServiceModel serchBattAllInfoByStationId(Object obj){
+ List list=((BattInfImpl)dao).serchBattAllInfoByStationId(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 serchDevice(Object obj){
+ int devNum=(new BattInfImpl()).serchByDeviceId(obj); //鎬昏澶囨暟(宸插畨瑁�)
+ int allNum=(new BattInfImpl()).serchByDeviceId_all(obj); //鎬昏澶囨暟(鍏ㄩ儴)
+ model.setSum(allNum);
+ model.setNewsum(devNum);
+ return model;
+ }
+
public static void main(String[] args) {
//new BattInfServices().findMenu();
BattInf b=new BattInf();
@@ -797,7 +1007,7 @@
b.setFbsDeviceIp_WG_old("192.168.0.1");
b.setStationName("");
b.setStationName1("");
- b.setStationName2("");
+ b.setStationName2("姝︽眽甯�");
b.setStationName9("");
b.setBattGroupName("");
b.setStationId("42070463");
@@ -827,13 +1037,18 @@
//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);
+ User_inf uinf=new User_inf();
+ uinf.setUId(1002);
+ ServiceModel model=bs.serchDevice(uinf);
+ System.out.println(model);
}
}
--
Gitblit v1.9.1