From 14b6f4ba5b54a0da64af36ce5653ee49e025bd23 Mon Sep 17 00:00:00 2001 From: 81041 <81041@DESKTOP-025NVD9> Date: 星期三, 19 十二月 2018 16:27:24 +0800 Subject: [PATCH] 修改验收 --- gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java | 67 +++++++++++++++++++++++++++++++-- 1 files changed, 63 insertions(+), 4 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 758c1e7..10aee51 100644 --- a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java +++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java @@ -22,6 +22,8 @@ import com.fgkj.dto.Page; import com.fgkj.dto.User_inf; import com.fgkj.dto.User_log; +import com.fgkj.dto.ram.FBS9100; +import com.fgkj.dto.ram.Fbs9100_state; import com.fgkj.services.User_logService; public class Battinf_applyImpl implements BaseDAO,CallBack{ @@ -121,6 +123,29 @@ return bl; } + //楠屾敹鐢宠(澶氭潯) + public boolean check(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); + BattInf binf=bapply.getBinf(); + bapply.setCheck_uid(((User_inf)ActionUtil.getUser()).getUId()); + String sql_update_apply=" update db_battinf.tb_battinf_apply set check_uid="+bapply.getCheck_uid()+",check_en=1 where battgrouoid="+binf.getBattGroupId(); + sql_str.add(sql_update_apply); + { + String msg="楠屾敹"+binf.getStationName()+"鏈烘埧"; + User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg); + listU.add(ulog); + } + } + } + Boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str); + (new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵 + return bl; + } //鐢宠浜哄啀鎴戠殑鐢宠椤甸潰鐨勪慨鏀规搷浣� public boolean updatePro(Object obj){ List<Battinf_apply> list=(List<Battinf_apply>) obj; @@ -192,7 +217,7 @@ Page page=(Page) obj; 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"+ + String sql=" select SQL_CALC_FOUND_ROWS distinct num,apply_uid,confrim_uid,check_uid,check_en,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 " + @@ -211,6 +236,9 @@ apply.setConfrim_uid(rs.getInt("confrim_uid")); apply.setConfirm_name((new User_infImpl()).changeUidToUname(apply.getConfrim_uid())); apply.setApply_en(rs.getInt("apply_en")); + apply.setCheck_uid(rs.getInt("check_uid")); + apply.setCheck_en(rs.getInt("check_en")); + apply.setCheck_uname((new User_infImpl()).changeUidToUname(apply.getCheck_en())); apply.setApply_date(rs.getTimestamp("apply_date")); apply.setApply_note(rs.getString("apply_note")); @@ -542,7 +570,34 @@ return false; } } - + //鐢宠琛ㄤ腑宸插鎵归�氳繃鐨勮澶囪繛鎺ユ暟 + public List devCommNum() { + String sql=" select distinct db_battinf.tb_battinf_apply.FbsDeviceId,dev_commcount " + + " from db_battinf.tb_battinf_apply,db_ram_db.tb_fbs9100_state " + + " where apply_en=1 and db_battinf.tb_battinf_apply.FbsDeviceId=db_ram_db.tb_fbs9100_state.dev_id " + + " order by apply_date desc" ; + List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null, new CallBack() { + + @Override + public List getResults(ResultSet rs) { + List list=new ArrayList(); + try { + while(rs.next()) { + Fbs9100_state fbs=new Fbs9100_state(); + fbs.setDev_id(rs.getInt("FbsDeviceId")); + fbs.setDev_commcount(rs.getInt("dev_commcount")); + list.add(fbs); + } + } catch (SQLException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return list; + } + }); + return list; + + } 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"); @@ -607,7 +662,11 @@ System.out.println(station_id); int battgroup_id=BattinfGroupFactory.searchMaxBattgroupId(); System.out.println(battgroup_id);*/ - boolean bl=bimpl.judgeBattInOrNot(binf); - System.out.println(bl); + /*boolean bl=bimpl.judgeBattInOrNot(binf); + System.out.println(bl);*/ + /*List<Fbs9100_state> list=bimpl.devCommNum(); + for (Fbs9100_state f : list) { + System.out.println(f.getDev_id()+" "+f.getDev_commcount()); + }*/ } } -- Gitblit v1.9.1