From fa00382db413a8489d07983b66f0869305b51a9a Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 11 一月 2019 11:35:54 +0800
Subject: [PATCH] 批量读取系统参数

---
 gx_tieta/src/com/fgkj/services/BattInfServices.java |  382 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 371 insertions(+), 11 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index a6c5028..72751d7 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -4,24 +4,40 @@
 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.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;
+import com.fgkj.dto.Batttestdatastop;
 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;
@@ -35,9 +51,17 @@
 	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);*/
+			/*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();
+			//灏嗗憡璀︾殑鏈嶅姟璁句负閲嶅惎
+			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("娣诲姞鎴愬姛!");
@@ -53,9 +77,17 @@
 	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);*/
+			/*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();
+			//灏嗗憡璀︾殑鏈嶅姟璁句负閲嶅惎
+			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("淇敼鎴愬姛!");
@@ -73,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();
@@ -82,7 +114,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());
@@ -97,13 +129,34 @@
 		//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);
 		if(bl){
-			//灏嗕富绋嬪簭鐨勬湇鍔¤涓洪噸鍚�
+			/*//灏嗕富绋嬪簭鐨勬湇鍔¤涓洪噸鍚�
 			Process_survey process=new Process_survey();
 			process.setProcessName(ProcessServerDao.BMS_FBSDEV);
+			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();
+			//灏嗗憡璀︾殑鏈嶅姟璁句负閲嶅惎
+			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("鍒犻櫎鎴愬姛!");
@@ -117,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);
@@ -671,6 +752,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);
@@ -685,7 +780,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) {
@@ -699,9 +836,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);
@@ -722,8 +887,189 @@
 		//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;
+	}
 
-	public static void main(String[] args) {
+	//棣栭〉涓婃牴鎹畇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);
@@ -737,11 +1083,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();
@@ -765,6 +1112,19 @@
 		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);
+		User_inf uinf=new User_inf();
+		uinf.setUId(1002);
+		ServiceModel model=bs.serchDevice(uinf);
+		System.out.println(model);
+		}
 	}
-}

--
Gitblit v1.9.1