From a49681949ab3d63f2051623a9d6ea32b063817a6 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@192.168.10.33>
Date: 星期四, 13 十二月 2018 15:25:06 +0800
Subject: [PATCH] FWFW
---
gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java | 42 ++++++++++++++----------------------------
1 files changed, 14 insertions(+), 28 deletions(-)
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 d5f8908..1ece33f 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
@@ -41,8 +41,8 @@
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);*/
+ int uid=((User_inf)ActionUtil.getUser()).getUId();
+ bapply.setApply_uid(uid);
BattInf binf=bapply.getBinf();
//楠岃瘉鏂版坊鍔犵殑鏈烘埧鏄惁瀛樺湪
List listS=(new BattInfImpl()).judgeBatt(binf);
@@ -67,21 +67,16 @@
}
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);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ Boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
+
+ (new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
return bl;
}
@@ -136,25 +131,21 @@
Battinf_apply bapply=list.get(i);
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()+"',"
+ "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();
+ +" 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 msg="淇敼"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑淇℃伅";
+ String msg="淇敼鐢宠鐨�"+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;
- }
+ Boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
+
(new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
return bl;
}
@@ -176,13 +167,8 @@
}
}
}
- Boolean bl=false;
- boolean en=BattinfGroupFactory.backup_battinf();
- if(en){
- bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
- }else{
- return false;
- }
+ Boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
+
(new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
return bl;
}
--
Gitblit v1.9.1