修改

81041

2018-12-13 e22fd0bac62d20d94e58409ea15049c67f6ff1eb

 gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java

@@ -133,7 +133,7 @@
   //9.1查询已经添加物理信息的机房(用户管理的,l查询全部打开页面)

   public List serchInBattMapByUid(Object obj) {

      User_inf uinf=(User_inf) 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,db_battinf.tb_battinf.monvolstd  " +

            "  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 (" +

@@ -158,6 +158,7 @@
                  binformation.setLatitude(rs.getDouble("latitude"));

                  binformation.setInformation(rs.getString("information"));

                  binformation.setFBSDeviceId(rs.getInt("fBSDeviceId"));

                  binformation.setMonvolstd(rs.getFloat("monvolstd")); //表明设备是2V还是12V

                  list.add(binformation);

               }

            } catch (SQLException e) {

@@ -175,7 +176,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,db_battinf.tb_battinf.station_install  " +

      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,db_battinf.tb_battinf.monvolstd  " +

            "  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 (" +

@@ -203,6 +204,7 @@
                  binformation.setInformation(rs.getString("information"));

                  binformation.setFBSDeviceId(rs.getInt("fBSDeviceId"));

                  binformation.setInformation(rs.getString("station_install"));

                  binformation.setMonvolstd(rs.getFloat("monvolstd")); //表明设备是2V还是12V

                  Page p=new Page();

                  binformation.setPage(p);

                  list.add(binformation);