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

LiJun

2018-10-22 72b008e0b171acb5f3f6f1494a933a76cf190ca8

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

 gx_tieta/WebRoot/index.jsp

@@ -1587,8 +1587,13 @@
            var pt = new BMap.Point(dotList[i].lng, dotList[i].lat);

            

            var mk = new BMap.Marker(pt, {icon: dotIcon});    // 定义marker点

            // addMenu(mk, mapDel);

			
            // 删除指定的点(该点会在本函数后面重新创建)

            deletePoint(map, dotList[i].title);

			
            // 给点右键菜单添加删除按钮

            addMenu(mk, mapDel);

			
            // 向mk点添加label

            var home_name = new BMap.Label(dotList[i].title, {offset:new BMap.Size(20,-10)});

            home_name.setStyle({display: 'none', padding: '4px 2px'});

@@ -1602,10 +1607,11 @@
                this.getLabel().setStyle({display: 'none'});                    

            });

            

            /* mk.addEventListener('click', function(e) {

            mk.addEventListener('click', function(e) {

                var target = e.target;

                showMapPanel(target, dotList);

            }); */

                //showMapPanel(target, dotList);

                searchPanelInfo(target);

            });

            mkList.push(mk);

            // 向地图添加覆盖物

            map.addOverlay(mk);

@@ -1762,7 +1768,6 @@
    function showMapPanelByPoint(point, dataList) {

        var searchInforWin = null;

        var opts = {

            //title  : warnList[i].title+'<a href="javascript:loadToHomeInfo();" style="margin-left: 1em;text-decoration:none">详情>></a>',      //标题

            title  : dataList.title+'<a href="javascript:loadToHomeInfo();" style="margin-left: 1em;text-decoration:none;cursor:not-allowed">详情>></a>',      //标题未开启

            width  : '290',             //宽度

            height : 140,              //高度

@@ -2021,8 +2026,22 @@
        function setDots(data) {

            dots = data;

        }

		
        // 将变量绑定到命名空间下

        gl.BMap.setDots = setDots;

		
        // 更新dots集合的数据

        function updateDots(data) {

            for(var i=0; i<dots.length; i++) {

                var _dots = dots[i];

                if(_dots.sId == data.sId) {

                    _dots.msg = data.msg;

                }

            }

        }

		
        // 将变量绑定到命名空间下

        gl.BMap.updateDots = updateDots;

        

        // 将函数绑定到命名空间下

        gl.BMap.queryInRect = queryInRect;

@@ -2064,7 +2083,7 @@
    

    var allStation = [];

    var mapPages = {

        pageSize:2,                 // 每页的行数

        pageSize:100,                 // 每页的行数

        pageCurr:1,                  // 当前页码数

        pageAll:1,                    // 数目

        pageNum: 0,

@@ -2098,7 +2117,7 @@
                    // 设置分页信息

                    mapPages.pageAll = list.length;

                    setMapPages();

                    console.info(mapPages);

					
                    // 遍历查询结果

                    for(var i=0;i<list.length;i++){

                        var _list = list[i];

@@ -2107,7 +2126,7 @@
                    

                    // 显示区域的图标

                    bmap.setDots(allStation);

                    bmap.queryInRect(map,createMapDot);

                    bmap.queryInRect(map, createMapDot);

                    // 是否第一次执行

                    if(setRect) {

                        map.addEventListener("moveend", bmap.queryInRect.bind({},map, createMapDot));  // 拖动

@@ -2130,6 +2149,7 @@
        obj.fbsId = list.FBSDeviceId;

        obj.addr = list.Address;

        obj.msg = "";

        obj.num = list.num;

        return obj;

    }

    

@@ -2137,10 +2157,12 @@
    function setMapPages() {

        var pageNum = Math.ceil(mapPages.pageAll/mapPages.pageSize);

        mapPages.pageNum = pageNum;

        mapPages.pageNew= true;

    }

    

    // 轮询更新地图的点查询

    function updateStation() {

        var bmap = GLOBAL.BMap;        // BMap的命名空间

        var updateStationData = [];

        $.ajax({

            type: "post",

@@ -2152,9 +2174,13 @@
                var data = JSON.parse(result.result);

                for(var i=0; i<data.length; i++) {

                    var _data = data[i];

                    updateStationData.push(formatUpdateStation(_data));

	        		
                    var _list =  formatUpdateStation(_data);

                    updateStationData.push(_list);

                    //_list.msg = 'item-nuclear_cap';

                    // 判断是否更新

                    if(mapPages.pageNew) {

                        bmap.updateDots(_list);

                    }

                }

                

                createMapDot(map, updateStationData);

@@ -2183,17 +2209,73 @@
        obj.fbsId = data.FBSDeviceId;

        obj.addr = data.Address;

        obj.msg = list.msg;

        obj.num = list.num;

        return obj;

    }

    

    // 更新所有机房

    // 查询机房面板信息

    function searchPanelInfo(data) {

        var point = data.point;

        var stationInfo = getStaionByPoint(point);

        if(!stationInfo) {

            alert('面板信息查询失败！');

            return;

        }

		
        var temp = {

            StationId: stationInfo.sId

        };

        // 查询面板信息

        $.ajax({

            type: 'post',

            async: true,

            url: 'BattMap_informationAction!searchUserManageStation3',

            data: 'json='+JSON.stringify(temp),

            dataType: 'json',

            success: function(result) {

                var rs = JSON.parse(result.result);

                if(rs.length != 0) {

                    var data = rs[0];

                    //console.info(data);

                    var content = '<div style="padding:6px;"><span>蓄电池组告警数目：</span>'+data.code+'<a style="margin-left: 14px" href="javascript:loadToWarnPage();">详情>></a></div>'+

                            '<div style="padding:6px;"><span>蓄电池组落后数目：</span>'+data.sum+'<a style="margin-left: 14px" href="javascript:loadToBehindPage();">详情>></a></div>'+

                            '<div style="padding:6px;"><span>蓄电池组延时数目：</span>'+data.newsum+'<a style="margin-left: 14px" href="javascript:loadToDischargeDelay();">详情>></a></div>'+

                            '<div style="padding:6px"><a href="javascript:loadToRealTime();">实时数据</a><a style="margin-left: 20px" href="javascript:loadToOldTime();">历史数据</a></div>'+

                            '<div style="padding:6px;"><span>地址：</span>'+data.data.Address+'</div>'+

                            '<input type="hidden" class="ipt-hide sid" value="'+data.data.StationId+'">'+

                            '<input type="hidden" class="ipt-hide province" value="'+data.data.stationName1+'">'+

                            '<input type="hidden" class="ipt-hide city" value="'+data.data.stationName2+'">';

					
                    var list = {

                        title: data.data.StationName,

                        content: content

                    };

					
                    showMapPanelByPoint(point, list);

                }

				
            }

        });	
    }

    

    

    // 根据经纬度获取机房的信息

    function getStaionByPoint(point) {

        var stationInfo = false;

        // 遍历所有机房

        for(var i=0; i<allStation.length; i++) {

            var info = allStation[i];

            if(info.lng == point.lng && info.lat == point.lat) {

                stationInfo = info;

            }

        }

        return stationInfo;

    }

    function setAllStation(obj,allstation){

        //console.info(allstation);

        var flag = false;

        var index = 0;

        for(var i = 0;i < allstation.length;i++){

        for(var i = 0;i < allStation.length;i++){

            //console.info(obj.binformation.num + "==" + allstation[i].binformation.num);

            if(obj.binformation.num == allstation[i].binformation.num){

                flag = true;

@@ -2300,16 +2382,18 @@
    }

    // 定位到实时数据页面

    function loadToRealTime() {

        var battgroupId = $('.ipt-hide').eq(0).val();

        var homeId = $('.ipt-hide').eq(1).val();

        window.open('control.jsp?battgroupId='+battgroupId+'&stationId='+homeId);

        var homeId = $('.ipt-hide.sid').val();

        var province = $('.ipt-hide.province').val();

        var city = $('.ipt-hide.city').val();

        window.open('control.jsp?province='+province+'&city='+city+'&stationId='+homeId);

    }



    // 定位到历史数据页面

    function loadToOldTime() {

        var battgroupId = $('.ipt-hide').eq(0).val();

        var homeId = $('.ipt-hide').eq(1).val();

        window.open('charge-test.jsp?battgroupId='+battgroupId+'&stationId='+homeId);

        var homeId = $('.ipt-hide.sid').val();

        var province = $('.ipt-hide.province').val();

        var city = $('.ipt-hide.city').val();

        window.open('charge-test.jsp?province='+province+'&city='+city+'&stationId='+homeId);

    }

    

    //定位到告警页面

@@ -2443,11 +2527,10 @@
                    text: '删除',

                    callback: function(e) {

                        //console.info(allStation);

                        console.info(mk);

                        console.info(allStation);

                        var temp = getStationMap(allStation, mk.point);

                        if(confirm("确认从地图上删除'"+temp.StationName+"'的位置信息吗？")){

                        if(confirm("确认从地图上删除'"+temp.title+"'的位置信息吗？")){

                            if(temp != undefined){

                                //console.info(temp);

                                var json = JSON.stringify(temp);

                                $.ajax({     

                                    type: "post",                 

@@ -2489,8 +2572,8 @@
    function getStationMap(list,localposi){

        if(list != undefined){

            for(var i = 0 ; i < list.length ; i++){

                if(list[i].binformation.latitude == localposi.lat && list[i].binformation.longitude == localposi.lng){

                    return list[i].binformation;

                if(list[i].lat == localposi.lat && list[i].lng == localposi.lng){

                    return list[i];

                }

            }

        }


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

@@ -3478,7 +3478,7 @@
    //根据机房id查询机房下的电池组信息(左侧导航第四层,根据机房查询下面的电池组,num中存放uid)

    public List serchBattByStation(Object obj){

        BattInf binf=(BattInf) obj;

        String sql="select DISTINCT StationName,StationId,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice,Load_curr,DisCurrMax " +

        String sql="select DISTINCT StationName,StationName1,StationName2,StationId,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice,Load_curr,DisCurrMax " +

                "from db_battinf.tb_battinf  where StationName1 like ? and StationName2 like ?  and  StationName like ?  ";

        //机房id

        String idSqlT=" and  Stationid like ? ";

@@ -3500,6 +3500,8 @@
                    while (rs.next()) {

                        BattInf batt = new BattInf();

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

                        batt.setStationName1(rs.getString("stationName1"));

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

                        batt.setStationId(rs.getString("StationId"));

                        batt.setStationIp(rs.getString("StationIP"));

                        batt.setBattGroupName(rs.getString("BattGroupName").trim());


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

@@ -224,7 +224,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 +245,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"));


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

@@ -62,7 +62,9 @@
                   "  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 ? ,? ";

                   " and stationid like ?  " +

                   " limit ? ,? ";

        System.out.println(sql);

        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) {


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

@@ -12,6 +12,9 @@
    private String information;            //备注

    private Integer FBSDeviceId;        //设备id

    private Page page;

    private String stationName1;

    private String stationName2;

    private String stationName3;

    public BattMap_information() {

        super();

        

@@ -113,10 +116,43 @@
                + ", StationName=" + StationName + ", Address=" + Address

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

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

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

                + FBSDeviceId + ", page=" + page + ", stationName1="

                + stationName1 + ", stationName2=" + stationName2

                + ", stationName3=" + stationName3 + "]";

    }





    public String getStationName1() {

        return stationName1;

    }





    public void setStationName1(String stationName1) {

        this.stationName1 = stationName1;

    }





    public String getStationName2() {

        return stationName2;

    }





    public void setStationName2(String stationName2) {

        this.stationName2 = stationName2;

    }





    public String getStationName3() {

        return stationName3;

    }





    public void setStationName3(String stationName3) {

        this.stationName3 = stationName3;

    }