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

chenjingjing

2018-12-27 14f7839ff1c25cca8d9e7dad4d717973797ff2d9

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

@@ -4378,14 +4378,43 @@
   public List serchByDischarge(Object obj) {

      BattInf binf=(BattInf) obj;

      Page page=binf.getPage();

      Connection conn=DBUtil.getConn();

      String numberSql=" SELECT FOUND_ROWS() number";

      String sql=" select SQL_CALC_FOUND_ROWS * from db_battinf.tb_battinf "

            + "  where StationName1 like ? and StationName2 like ? and StationName3 like ? and StationName5 like ? "

            + "  and GroupIndexInFBSDevice=?   and MonVolStd=? "

            + "  order by StationId asc,GroupIndexInFBSDevice asc "

            + "  limit ?,? ";

      List<BattInf> list=DAOHelper.executeQueryLimit(sql, conn, new Object[] {"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationName5()+"%",binf.getGroupIndexInFBSDevice(),binf.getMonVolStd(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {

      /*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,GroupIndexInFBSDevice,db_battinf.tb_battinf.battgroupId,battGroupName" +

             ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,Load_curr,DisCurrMax"

             + ",db_ram_db.tb_fbs9100_state.dev_version  "

            + " from db_battinf.tb_battinf,db_ram_db.tb_fbs9100_state "

            + " where db_battinf.tb_battinf.FBSDeviceId=db_ram_db.tb_fbs9100_state.dev_id "

            + " and GroupIndexInFBSDevice=?   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()+"%",

      //条件

      String sql0=" and stationid=? "; //具体机房

      String sql1=" and stationname1=? ";//省

      String sql2=" and stationname2=? ";//市

      String sql5=" and stationname5=? ";//区县

      switch (binf.getNum()) {

      case 0:

         sql+=sql0;

         break;

        case 1:

           sql+=sql1;

         break;

        case 2:

           sql+=sql2;

         break;

        case 5:

           sql+=sql5;

          break;

      default:

         return null;

      }

		
      //排序

      String orderSql="  order by StationId asc,GroupIndexInFBSDevice asc ";

      sql+=orderSql;

      List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[] {binf.getGroupIndexInFBSDevice(),binf.getMonVolStd(),binf.getStationName()}, new CallBack() {

         

         @Override

         public List getResults(ResultSet rs) {

@@ -4403,32 +4432,36 @@
                  binf.setStationIp(rs.getString("stationIp"));

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

                  

                  binf.setFbsDeviceIp(rs.getString("fbsDeviceIp"));

                  /*binf.setFbsDeviceIp(rs.getString("fbsDeviceIp"));

                  binf.setFbsDeviceIp_YM(rs.getString("fbsDeviceIp_YM"));

                  binf.setFbsDeviceIp_WG(rs.getString("fbsDeviceIp_WG"));

                  binf.setFbsDeviceIp_WG(rs.getString("fbsDeviceIp_WG"));*/

                  binf.setFBSDeviceName(rs.getString("fBSDeviceName"));

                  binf.setGroupIndexInFBSDevice(rs.getInt("groupIndexInFBSDevice"));

                  binf.setBattGroupId(rs.getInt("battGroupId"));

                  binf.setBattGroupNum(rs.getInt("battGroupNum"));

                  binf.setBattGroupName(rs.getString("battGroupName"));

                  /*binf.setBattGroupNum(rs.getInt("battGroupNum"));

                  binf.setFloatVolLevel(rs.getFloat("floatVolLevel"));

                  binf.setOfflineVolLevel(rs.getFloat("offlineVolLevel"));

                  binf.setBattFloatCurrent(rs.getFloat("battFloatCurrent"));

                  binf.setBattFloatCurrent(rs.getFloat("battFloatCurrent"));*/

                  binf.setMonCount(rs.getInt("monCount"));

                  binf.setMonCapStd(rs.getFloat("monCapStd"));

                  binf.setMonVolStd(rs.getFloat("monVolStd"));

                  binf.setMonResStd(rs.getFloat("monResStd"));

                  binf.setMonSerStd(rs.getFloat("monSerStd"));

                  binf.setMonVolLowToAvg(rs.getFloat("monVolLowToAvg"));

                  /*binf.setMonVolLowToAvg(rs.getFloat("monVolLowToAvg"));

                  binf.setBattProducer(rs.getString("battProducer"));

                  binf.setBattModel(rs.getString("battModel"));

                  binf.setBattProductDate(rs.getDate("battProductDate"));

                  binf.setBattInUseDate(rs.getDate("battInUseDate"));

                  binf.setInstall_user(rs.getString("install_user"));*/

                  binf.setLoad_curr(rs.getFloat("load_curr"));

                  binf.setInstall_user(rs.getString("install_user"));

						
                        binf.setDisCurrMax(rs.getFloat("disCurrMax"));

                        binf.setStation_phone(rs.getString("station_phone"));

                        binf.setStation_install(rs.getInt("station_install"));

                        /*binf.setStation_phone(rs.getString("station_phone"));

                        binf.setStation_install(rs.getInt("station_install"));*/

                        
                        
                        binf.setStationName9(rs.getString("dev_version"));

                  list.add(binf);

               }

            } catch (SQLException e) {

@@ -4438,12 +4471,12 @@
            return list;

         }

      });

      //去掉limit条件后的总数

      /*//去掉limit条件后的总数

      int number=LimitNumberFactory.GetLimtitNumber(conn, numberSql);

      //System.out.println("number: "+number);

      if(list!=null&&list.size()>0){

         list.get(list.size()-1).setNum(number);

      }

      }*/

      return list;

   }



@@ -4452,9 +4485,9 @@
      

      BattInfImpl biml = new BattInfImpl();

      BattInf binf = new BattInf();

      binf.setNum(1002);

      binf.setNum(1);

      binf.setBattGroupId(1000001);

      binf.setStationName("广西省-百色-GX百色乐业县立新小区WF-BTS设备");

      binf.setStationName("广西省");

      binf.setStationName1("");

      binf.setStationName2("百色");

      binf.setStationName3("");