From e6127f8fc2e32360366315e02668ed06483c31e6 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.7>
Date: 星期一, 03 十二月 2018 16:16:32 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 4b6c4c8..0ef3f65 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -17,6 +17,7 @@
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.FBS9100_ComBase;
@@ -53,11 +54,12 @@
//鑾峰彇褰撳墠鏈�澶х殑stationid鍜宐attgroupid
int maxs=42000000;//鏈�澶tationid
int maxb=1000001;//鏈�澶attgroupid
- List maxList=(new BattInfImpl()).searchMaxId();
- if(maxList!=null&&maxList.size()>0){
+ maxs=BattinfGroupFactory.searchStationId();
+ maxb=BattinfGroupFactory.searchMaxBattgroupId();
+ /*if(maxList!=null&&maxList.size()>0){
maxs=(Integer) maxList.get(0)+1;
- maxb=(Integer) maxList.get(1)+1;
- }
+ //maxb=(Integer) maxList.get(1)+1;
+ }*/
if(list!=null && list.size()>0){
for (int i = 0; i < list.size(); i++) {
BattInf binf=list.get(i);
@@ -110,11 +112,12 @@
binf.setStationId((String) listS.get(listS.size()-1));
}else{
//鑾峰彇褰撳墠鏈�澶х殑stationid
- List maxList=(new BattInfImpl()).searchMaxId();
- if(maxList!=null&&maxList.size()>0){
+ int maxs=BattinfGroupFactory.searchStationId();
+ binf.setStationId(String.valueOf(maxs));
+ /*if(maxList!=null&&maxList.size()>0){
int maxs=(Integer) maxList.get(0)+1;
binf.setStationId(String.valueOf(maxs));
- }
+ }*/
}
String sql = "update db_battinf.tb_battinf set StationId='"+binf.getStationId()+"',StationName='"+binf.getStationName()+"',StationName1='"+binf.getStationName1()+"',StationName2='"+binf.getStationName2()+"',StationName3='"+binf.getStationName3()+"',StationName4='"+binf.getStationName4()+"',StationName5='"+binf.getStationName5()+"',StationIp='"+binf.getStationIp()+"',FBSDeviceId="+binf.getFBSDeviceId()+",FbsDeviceIp='"+binf.getFbsDeviceIp()+"',"
+ "FBSDeviceName='"+binf.getFBSDeviceName()+"',GroupIndexInFBSDevice="+binf.getGroupIndexInFBSDevice()+",BattGroupNum="+binf.getBattGroupNum()+",BattGroupName='"+binf.getBattGroupName()+"',FloatVolLevel="+binf.getFloatVolLevel()+",OfflineVolLevel="+binf.getOfflineVolLevel()+",BattFloatCurrent="+binf.getBattFloatCurrent()+"," +
@@ -354,8 +357,9 @@
return list;
}
//娣诲姞鐢垫睜缁勬椂鏌ヨ鍑烘渶澶х殑鏈烘埧id鍜岀數姹犵粍id
- public List searchMaxId(){
- String sql="select max(stationid) as maxs,max(battgroupid) as maxb from db_battinf.tb_battinf limit 1";
+ public int searchMaxId(){
+ //,max(battgroupid) as maxb
+ String sql="select max(stationid) as stationid_maxs from db_battinf.tb_battinf limit 1";
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null, new CallBack() {
public List getResults(ResultSet rs) {
@@ -364,15 +368,15 @@
while(rs.next()){
int maxs=42000000;
- int maxb=1000001;
- if(rs.getString("maxs") != null){
- maxs=Integer.parseInt(rs.getString("maxs"));
+ //int maxb=1000001;
+ if(rs.getString("stationid_maxs") != null){
+ maxs=Integer.parseInt(rs.getString("stationid_maxs"));
}
- if(rs.getInt("maxb")!=0){
+ /*if(rs.getInt("maxb")!=0){
maxb=rs.getInt("maxb");
- }
+ }*/
list.add(maxs);
- list.add(maxb);
+ //list.add(maxb);
}
} catch (SQLException e) {
// TODO Auto-generated catch block
@@ -381,7 +385,11 @@
return list;
}
});
- return list;
+ int stationid=0;
+ if(list!=null&&list.size()>0){
+ stationid=(Integer) list.get(list.size()-1);
+ }
+ return stationid;
}
//鍒ゆ柇鏂板鐨勭數姹犵粍鏄惁瀛樺湪
public List judgeBatt(Object obj){
--
Gitblit v1.9.1