didiyu
2019-01-08 5f585252c155d62109a937563285e36d32b1b0de
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -4602,12 +4602,15 @@
      //Page page=binf.getPage();
      /*Connection conn=DBUtil.getConn();
      String numberSql=" SELECT FOUND_ROWS() number";SQL_CALC_FOUND_ROWS*/
      String sql=" select  distinct(StationId),StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,"
            + "FBSDeviceName,battGroupNum" +
             ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,Load_curr,DisCurrMax,montmpstd,floatVolLevel,offlineVolLevel,battFloatCurrent"
             + ",db_ram_db.tb_fbs9100_state.dev_version  "
            + " from db_battinf.tb_battinf,db_ram_db.tb_fbs9100_state "
      String sql=" select  distinct(tb_battinf.StationId),StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,"
            + "FBSDeviceName,count(FBSDeviceId) as batt_num" +
             ",MonCount,monVolStd,monResStd,MonSerStd,Load_curr,DisCurrMax,montmpstd,floatVolLevel,offlineVolLevel,battFloatCurrent"
             + ",GROUP_CONCAT(tb_battinf.MonCapStd order by groupIndexInFBSDevice separator '/' ) as moncapstds "
             + ",db_ram_db.tb_fbs9100_state.dev_version"
             + ",web_site.tb_batt_endurance.real_cap_group1 ,web_site.tb_batt_endurance.real_cap_group2,web_site.tb_batt_endurance.real_cap_group3,web_site.tb_batt_endurance.real_cap_group4 "
            + " from db_battinf.tb_battinf,db_ram_db.tb_fbs9100_state,web_site.tb_batt_endurance  "
            + " where db_battinf.tb_battinf.FBSDeviceId=db_ram_db.tb_fbs9100_state.dev_id "
            + " and db_battinf.tb_battinf.FBSDeviceId=web_site.tb_batt_endurance.deviceid "
            + "  and MonVolStd=?  and Station_install=1 ";
            //+ "  limit ?,? ";StationName1 like ? and StationName2 like ? and StationName3 like ? and StationName5 like ? "
      //,(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%",
@@ -4634,9 +4637,9 @@
      }
      
      //排序
      String orderSql="  order by StationId asc,GroupIndexInFBSDevice asc ";
      String orderSql=" GROUP BY  FBSDeviceId  order by StationId asc,GroupIndexInFBSDevice asc ";
      sql+=orderSql;
      System.out.println(sql);
      //System.out.println(sql);
      List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[] {binf.getMonVolStd(),binf.getStationName()}, new CallBack() {
         
         @Override
@@ -4660,13 +4663,20 @@
                  binf.setFbsDeviceIp_YM(rs.getString("fbsDeviceIp_YM"));
                  binf.setFbsDeviceIp_WG(rs.getString("fbsDeviceIp_WG"));*/
                  binf.setFBSDeviceName(rs.getString("fBSDeviceName"));
                  binf.setBattGroupNum(rs.getInt("battGroupNum"));
                  binf.setBattGroupNum(rs.getInt("batt_num"));
                  
                  binf.setFloatVolLevel(rs.getFloat("floatVolLevel"));
                  binf.setOfflineVolLevel(rs.getFloat("offlineVolLevel"));
                  binf.setBattFloatCurrent(rs.getFloat("battFloatCurrent"));
                  binf.setMonCount(rs.getInt("monCount"));
                  binf.setMonCapStd(rs.getFloat("monCapStd"));
                  //binf.setMonCapStd(rs.getFloat("monCapStd"));
                  binf.setMoncapstds(rs.getString("moncapstds"));
                  binf.setReal_cap_group1(rs.getFloat("real_cap_group1"));
                  binf.setReal_cap_group2(rs.getFloat("real_cap_group2"));
                  binf.setReal_cap_group3(rs.getFloat("real_cap_group3"));
                  binf.setReal_cap_group4(rs.getFloat("real_cap_group4"));
                  binf.setMonVolStd(rs.getFloat("monVolStd"));
                  binf.setMonResStd(rs.getFloat("monResStd"));
                  binf.setMonSerStd(rs.getFloat("monSerStd"));
@@ -4709,7 +4719,7 @@
      BattInf binf = new BattInf();
      binf.setNum(2);
      binf.setBattGroupId(1000001);
      binf.setStationName("广西省-玉林-玉林玉州区西城里-BTS设备");
      binf.setStationName("百色");
      binf.setStationName1("");
      binf.setStationName2("");
      binf.setStationName3("");