From 5c9ff4d11524b55914d8edf7f1ca776c6e0cb62e Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.16>
Date: 星期二, 11 十二月 2018 11:44:48 +0800
Subject: [PATCH] 添加电池组或申请电池组

---
 gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java       |   14 +
 gx_tieta/src/com/fgkj/dao/BaseDAO.java                   |    2 
 gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java   |   45 ++++
 gx_tieta/src/com/fgkj/actions/BattInfAction.java         |   10 
 gx_tieta/src/com/fgkj/dto/Battinf_apply.java             |   64 ++++++
 gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java          |   36 +++
 gx_tieta/src/com/fgkj/services/Battinf_applyService.java |   43 ++++
 gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java  |    7 
 gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java    |  312 +++++++++++++++++++++++++++++++
 gx_tieta/src/com/fgkj/services/BattInfServices.java      |   10 
 gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java            |    2 
 11 files changed, 535 insertions(+), 10 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index 947b4f5..833b60f 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -93,7 +93,15 @@
 		//System.out.println(result);
 		return SUCCESS;
 	}
-
+    
+	//娣诲姞鎿嶄綔鏃舵煡璇㈠嚭璁惧id
+    public String searchmaxdev_id(){
+    	model = service.searchmaxdev_id();
+		result = ActionUtil.tojson(model);
+		return SUCCESS;
+    }
+    
+    
 	public String searchAll() {
 		model = service.searchAll();
 		result = ActionUtil.tojson(model);
diff --git a/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java b/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
new file mode 100644
index 0000000..6c63ae6
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
@@ -0,0 +1,45 @@
+package com.fgkj.actions;
+
+import java.util.List;
+
+import com.fgkj.dto.BattInf;
+import com.fgkj.dto.Battinf_apply;
+import com.fgkj.dto.ServiceModel;
+import com.fgkj.services.Battinf_applyService;
+import com.google.gson.reflect.TypeToken;
+
+public class Battinf_applyAction extends  ActionUtil{
+	
+	private Battinf_applyService service=new Battinf_applyService();
+	private String json;
+	private String result;
+	
+	
+	//纭鐢宠(澶氭潯)
+	public String update(){
+		List<Battinf_apply> list=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json,new TypeToken<List<Battinf_apply>>(){}.getType() );
+		ServiceModel model=service.update(list);
+		result=tojson(model);
+		return SUCCESS;
+	}
+	 //娣诲姞鐢宠
+	public String add(){
+		List<Battinf_apply> list=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json,new TypeToken<List<Battinf_apply>>(){}.getType() );
+		ServiceModel model=service.add(list);
+		result=tojson(model);
+		return SUCCESS;
+	}
+	
+	
+	
+	public String getResult() {
+		return result;
+	}
+	public void setJson(String json) {
+		this.json = json;
+	}
+	
+	
+	
+
+}
diff --git a/gx_tieta/src/com/fgkj/dao/BaseDAO.java b/gx_tieta/src/com/fgkj/dao/BaseDAO.java
index e720d18..2793c0c 100644
--- a/gx_tieta/src/com/fgkj/dao/BaseDAO.java
+++ b/gx_tieta/src/com/fgkj/dao/BaseDAO.java
@@ -202,6 +202,8 @@
 	
 	public static final int  APP_BTS_COMM_TASK=99;
 	
+	public static final int  BATTINF_APPLY=100;
+	
 	public boolean add(Object obj); // 娣诲姞
 
 	public boolean update(Object obj); // 鏇存柊
diff --git a/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java b/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
index 628b621..13eebce 100644
--- a/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
@@ -32,6 +32,7 @@
 import com.fgkj.dao.impl.Battalarm_dataDAOImpl;
 import com.fgkj.dao.impl.Battalarm_data_historyImpl;
 import com.fgkj.dao.impl.BattinfThirdImpl;
+import com.fgkj.dao.impl.Battinf_applyImpl;
 import com.fgkj.dao.impl.Battinf_exImpl;
 import com.fgkj.dao.impl.BattresdataDAOImpl;
 import com.fgkj.dao.impl.Battresdata_infDAOImpl;
@@ -208,6 +209,7 @@
 			case 97:return new  Bts_gprs_stateImpl();
 			case 98:return new  Fbs9100_battparamImpl();
 			case 99:return new  App_bts_comm_taskImpl();
+			case 100:return new  Battinf_applyImpl();
 			default :return null;
 		}
 	}
diff --git a/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java b/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
index 5024dc6..20e7edf 100644
--- a/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
@@ -5,6 +5,7 @@
 
 import com.fgkj.dao.impl.BattInfImpl;
 import com.fgkj.dao.impl.Batt_rtstateDAOImpl;
+import com.fgkj.dao.impl.Battinf_applyImpl;
 import com.fgkj.dao.impl.Database_backupImpl;
 import com.fgkj.dto.BattInf;
 import com.fgkj.dto.Database_backup;
@@ -118,7 +119,18 @@
 		int station_next=station_max+1;
 		return station_next;
 	}
-    
+	//鏌ヨ褰撳墠鏈�澶х殑dev_id
+	public static int searchmaxdev_id(){
+		int dev_id=0;
+		int devid_inf=(new BattInfImpl()).searchMaxdevId_binf();
+		int devid_apply=(new Battinf_applyImpl()).searchMaxdevId_apply();
+		if(devid_inf>=devid_apply){
+			dev_id=devid_inf+1;
+		}else{
+			dev_id=devid_apply+1;
+		}
+		return dev_id;
+	}
 	//褰撳battinf琛ㄤ腑鏁版嵁杩涜澧炲垹鏀圭殑鎿嶄綔鏃讹紝鍏堝浠絛b_battinf.tb_battinf
 	public static boolean backup_battinf(){
 		boolean en=false;
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 992983c..5b0a86b 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -382,8 +382,7 @@
 	}
 	//娣诲姞鐢垫睜缁勬椂鏌ヨ鍑烘渶澶х殑鏈烘埧id鍜岀數姹犵粍id
 	public int searchMaxId(){
-		//,max(battgroupid) as maxb
-		String sql="select max(stationid) as stationid_maxs from db_battinf.tb_battinf limit 1";
+		String sql="SELECT GREATEST((select max(StationId) from db_battinf.tb_battinf) ,(select max(StationId) from db_battinf.tb_battinf_apply)) as id";
 		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null, new CallBack() {
 			
 			public List getResults(ResultSet rs) {
@@ -391,10 +390,10 @@
 				try {
 					
 					while(rs.next()){
-						int maxs=42000000;
+						int maxs=42010000;
 						//int maxb=1000001;
-						if(rs.getString("stationid_maxs") != null){
-							maxs=Integer.parseInt(rs.getString("stationid_maxs"));
+						if(rs.getString("id") != null){
+							maxs=Integer.parseInt(rs.getString("id"));
 						}
 						/*if(rs.getInt("maxb")!=0){
 							maxb=rs.getInt("maxb");
@@ -415,6 +414,33 @@
 		}
 		return stationid;
 	}
+	//鏌ヨ鍑哄綋鍓嶅瓨鍦ㄥ唴瀛樹腑鏈�澶х殑璁惧鐨刬d(寰堥噸瑕�**********)
+	public int searchMaxdevId_binf(){
+		String sql="select max(FbsDeviceId) as id from db_battinf.tb_battinf  limit 1";
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null, new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list=new ArrayList();
+				try {
+					while(rs.next()){
+						int dev_id=0;
+						if(rs.getString("id")!=null){}
+						dev_id=rs.getInt("id");
+						list.add(dev_id);
+					}
+				} catch (SQLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				return list;
+			}
+		});
+		int dev_id=0;
+		if(list!=null&&list.size()>0){
+			dev_id=(Integer) list.get(list.size()-1);
+		}
+		return dev_id;
+	}
     //鍒ゆ柇鏂板鐨勭數姹犵粍鏄惁瀛樺湪
 	public List judgeBatt(Object obj){
 		BattInf binf=(BattInf) obj;
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
index 49a50f7..a63fb42 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_rtstateDAOImpl.java
@@ -752,14 +752,17 @@
    
 	//鏌ヨ鍑哄綋鍓嶅瓨鍦ㄥ唴瀛樹腑鏈�澶х殑鐢垫睜缁刬d(寰堥噸瑕�**********)
 	public int searchMaxBattgroupId(){
-		String sql=" select max(BattGroupId) as max_id from db_ram_db.tb_batt_rtstate limit 1";
+		String sql=" SELECT GREATEST((select max(battgroupId) from db_battinf.tb_battinf) ,(select max(battgroupId) from db_battinf.tb_battinf_apply)) as id limit 1";
 		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null, new CallBack() {
 			
 			public List getResults(ResultSet rs) {
 				List list=new ArrayList();
 				try {
 					while(rs.next()){
-						int battgroupid=rs.getInt("max_id");
+						int battgroupid=1010000;
+						if(rs.getString("id")!=null){
+							battgroupid=rs.getInt("id");
+						}
 						list.add(battgroupid);
 					}
 				} catch (SQLException e) {
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
new file mode 100644
index 0000000..5074c64
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
@@ -0,0 +1,312 @@
+package com.fgkj.dao.impl;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+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.BattinfGroupFactory;
+import com.fgkj.dao.CallBack;
+import com.fgkj.dao.DAOHelper;
+import com.fgkj.dao.LimitNumberFactory;
+import com.fgkj.dao.UinfDaoFactory;
+import com.fgkj.db.DBUtil;
+import com.fgkj.dto.BattInf;
+import com.fgkj.dto.Battinf_apply;
+import com.fgkj.dto.Page;
+import com.fgkj.dto.User_inf;
+import com.fgkj.dto.User_log;
+import com.fgkj.services.User_logService;
+
+public class Battinf_applyImpl implements BaseDAO,CallBack{
+
+	public List getResults(ResultSet rs) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+    //娣诲姞鐢宠
+	public boolean add(Object obj) {
+		List<Battinf_apply> list=(List<Battinf_apply>) obj;
+		List<User_log> listU=new ArrayList<User_log>();//瀛樻斁user_log
+		ArrayList<String> sql_str=new ArrayList();
+		//鑾峰彇褰撳墠鏈�澶х殑stationid鍜宐attgroupid
+	    int maxs=BattinfGroupFactory.searchStationId();
+	    int maxb=BattinfGroupFactory.searchMaxBattgroupId();
+		if(list!=null && list.size()>0){
+			for (int i = 0; i < list.size(); i++) {
+				Battinf_apply bapply=list.get(i);
+				/*int uid=((User_inf)ActionUtil.getUser()).getUId();
+			    bapply.setApply_uid(uid);*/
+				BattInf binf=bapply.getBinf();
+				//楠岃瘉鏂版坊鍔犵殑鏈烘埧鏄惁瀛樺湪
+				List listS=(new BattInfImpl()).judgeBatt(binf);
+				if(listS!=null&&listS.size()>0){
+					binf.setStationId((String) listS.get(listS.size()-1));
+				}else{
+					binf.setStationId(String.valueOf(maxs));
+				}
+				binf.setBattGroupId(maxb);
+				String sql = "insert into db_battinf.tb_battinf_apply(" +
+						"apply_uid,apply_date,StationId,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,FbsDeviceIp,FbsDeviceIp_YM,FbsDeviceIp_WG,"
+						+ "FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +
+						",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,install_user,DisCurrMax,station_phone" +
+						") values("+bapply.getApply_uid()+",'"+DAOHelper.sdf.format(bapply.getApply_date())+"','"+binf.getStationId()+"','"+binf.getStationName()+"','"+binf.getStationName1()+"','"+binf.getStationName2()+"','"+binf.getStationName3()+"','"+binf.getStationName4()+"','"+binf.getStationName5()+
+						"','"+binf.getStationIp()+"',"+binf.getFBSDeviceId()+",'"+binf.getFbsDeviceIp()+"','"+binf.getFbsDeviceIp_YM()+"','"+binf.getFbsDeviceIp_WG()+"','"+binf.getFBSDeviceName()+"',"+binf.getGroupIndexInFBSDevice()+
+						","+binf.getBattGroupId()+","+binf.getBattGroupNum()+",'"+binf.getBattGroupName()+"',"+binf.getFloatVolLevel()+","+binf.getOfflineVolLevel()+","+binf.getBattFloatCurrent()+
+						","+binf.getMonCount()+","+binf.getMonCapStd()+","+binf.getMonVolStd()+","+binf.getMonResStd()+","+binf.getMonSerStd()+","+binf.getMonVolLowToAvg()+
+						",'"+binf.getBattProducer()+"','"+binf.getBattModel()+"','"+DAOHelper.sdf.format(binf.getBattProductDate())+"','"+DAOHelper.sdf.format(binf.getBattInUseDate())+"',"+binf.getLoad_curr()+",'"+binf.getInstall_user()+"',"+binf.getDisCurrMax()+",'"+binf.getStation_phone()+"')";
+				
+				if(binf.getStationId().equals(maxs)){
+					maxs++;
+				}
+				maxb++;
+				sql_str.add(sql);
+				/*{
+					String msg=((User_inf)ActionUtil.getUser()).getUId()+"鐢宠娣诲姞"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑淇℃伅";
+					User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Increase, msg);
+					listU.add(ulog);
+				 }*/
+			}
+		}
+		Boolean bl=false;
+		boolean en=BattinfGroupFactory.backup_battinf();
+		if(en){
+			bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
+		}else{
+			return false;
+		}
+		//(new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+		
+		return bl;
+	}
+    //纭鐢宠(澶氭潯)
+	public boolean update(Object obj) {
+		List<Battinf_apply> list=(List<Battinf_apply>) obj;
+		List<User_log> listU=new ArrayList<User_log>();//瀛樻斁user_log
+		ArrayList<String> sql_str=new ArrayList();
+		if(list!=null&&list.size()>0){
+			for (int i = 0; i < list.size(); i++) {
+				Battinf_apply bapply=list.get(i);
+				bapply.setConfrim_uid(((User_inf)ActionUtil.getUser()).getUId());
+				BattInf binf=bapply.getBinf();
+				binf.setStation_install(1);
+				String sql_update_apply=" update db_battinf.tb_battinf_apply set confrim_uid="+bapply.getConfrim_uid()+",apply_en=1 where num="+bapply.getNum();
+			    sql_str.add(sql_update_apply);
+			    String sql_insert_binf="insert into db_battinf.tb_battinf(" +
+						"StationId,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,FbsDeviceIp,FbsDeviceIp_YM,FbsDeviceIp_WG,"
+						+ "FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +
+						",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,install_user,DisCurrMax,station_phone,Station_install" +
+						") values('"+binf.getStationId()+"','"+binf.getStationName()+"','"+binf.getStationName1()+"','"+binf.getStationName2()+"','"+binf.getStationName3()+"','"+binf.getStationName4()+"','"+binf.getStationName5()+
+						"','"+binf.getStationIp()+"',"+binf.getFBSDeviceId()+",'"+binf.getFbsDeviceIp()+"','"+binf.getFbsDeviceIp_YM()+"','"+binf.getFbsDeviceIp_WG()+"','"+binf.getFBSDeviceName()+"',"+binf.getGroupIndexInFBSDevice()+
+						","+binf.getBattGroupId()+","+binf.getBattGroupNum()+",'"+binf.getBattGroupName()+"',"+binf.getFloatVolLevel()+","+binf.getOfflineVolLevel()+","+binf.getBattFloatCurrent()+
+						","+binf.getMonCount()+","+binf.getMonCapStd()+","+binf.getMonVolStd()+","+binf.getMonResStd()+","+binf.getMonSerStd()+","+binf.getMonVolLowToAvg()+
+						",'"+binf.getBattProducer()+"','"+binf.getBattModel()+"','"+DAOHelper.sdf.format(binf.getBattProductDate())+"','"+DAOHelper.sdf.format(binf.getBattInUseDate())+"',"+binf.getLoad_curr()+",'"+binf.getInstall_user()+"',"+binf.getDisCurrMax()+",'"+binf.getStation_phone()+"',"+binf.getStation_install()+")";
+			    sql_str.add(sql_insert_binf);
+			    {
+					String msg=((User_inf)ActionUtil.getUser()).getUId()+"纭娣诲姞"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑淇℃伅";
+					User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
+					listU.add(ulog);
+				 }
+			}
+		}
+		Boolean bl=false;
+		boolean en=BattinfGroupFactory.backup_battinf();
+		if(en){
+			bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
+		}else{
+			return false;
+		}
+		(new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+		return bl;
+		
+	}
+
+	public boolean del(Object obj) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+    
+	public List searchAll() {
+		
+		return null;
+	}
+	//鏌ヨ鍑烘墍鏈夐渶瑕佺‘璁ょ殑鐢宠
+	public List serchByCondition(Object obj) {
+		Battinf_apply bapply=(Battinf_apply) obj;
+		BattInf b=bapply.getBinf();
+		Page page=b.getPage();
+		Connection conn=DBUtil.getConn();
+		String numberSql=" SELECT FOUND_ROWS() number";
+		String sql=" select SQL_CALC_FOUND_ROWS distinct num,apply_uid,confrim_uid,apply_date,apply_en,apply_note,StationId,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FbsDeviceId,FbsDeviceIp_YM,FbsDeviceIp_WG,FbsDeviceIp"+
+			     ",FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +
+				 ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,install_user,DisCurrMax,station_phone " +
+				" from db_battinf.tb_battinf_apply " +
+				" where apply_en=0  and stationName1 like ? and stationName2 like ? and stationId like ? and stationName5 like ? " +
+				" limit ?,? ";
+		List<Battinf_apply> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+b.getStationName1()+"%","%"+b.getStationName2()+"%","%"+b.getStationId()+"%","%"+b.getStationName5()+"%",(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list=new ArrayList();
+				try {
+					while(rs.next()){
+						Battinf_apply apply=new Battinf_apply();
+						apply.setNum(rs.getInt("num"));
+						apply.setApply_uid(rs.getInt("apply_uid"));
+						apply.setConfrim_uid(rs.getInt("confrim_uid"));
+						apply.setApply_en(rs.getInt("apply_en"));
+						apply.setApply_date(rs.getTimestamp("apply_date"));
+						apply.setApply_note(rs.getString("apply_note"));
+						
+						BattInf binf=new BattInf();
+						binf.setStationId(rs.getString("stationId"));
+						binf.setStationName(rs.getString("stationName"));
+						binf.setStationName1(rs.getString("stationName1"));
+						binf.setStationName2(rs.getString("stationName2"));
+						binf.setStationName3(rs.getString("stationName3"));
+						binf.setStationName4(rs.getString("stationName4"));
+						binf.setStationName5(rs.getString("stationName5"));
+						binf.setStationIp(rs.getString("stationIp"));
+						binf.setFBSDeviceId(rs.getInt("fBSDeviceId"));
+						
+						binf.setFbsDeviceIp(rs.getString("fbsDeviceIp"));
+						binf.setFbsDeviceIp_YM(rs.getString("fbsDeviceIp_YM"));
+						binf.setFbsDeviceIp_WG(rs.getString("fbsDeviceIp_WG"));
+						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.setFloatVolLevel(rs.getFloat("floatVolLevel"));
+						binf.setOfflineVolLevel(rs.getFloat("offlineVolLevel"));
+						binf.setBattFloatCurrent(rs.getFloat("battFloatCurrent"));
+						binf.setMonCount(rs.getInt("monCount"));
+						binf.setMonCapStd(rs.getFloat("monCapStd"));
+						binf.setMonVolStd(rs.getFloat("monVolStd"));
+						binf.setMonResStd(rs.getFloat("monResStd"));
+						binf.setMonSerStd(rs.getFloat("monSerStd"));
+						binf.setMonVolLowToAvg(rs.getFloat("monVolLowToAvg"));
+						binf.setBattProducer(rs.getString("battProducer"));
+						binf.setBattModel(rs.getString("battModel"));
+						binf.setBattProductDate(rs.getDate("battProductDate"));
+						binf.setBattInUseDate(rs.getDate("battInUseDate"));
+						binf.setLoad_curr(rs.getFloat("load_curr"));
+						binf.setInstall_user(rs.getString("install_user"));
+                        binf.setDisCurrMax(rs.getFloat("disCurrMax"));
+                        binf.setStation_phone(rs.getString("station_phone"));
+                        
+						apply.setBinf(binf);
+						list.add(apply);
+						
+					}
+				} catch (SQLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				return list;
+			}
+		});
+		//鍘绘帀limit鏉′欢鍚庣殑鎬绘暟
+		int number=LimitNumberFactory.GetLimtitNumber(conn, numberSql);
+		//System.out.println("number: "+number);
+		if(list!=null&&list.size()>0){
+			list.get(list.size()-1).setNum(number);
+		}
+		return list;
+	}
+	//鏌ヨ鍑哄綋鍓嶅瓨鍦ㄥ唴瀛樹腑鏈�澶х殑璁惧鐨刬d(寰堥噸瑕�**********)
+	public int searchMaxdevId_apply(){
+		String sql="select max(FbsDeviceId) as id  from db_battinf.tb_battinf_apply limit 1";
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null, new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list=new ArrayList();
+				try {
+					while(rs.next()){
+						int dev_id=0;
+						if(rs.getString("id")!=null){}
+						dev_id=rs.getInt("id");
+						list.add(dev_id);
+					}
+				} catch (SQLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				return list;
+			}
+		});
+		int dev_id=0;
+		if(list!=null&&list.size()>0){
+			dev_id=(Integer) list.get(list.size()-1);
+		}
+		return dev_id;
+	}
+	public List serchByInfo(Object obj) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+    public static void main(String[] args) throws ParseException {
+    	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		Date date1 = sdf.parse("2000-01-01 00:00:00");
+		Date date2 = sdf.parse("2020-01-01 23:59:59");
+		Battinf_applyImpl bimpl=new Battinf_applyImpl();
+		Battinf_apply bapply=new Battinf_apply();
+		bapply.setApply_date(ActionUtil.getSimpDate(date2));
+		bapply.setApply_uid(1002);
+		
+		
+		BattInf binf=new BattInf();
+		binf.setStationName1("婀栧寳鐪�");
+		binf.setStationName2("姝︽眽甯�");
+		binf.setStationName3("鑽嗛棬甯�");
+		binf.setStationName4("BTS璁惧");
+		binf.setStationName5("閽熺ゥ");
+		binf.setStationId("4011100");
+		binf.setStationIp("");
+		binf.setFBSDeviceId(910001000);
+		binf.setFbsDeviceIp("127.0.0.1");
+		binf.setFbsDeviceIp_YM("255.255.255.0");
+		binf.setFbsDeviceIp_WG("127.0.0.1");
+		binf.setFBSDeviceName("璁惧鍚嶇О");
+		binf.setGroupIndexInFBSDevice(1); 
+		binf.setBattGroupId(1000005); 
+		binf.setBattGroupNum(2); 
+		binf.setBattGroupName("鐢垫睜缁�1");
+		binf.setFloatVolLevel(54f);
+		binf.setOfflineVolLevel(42.9f ); 
+		binf.setBattFloatCurrent(10f); 
+		binf.setMonCount(24); 
+		binf.setMonCapStd(300f); 
+		binf.setMonVolStd(2f); 
+		binf.setMonResStd(0.2f); 
+		binf.setMonSerStd(5000f); 
+		binf.setMonVolLowToAvg(0.05f ); 
+		binf.setLoad_curr(15f); 
+		binf.setDisCurrMax(39.5f);
+		binf.setStation_phone("12345678912"); 
+		binf.setBattProducer("");
+		binf.setBattModel(""); 
+		binf.setBattProductDate(ActionUtil.getSimpDate(date1));
+		binf.setBattInUseDate(ActionUtil.getSimpDate(date2));
+		binf.setInstall_user("");
+
+		Page page=new Page();
+		page.setPageCurr(1);
+		page.setPageSize(10);
+		binf.setPage(page);
+		bapply.setBinf(binf);
+		/*List list=bimpl.serchByCondition(bapply);
+		System.out.println(list.size());*/
+		/*List list=new ArrayList();
+		list.add(bapply);
+		boolean bl=bimpl.add(list);
+		System.err.println(bl);*/
+		int dev_id=BattinfGroupFactory.searchmaxdev_id();
+		System.out.println(dev_id);
+	}
+}
diff --git a/gx_tieta/src/com/fgkj/dto/Battinf_apply.java b/gx_tieta/src/com/fgkj/dto/Battinf_apply.java
new file mode 100644
index 0000000..acc61b7
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/dto/Battinf_apply.java
@@ -0,0 +1,64 @@
+package com.fgkj.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Battinf_apply implements Serializable{
+	 private int num;
+	 private int apply_uid;
+	 private int confrim_uid;
+	 private Date apply_date;
+	 private int apply_en;
+	 private String apply_note;
+	 private BattInf binf;
+	public int getNum() {
+		return num;
+	}
+	public void setNum(int num) {
+		this.num = num;
+	}
+	public int getApply_uid() {
+		return apply_uid;
+	}
+	public void setApply_uid(int apply_uid) {
+		this.apply_uid = apply_uid;
+	}
+	public int getConfrim_uid() {
+		return confrim_uid;
+	}
+	public void setConfrim_uid(int confrim_uid) {
+		this.confrim_uid = confrim_uid;
+	}
+	public Date getApply_date() {
+		return apply_date;
+	}
+	public void setApply_date(Date apply_date) {
+		this.apply_date = apply_date;
+	}
+	public int getApply_en() {
+		return apply_en;
+	}
+	public void setApply_en(int apply_en) {
+		this.apply_en = apply_en;
+	}
+	public String getApply_note() {
+		return apply_note;
+	}
+	public void setApply_note(String apply_note) {
+		this.apply_note = apply_note;
+	}
+	public BattInf getBinf() {
+		return binf;
+	}
+	public void setBinf(BattInf binf) {
+		this.binf = binf;
+	}
+	@Override
+	public String toString() {
+		return "Battinf_apply [num=" + num + ", apply_uid=" + apply_uid
+				+ ", confrim_uid=" + confrim_uid + ", apply_date=" + apply_date
+				+ ", apply_en=" + apply_en + ", apply_note=" + apply_note
+				+ ", binf=" + binf + "]";
+	}
+	 
+}
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index 72477ae..6dcb6f0 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -1015,7 +1015,15 @@
 		model.setMsg("鏌ヨ鎴愬姛!");
 		return model;
     }
-	public static void main(String[] args) {
+	
+    //娣诲姞鎿嶄綔鏃舵煡璇㈠嚭璁惧id
+    public ServiceModel searchmaxdev_id(){
+    	int dev_id=BattinfGroupFactory.searchmaxdev_id();
+    	model.setData(dev_id);
+    	return model;
+    }
+    
+    public static void main(String[] args) {
 		//new BattInfServices().findMenu();
 		BattInf b=new BattInf();
 		//b.setBattGroupId(1000005);
diff --git a/gx_tieta/src/com/fgkj/services/Battinf_applyService.java b/gx_tieta/src/com/fgkj/services/Battinf_applyService.java
new file mode 100644
index 0000000..f174cb7
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/services/Battinf_applyService.java
@@ -0,0 +1,43 @@
+package com.fgkj.services;
+
+import java.util.List;
+
+import com.fgkj.dao.BaseDAO;
+import com.fgkj.dao.BaseDAOFactory;
+import com.fgkj.dto.ServiceModel;
+
+public class Battinf_applyService {
+
+	private ServiceModel model;
+	private BaseDAO dao;
+	public Battinf_applyService() {
+		super();
+		model=new ServiceModel();
+		dao=BaseDAOFactory.getBaseDAO(BaseDAO.BATTINF_APPLY);
+	}
+	//纭鐢宠(澶氭潯)
+	public ServiceModel update(Object obj){
+		boolean bl=dao.update(obj);
+		if(bl){
+			model.setCode(1);
+			model.setMsg("纭鎴愬姛!");
+		}else{
+			model.setCode(0);
+			model.setMsg("纭疄澶辫触!");
+		}
+		return model;
+	}
+	
+	 //娣诲姞鐢宠
+	public ServiceModel add(Object obj){
+		boolean bl=dao.add(obj);
+		if(bl){
+			model.setCode(1);
+			model.setMsg("纭鎴愬姛!");
+		}else{
+			model.setCode(0);
+			model.setMsg("纭疄澶辫触!");
+		}
+		return model;
+	}
+}

--
Gitblit v1.9.1