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

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

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl$1.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl$1.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_battgroup.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_comm_task.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties

@@ -1124,4 +1124,7 @@
Batch_batt_param_set = \u6279\u91cf\u7535\u6c60\u53c2\u6570\u8bbe\u7f6e



##################  sys-set-test.jsp     ##############################

Batch_sys_param_set = \u6279\u91cf\u7cfb\u7edf\u53c2\u6570\u8bbe\u7f6e
Batch_sys_param_set = \u6279\u91cf\u7cfb\u7edf\u53c2\u6570\u8bbe\u7f6e



##################  bts-comm-mon.jsp      #########################

Batt_conn_info_query = \u7535\u6c60\u7ec4\u8fde\u63a5\u4fe1\u606f\u67e5\u8be2

 gx_tieta/WebRoot/bts-comm-mon.jsp

@@ -15,7 +15,7 @@
        <meta http-equiv="expires" content="0">    

        <meta http-equiv="keywords" content="keyword1,keyword2,keyword3">

        <meta http-equiv="description" content="This is my page">

        <title>电池注册信息查询</title>							
        <title><s:text name="Batt_conn_info_query"/></title>                        <!-- 电池组连接信息查询 -->			
        <link rel="stylesheet" type="text/css" href="pages/css/base.css">

        <link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.css">

        <link rel="stylesheet" type="text/css" href="src/css/layui.css">

@@ -105,9 +105,12 @@
                    ,cols: [[

                        {field: 'Staionanme', title: '机房名称', align: 'center', width: 450}

                        ,{field:'dev_id', title:'设备id', align:'center', width: 260}

                        ,{field:'battgroup_id', title:'电池组id', align:'center', width: 260}

                        ,{field:'battgroup_index', title:'电池组索引', align:'center', width: 260}

                        ,{field:'battgroup_mon_cnt', title:'电池组单体个数', align:'center', width: 260}

                        ,{field:'battgroup_id', title:'电池组id', align:'center', width: 200}

                        ,{field:'battgroup_index', title:'电池组索引', align:'center', width: 200}

                        ,{field:'battgroup_mon_cnt', title:'电池组单体个数', align:'center', width: 200}

                        ,{field:'battgroup_float_vol', title:'浮充电压', align:'center', width: 200}

                        ,{field:'battgroup_float_curr', title:'浮充电流', align:'center', width: 200}

                        ,{field:'battgroup_register_code', title:'注册码', align:'center', width: 200}

                        

                    ]]

                    ,data:[]

@@ -151,6 +154,9 @@
                                    _tmp.battgroup_id = _data.battgroup_id;

                                    _tmp.battgroup_index = _data.battgroup_index;

                                    _tmp.battgroup_mon_cnt = _data.battgroup_mon_cnt;

                                    _tmp.battgroup_float_vol = _data.battgroup_float_vol;

                                    _tmp.battgroup_float_curr = _data.battgroup_float_curr;

                                    _tmp.battgroup_register_code = _data.battgroup_register_code;

                                    

                                    arr_td.push(_tmp);

                                    Page.setAll(_data.num);


 gx_tieta/WebRoot/mobil/app/css/common.css

@@ -95,7 +95,18 @@
.mrt8 {

    margin-top: 8px;

}



.mrt16 {

    margin-top: 16px;

}

.mrt24 {

    margin-top: 24px;

}

.mrt28 {

    margin-top: 28px;

}

.mrt32 {

    margin-top: 32px;

}

/* margin-left */

.mrl8 {

    margin-left: 8px;


 gx_tieta/WebRoot/mobil/charge-history.html

@@ -257,12 +257,13 @@
            var record = -1;

            var index = -1;

            var flag = false;

            var start_record_num = list[0].record_num;

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

                //console.info(list[i]);

                if(list[i].record_num != record){

                    ALLData[++index] = new Array();

                    

                    if(list[i].record_num > 1){	
                    if(list[i].record_num > start_record_num){	
                        flag = true;

                        ALLData[index] = ALLData[index-1].slice(0);

                    }


 gx_tieta/WebRoot/mobil/homeList.html

@@ -8,8 +8,12 @@
<link rel="stylesheet" href="css/breadcrumb.css">

<link rel="stylesheet" type="text/css" href="css/defined.popup.css"/>

<link rel="stylesheet" type="text/css" href="src/css/layui.css">

<link rel="stylesheet" type="text/css" href="app/css/common.css">

<link rel="stylesheet" type="text/css" href="font-awesome-4.7.0/css/font-awesome.css">

<style type="text/css">

	
    #battList li a{

        font-size: 12px !important;

    }

</style>

</head>

    <body>

@@ -20,9 +24,9 @@
            </div>

            <div data-role="content">

                <div class="home-search-input-container">

                    <input type="text" data-type="search" name="search" id="searchInput" placeholder="搜索内容..." autofocus="autofocus">

                    <input type="text" data-type="search" name="search" id="searchInput" placeholder="请输入机房名称关键字..." autofocus="autofocus">

                </div>

                <div id="battList"></div>

                <div id="battList" class="mrt28"></div>

            </div>

        </div>

        <!-- 存储机房信息列表 -->

@@ -40,6 +44,20 @@
            setTimeout(function() {

                findHome();        // 查询所有的机房

            }, 10);

			
            //固定块

            layui.util.fixbar({

                css: {right: 10, bottom: 10}

                ,showHeight: 100

                ,bgcolor: '#393D49'

                ,click: function(type){

                  if(type === 'bar1'){

                    layer.msg('icon是可以随便换的')

                  } else if(type === 'bar2') {

                    layer.msg('两个bar都可以设定是否开启')

                  }

                }

              });

        });

        

        // 点击机房事件

@@ -140,13 +158,13 @@
            ulCon.find('ul').remove();

            

            // 创建ul

            var _ul = $('<ul data-role="listview" data-inset="true"></ul>');

            var _ul = $('<ul data-role="listview" data-inset="false"></ul>');

            

            // 遍历dataList生成li和a

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

                var _li = $('<li></li');

                var _li = $('<li data-icon="false"></li');

                var _dataList = dataList[i];

                var _a = $('<a href="javascript:;" value=""  data-transition="slide">'+_dataList.home+'</a>');

                var _a = $('<a href="javascript:;" value=""><i class="fa fa-home mrr4"></i>'+_dataList.home+'</a>');

                _a.data('homedata', _dataList);        // 给连接添加信息                

                // 将_a添加到_li，将_li添加到_ul中

                _li.append(_a);


 gx_tieta/WebRoot/mobil/index.html

@@ -96,6 +96,13 @@
        $(document.body).css( "visibility", "visible") ;

    });

    

    //拦截安卓回退按钮

    history.pushState(null, null, location.href);

    window.addEventListener('popstate', function(event) {

        history.pushState(null, null, location.href );

        //此处加入回退时你要执行的代码

    });

	
    //安全退出

    function exitUser(){

        $.post("../LoginAction!exitUser",null,function(data){

@@ -122,6 +129,7 @@
                }

        });

    }

	
    //根据权限名判断是否具有某个权限

    function isHasPermit(_permitName,_permitList)

    {


 gx_tieta/WebRoot/mobil/machineroomM.html

@@ -21,7 +21,7 @@
            <div data-role="content">

                <ul class="breadcrumb"></ul>

                <div class="home-search-input-container">

                    <input type="text" data-type="search" name="search" id="searchInput" placeholder="搜索内容...">

                    <input type="text" data-type="search" name="search" id="searchInput" placeholder="请输入机房名称关键字...">

                </div>

                <div id="battList"></div>

            </div>


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

@@ -54,7 +54,7 @@
        Page page=binf.getPage();

        Connection conn=DBUtil.getConn();

        String numberSql=" SELECT FOUND_ROWS() number";

        String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,battgroup_id,battgroup_index,battgroup_mon_cnt " +

        String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,battgroup_id,battgroup_index,battgroup_mon_cnt,battgroup_float_vol,battgroup_float_curr,battgroup_register_code " +

                "  ,stationName,stationName1,stationName2,stationName3,stationName5,StationId " +

                " from db_app_sys.tb_app_bts_battgroup " +

                " left outer join db_battinf.tb_battinf  on db_app_sys.tb_app_bts_battgroup.dev_id=db_battinf.tb_battinf.fBSDeviceId " +

@@ -75,7 +75,7 @@
        }else{

            sql+=dev_idT;

        }

        String orderSql="  order by dev_id limit ?,? ";

        String orderSql="  order by dev_id,battgroup_index asc  limit ?,? ";

        sql+=orderSql;

        //System.out.println(sql);                                                    //"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationId()+"%","%"+binf.getStationName5()+"%",binf.getNum()

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

@@ -89,6 +89,9 @@
                        abattgroup.setBattgroup_id(rs.getInt("battgroup_id"));

                        abattgroup.setBattgroup_index(rs.getInt("battgroup_index"));

                        abattgroup.setBattgroup_mon_cnt(rs.getInt("battgroup_mon_cnt"));

                        abattgroup.setBattgroup_float_vol(rs.getFloat("battgroup_float_vol"));

                        abattgroup.setBattgroup_float_curr(rs.getFloat("battgroup_float_curr"));

                        abattgroup.setBattgroup_register_code(rs.getString("battgroup_register_code"));

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

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

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


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

@@ -49,7 +49,7 @@
        Page page=binf.getPage();

        Connection conn=DBUtil.getConn();

        String numberSql=" SELECT FOUND_ROWS() number";

        String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,thread_id,battgroup_cnt,battgroup_id1,battgroup_index1,battgroup_id2,battgroup_index2,battgroup_id3,battgroup_index3,battgroup_id4,battgroup_index4,connet_time,dev_comm_runtime,break_type " +

        String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,thread_id,dev_mcu_uid,battgroup_cnt,battgroup_id1,battgroup_index1,battgroup_id2,battgroup_index2,battgroup_id3,battgroup_index3,battgroup_id4,battgroup_index4,connet_time,dev_comm_runtime,break_type " +

                "  ,stationName,stationName1,stationName2,stationName3,stationName5,StationId " +

                " from db_app_sys.tb_app_bts_comm_task " +

                " left outer join db_battinf.tb_battinf  on db_app_sys.tb_app_bts_comm_task.dev_id=db_battinf.tb_battinf.fBSDeviceId " +

@@ -83,6 +83,7 @@
                        atask.setDev_id(rs.getInt("dev_id"));

                        atask.setThread_id(rs.getInt("thread_id"));

                        atask.setBattgroup_cnt(rs.getInt("battgroup_cnt"));

                        atask.setDev_mcu_uid(rs.getString("dev_mcu_uid"));

                        atask.setBattgroup_id1(rs.getInt("battgroup_id1"));

                        atask.setBattgroup_index1(rs.getInt("battgroup_index1"));

                        atask.setBattgroup_id2(rs.getInt("battgroup_id2"));


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

@@ -8,6 +8,9 @@
    private int battgroup_id;

    private int battgroup_index;

    private int battgroup_mon_cnt;

    private float battgroup_float_vol;

    private float battgroup_float_curr;

    private String battgroup_register_code;

    private String stationName;

    private String stationName1;

    private String stationName2;

@@ -87,14 +90,34 @@
    public void setNote(String note) {

        this.note = note;

    }

    public float getBattgroup_float_vol() {

        return battgroup_float_vol;

    }

    public void setBattgroup_float_vol(float battgroup_float_vol) {

        this.battgroup_float_vol = battgroup_float_vol;

    }

    public float getBattgroup_float_curr() {

        return battgroup_float_curr;

    }

    public void setBattgroup_float_curr(float battgroup_float_curr) {

        this.battgroup_float_curr = battgroup_float_curr;

    }

    public String getBattgroup_register_code() {

        return battgroup_register_code;

    }

    public void setBattgroup_register_code(String battgroup_register_code) {

        this.battgroup_register_code = battgroup_register_code;

    }

    @Override

    public String toString() {

        return "App_bts_battgroup [num=" + num + ", dev_id=" + dev_id + ", battgroup_id=" + battgroup_id

                + ", battgroup_index=" + battgroup_index + ", battgroup_mon_cnt=" + battgroup_mon_cnt + ", stationName="

                + stationName + ", stationName1=" + stationName1 + ", stationName2=" + stationName2 + ", stationName3="

                + stationName3 + ", stationName5=" + stationName5 + ", stationId=" + stationId + ", note=" + note + "]";

                + ", battgroup_index=" + battgroup_index + ", battgroup_mon_cnt=" + battgroup_mon_cnt

                + ", battgroup_float_vol=" + battgroup_float_vol + ", battgroup_float_curr=" + battgroup_float_curr

                + ", battgroup_register_code=" + battgroup_register_code + ", stationName=" + stationName

                + ", stationName1=" + stationName1 + ", stationName2=" + stationName2 + ", stationName3=" + stationName3

                + ", stationName5=" + stationName5 + ", stationId=" + stationId + ", note=" + note + "]";

    }



	
    

    

}


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

@@ -7,6 +7,7 @@
    private int num;

    private int thread_id;

    private int dev_id;

    private String dev_mcu_uid;

    private int battgroup_cnt;

    private int battgroup_id1;

    private int battgroup_index1;

@@ -158,24 +159,26 @@
    public void setStationId(String stationId) {

        this.stationId = stationId;

    }

    public String getDev_mcu_uid() {

        return dev_mcu_uid;

    }

    public void setDev_mcu_uid(String dev_mcu_uid) {

        this.dev_mcu_uid = dev_mcu_uid;

    }

    @Override

    public String toString() {

        return "App_bts_comm_task [num=" + num + ", thread_id=" + thread_id

                + ", dev_id=" + dev_id + ", battgroup_cnt=" + battgroup_cnt

                + ", battgroup_id1=" + battgroup_id1 + ", battgroup_index1="

                + battgroup_index1 + ", battgroup_id2=" + battgroup_id2

                + ", battgroup_index2=" + battgroup_index2 + ", battgroup_id3="

                + battgroup_id3 + ", battgroup_index3=" + battgroup_index3

                + ", battgroup_id4=" + battgroup_id4 + ", battgroup_index4="

                + battgroup_index4 + ", connect_time=" + connet_time

                + ", dev_comm_runtime=" + dev_comm_runtime + ", break_type="

                + break_type + ", stationName=" + stationName

                + ", stationName1=" + stationName1 + ", stationName2="

                + stationName2 + ", stationName3=" + stationName3

                + ", stationName5=" + stationName5 + ", stationId=" + stationId

        return "App_bts_comm_task [num=" + num + ", thread_id=" + thread_id + ", dev_id=" + dev_id + ", dev_mcu_uid="

                + dev_mcu_uid + ", battgroup_cnt=" + battgroup_cnt + ", battgroup_id1=" + battgroup_id1

                + ", battgroup_index1=" + battgroup_index1 + ", battgroup_id2=" + battgroup_id2 + ", battgroup_index2="

                + battgroup_index2 + ", battgroup_id3=" + battgroup_id3 + ", battgroup_index3=" + battgroup_index3

                + ", battgroup_id4=" + battgroup_id4 + ", battgroup_index4=" + battgroup_index4 + ", connet_time="

                + connet_time + ", dev_comm_runtime=" + dev_comm_runtime + ", break_type=" + break_type

                + ", stationName=" + stationName + ", stationName1=" + stationName1 + ", stationName2=" + stationName2

                + ", stationName3=" + stationName3 + ", stationName5=" + stationName5 + ", stationId=" + stationId

                + ", note=" + note + "]";

    }

    

    

	


}


 gx_tieta/src/global_zh_CN.properties

@@ -1124,4 +1124,7 @@
Batch_batt_param_set = \u6279\u91cf\u7535\u6c60\u53c2\u6570\u8bbe\u7f6e



##################  sys-set-test.jsp     ##############################

Batch_sys_param_set = \u6279\u91cf\u7cfb\u7edf\u53c2\u6570\u8bbe\u7f6e
Batch_sys_param_set = \u6279\u91cf\u7cfb\u7edf\u53c2\u6570\u8bbe\u7f6e



##################  bts-comm-mon.jsp      #########################

Batt_conn_info_query = \u7535\u6c60\u7ec4\u8fde\u63a5\u4fe1\u606f\u67e5\u8be2