From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/services/BattInfServices.java | 237 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 226 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index 32fd1b2..72751d7 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,8 @@
import com.fgkj.dto.Page;
import com.fgkj.dto.Process_survey;
import com.fgkj.dto.ServiceModel;
+import com.fgkj.dto.User_inf;
+import com.sun.scenario.effect.Bloom;
public class BattInfServices {
private ServiceModel model;
@@ -55,6 +59,10 @@
as.setAppServer_Reinit_BattGroupData_EN(BattTestData.AppServer_Reinit_BattGroupData_EN);
Boolean b=(new App_SysImpl()).update(as);*/
BattTestData.run_cmd();
+ //灏嗗憡璀︾殑鏈嶅姟璁句负閲嶅惎
+ Process_survey process=new Process_survey();
+ process.setProcessName(ProcessServerDao.BMS_FBSDEV_ALARM_BATT);
+ Boolean b=(new Process_surveyImpl()).update(process);
model.setCode(1);
model.setMsg("娣诲姞鎴愬姛!");
}
@@ -77,6 +85,10 @@
as.setAppServer_Reinit_BattGroupData_EN(BattTestData.AppServer_Reinit_BattGroupData_EN);
Boolean b=(new App_SysImpl()).update(as);*/
BattTestData.run_cmd();
+ //灏嗗憡璀︾殑鏈嶅姟璁句负閲嶅惎
+ Process_survey process=new Process_survey();
+ process.setProcessName(ProcessServerDao.BMS_FBSDEV_ALARM_BATT);
+ Boolean b=(new Process_surveyImpl()).update(process);
model.setCode(1);
model.setMsg("淇敼鎴愬姛!");
}
@@ -93,7 +105,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();
@@ -117,6 +129,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);
@@ -129,6 +154,10 @@
as.setAppServer_Reinit_BattGroupData_EN(BattTestData.AppServer_Reinit_BattGroupData_EN);
Boolean b=(new App_SysImpl()).update(as);*/
BattTestData.run_cmd();
+ //灏嗗憡璀︾殑鏈嶅姟璁句负閲嶅惎
+ Process_survey process=new Process_survey();
+ process.setProcessName(ProcessServerDao.BMS_FBSDEV_ALARM_BATT);
+ Boolean b=(new Process_surveyImpl()).update(process);
model.setCode(1);
model.setMsg("鍒犻櫎鎴愬姛!");
}
@@ -141,6 +170,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 +794,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 +836,7 @@
}
return model;
}
- //鏌ヨ绠＄悊鐨勬満鎴�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鏈烘埧)
+ //鏌ヨ绠＄悊鐨勬満鎴�(宸︿晶瀵艰埅绗洓灞傦紝鏌ユ墍鏈夌殑鏈烘埧)
public ServiceModel serchStationName3_all(Object obj){
List list=((BattInfImpl)dao).serchStationName3_all(obj);
if (list != null && list.size() > 0) {
@@ -765,7 +850,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 +864,7 @@
}
return model;
}
- //鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗洓灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍)
+ //鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗簲灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍)
public ServiceModel serchBattByStation_all(Object obj){
List list=((BattInfImpl)dao).serchBattByStation_all(obj);
if (list != null && list.size() > 0) {
@@ -833,11 +918,11 @@
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()){
+ if((j+1)==brinf.getOld_monum()&&sdata.getBattGroupId()==brinf.getOld_battgroupid()){
sdata.setMon_num(-1);
break;
}
- if((j+1)==brinf.getNew_monum()){
+ if((j+1)==brinf.getNew_monum()&&sdata.getBattGroupId()==brinf.getNew_battgroupid()){
sdata.setNote(brinf.getOld_battproducer());
break;
}
@@ -858,7 +943,133 @@
}
return model;
}
- public static void main(String[] args) {
+ //鐢垫睜閰嶇粍绠＄悊(閲嶈)
+ 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); //鎬昏澶囨暟(宸插畨瑁�)
+ List list=(new BattInfImpl()).serchByDeviceId_all(obj); //鎬昏澶囨暟(鍏ㄩ儴)
+ if (list != null && list.size() > 0) {
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ //System.out.println(model.getData());
+ return model;
+ }
+ //澶撮儴鏌ュ嚭宸插畨瑁呯殑鎵�鏈夋満鎴�
+ public ServiceModel serchByDeviceId(Object obj){
+ int devNum=(new BattInfImpl()).serchByDeviceId(obj); //鎬昏澶囨暟(宸插畨瑁�)
+ model.setCode(1);
+ model.setSum(devNum);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ return model;
+ }
+ //澶撮儴鏌ュ嚭宸插畨瑁呯殑鐢垫睜鍗曚綋
+ public ServiceModel serchByInstall_count(Object obj){
+ int devNum=(new BattInfImpl()).serchByInstall_count(obj); //鎬昏澶囨暟(宸插畨瑁�)
+ model.setCode(1);
+ model.setSum(devNum);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ return model;
+ }
+
+ //娣诲姞鎿嶄綔鏃舵煡璇㈠嚭璁惧id
+ public ServiceModel searchmaxdev_id(){
+ int dev_id=BattinfGroupFactory.searchmaxdev_id();
+ model.setData(dev_id);
+ return model;
+ }
+ //娣诲姞鎿嶄綔鏃舵煡璇㈠嚭鐢垫睜缁刬d
+ public ServiceModel searchMaxBattgroupId(){
+ int battgroupid=BattinfGroupFactory.searchMaxBattgroupId();
+ model.setData(battgroupid);
+ return model;
+ }
+
+ //鎵归噺璁剧疆鏀剧數鍙傛暟鏃讹紝鏍规嵁鐪佸競鍖猴紝鐢垫睜鍗曚綋鍨嬪彿锛堜紡鏁帮級锛岀粍鏁扮瓫閫夊嚭鐢垫睜缁�
+ public ServiceModel serchByDischarge(Object obj){
+ List list=((BattInfImpl)dao).serchByDischarge(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 judgeBatt(Object obj) {
+ List list=((BattInfImpl)dao).judgeBatt(obj);
+ if (list != null && list.size() > 0) {
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
+
+ public static void main(String[] args) {
//new BattInfServices().findMenu();
BattInf b=new BattInf();
//b.setBattGroupId(1000005);
@@ -872,7 +1083,7 @@
b.setFbsDeviceIp_WG_old("192.168.0.1");
b.setStationName("");
b.setStationName1("");
- b.setStationName2("");
+ b.setStationName2("姝︽眽甯�");
b.setStationName9("");
b.setBattGroupName("");
b.setStationId("42070463");
@@ -902,14 +1113,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