From fdc45803b0b4468508316efc5cfd90af9c63e9c9 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期六, 05 一月 2019 14:06:52 +0800
Subject: [PATCH] 电池放电参数设置批量

---
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class                  |    0 
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl$70.class               |    0 
 gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java                      |   74 ++++++++++++++++++++++++++++++++++--
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class   |    0 
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.class    |    0 
 gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java                                       |    6 ++-
 gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java                         |   14 ++++++-
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$1.class |    0 
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class |    0 
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl$1.class  |    0 
 gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java                        |    8 ++++
 11 files changed, 93 insertions(+), 9 deletions(-)

diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$1.class
index 828344b..e9e0788 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$1.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class
index 854c02d..d644d5b 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl$70.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl$70.class
index 16eca5d..8f489e2 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl$70.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl$70.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class
index 27b03b0..c2ecdd5 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl$1.class
index d5a8013..305b0d2 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl$1.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.class
index b4856d4..181c8cb 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class
index 8260987..ccd93ff 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class
Binary files differ
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java
index 8aaa584..51964f2 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java
@@ -5,6 +5,7 @@
 import com.fgkj.actions.ActionUtil;
 import com.fgkj.dao.FBS9100_ComBase;
 import com.fgkj.dao.UinfDaoFactory;
+import com.fgkj.dto.BattInf;
 import com.fgkj.dto.ServiceModel;
 import com.fgkj.dto.User_log;
 import com.fgkj.dto.ram.Fbs9100_battparam;
@@ -51,6 +52,13 @@
 		result = tojson(model);		
 		return SUCCESS;	
 	}
+	//鎵归噺璁剧疆鐢垫睜鍙傛暟鏃讹紝鏍规嵁鐪佸競鍖猴紝鐢垫睜鍗曚綋鍨嬪彿锛堜紡鏁帮級锛岀粍鏁扮瓫閫夊嚭鐢垫睜缁勫苟璇诲彇瀹冪殑瀹為檯鐢垫睜鍙傛暟
+	public String serchBattinfAndParam() {
+		BattInf binf=getGson().fromJson(json, BattInf.class);
+		ServiceModel model = service.serchBattinfAndParam(binf);
+		result = tojson(model);		
+		return SUCCESS;	
+	}
 	
 	
 	
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index e2c4b09..eb87b4a 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -4385,11 +4385,11 @@
 	//鎵归噺璁剧疆鏀剧數鍙傛暟鏃讹紝鏍规嵁鐪佸競鍖猴紝鐢垫睜鍗曚綋鍨嬪彿锛堜紡鏁帮級锛岀粍鏁扮瓫閫夊嚭鐢垫睜缁�
 	public List serchByDischarge(Object obj) {
 		BattInf binf=(BattInf) obj;
-		Page page=binf.getPage();
+		//Page page=binf.getPage();
 		/*Connection conn=DBUtil.getConn();
 		String numberSql=" SELECT FOUND_ROWS() number";SQL_CALC_FOUND_ROWS*/
 		String sql=" select  distinct(StationId),StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,"
-				+ "FBSDeviceName,GroupIndexInFBSDevice,db_battinf.tb_battinf.battgroupId,battGroupName" +
+				+ "FBSDeviceName,GroupIndexInFBSDevice,db_battinf.tb_battinf.battgroupId,battGroupName,battGroupNum" +
 				 ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,Load_curr,DisCurrMax"
 				 + ",db_ram_db.tb_fbs9100_state.dev_version  "
 				+ " from db_battinf.tb_battinf,db_ram_db.tb_fbs9100_state "
@@ -4430,6 +4430,7 @@
 				try {
 					while(rs.next()) {
 						BattInf binf = new BattInf();
+						binf.setNum(0);
 						binf.setStationId(rs.getString("stationId"));
 						binf.setStationName(rs.getString("stationName"));
 						binf.setStationName1(rs.getString("stationName1"));
@@ -4446,6 +4447,7 @@
 						binf.setFBSDeviceName(rs.getString("fBSDeviceName"));
 						binf.setGroupIndexInFBSDevice(rs.getInt("groupIndexInFBSDevice"));
 						binf.setBattGroupId(rs.getInt("battGroupId"));
+						binf.setBattGroupNum(rs.getInt("battGroupNum"));
 						binf.setBattGroupName(rs.getString("battGroupName"));
 						/*binf.setBattGroupNum(rs.getInt("battGroupNum"));
 						binf.setFloatVolLevel(rs.getFloat("floatVolLevel"));
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java
index 877507e..be93542 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java
@@ -40,6 +40,16 @@
 			,bparam.getBattTemp(),bparam.getFloatChargeVol(),bparam.getFloatChargeCurr(),bparam.getOnlineVolLow(),bparam.getGroupConnType()});
 		return bl;
 	}
+	//鎵归噺璁剧疆鍙傛暟鍓嶅線琛ㄤ腑鍔犲叆鏁版嵁
+	public boolean updatePL(Object obj) {
+		Fbs9100_battparam bparam=(Fbs9100_battparam) obj;
+		/*String sql=" update db_ram_db.tb_fbs9100_battparam set STD_CAP=?,STD_RES=?,BattGroupCount=?,EachGroupBattCount=?,MonomerVol=?,GroupVol=?,BattTemp=?,FloatChargeVol=?,FloatChargeCurr=?,OnlineVolLow=?,GroupConnType=? " +
+				" where dev_id=? ";*/
+		String sql=" replace into db_ram_db.tb_fbs9100_battparam(dev_id,op_cmd,dev_ip,STD_CAP,STD_RES,BattGroupCount,EachGroupBattCount,MonomerVol,GroupVol,BattTemp,FloatChargeVol,FloatChargeCurr,OnlineVolLow,GroupConnType) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+		boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{bparam.getDev_id(),bparam.getOp_cmd(),bparam.getDev_ip(),bparam.getSTD_CAP(),bparam.getSTD_RES(),bparam.getBattGroupCount(),bparam.getEachGroupBattCount(),bparam.getMonomerVol(),bparam.getGroupVol()
+			,bparam.getBattTemp(),bparam.getFloatChargeVol(),bparam.getFloatChargeCurr(),bparam.getOnlineVolLow(),bparam.getGroupConnType()});
+		return bl;
+	}
 	//鎵归噺淇敼鐢垫睜鍙傛暟
 	public boolean updatePro(Object obj) {
 		List<Fbs9100_battparam> list=(List<Fbs9100_battparam>) obj;
@@ -48,9 +58,9 @@
 		if(list!=null&&list.size()>0){
 			for (int i = 0; i < list.size(); i++) {
 				Fbs9100_battparam fs=list.get(i);
-				String sql="replace into db_ram_db.tb_fbs9100_battparam(dev_id,dev_ip,STD_CAP,STD_RES,BattGroupCount,EachGroupBattCount"
+				String sql="replace into db_ram_db.tb_fbs9100_battparam(dev_id,op_cmd,dev_ip,STD_CAP,STD_RES,BattGroupCount,EachGroupBattCount"
 						+ ",MonomerVol,GroupVol,BattTemp,FloatChargeVol,FloatChargeCurr,OnlineVolLow,GroupConnType) "
-						+ " values("+fs.getDev_id()+",'"+fs.getDev_ip()+"',"+fs.getSTD_CAP()+","+fs.getSTD_RES()+","+fs.getBattGroupCount()+","+fs.getEachGroupBattCount()
+						+ " values("+fs.getDev_id()+","+fs.getOp_cmd()+",'"+fs.getDev_ip()+"',"+fs.getSTD_CAP()+","+fs.getSTD_RES()+","+fs.getBattGroupCount()+","+fs.getEachGroupBattCount()
 						+","+fs.getMonomerVol()+","+fs.getGroupVol()+","+fs.getBattTemp()+","+fs.getFloatChargeVol()+","+fs.getFloatChargeCurr()+","+fs.getOnlineVolLow()+","+fs.getGroupConnType()+")";
 				sql_str.add(sql);
 				{
diff --git a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
index e7c14a5..aa3a670 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
@@ -1,5 +1,6 @@
 package com.fgkj.services.ram;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
@@ -10,6 +11,7 @@
 import com.fgkj.dao.impl.ram.Bts_gprs_stateImpl;
 import com.fgkj.dao.impl.ram.Fbs9100_battparamImpl;
 import com.fgkj.dao.impl.ram.Fbs9100_sysparamImpl;
+import com.fgkj.dto.BattInf;
 import com.fgkj.dto.ServiceModel;
 import com.fgkj.dto.ram.Bts_gprs_state;
 import com.fgkj.dto.ram.Fbs9100_battparam;
@@ -98,13 +100,75 @@
 	}
 	//鎵归噺璁剧疆鐢垫睜鍙傛暟鏃讹紝鏍规嵁鐪佸競鍖猴紝鐢垫睜鍗曚綋鍨嬪彿锛堜紡鏁帮級锛岀粍鏁扮瓫閫夊嚭鐢垫睜缁勫苟璇诲彇瀹冪殑瀹為檯鐢垫睜鍙傛暟
 	public ServiceModel serchBattinfAndParam(Object obj) {
-		List list=(new BattInfImpl()).serchByDischarge(obj);
+		List<BattInf> list=(new BattInfImpl()).serchByDischarge(obj);
 		if(list!=null&&list.size()>0) {
-			for (int i = 0; i < list.size(); i++) {
-				
-			}
+  			Calendar c = Calendar.getInstance(); 
+  			//鐜板湪鐨勬椂闂�(鍗曚綅锛氭绉�) 
+  			long now_time = c.getTimeInMillis();
+  			long time=0;
+  			int success=0;
+  			int count=0;
+  			do {
+  				for (int i = 0; i < list.size(); i++) {
+  					BattInf binf=list.get(i);
+  					Fbs9100_battparam fs=new Fbs9100_battparam();
+	  				fs.setDev_id(binf.getFBSDeviceId());
+	  				fs.setOp_cmd(FBS9100_ComBase.CMD_GetBattParam);
+  					if(count==0) {
+  	  					fs.setDev_ip("127.0.0.0");
+  	  					fs.setSTD_CAP(1);
+  	  					fs.setSTD_RES(1);
+  	  					fs.setBattGroupCount(1);
+  	  					fs.setEachGroupBattCount(1);
+  	  					fs.setMonomerVol(1);
+  	  					fs.setGroupVol(1);
+  	  					fs.setBattTemp(1);
+  	  					fs.setFloatChargeVol(1);
+  	  					fs.setFloatChargeCurr(1);
+  	  					fs.setOnlineVolLow(1);
+  	  					fs.setGroupConnType(1);
+  	  					boolean bl=((Fbs9100_battparamImpl)dao).updatePL(fs);
+  					}
+  					if(binf.getNum()==0) {
+  						boolean b=((Fbs9100_battparamImpl)dao).getCmdAck(fs.getOp_cmd(), fs.getDev_id());
+  						if(b) {
+  							success+=1;
+  							list.get(i).setNum(1);
+  						    List listbatt=dao.serchByCondition(fs);
+  						    list.get(i).setObj(listbatt);
+  						   // System.out.println(list.get(i).getFBSDeviceId());
+  						}
+  					}
+  				}
+  				count++;
+  				if(success==list.size()) {
+  					break;
+  				}
+  				Calendar cl = Calendar.getInstance(); 
+  				long moment_time = cl.getTimeInMillis();
+  				time=moment_time-now_time;
+  			}while(time<=5*1000);
+  			model.setData(list);
+  			model.setCode(1);
+  			model.setSum(success);
+  			model.setMsg("淇敼鎴愬姛!");
+		}else{
+			model.setCode(0);
+			model.setMsg("鏌ヨ澶辫触!");
 		}
 		return model;
 	}
-	
+	public static void main(String[] args) {
+		Fbs9100_battparamService service=new Fbs9100_battparamService();
+		BattInf binf=new BattInf();
+		binf.setNum(2);
+		binf.setStationName("鐧捐壊");
+		binf.setGroupIndexInFBSDevice(0);
+		binf.setMonVolStd(12f);
+		ServiceModel model=service.serchBattinfAndParam(binf);
+		List list=(List)model.getData();
+		for (int i = 0; i < list.size(); i++) {
+			System.out.println(((BattInf)list.get(i)).getObj());
+		}
+	}
 }

--
Gitblit v1.9.1