Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git ...

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2019-01-18 864e4772eea5e0a589b6f6797d0695a3b3dd225e

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

@@ -51,7 +51,14 @@
         binformation.getAddress(),binformation.getLongitude(),binformation.getLatitude()});

      return bl;

   }



    //9.1录入机房信息(手机端)

   public boolean replace(Object obj) {

      BattMap_information binformation=(BattMap_information) obj;

      String sql="replace into web_site.tb_battmap_information(StationId,StationName,address,longitude,latitude) values(?,?,?,?,?)";

      Boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{binformation.getStationId(),binformation.getStationName(),

         binformation.getAddress(),binformation.getLongitude(),binformation.getLatitude()});

      return bl;

   }

   public boolean update(Object obj) {

      BattMap_information binformation=(BattMap_information) obj;

      String sql="update web_site.tb_battmap_information set StationId=?,StationName=?,address=?,longitude=?,latitude=?,information=? where num=?";

@@ -133,7 +140,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 +165,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 +183,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 +211,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);

@@ -225,7 +234,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,tb_battinf.stationName1,tb_battinf.stationName2,tb_battinf.stationName3  " +

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

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

@@ -249,6 +258,7 @@
                  binformation.setStationName1(rs.getString("stationName1"));

                  binformation.setStationName2(rs.getString("stationName2"));

                  binformation.setStationName3(rs.getString("stationName3"));

                  binformation.setStationName5(rs.getString("stationName5"));

                  binformation.setAddress(rs.getString("address"));

                  binformation.setLongitude(rs.getDouble("longitude"));

                  binformation.setLatitude(rs.getDouble("latitude"));