From 757865dcd922043d6ad407af647eaab5c2835dfb Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 13 十二月 2018 16:38:34 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 57 +++++++++++++++++++++++-----
gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java | 53 +++++++++++++++++++++++---
2 files changed, 94 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 1fad757..5e914c2 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -114,7 +114,7 @@
if(list!=null&&list.size()>0){
for (int i = 0; i < list.size(); i++) {
BattInf binf=list.get(i);
- //楠岃瘉鏂版坊鍔犵殑鏈烘埧鏄惁瀛樺湪
+ /*//楠岃瘉鏂版坊鍔犵殑鏈烘埧鏄惁瀛樺湪
List listS=(new BattInfImpl()).judgeBatt(binf);
if(listS!=null&&listS.size()>0){
binf.setStationId((String) listS.get(listS.size()-1));
@@ -122,15 +122,25 @@
//鑾峰彇褰撳墠鏈�澶х殑stationid
int maxs=BattinfGroupFactory.searchStationId();
binf.setStationId(String.valueOf(maxs));
- /*if(maxList!=null&&maxList.size()>0){
+ 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()+"',"
+ }
+ }*/
+ /*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()+"," +
"MonCount="+binf.getMonCount()+",MonCapStd="+binf.getMonCapStd()+",monVolStd="+binf.getMonVolStd()+",monResStd="+binf.getMonResStd()+",MonSerStd="+binf.getMonSerStd()+",MonVolLowToAvg="+binf.getMonVolLowToAvg()+",BattProducer='"+binf.getBattProducer()+"',BattModel='"+binf.getBattModel()+"',BattProductDate='"+DAOHelper.sdf.format(binf.getBattProductDate())+"',BattInUseDate='"+DAOHelper.sdf.format(binf.getBattInUseDate())+"', "
- +" Load_curr="+binf.getLoad_curr()+",install_user='"+binf.getInstall_user()+"',DisCurrMax="+binf.getDisCurrMax()+",station_phone='"+binf.getStation_phone()+"',Station_install="+binf.getStation_install()+" where battgroupId="+binf.getBattGroupId();
+ +" Load_curr="+binf.getLoad_curr()+",install_user='"+binf.getInstall_user()+"',DisCurrMax="+binf.getDisCurrMax()+",station_phone='"+binf.getStation_phone()+"',Station_install="+binf.getStation_install()+" where battgroupId="+binf.getBattGroupId();*/
+ String sql = "replace into db_battinf.tb_battinf(" +
+ "StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,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.getStationName()+"','"+binf.getStationName1()+"','"+binf.getStationName2()+"','"+binf.getStationName3()+"','"+binf.getStationName4()+"','"+binf.getStationName5()+
+ "','"+binf.getStationIp()+"','"+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);
{
String msg="淇敼"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑淇℃伅";
@@ -139,7 +149,6 @@
}
}
}
-
Boolean bl=false;
boolean en=BattinfGroupFactory.backup_battinf();
@@ -462,6 +471,32 @@
}
});
return list;
+ }
+ //鍒ゆ柇鏂板鐨勭數姹犵粍鏄惁瀛樺湪
+ public boolean judgeBattInOrNot(Object obj){
+ BattInf binf=(BattInf) obj;
+ String sql="select distinct stationid from db_battinf.tb_battinf where stationname=? limit 1";
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getStationName()}, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ String stationid=rs.getString("stationid");
+ list.add(stationid);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ if(list!=null&&list.size()>0){
+ return true;
+ }else{
+ return false;
+ }
}
//0.4鏍规嵁鍩庡競鍚嶇О鏌ョ數姹犵粍
public List search(Object obj){
@@ -4313,7 +4348,7 @@
BattInf binf = new BattInf();
binf.setNum(1002);
binf.setBattGroupId(1000001);
- binf.setStationName("");
+ binf.setStationName("骞胯タ鐪�-鐧捐壊-GX鐧捐壊涔愪笟鍘跨珛鏂板皬鍖篧F-BTS璁惧");
binf.setStationName1("");
binf.setStationName2("");
binf.setStationName3("");
@@ -4354,8 +4389,10 @@
System.out.println(b);
}
System.out.println(list.size());*/
- int nums=biml.serchByInstall_count(uinf);
- System.out.println(nums);
+ /*int nums=biml.serchByInstall_count(uinf);
+ System.out.println(nums);*/
+ boolean bl=biml.judgeBattInOrNot(binf);
+ System.out.println(bl);
}
public List getResults(ResultSet rs) {
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
index 1ece33f..315a3ba 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
@@ -91,7 +91,7 @@
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();
+ String sql_update_apply=" update db_battinf.tb_battinf_apply set confrim_uid="+bapply.getConfrim_uid()+",apply_en=1 where battgrouoid="+binf.getBattGroupId();
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,"
@@ -132,11 +132,21 @@
bapply.setConfrim_uid(((User_inf)ActionUtil.getUser()).getUId());
BattInf binf=bapply.getBinf();
//System.out.println(binf);
- String sql_update_apply= "update db_battinf.tb_battinf_apply set StationName='"+binf.getStationName()+"',StationName1='"+binf.getStationName1()+"',StationName2='"+binf.getStationName2()+"',StationName3='"+binf.getStationName3()+"',StationName4='"+binf.getStationName4()+"',StationName5='"+binf.getStationName5()+"',StationIp='"+binf.getStationIp()+"',"
+ /* String sql_update_apply= "update db_battinf.tb_battinf_apply set StationName='"+binf.getStationName()+"',StationName1='"+binf.getStationName1()+"',StationName2='"+binf.getStationName2()+"',StationName3='"+binf.getStationName3()+"',StationName4='"+binf.getStationName4()+"',StationName5='"+binf.getStationName5()+"',StationIp='"+binf.getStationIp()+"',"
+ "FBSDeviceName='"+binf.getFBSDeviceName()+"',GroupIndexInFBSDevice="+binf.getGroupIndexInFBSDevice()+",BattGroupNum="+binf.getBattGroupNum()+",BattGroupName='"+binf.getBattGroupName()+"',FloatVolLevel="+binf.getFloatVolLevel()+",OfflineVolLevel="+binf.getOfflineVolLevel()+",BattFloatCurrent="+binf.getBattFloatCurrent()+"," +
"MonCount="+binf.getMonCount()+",MonCapStd="+binf.getMonCapStd()+",monVolStd="+binf.getMonVolStd()+",monResStd="+binf.getMonResStd()+",MonSerStd="+binf.getMonSerStd()+",MonVolLowToAvg="+binf.getMonVolLowToAvg()+",BattProducer='"+binf.getBattProducer()+"',BattModel='"+binf.getBattModel()+"',BattProductDate='"+DAOHelper.sdf.format(binf.getBattProductDate())+"',BattInUseDate='"+DAOHelper.sdf.format(binf.getBattInUseDate())+"', "
+" Load_curr="+binf.getLoad_curr()+",install_user='"+binf.getInstall_user()+"',DisCurrMax="+binf.getDisCurrMax()+",station_phone='"+binf.getStation_phone()+"' where num="+bapply.getNum();
- sql_str.add(sql_update_apply);
+ */
+ String sql_update_apply = "replace into db_battinf.tb_battinf_apply(" +
+ ",StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,"
+ + "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('"+binf.getStationName()+"','"+binf.getStationName1()+"','"+binf.getStationName2()+"','"+binf.getStationName3()+"','"+binf.getStationName4()+"','"+binf.getStationName5()+
+ "','"+binf.getStationIp()+"','"+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()+"')";
+ sql_str.add(sql_update_apply);
{
String msg="淇敼鐢宠鐨�"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑淇℃伅";
User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
@@ -158,7 +168,7 @@
for (int i = 0; i < list.size(); i++) {
Battinf_apply bapply=list.get(i);
BattInf binf=bapply.getBinf();
- String sql_del_apply=" delete from db_battinf.tb_battinf_apply where num="+bapply.getNum();
+ String sql_del_apply=" delete from db_battinf.tb_battinf_apply where battgroupid="+binf.getBattGroupId();
sql_str.add(sql_del_apply);
{
String msg="鍙栨秷"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑鐢宠";
@@ -506,6 +516,33 @@
});
return list;
}
+ //鍒ゆ柇鏂板鐨勭數姹犵粍鏄惁瀛樺湪
+ public boolean judgeBattInOrNot(Object obj){
+ BattInf binf=(BattInf) obj;
+ String sql="select distinct stationid from db_battinf.tb_battinf_apply where stationname=? limit 1";
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getStationName()}, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ String stationid=rs.getString("stationid");
+ list.add(stationid);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ if(list!=null&&list.size()>0){
+ return true;
+ }else{
+ return false;
+ }
+ }
+
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");
@@ -517,11 +554,13 @@
BattInf binf=new BattInf();
+ binf.setStationName("骞胯タ鐪�-鐧捐壊-GX鐧捐壊涔愪笟鍘跨珛鏂板皬鍖篧F-BTS璁惧");
binf.setStationName1("婀栧寳鐪�");
binf.setStationName2("鑽嗛棬甯�");
binf.setStationName3("娴嬭瘯璁惧鏈烘埧2");
binf.setStationName4("BTS璁惧");
binf.setStationName5("娌欐磱鍘�");
+
binf.setStationId("4011100");
binf.setStationIp("");
binf.setFBSDeviceId(910001000);
@@ -558,15 +597,17 @@
bapply.setBinf(binf);
/*List list=bimpl.serchByCondition(page);
System.out.println(list.size());*/
- List list=new ArrayList();
+ /*List list=new ArrayList();
list.add(bapply);
boolean bl=bimpl.add(list);
- System.err.println(bl);
+ System.err.println(bl);*/
/*int dev_id=BattinfGroupFactory.searchmaxdev_id();
System.out.println(dev_id);
int station_id=BattinfGroupFactory.searchStationId();
System.out.println(station_id);
int battgroup_id=BattinfGroupFactory.searchMaxBattgroupId();
System.out.println(battgroup_id);*/
+ boolean bl=bimpl.judgeBattInOrNot(binf);
+ System.out.println(bl);
}
}
--
Gitblit v1.9.1