From 1a05dd9a571e46ae4cb90d5c0a2b691a3a62d34f Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 21 十一月 2018 14:47:48 +0800
Subject: [PATCH] 提交内容
---
gx_tieta/src/com/fgkj/services/BattInfServices.java | 140 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 133 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index b81a4fd..8d9b59a 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,6 +23,7 @@
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;
@@ -34,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;
@@ -93,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();
@@ -141,6 +144,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);
@@ -737,7 +768,35 @@
}
return model;
}
- //鏌ヨ绠＄悊鐨勬満鎴�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鏈烘埧,num涓瓨鏀緐id)
+ //鏌ヨ绠＄悊鐨勫幙/鍖�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鍘�/鍖�)
+ 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) {
@@ -751,7 +810,7 @@
}
return model;
}
- //鏌ヨ绠＄悊鐨勬満鎴�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鏈烘埧)
+ //鏌ヨ绠＄悊鐨勬満鎴�(宸︿晶瀵艰埅绗洓灞傦紝鏌ユ墍鏈夌殑鏈烘埧)
public ServiceModel serchStationName3_all(Object obj){
List list=((BattInfImpl)dao).serchStationName3_all(obj);
if (list != null && list.size() > 0) {
@@ -765,7 +824,7 @@
}
return model;
}
- //鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗洓灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍,num涓瓨鏀緐id)
+ //鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗簲灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍,num涓瓨鏀緐id)
public ServiceModel serchBattByStation(Object obj){
List list=((BattInfImpl)dao).serchBattByStation(obj);
if (list != null && list.size() > 0) {
@@ -779,7 +838,7 @@
}
return model;
}
- //鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗洓灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍)
+ //鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗簲灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍)
public ServiceModel serchBattByStation_all(Object obj){
List list=((BattInfImpl)dao).serchBattByStation_all(obj);
if (list != null && list.size() > 0) {
@@ -858,6 +917,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();
@@ -902,14 +1024,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