81041
2018-12-26 e3e09bc29f2ddc1600e27a8d0ec12981215e68b2
gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
@@ -94,7 +94,7 @@
            int uid=((User_inf)ActionUtil.getUser()).getUId();
             bapply.setApply_uid(uid);
            BattInf binf=bapply.getBinf();
            String sql = "insert into db_battinf.tb_battinf_apply(" +
            String sql = "replace 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" +
@@ -172,6 +172,8 @@
            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 battgroupid="+binf.getBattGroupId();
             sql_str.add(sql_update_apply);
             String sql_replace_map=" replace into web_site.tb_battmap_information(StationId,StationName,address,longitude,latitude) values('"+binf.getStationId()+"','"+binf.getStationName()+"','"+bapply.getAddress()+"',"+bapply.getLongitude()+","+bapply.getLatitude()+")";
             sql_str.add(sql_replace_map);
             {
               String msg="验收"+binf.getStationName()+"机房";
               User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
@@ -192,7 +194,7 @@
         for (int i = 0; i < list.size(); i++) {
            Battinf_apply bapply=list.get(i);
            BattInf binf=bapply.getBinf();
            String sql_update_apply=" update db_battinf.tb_battinf_apply set check_en=2 where battgroupid="+binf.getBattGroupId();
            String sql_update_apply=" update db_battinf.tb_battinf_apply set check_en=2,longitude="+bapply.getLongitude()+",latitude="+bapply.getLatitude()+",address='"+bapply.getAddress()+"' where battgroupid="+binf.getBattGroupId();
             sql_str.add(sql_update_apply);
             {
               String msg="申请验收"+binf.getStationName()+"机房";
@@ -280,7 +282,8 @@
      String numberSql=" SELECT FOUND_ROWS() number";
      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 " +
             ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,install_user,DisCurrMax,station_phone "
             + ",longitude,latitude,address " +
            " from db_battinf.tb_battinf_apply " +
            " where apply_en=?  order by apply_date desc" +
            " limit ?,? ";
@@ -302,6 +305,9 @@
                  apply.setCheck_uname((new User_infImpl()).changeUidToUname(apply.getCheck_uid()));
                  apply.setApply_date(rs.getTimestamp("apply_date"));
                  apply.setApply_note(rs.getString("apply_note"));
                  apply.setLongitude(rs.getDouble("longitude"));
                  apply.setLatitude(rs.getDouble("latitude"));
                  apply.setAddress(rs.getString("address"));
                  
                  BattInf binf=new BattInf();
                  binf.setStationId(rs.getString("stationId"));
@@ -711,7 +717,7 @@
   }
    //申请表中已审批通过的设备连接数
   public List devCommNum() {
      String sql=" select  distinct db_battinf.tb_battinf_apply.FbsDeviceId,dev_commcount " +
      String sql=" select  distinct db_battinf.tb_battinf_apply.FbsDeviceId,dev_commcount,dev_errcommcount " +
            " 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" ;
@@ -725,6 +731,7 @@
                  Fbs9100_state fbs=new Fbs9100_state();
                  fbs.setDev_id(rs.getInt("FbsDeviceId"));
                  fbs.setDev_commcount(rs.getInt("dev_commcount"));
                  fbs.setDev_errcommcount(rs.getInt("dev_errcommcount"));
                  list.add(fbs);
               }
            } catch (SQLException e) {