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

hdw

2018-10-19 98cd37e22ae11376692241a62a8b5d932cbcd24e

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

 gx_tieta/WebRoot/batt-state-manage.jsp

@@ -476,68 +476,58 @@
                            // 停电

                            if(_data.station_stat_poff) {

                                arrTd[index++]= create_ali_font('icon-tingdian-', 'red', {msg:'停电异常'});

                            }else {

                                arrTd[index++]= create_ali_font('icon-tingdian-', 'green', {msg: '正常'});

                            }

							
                            arrTd[index++]=_data.station_poff_start_time //停电开始时间

                            if(_data.station_stat_poff){

                                arrTd[index++]=StringtoData(_data.station_poff_start_time);      //停电时长

                            }else{

                                arrTd[index++] = create_ali_font('icon-tingdian-', 'green', {msg: '正常'});

                                arrTd[index++] = "-";

                                arrTd[index++]=formartTime(0);

                            }

						
                            // 发电

                            if(_data.station_stat_fadian) {

                                arrTd[index++]= create_ali_font('icon-dynamotor', 'red', {msg: '发电异常'}); //发电

                            }else {

                                arrTd[index++]= create_ali_font('icon-dynamotor', 'green', {msg: '正常'}); //发电

                            }

							
                            arrTd[index++]=_data.station_fadian_start_time;   //发电开始时间

                            if(_data.station_stat_fadian){

                                arrTd[index++]=StringtoData(_data.station_fadian_start_time);

                            }else{

                                arrTd[index++] = create_ali_font('icon-dynamotor', 'green', {msg: '正常'}); //发电

                                arrTd[index++] = "-";   //发电开始时间

                                arrTd[index++]=formartTime(0);

                            }

						
                            // 掉站

                            if(_data.station_stat_diaozhan) {

                                arrTd[index++]= create_ali_font('icon-dianchi', 'red', {msg: '已掉站'});

                            }else {

                                arrTd[index++]= create_ali_font('icon-dianchi4', 'green', {msg: '正常'});

                            }

							
                            arrTd[index++]=_data.station_diaozhan_start_time;//掉站开始时间

                            if(_data.station_stat_diaozhan){

                                arrTd[index++]=StringtoData(_data.station_diaozhan_start_time);

                            }else{

                                arrTd[index++] = create_ali_font('icon-dianchi4', 'green', {msg: '正常'});

                                arrTd[index++] = "-";//掉站开始时间

                                arrTd[index++]=formartTime(0);

                            }

                            

                            //续航

                            if(_data.station_stat_xuhang){

                                arrTd[index++]=create_fa_font('fa-television','red',{msg: '已异常'});

                            }else{

                                arrTd[index++]=create_fa_font('fa-television','green',{msg: '正常'});

                            }

                                arrTd[index++] = create_fa_font('fa-television','red',{msg: '续航异常'});

                            arrTd[index++]=_data.station_xuhang_start_time;

                            if(_data.station_stat_xuhang){

                                arrTd[index++]=StringtoData(_data.station_xuhang_start_time);

                            }else{

                                arrTd[index++] = create_fa_font('fa-television','green',{msg: '正常'});

                                arrTd[index++] = "-";

                                arrTd[index++]=formartTime(0);

                            }    

							
                            // 开门关门异常

                            if(_data.station_stat_dooropen) {

                                arrTd[index++] = create_ali_font('icon-quankaimen', 'red', {msg: '开门'});

                            }else {

                                arrTd[index++] = create_ali_font('icon-quankaimen', 'green', {msg: '关门'});

                            }

							
                            arrTd[index++]=_data.station_dooropen_start_time;//开门关门异常时间

                            if(_data.station_stat_dooropen) {

                                arrTd[index++]=StringtoData(_data.station_dooropen_start_time);

                            }else{

                                arrTd[index++] = create_ali_font('icon-quankaimen', 'green', {msg: '关门'});

                                arrTd[index++] = "-";//开门关门异常时间

                                arrTd[index++]=formartTime(0);

                            }

						
                            arrTd[index++]=_data.station_temp; //温度

                            arrTd[index++]=_data.station_damp; //湿度

                        }

@@ -554,25 +544,25 @@
        var date1= value;  //开始时间

        var date2 = new Date();    //结束时间

        var date3 = date2.getTime() - new Date(date1).getTime();   //时间差的毫秒数      

        var date4 = Math.floor(date3/(24*3600*1000));

        var date4 = Math.floor(date3/(1000));

        return formartTime(date4);

        }        

            //格式化时间

            //格式化时间value传入为秒

        function formartTime(value){

            value = Math.abs(parseInt(value));

            //console.info(value);

            var day_num = 0;

            var hour_num = 0;

            var min_num = 0;

            if(value>=24*60){

                day_num = Math.floor(value/(24*60));

                value = value%(24*60);

            if(value>=24*60*60){

                day_num = Math.floor(value/(24*60*60));

                value = value%(24*60*60);

            }

            if(value>=60){

                hour_num = Math.floor(value/60);

                value = value%60;

            if(value>=60*60){

                hour_num = Math.floor(value/(60*60));

                value = value%(60*60);

            }

            min_num = value;

            min_num = Math.floor(value/60);

            return day_num+"天"+hour_num+"小时"+min_num+"分";

        }        

                    


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

@@ -44,7 +44,7 @@
    //查询机房实时状态

    public List serchByCondition(Object obj) {

        BattInf binf=(BattInf) obj;

        Page p=new Page();

        Page p=binf.getPage();

        Connection conn=DBUtil.getConn();

        String numberSql="SELECT FOUND_ROWS() number";//存放总数

        String sql="select SQL_CALC_FOUND_ROWS distinct station_id,dev_id,record_datetime,station_stat,station_poff_start_time,station_fadian_start_time" +

@@ -126,11 +126,11 @@
        binf.setStationId("");

        Page p=new Page();

        p.setPageCurr(1);

        p.setPageSize(10);

        p.setPageSize(1);

        binf.setPage(p);

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

        for (Bts_station_state bs : list) {

            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.getStation_stat_diaozhan()+"  "+bs.getStation_stat_dooropen()+"  "+bs.getStation_stat_fadian()+"   "+bs.getStation_stat_xuhang()+"  "+bs.getStation_stat_poff());

            System.out.println(bs);

        }

    }