From 32c80047acc38cc715af4ddd54a7a8ecb1d61687 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 07 十一月 2018 10:08:39 +0800
Subject: [PATCH] 修改页面显示大小
---
gx_tieta/src/com/fgkj/services/BattInfServices.java | 312 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 284 insertions(+), 28 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index b292edb..077c682 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -4,21 +4,34 @@
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.text.ParseException;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.fgkj.actions.ActionUtil;
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.BaseDAOFactory;
+import com.fgkj.dao.BattCapFactory;
+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;
+import com.fgkj.dao.impl.Batt_param_lowImpl;
+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.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;
+import com.fgkj.dto.Batttestdatastop;
import com.fgkj.dto.Page;
import com.fgkj.dto.Process_survey;
import com.fgkj.dto.ServiceModel;
@@ -35,10 +48,14 @@
public ServiceModel add(Object obj) {
Boolean bl=dao.add(obj);
if(bl){
- //灏嗕富绋嬪簭鐨勬湇鍔¤涓洪噸鍚�
+ /*//灏嗕富绋嬪簭鐨勬湇鍔¤涓洪噸鍚�
Process_survey process=new Process_survey();
process.setProcessName(ProcessServerDao.BMS_FBSDEV);
- Boolean b=(new Process_surveyImpl()).update(process);
+ Boolean b=(new Process_surveyImpl()).update(process);*/
+ /*App_Sys as=new App_Sys();
+ as.setAppServer_Reinit_BattGroupData_EN(BattTestData.AppServer_Reinit_BattGroupData_EN);
+ Boolean b=(new App_SysImpl()).update(as);*/
+ BattTestData.run_cmd();
model.setCode(1);
model.setMsg("娣诲姞鎴愬姛!");
}
@@ -53,10 +70,14 @@
public ServiceModel update(Object obj) {
Boolean bl=dao.update(obj);
if(bl){
- //灏嗕富绋嬪簭鐨勬湇鍔¤涓洪噸鍚�
+ /*//灏嗕富绋嬪簭鐨勬湇鍔¤涓洪噸鍚�
Process_survey process=new Process_survey();
process.setProcessName(ProcessServerDao.BMS_FBSDEV);
- Boolean b=(new Process_surveyImpl()).update(process);
+ Boolean b=(new Process_surveyImpl()).update(process);*/
+ /*App_Sys as=new App_Sys();
+ as.setAppServer_Reinit_BattGroupData_EN(BattTestData.AppServer_Reinit_BattGroupData_EN);
+ Boolean b=(new App_SysImpl()).update(as);*/
+ BattTestData.run_cmd();
model.setCode(1);
model.setMsg("淇敼鎴愬姛!");
}
@@ -73,7 +94,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();
@@ -82,7 +103,7 @@
model.setCode(1);
model.setMsg("淇敼鎴愬姛!");
}else{
- System.out.println(bl);
+ //System.out.println(bl);
binf.setFbsDeviceIp(binf.getFbsDeviceIp_old());
binf.setFbsDeviceIp_WG(binf.getFbsDeviceIp_WG_old());
binf.setFbsDeviceIp_YM(binf.getFbsDeviceIp_YM_old());
@@ -101,10 +122,14 @@
public ServiceModel delete(Object obj) {
Boolean bl=dao.del(obj);
if(bl){
- //灏嗕富绋嬪簭鐨勬湇鍔¤涓洪噸鍚�
+ /*//灏嗕富绋嬪簭鐨勬湇鍔¤涓洪噸鍚�
Process_survey process=new Process_survey();
process.setProcessName(ProcessServerDao.BMS_FBSDEV);
- Boolean b=(new Process_surveyImpl()).update(process);
+ Boolean b=(new Process_surveyImpl()).update(process);*/
+ /*App_Sys as=new App_Sys();
+ as.setAppServer_Reinit_BattGroupData_EN(BattTestData.AppServer_Reinit_BattGroupData_EN);
+ Boolean b=(new App_SysImpl()).update(as);*/
+ BattTestData.run_cmd();
model.setCode(1);
model.setMsg("鍒犻櫎鎴愬姛!");
}
@@ -117,6 +142,20 @@
//鏍规嵁缁存姢鍖哄拰鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁勪俊鎭�
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 searchInform1(Object obj) {
+ List<BattInf> list=((BattInfImpl)dao).searchInform1(obj);
if (list != null && list.size() > 0) {
model.setCode(1);
model.setData(list);
@@ -641,21 +680,7 @@
}
return model;
}
- //鏌ヨ鎵�鏈夌殑鏈烘埧
- public ServiceModel serchAllStation(Object obj){
- List list=((BattInfImpl)dao).serchAllStation(obj);
- if (list != null && list.size() > 0) {
- model.setCode(1);
- model.setData(list);
- model.setMsg("鏌ヨ鎴愬姛!");
- }else{
- model.setCode(0);
- model.setData(list);
- model.setMsg("鏌ヨ澶辫触!");
- }
- //System.out.println(model);
- return model;
- }
+
//鎼滅储鏈烘埧鎴栫數姹犵粍
public ServiceModel serchStationOrBattgroup(Object obj){
List list=((BattInfImpl)dao).serchStationOrBattgroup(obj);
@@ -671,7 +696,119 @@
//System.out.println(list.size());
return model;
}
- //鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�
+ //鏌ヨ鎵�鏈夌殑鐪佷唤(宸︿晶瀵艰埅绗竴灞傦紝鏌ユ墍鏈夌殑鐪佷唤)
+ public ServiceModel serchAllStation(Object obj){
+ List list=((BattInfImpl)dao).serchAllStation(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 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);
+ 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) {
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setData(list);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ 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) {
@@ -683,7 +820,20 @@
model.setData(list);
model.setMsg("鏌ヨ澶辫触!");
}
- //System.out.println(model);
+ 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);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setData(list);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
return model;
}
//鏌ヨ鎵�鏈夌殑鐢垫睜缁勬暟
@@ -693,6 +843,102 @@
model.setSum(nums);
model.setMsg("鏌ヨ鎴愬姛!");
//System.out.println(model);
+ return model;
+ }
+ //鐢垫睜閰嶇粍绠＄悊(閲嶈)
+ public ServiceModel serchMakeGroup(Object obj){
+ List<BattInf> list=((BattInfImpl)dao).serchMakeGroup(obj);
+ Batt_param_low capLow=new Batt_param_low();
+ capLow.setLow_type(BattCapFactory.CapType_type);//2瀹归噺
+ capLow.setLow_nametype(BattCapFactory.CapType_name);//1娆′綆
+ capLow.setLow_method(BattCapFactory.CapType_method);//0
+ List<Batt_param_low> listp=(new Batt_param_lowImpl()).serchByLow(capLow);
+ float param=0f;//闃堝��
+ if(listp!=null&&listp.size()>0){
+ param=listp.get(listp.size()-1).getLow_value();//0.1
+ }
+ if(list!=null&&list.size()>0){
+ for (int i = 0; i < list.size(); i++) {
+ BattInf binf=list.get(i);
+ List<Batttestdatastop> list_sdata=new ArrayList();
+ //绛涢�夊嚭鐢垫睜缁勬湁鏁堢殑鑺傝兘鏀剧數璁板綍
+ List<Batttestdata_inf> list_tinf=(new Batttestdata_infDAOImpl()).Batt_selecteffectiveBatt(binf, param);
+ if(list_tinf!=null&&list_tinf.size()>0){
+ Batttestdata_inf tinf=list_tinf.get(list_tinf.size()-1);
+ //姹傚嚭鍗曚綋鐨勫疄闄呭閲�
+ 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);
+ }
+ }
+ binf.setObj(list_sdata);
+ }
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ 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;
}
@@ -710,11 +956,12 @@
b.setFbsDeviceIp_WG_old("192.168.0.1");
b.setStationName("");
b.setStationName1("");
+ b.setStationName2("姝︽眽甯�");
b.setStationName9("");
b.setBattGroupName("");
b.setStationId("42070463");
//b.setBattGroupName1("寮�鍏崇數婧愮郴缁�");
- //b.setBattProducer("鍏夊畤");
+ b.setBattProducer("1");
b.setMonCapStd(100f);
b.setMonVolStd(12f);
BattInfServices bs=new BattInfServices();
@@ -738,6 +985,15 @@
bmd.setPage(page);
//bs.searchInform(bmd);
//bs.serchByBattGroupName(b);
- bs.updateIp(b);
+ //bs.updateIp(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