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

LiJun

2018-10-22 18cf7a6b456cb0f401c48ad16b12de1877541558

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

 gx_tieta/src/com/fgkj/actions/BattInfAction.java

@@ -329,6 +329,8 @@
    //电池配组管理(重要)

    public String serchMakeGroup(){

        BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);

        User_inf uinf=(User_inf) getUser();

        binf.setNum(uinf.getUId());

        ServiceModel model = service.serchMakeGroup(binf);

        result = ActionUtil.tojson(model);

        return SUCCESS;

@@ -336,6 +338,8 @@
    //电池配组管理(重要)

    public String serchGroupByInfor(){

        BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);

        User_inf uinf=(User_inf) getUser();

        binf.setNum(uinf.getUId());

        ServiceModel model = service.serchGroupByInfor(binf);

        result = ActionUtil.tojson(model);

        return SUCCESS;


 gx_tieta/src/com/fgkj/actions/BattMap_informationAction.java

@@ -4,6 +4,7 @@


import com.fgkj.dao.UinfDaoFactory;

import com.fgkj.dto.BattMap_information;

import com.fgkj.dto.Page;

import com.fgkj.dto.ServiceModel;

import com.fgkj.dto.User_inf;

import com.fgkj.dto.User_log;

@@ -98,14 +99,31 @@
        result = tojson(model);

        return SUCCESS;

    }

    //9.1首页上查询已经添加物理信息的机房(用户管理的)  包括(告警总数落后总数延迟总数)

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

    public String searchUserManageStation() {

        User_inf uinf=(User_inf) getUser();

        List list = service.searchUserManageStation(uinf);

        ServiceModel model = service.searchUserManageStation(uinf);

        result = tojson(model);

        return SUCCESS;

    }

    //9.1首页上查询已经添加物理信息的机房(用户管理的，分页刷新)

    public String searchUserManageStation2() {

        Page p=getGson().fromJson(json, Page.class);

        User_inf uinf=(User_inf) getUser();

        p.setPageAll(uinf.getUId());

        List list = service.searchUserManageStation2(p);

        result = tojson(list);

        return SUCCESS;

    }

	
    //9.1首页上查询已经添加物理信息的机房(用户管理的，3.根据具体id查询告警信息等)

    public String searchUserManageStation3() {

        BattMap_information binfor=getGson().fromJson(json, BattMap_information.class);

        User_inf uinf=(User_inf) getUser();

        binfor.setNum(uinf.getUId());

        List list = service.searchUserManageStation3(binfor);

        result = tojson(list);

        return SUCCESS;

    }

    //9.1电池寿命管理

    public String serchByStationid(){

        BattMap_information bmap = getGson().fromJson(json, BattMap_information.class);


 gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java

@@ -2,6 +2,7 @@


import com.fgkj.dto.Batt_endurance;

import com.fgkj.dto.ServiceModel;

import com.fgkj.dto.User_inf;

import com.fgkj.services.Batt_enduranceService;



public class Batt_enduranceAction extends ActionUtil{

@@ -12,6 +13,8 @@
    //续航时间的查询

    public String serchByCondition() {

        Batt_endurance bendurance=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_endurance.class);

        User_inf uinf=(User_inf) getUser();

        bendurance.setNum(uinf.getUId());

        ServiceModel model=service.serchByCondition(bendurance);

        result=tojson(model);

        return SUCCESS;


 gx_tieta/src/com/fgkj/actions/Bts_station_eventAction.java

@@ -5,6 +5,7 @@
import com.fgkj.dto.BattInf;

import com.fgkj.dto.Bts_station_event;

import com.fgkj.dto.ServiceModel;

import com.fgkj.dto.User_inf;

import com.fgkj.services.Batt_devalarm_data_historyService;

import com.fgkj.services.Bts_station_eventService;



@@ -17,6 +18,8 @@
    //机房事件统计

    public String serchByCondition(){

        BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);

        User_inf uinf=(User_inf) getUser();

        binf.setNum(uinf.getUId());

        ServiceModel model=service.serchByCondition(binf);

        result=tojson(model);

        return SUCCESS;

@@ -24,6 +27,8 @@
    //机房事件统计

    public String serchByInfo(){

        Bts_station_event bevent=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Bts_station_event.class);

        User_inf uinf=(User_inf) getUser();

        bevent.setNum(uinf.getUId());

        ServiceModel model=service.serchByInfo(bevent);

        result=tojson(model);

        return SUCCESS;


 gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java

@@ -3,6 +3,7 @@
import com.fgkj.actions.ActionUtil;

import com.fgkj.dto.BattInf;

import com.fgkj.dto.ServiceModel;

import com.fgkj.dto.User_inf;

import com.fgkj.services.ram.Bts_station_stateService;



public class Bts_station_stateAction extends ActionUtil{

@@ -12,10 +13,19 @@
    //查询机房实时状态

    public String serchByCondition(){

        BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);

        User_inf uinf=(User_inf) getUser();

        binf.setNum(uinf.getUId());

        ServiceModel model=service.serchByCondition(binf);

        result=tojson(model);

        return SUCCESS;

    }

  //查询当前机房停电数

    public String serchByState(){

        User_inf uinf=(User_inf) getUser();

        ServiceModel model=service.serchByState(uinf);

        result=tojson(model);

        return SUCCESS;

    }

    

    

    


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

@@ -3628,7 +3628,12 @@
                " from db_battinf.tb_battinf " +

                " left outer join (select * from db_battinf.tb_battinf_rebuild where tb_battinf_rebuild.rebuild_clear_type=1 ) as battinf_re " +

                " on BattGroupId=battinf_re.new_battgroupid or BattGroupId=battinf_re.old_battgroupid " +

                " where stationname2 like ? ";

                " where stationname2 like ?  ";

        //用户管理

        String userSql=" and StationId in(" +

                " select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id  and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +

                " ) ";

        sql+=userSql;

        //选中品牌一致

        String producerSqlT=" order by BattProducer,MonCapStd,MonVolStd,BattGroupId ";//一致

        String producerSqlF=" order by MonCapStd,MonVolStd,BattGroupId ";//不一致

@@ -3637,7 +3642,7 @@
        }else{

            sql+=producerSqlF;

        }

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+binf.getStationName2()+"%"}, new CallBack() {

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+binf.getStationName2()+"%",binf.getNum()}, new CallBack() {

            

            public List getResults(ResultSet rs) {

                List<BattInf> list=new ArrayList();

@@ -3704,7 +3709,12 @@
                " left outer join (select * from db_battinf.tb_battinf_rebuild where tb_battinf_rebuild.rebuild_clear_type=1 ) as battinf_re " +

                " on BattGroupId=battinf_re.new_battgroupid or BattGroupId=battinf_re.old_battgroupid " +

                " where stationname1 like ? and stationname2 like ? and stationname3 like ?  and battgroupname like ?  and battgroupid=? ";

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getBattGroupName()+"%",binf.getBattGroupId()}, new CallBack() {

        //用户管理

        String userSql=" and StationId in(" +

                " select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id  and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +

                " ) ";

        sql+=userSql;

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getBattGroupName()+"%",binf.getBattGroupId(),binf.getNum()}, new CallBack() {

            

            public List getResults(ResultSet rs) {

                List<BattInf> list=new ArrayList();

@@ -3769,11 +3779,12 @@
        

        BattInfImpl biml = new BattInfImpl();

        BattInf binf = new BattInf();

        binf.setNum(1002);

        binf.setBattGroupId(1000001);

        binf.setStationName("");

        binf.setStationName1("");

        binf.setStationName2("");

        binf.setStationName3("武汉源暢实验室1");

        binf.setStationName3("");

        binf.setBattGroupName("");

        binf.setBattProducer("1");

        User_inf uinf=new User_inf();

@@ -3800,8 +3811,8 @@
        //List<BattInf> list = biml.serchByConditionNew(bmd);

        //List<BattInf> list=biml.serchByTestType(bmd);

        //List<BattInf> list=biml.serchGroupAssess(bmd);

        //List<BattInf> list=biml.serchMakeGroup(binf);

        List<BattInf> list=biml.serchGroupByInfor(binf);

        List<BattInf> list=biml.serchMakeGroup(binf);

        //List<BattInf> list=biml.serchGroupByInfor(binf);

        for (BattInf b : list) {

            System.out.println(b);

        }


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

@@ -1,5 +1,6 @@
package com.fgkj.dao.impl;



import java.sql.Connection;

import java.sql.ResultSet;

import java.sql.SQLException;

import java.util.ArrayList;

@@ -9,6 +10,7 @@
import com.fgkj.dao.BaseDAO;

import com.fgkj.dao.CallBack;

import com.fgkj.dao.DAOHelper;

import com.fgkj.dao.LimitNumberFactory;

import com.fgkj.db.DBUtil;

import com.fgkj.db.IDatabaseName;

import com.fgkj.dto.BattDischarge_plan;

@@ -16,6 +18,7 @@
import com.fgkj.dto.BattMap_information;

import com.fgkj.dto.Batt_Maint_Dealarm;

import com.fgkj.dto.Battalarm_data;

import com.fgkj.dto.Page;

import com.fgkj.dto.User_inf;



public class BattMap_informationImpl implements BaseDAO,CallBack{

@@ -127,7 +130,7 @@
        });

        return list;

    }

    //9.1查询已经添加物理信息的机房(用户管理的)

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

@@ -139,7 +142,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=?  ) ";

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{uinf.getUId()}, new CallBack() {

            

            public List getResults(ResultSet rs) {

@@ -166,6 +169,98 @@
        } );

        return list;

    }

    //9.1查询已经添加物理信息的机房(用户管理的，分页刷新)

    public List serchInBattMapByUid2(Object obj) {

        Page page=(Page) obj;

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

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

                "  select distinct db_battinf.tb_battinf.stationid  " +

                "  from db_battinf.tb_battinf " +

                "  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=?  )  " +

                "  limit ?,?  " +

                "  order by tb_battmap_information.StationId ";

        List<BattMap_information> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{uid,(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {

			
            public List getResults(ResultSet rs) {

                List list=new ArrayList();

                try {

                    while(rs.next()){

                        BattMap_information binformation=new BattMap_information();

                        binformation.setNum(rs.getInt("num"));

                        binformation.setStationId(rs.getString("stationId"));

                        binformation.setStationName(rs.getString("stationName"));

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

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

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

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

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

                        Page p=new Page();

                        binformation.setPage(p);

                        list.add(binformation);

                    }

                } catch (SQLException e) {

                    // TODO Auto-generated catch block

                    e.printStackTrace();

                }

                return list;

            }

        } );

        //去掉limit条件后的总数

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

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

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

            list.get(list.size()-1).getPage().setPageAll(number);

        }

        return list;

    }

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

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

                "  select distinct db_battinf.tb_battinf.stationid  " +

                "  from db_battinf.tb_battinf " +

                "  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=?  ) " +

                "  and tb_battmap_information.StationId=? ";

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{binfor.getNum(),binfor.getStationId()}, new CallBack() {

			
            public List getResults(ResultSet rs) {

                List list=new ArrayList();

                try {

                    while(rs.next()){

                        BattMap_information binformation=new BattMap_information();

                        binformation.setNum(rs.getInt("num"));

                        binformation.setStationId(rs.getString("stationId"));

                        binformation.setStationName(rs.getString("stationName"));

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

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

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

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

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

                        list.add(binformation);

                    }

                } catch (SQLException e) {

                    // TODO Auto-generated catch block

                    e.printStackTrace();

                }

                return list;

            }

        } );

        return list;

    }

    //9.1查询机房所在的所有省份

    public List serchStationName1(){

        String sql="  SELECT  DISTINCT substring_index(substring_index(address,'-',2),'-',1) as stationname1  FROM web_site.tb_BattMap_information  " ;


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

@@ -50,7 +50,14 @@
        String sql="select SQL_CALC_FOUND_ROWS distinct tb_batt_endurance.num,tb_batt_endurance.deviceid,tb_batt_endurance.stationid,real_cap,tb_batt_endurance.moncapstd,real_curr,endurance_theory_timelong,endurance_actual_timelong,is_out_stand " +

                ",db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1,db_battinf.tb_battinf.StationName2 " +

                " from web_site.tb_batt_endurance,db_battinf.tb_battinf " +

                " where tb_batt_endurance.stationid=db_battinf.tb_battinf.stationid " ;

                " where tb_batt_endurance.stationid=db_battinf.tb_battinf.stationid "+

                "  and tb_batt_endurance.stationid in (" +

                "  select distinct db_battinf.tb_battinf.stationid  " +

                "  from db_battinf.tb_battinf " +

                "  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=?  ) " ;

        //机房筛选

        String stationSql=" and db_battinf.tb_battinf.StationName like ? and db_battinf.tb_battinf.StationName1 like ? and db_battinf.tb_battinf.StationName2 like ?";

        sql+=stationSql;

@@ -79,7 +86,7 @@
        

        

        //System.out.println(sql);

        List<Batt_endurance> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+bendurance.getStationName()+"%","%"+bendurance.getStationName1()+"%","%"+bendurance.getStationName2()+"%",bendurance.getEndurance_actual_timelong(),bendurance.getIs_out_stand()

        List<Batt_endurance> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{bendurance.getNum(),"%"+bendurance.getStationName()+"%","%"+bendurance.getStationName1()+"%","%"+bendurance.getStationName2()+"%",bendurance.getEndurance_actual_timelong(),bendurance.getIs_out_stand()

                                        ,(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {

            

            public List getResults(ResultSet rs) {

@@ -125,6 +132,7 @@
    public static void main(String[] args) {

        Batt_enduranceImpl bimpl=new Batt_enduranceImpl();

        Batt_endurance ben=new Batt_endurance();

        ben.setNum(1002);

        ben.setStationName("");

        ben.setStationName1("");

        ben.setStationName2("");


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

@@ -57,6 +57,13 @@
        String sql="select station_id,dev_id,station_event_type,record_datetime,station_event_trig ,tb_battinf.StationName,tb_battinf.StationName1,tb_battinf.StationName2,tb_battinf.StationName3 " +

                " from db_alarm.tb_bts_station_event,db_battinf.tb_battinf " +

                " where  tb_bts_station_event.dev_id=tb_battinf.FBSDeviceId " +

                "  and tb_bts_station_event.station_id in (" +

               "  select distinct db_battinf.tb_battinf.stationid  " +

               "  from db_battinf.tb_battinf " +

               "  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=?  ) " +

                " and  record_datetime>=?  and  record_datetime<=?  " +

                " and stationname1 like ? and stationname2 like  ? and stationname3 like ? and stationid like ? " ;

        /*//事件筛选

@@ -74,7 +81,7 @@
        String orderSql="  order by station_id,record_datetime,station_event_type asc  ";

        sql+=orderSql;

        //System.err.println(sql);

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getBattInUseDate(),binf.getBattInUseDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%"}, new CallBack() {

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum(),binf.getBattInUseDate(),binf.getBattInUseDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%"}, new CallBack() {

            

            public List getResults(ResultSet rs) {

                List list=new ArrayList();

@@ -300,6 +307,13 @@
        String sql="select  distinct station_id,dev_id,station_event_type,record_datetime,station_event_trig ,tb_battinf.StationName,tb_battinf.StationName1,tb_battinf.StationName2,tb_battinf.StationName3 " +

                " from db_alarm.tb_bts_station_event,db_battinf.tb_battinf " +

                " where  tb_bts_station_event.dev_id=tb_battinf.FBSDeviceId " +

                "  and tb_bts_station_event.station_id in (" +

                "  select distinct db_battinf.tb_battinf.stationid  " +

                "  from db_battinf.tb_battinf " +

                "  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=?  ) " +

                " and dev_id=?  " +

                " and  record_datetime>=?  and  record_datetime<=? ";

        //基站状态

@@ -318,7 +332,7 @@
        //sql+=limitSql;

        //,(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()

        //executeQueryLimit

        List<Bts_station_event> list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{bevent.getDev_id(),bevent.getRecord_datetime(),bevent.getRecord_datetime_end(),bevent.getStation_event_type()}, new CallBack() {

        List<Bts_station_event> list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{bevent.getNum(),bevent.getDev_id(),bevent.getRecord_datetime(),bevent.getRecord_datetime_end(),bevent.getStation_event_type()}, new CallBack() {

            

            public List getResults(ResultSet rs) {

                List list=new ArrayList();

@@ -371,7 +385,7 @@
        

        

        BattInf binf = new BattInf();

        binf.setNum(0);

        binf.setNum(1002);

        binf.setStationName("");

        binf.setStationName1("");

        binf.setStationName2("");

@@ -387,12 +401,13 @@
        bmd.setPage(p);

        bmd.setBinf(binf);

        bmd.setUinf(uinf);

       /* List<Bts_station_event> list=bimpl.serchByCondition(binf);

        List<Bts_station_event> list=bimpl.serchByCondition(binf);

        System.out.println(list.size());

        for (Bts_station_event b : list) {

            System.out.println(b.getNote()+" "+b.getDev_id()+" "+b.getStation_event_type_poff()+" "+b.getStation_event_type_xuhang()+" "+b.getStation_event_type_fadian()+" "+b.getStation_event_type_diaozhan()+" "+b.getStation_event_type_dooropen()+" "+b.getStation_event_type_tempup()+" "+b.getStation_event_type_templow()+" "+b.getStation_event_type_dampup()+" "+b.getStation_event_type_damplow()+" "+b.getStationName());

        }*/

        }

        Bts_station_event b=new Bts_station_event();

        b.setNum(1002);

        b.setDev_id(910000001);

        b.setRecord_datetime(ActionUtil.getSimpDate(date1));

        b.setRecord_datetime_end(ActionUtil.getSimpDate(date2));

@@ -401,8 +416,8 @@
        page.setPageCurr(1);

        page.setPageSize(10);

        b.setPage(page);

        List list=bimpl.serchByInfo(b);

        System.out.println(list.size());

        /*List list=bimpl.serchByInfo(b);

        System.out.println(list.size());*/

    }



}


 gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java

@@ -10,9 +10,11 @@
import com.fgkj.dao.CallBack;

import com.fgkj.dao.DAOHelper;

import com.fgkj.dao.LimitNumberFactory;

import com.fgkj.dao.UinfDaoFactory;

import com.fgkj.db.DBUtil;

import com.fgkj.dto.BattInf;

import com.fgkj.dto.Page;

import com.fgkj.dto.User_inf;

import com.fgkj.dto.ram.Bts_station_state;



public class Bts_station_stateImpl implements BaseDAO,CallBack{

@@ -52,10 +54,16 @@
                   " ,tb_battinf.stationname,tb_battinf.stationname1,tb_battinf.stationname2,tb_battinf.stationname3 " +

                   " from db_ram_db.tb_bts_station_state,db_battinf.tb_battinf  " +

                   " where  tb_bts_station_state.dev_id=db_battinf.tb_battinf.FBSDeviceId  " +

                   " and tb_bts_station_state.station_id=db_battinf.tb_battinf.StationId  " +

                   "  and tb_bts_station_state.station_id in (" +

                   "  select distinct db_battinf.tb_battinf.stationid  " +

                   "  from db_battinf.tb_battinf " +

                   "  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=?  ) " +

                   " and tb_battinf.stationname1 like ? and tb_battinf.stationname2 like ? and tb_battinf.stationname3 like ? " +

                   " and stationid like ?  limit ? ,? ";

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

        List<Bts_station_state> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{binf.getNum(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%",(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()},new CallBack() {

            

            public List getResults(ResultSet rs) {

                List list=new ArrayList();

@@ -111,19 +119,52 @@
        }

        return list;

    }



    //查询当前机房停电数

    public int serchByState(Object obj) {

        User_inf uinf=(User_inf) obj;

        String sql=" select count(*) as nums from db_ram_db.tb_bts_station_state where station_stat&2>1  " +

                   "  and tb_bts_station_state.station_id in (" +

                   "  select distinct db_battinf.tb_battinf.stationid  " +

                   "  from db_battinf.tb_battinf " +

                   "  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=?  ) " ;

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {

			
            public List getResults(ResultSet rs) {

                List list=new ArrayList();

                try {

                    while(rs.next()){

                        list.add(rs.getInt("nums"));

                    }

                } catch (SQLException e) {

                    // TODO Auto-generated catch block

                    e.printStackTrace();

                }

                return list;

            }

        });

        int nums=0;//总数

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

            nums=(Integer) list.get(list.size()-1);

        }

        return nums;

    }

    public List serchByInfo(Object obj) {

        // TODO Auto-generated method stub

        return null;

    }



    public static void main(String[] args) {

        Bts_station_stateImpl bimpl=new Bts_station_stateImpl();

        BattInf binf=new BattInf();

        binf.setNum(1002);

        binf.setStationName1("");

        binf.setStationName2("");

        binf.setStationName3("");

        binf.setStationId("");

        User_inf uinf=new User_inf();

        uinf.setUId(1002);

        Page p=new Page();

        p.setPageCurr(1);

        p.setPageSize(1);

@@ -133,5 +174,9 @@
            //System.out.println(bs.getStation_stat_diaozhan()+"  "+bs.getStation_stat_dooropen()+"  "+bs.getStation_stat_fadian()+"   "+bs.getStation_stat_xuhang()+"  "+bs.getStation_stat_poff());

            System.out.println(bs);

        }

        /*int nums=bimpl.serchByState(uinf);

        System.out.println(nums);*/

    }



	
}


 gx_tieta/src/com/fgkj/dto/BattMap_information.java

@@ -11,7 +11,7 @@
    private Double latitude;                // 纬度

    private String information;            //备注

    private Integer FBSDeviceId;        //设备id

	
    private Page page;

    public BattMap_information() {

        super();

        

@@ -97,15 +97,27 @@
    }





    public Page getPage() {

        return page;

    }





    public void setPage(Page page) {

        this.page = page;

    }





    @Override

    public String toString() {

        return "BattMap_information [num=" + num + ", StationId=" + StationId

                + ", StationName=" + StationName + ", Address=" + Address

                + ", longitude=" + longitude + ", latitude=" + latitude

                + ", information=" + information + ", FBSDeviceId="

                + FBSDeviceId + "]";

                + FBSDeviceId + ", page=" + page + "]";

    }







    

    

}


 gx_tieta/src/com/fgkj/services/BattMap_informationService.java

@@ -86,10 +86,22 @@
        }

        return listAll;

    }

	
    //首页上查询用户管理的已经设置过位置的机房信息

    public List searchUserManageStation(Object obj){		
        List<BattMap_information> list = ((BattMap_informationImpl)dao).serchInBattMapByUid(obj);

    //首页上查询用户管理的已经设置过位置的机房信息(用户管理的,l查询全部打开页面)

    public ServiceModel searchUserManageStation(Object obj){		
        List list = ((BattMap_informationImpl)dao).serchInBattMapByUid(obj);

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

            model.setCode(1);

            model.setData(list);

            model.setMsg("查询成功!");

        }else{

            model.setCode(0);

            model.setMsg("查询失败!");

        }

        return model;

    }

    //首页上查询用户管理的已经设置过位置的机房信息(用户管理的，分页刷新)

    public List searchUserManageStation2(Object obj){		
        List<BattMap_information> list = ((BattMap_informationImpl)dao).serchInBattMapByUid2(obj);

        List listAll=new ArrayList();//存放最后的结果

        String state="";

        int numBadBatt=0;

@@ -131,7 +143,50 @@
        }

        return listAll;

    }

	
    //首页上查询用户管理的已经设置过位置的机房信息(用户管理的，3.根据具体id查询告警信息等)

    public List searchUserManageStation3(Object obj){		
        List<BattMap_information> list = ((BattMap_informationImpl)dao).serchInBattMapByUid3(obj);

        List listAll=new ArrayList();//存放最后的结果

        String state="";

        int numBadBatt=0;

        int numAlarm=0;

        int numPlan=0;

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

            for(int i=0;i<list.size();i++){

                state="item-normal";

                ServiceModel model=new ServiceModel();

                BattMap_information binformation = list.get(i);

                if(binformation.getFBSDeviceId()/100000==6185){

                    BattInf binf=new BattInf();

                    binf.setFBSDeviceId(binformation.getFBSDeviceId());

                    state=(new Fbs9100_stateImpl().seachDevNow(binf));

                }else{

                    numBadBatt=(new BadBatt_monImpl()).serchByStationId(binformation);                //落后总数

                    numAlarm=(new Battalarm_dataDAOImpl()).serchByStationId(binformation);        //告警总数

                    numPlan=(new BattDischarge_planImpl()).serchByStationId(binformation);    //延迟总数

                    if(numBadBatt>0){

                        state="item-behind";                                    //落后机房

                    }else{

                        if(numAlarm > 0){

                            state="item-warn";                                //告警机房

                        }else{

                            if(numPlan > 0){

                                state="item-timeout";                        //延迟机房

                            }

                        }

                    }

                }

                model.setData(list.get(i));

                model.setCode(numAlarm);        //告警总数

                model.setSum(numBadBatt);        //落后总数

                model.setNewsum(numPlan);        //延时总数

                model.setMsg(state);            //61850状态

                model.setMsgN(binformation.getFBSDeviceId().toString());

                listAll.add(model);

            }

        }

        return listAll;

    }

    //9.1百度地图定位根据省份查询所有该区域的机房

    public List serchByCondition(Object obj){

            List<BattMap_information> list =dao.serchByCondition(obj);


 gx_tieta/src/com/fgkj/services/ram/Bts_station_stateService.java

@@ -4,6 +4,7 @@


import com.fgkj.dao.BaseDAO;

import com.fgkj.dao.BaseDAOFactory;

import com.fgkj.dao.impl.ram.Bts_station_stateImpl;

import com.fgkj.dto.ServiceModel;



public class Bts_station_stateService {

@@ -28,5 +29,11 @@
        }

        return model;    

    }

    //查询当前机房停电数

    public ServiceModel serchByState(Object obj) {

        int nums=((Bts_station_stateImpl)dao).serchByState(obj);

        model.setNewsum(nums);

        return model;	
    }



}