hdw
2018-11-27 f0528386da3b2c5ae38c1699ffea318d37376665
Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
1个文件已添加
3个文件已修改
566 ■■■■■ 已修改文件
gx_tieta/WebRoot/mobil/batt-traffic-statistics.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/ele-param.html 491 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/services/BattInfServices.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/batt-traffic-statistics.html
@@ -147,6 +147,14 @@
                    
            </table>
        </div>
        <div data-role="footer" data-position="fixed">
             <div data-role="navbar">
          <ul>
            <li><a href="index.html" target="_top" data-icon="home">首页</a></li>
            <li><a href="batt-traffic-line.html" target="_top" data-icon="arrow-r">折现图</a></li>
          </ul>
        </div>
        </div>
    </div>
</body>
gx_tieta/WebRoot/mobil/ele-param.html
New file
@@ -0,0 +1,491 @@
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <title>电池组信息配置</title>
    <meta name="viewport" content="width=device-width,initial-scale=1">
    <meta name="apple-mobile-web-app-capable" content="yes">
    <meta name="apple-mobile-web-app-status-bar-style" content="black">
    <link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
    <link href="mobilCss/mobiscroll.core-2.5.2.css" rel="stylesheet" type="text/css" />
    <link href="mobilCss/mobiscroll.animation-2.5.2.css" rel="stylesheet" type="text/css" />
    <link rel="stylesheet" type="text/css" href="css/tbl.css">
    <script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
    <script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
    <style type="text/css">
        /*规定面板的样式*/
        .ui-panel {
            width: 80%;
        }
        .ui-panel-dismiss{
            width: 20%;
        }
        .ui-panel-inner{
            padding:0 !important;
        }
        .ui-collapsible-heading-toggle{
            padding-left: 1em !important;
        }
        .panel-header{
            padding: 8px 0;
            font-size: 1.2em;
            text-indent: 1em;
            background-color: #DFDCDC;
        }
        /*规定开关的位置*/
        .ui-flipswitch {
            margin-left: 0.5em;
        }
        .ui-field-contain{
            padding: 0 0.6em ;
        }
        .ui-field-contain {
            border-bottom-color: #828282;
            border-bottom-color: rgba(0,0,0,.15);
            border-bottom-width: 1px;
            border-bottom-style: none;
        }
        .sicon{
            display:inline-block;width:4%;margin:1em 0;float:left;
        }
        .checkdata{
             display:inline-block;width:48%;margin:0 0 0 0;float:left;
         }
         .next-page, .pre-page {
            position: fixed;
            width: 40px;
            height: 40px;
            top: 50%;
            margin-top: -15px;
        }
        .next-page  {
            right: 0;
        }
        .pre-page  {
            left: 0;
        }
        table {
            margin-top:.5em;
            border-collapse:separate;
            border-spacing:0 .5em;
        }
        tbody tr td{
            overflow: hidden;
            text-overflow:ellipsis;
            white-space: nowrap;
        }
    </style>
    <link rel="stylesheet" href="css/fgpanel.css">
</head>
<body>
    <div data-role="page">
        <div class="fg-panel">
            <form>
                <div class="fg-panel-header">筛选</div>
                <div class="fg-panel-content">
                    <fieldset data-role="controlgroup">
                         <p>省</p>
                        <select id="mainteArea" data-mini="true">
                          <option value="">全部</option>
                          <option value="">一枢纽</option>
                          <option value="">二枢纽</option>
                          <option value="">枢纽楼</option>
                        </select>
                        <p>市</p>
                        <select id="city" data-mini="true">
                            <option value="">全部</option>
                        </select>
                        <p>区/县</p>
                        <select id="country" data-mini="true">
                            <option value="">全部</option>
                        </select>
                         <p>机房站点</p>
                        <select id="homeName" data-mini="true">
                            <option value="">全部</option>
                        </select>
                    </fieldset>
                </div>
                <div class="fg-panel-btn">
                    <a href="javascript:panel.hide(true);" id="submit" data-role="button" class="ui-btn ui-mini ui-btn-b ui-shadow">确定</a>
                </div>
            </form>
        </div>
        <!-- 头部内容 -->
        <div data-role="header" data-position="fixed">
            <a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">返回</a>
            <h1>电池组信息配置</h1>
            <a href="javascript:panel.show();" class="ui-btn ui-corner-all ui-shadow ui-icon-grid ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;" id="screen">筛选</a>
        </div>
        <!-- 主体内容 -->
        <div data-role="main">
            <div class="pre-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-l ui-btn-icon-notext">图标</a></div>
            <div class="next-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-r ui-btn-icon-notext">图标</a></div>
            <!-- 表格容器 -->
            <div class="tbl-container"></div>
            <table data-role="table" class="ui-responsive ui-shadow" id="tab" >
            </table>
        </div>
        <div data-role="footer" data-position="fixed" data-theme="a">
            <div data-role="navbar">
                <ul>
                  <li><a href="index.html" target="_top" data-role="button" data-icon="home" data-transition="slide">首页</a></li>
                  <li><a href="" target="_top" data-role="button" data-icon="grid" data-transition="slide">新建</a></li>
                </ul>
            </div>
        </div>
    </div>
</body>
<script src="mobilJs/mobiscroll.core-2.5.2.js" type="text/javascript"></script>
<script src="mobilJs/mobiscroll.core-2.5.2-zh.js" type="text/javascript"></script>
<script src="mobilJs/mobiscroll.datetime-2.5.1.js" type="text/javascript"></script>
<script src="mobilJs/mobiscroll.datetime-2.5.1-zh.js" type="text/javascript"></script>
<script type="text/javascript" src="js/tbl.js"></script>
<script type="text/javascript" src="mobilJs/base.js"></script>
<script type="text/javascript" src="js/panel.js"></script>
 <script type="text/javascript">
    $('document').ready(function(){panel.show();});
    var arr=new Array();        //当前表格td数据
    var tblCon = $('.tbl-container');
    var Page = {
        pageSize:10,                 //每页的行数
        pageCurr:1,                  //当前页码数
        pageAll:0,
    };
    $('document').ready(function(){panel.show();});
    var arrTh = [ '机房编号', '省', '城市','区县','机房名称','设备名称','机房IP','FBS设备ID(重要)','FBS设备IP(重要)','子网掩码','网关','FBS设备名称','FBS电池索引(0-3)','电池组ID','机房内电池组编号','电池组名称','浮充电压阀值(V)','离线电压阀值(V)','浮充电流阀值(A)','单体数量','标称容量(AH)','标称单体电压(V)','标称单体内阻(mΩ)','标称单体电导','单体电压次低偏移量(V)','负载电流(A)','最大核容电流(A)','基站号码','电池品牌','电池型号','电池生产日期','投入使用日期','安装人员'];
    dataArr = [];
    var startTime = "1980-01-01";
    var endTime = new Date().format('yyyy-MM-dd');
    var tbl = $('.tbl-container');
    createTbl(tbl, arrTh, dataArr);
    $(document).ready(function(){
        setPage();
        $("#submit").click(function(){
            Page.pageCurr=1;
            searchBattLife();
        });
     });
    // 查询内容
        function searchBattLife(){
            var temp = createSearchParam();
            var json = JSON.stringify(temp);
            arrTd = new Array();
            var load;
            /*if() {
                load = layer.load(1);
            }*/
             $.ajax({
                type:"post",
                url:"",
                async:true,
                datatype:'json',
                data:"json="+json,
                success:function(data){
                    //console.info(data);
                    var data = JSON.parse(data.result);
                    //layer.close(load);
                    if(data.code==1&&data.data.length>0){
                        data=data.data;
                        var index = 0;
                        var ArryTb= new Array();
                        for(i=0;i<data.length;i++){
                            arrTd[index++]=data[i].deviceId;
                            arrTd[index++]=data[i].stationName;
                            arrTd[index++]=data[i].real_cap;
                            //arrTd[index++]=data[i].is_out_stand;
                        }
                        Page.pageAll = data[data.length-1].page.pageAll;
                    }else{
                        Page.pageAll = 0;
                    }
                    setPage();
                    //console.info(Page.pageAll);
                    createTbl(tblCon, arrTh, arrTd);
                }
            });
            /* 模拟数据做好就删!!!!!!!! */
            for(i=0;i<100;i++){
                     arrTd[i]=i*10;
                    }
                    createTbl(tblCon, arrTh, arrTd);
            /* 模拟数据做好就删!!!!!!!! */
        }
    function createSearchForm(){
        var temp={
                page:Page,
                StationName1:$('#mainteArea').val(),
                StationName2:$('#city').val(),
                StationName5:$('#country').val(),
                StationName:$('#homeName').val(),
        };
        return temp;
    }
    // stringify(createSearchForm());
    //页面加载时查询省
    $.post("BattInfAction_serchByStation",null,function(data){
        data = data.result;
        data = eval("("+data+")");
        //console.info(data);
        //console.info(data.code);
        if(data.code==1&&data.data.length>0){
               var $Ostation_name1=$("#mainteArea");
            $Ostation_name1.text("");
            var arr = new Array();
            for(var i=0;i<=data.data.length;i++)
            {
                   if(i == 0){
                       arr.push({
                           val:"",
                           txt:"全部(共"+data.sum+"个)",
                       });
                   }else{
                       arr.push({
                           val:data.data[i-1].StationName1,
                           txt:data.data[i-1].StationName1,
                       });
                   }
            }
            updataSel($Ostation_name1, arr);
        }
         findCity();
    });
//当省改变时更新市
    function findCity(){
        var data = {
            StationName1: $("#mainteArea").val()
        };
        //console.info(data);
        // 请求获取当前省下的市
        $.ajax({
            type: "post",
            url: "BattInfAction!serchStationName2",
            async:true,
            dataType:'json',
            data:"json = "+JSON.stringify(data),
            success: function(data){
            data = data.result;
            data = eval("("+data+")");
            //console.info(data);
            //console.info(data.code);
            if(data.code==1&&data.data.length>0){
                   var $Ostation_name1=$("#city");
                $Ostation_name1.text("");
                var arr = new Array();
                for(var i=0;i<=data.data.length;i++)
                {
                       if(i == 0){
                           arr.push({
                               val:"",
                               txt:"全部(共"+data.data.length+"个)",
                           });
                       }else{
                           arr.push({
                               val:data.data[i-1].StationName2,
                               txt:data.data[i-1].StationName2,
                           });
                       }
                }
                updataSel($Ostation_name1, arr);
            }
             findCounty();
        }
        });
    }
//当市改变时更新区/县
    function findCounty(){
        var data = {
            StationName1: $("#mainteArea").val(),
            StationName2:$("#city").val(),
        };
        //console.info(data);
        $.ajax({
            type: "post",
            url: "BattInfAction!serchStationName5",
            async:true,
            dataType:'json',
            data:"json = "+JSON.stringify(data),
            success: function(data){
            data = data.result;
            data = eval("("+data+")");
            //console.info(data);
            //console.info(data.code);
            if(data.code==1&&data.data.length>0){
                   var $Ostation_name1=$("#country");
                $Ostation_name1.text("");
                var arr = new Array();
                for(var i=0;i<=data.data.length;i++)
                {
                       if(i == 0){
                           arr.push({
                               val:"",
                               txt:"全部(共"+data.data.length+"个)",
                           });
                       }else{
                           arr.push({
                               val:data.data[i-1].StationName5,
                               txt:data.data[i-1].StationName5,
                           });
                       }
                }
                updataSel($Ostation_name1, arr);
            }
          findStationNamebyStationname1();
        }
        });
    }
 //当区县更新时更新机房
    function findStationNamebyStationname1(){
        var data = {
            StationName1: $("#mainteArea").val(),
            StationName2:$("#city").val(),
            StationName5:$("#country").val()
        };
        //console.info(data);
        $.ajax({
            type: "post",
            url: "BattInfAction!serchStationName3",
            async:true,
            dataType:'json',
            data:"json = "+JSON.stringify(data),
            success: function(data){
            data = data.result;
            data = eval("("+data+")");
            //console.info(data);
            //console.info(data.code);
            if(data.code==1&&data.data.length>0){
                   var $Ostation_name1=$("#homeName");
                $Ostation_name1.text("");
                var arr = new Array();
                for(var i=0;i<=data.data.length;i++)
                {
                       if(i == 0){
                           arr.push({
                               val:"",
                               stationid:"",
                               txt:"全部(共"+data.data.length+"个)",
                           });
                       }else{
                           arr.push({
                               val:data.data[i-1].StationName3,
                               stationid:data.data[i-1].StationId,
                               txt:data.data[i-1].StationName3,
                           });
                       }
                }
                //console.info(111111111111111);
                updataSelStation($Ostation_name1, arr);
            }
        }
        });
    }
   //当省改变时更新市
   $('#mainteArea').change(function(){
           findCity();
   });
   //当市改变时改变区/县
   $('#city').change(function(){
           findCounty();
   });
   //当区/县改变时改变机房
   $('#country').change(function(){
           findStationNamebyStationname1();
   });
    //构造查询条件
        function createSearchParam(){
            var temp = {
                page:Page,
                stationName1:$('#mainteArea').val(),
                stationName2:$('#city').val(),
                stationName5: $('#country').val(),
                stationName:$('#homeName').val(),
            };
            console.info(temp);
            return temp;
        }
    $(function() {
        //点击上一页
        $('.pre-page').on('click', 'a', function() {
            if(Page.pageCurr>1){
                Page.pageCurr = Page.pageCurr - 1;
                searchBattLife();
            }
        });
        //点击下一页
        $('.next-page').on('click', 'a', function() {
            var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
            if(Page.pageCurr<pageNum){
                Page.pageCurr = Page.pageCurr + 1;
                searchBattLife();
            }
        });
    });
    // 判断是否显示翻页按钮
    function setPageTurning(isShowPre, isShowNext) {
        if(isShowPre) {    // 判断是否显示向上翻页按钮
            $('.pre-page').show();
        }else {
            $('.pre-page').hide();
        }
        if(isShowNext) {    // 判断是否显示向下翻页按钮
            $('.next-page').show();
        }else {
            $('.next-page').hide();
        }
    }
    //设置页面的跳转链接
    function setPage(){
        if(Page.pageCurr <= 1){
            $('.pre-page').hide();
        }else{
            $('.pre-page').show();
        }
        var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
        if(Page.pageCurr < pageNum){
            $('.next-page').show();
        }else{
            $('.next-page').hide();
        }
    }
   </script>
</html>
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -1113,37 +1113,57 @@
        return number;
    }
    //查询设备总数(全部)
    public int serchByDeviceId_all(Object obj){
    public List serchByDeviceId_all(Object obj){
        User_inf uinf=(User_inf) obj;
        String sql=" SELECT COUNT(DISTINCT fbsdeviceid) number FROM db_battinf.tb_battinf  " +
                    " left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId " +
                    " 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 1 ";
        List<BattInf> list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
        String sql=" SELECT DISTINCT fbsdeviceid,station_install,monvolstd FROM db_battinf.tb_battinf  " +
                   "  where 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=? " +
                   " ) ";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
            
            public List getResults(ResultSet rs) {
                List list=new ArrayList();
                int num_2_install=0;//2v已安装
                int num_2=0;//2v全部
                int num_12_install=0;//12v已安装
                int num_12=0;//12v全部
                int num_install=0;//已安装
                int num=0;//全部
                try {
                    while(rs.next()){
                        BattInf binf=new BattInf();
                        binf.setNum(rs.getInt("number"));
                        list.add(binf);
                        int insatll=rs.getInt("station_install");
                        float monvolstd=rs.getFloat("monvolstd");
                        if(insatll==1){
                            num_install+=1;
                            if(monvolstd==2.0){
                                num_2_install+=1;
                            }else{
                                num_12_install+=1;
                            }
                        }
                        if(monvolstd==2.0){
                            num_2+=1;
                        }else{
                            num_12+=1;
                        }
                        num+=1;
                    }
                } catch (SQLException e) {
                    // TODO Auto-generated catch block
                    e.printStackTrace();
                }
                list.add(num_2_install);
                list.add(num_2);
                list.add(num_12_install);
                list.add(num_12);
                list.add(num_install);
                list.add(num);
                return list;
            }
            
        });
        int number=0;//存放总数
        if(list!=null&&list.size()>0){
            number=list.get(list.size()-1).getNum();
        }
        return number;
        return list;
    }
    //-----------根据蓄电池组查不重复的MonCount(monNum)(单体编号)
    public List serchByMonNum(Object obj){
gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -986,10 +986,17 @@
    }
    //首页上显示已安装数和全部基站数
    public ServiceModel serchDevice(Object obj){
        int devNum=(new BattInfImpl()).serchByDeviceId(obj);        //总设备数(已安装)
        int allNum=(new BattInfImpl()).serchByDeviceId_all(obj);        //总设备数(全部)
        model.setSum(allNum);
        model.setNewsum(devNum);
        //int devNum=(new BattInfImpl()).serchByDeviceId(obj);        //总设备数(已安装)
        List list=(new BattInfImpl()).serchByDeviceId_all(obj);        //总设备数(全部)
        if (list != null && list.size() > 0) {
            model.setCode(1);
            model.setData(list);
            model.setMsg("查询成功!");
        }else{
            model.setCode(0);
            model.setMsg("查询失败!");
        }
        //System.out.println(model.getData());
        return model;
    }