LiJun
2018-10-26 6323632c50a2f74ae7dd68330ee9e497d5ca939b
gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
@@ -175,7 +175,7 @@
      int uid=page.getPageAll();
      Connection conn=DBUtil.getConn();
      String numberSql="SELECT FOUND_ROWS() number";//存放总数
      String sql="select SQL_CALC_FOUND_ROWS distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId  " +
      String sql="select SQL_CALC_FOUND_ROWS distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.station_install  " +
            "  from web_site.tb_battmap_information,db_battinf.tb_battinf " +
            "  where  tb_battmap_information.StationId=db_battinf.tb_battinf.StationId " +
            "  and tb_battmap_information.StationId in (" +
@@ -184,7 +184,7 @@
            "  left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.stationid=db_battinf.tb_battinf.stationid " +
            "  left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
            "  left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
            "  where db_user.tb_user_inf.uid=?  )  " +
            "  where db_user.tb_user_inf.uid=?  and tb_battinf.station_install=true)  " +
            "  order by tb_battmap_information.StationId "+
            "  limit ?,?  " ;
      List<BattMap_information> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{uid,(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
@@ -202,6 +202,7 @@
                  binformation.setLatitude(rs.getDouble("latitude"));
                  binformation.setInformation(rs.getString("information"));
                  binformation.setFBSDeviceId(rs.getInt("fBSDeviceId"));
                  binformation.setInformation(rs.getString("station_install"));
                  Page p=new Page();
                  binformation.setPage(p);
                  list.add(binformation);
@@ -224,7 +225,7 @@
   //9.1查询已经添加物理信息的机房(用户管理的,3.根据具体id查询告警信息等)
   public List serchInBattMapByUid3(Object obj) {
      BattMap_information binfor=(BattMap_information) obj;
      String sql="select distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId  " +
      String sql="select distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId,tb_battinf.stationName1,tb_battinf.stationName2,tb_battinf.stationName3  " +
            "  from web_site.tb_battmap_information,db_battinf.tb_battinf " +
            "  where  tb_battmap_information.StationId=db_battinf.tb_battinf.StationId " +
            "  and tb_battmap_information.StationId in (" +
@@ -245,6 +246,9 @@
                  binformation.setNum(rs.getInt("num"));
                  binformation.setStationId(rs.getString("stationId"));
                  binformation.setStationName(rs.getString("stationName"));
                  binformation.setStationName1(rs.getString("stationName1"));
                  binformation.setStationName2(rs.getString("stationName2"));
                  binformation.setStationName3(rs.getString("stationName3"));
                  binformation.setAddress(rs.getString("address"));
                  binformation.setLongitude(rs.getDouble("longitude"));
                  binformation.setLatitude(rs.getDouble("latitude"));