From f0528386da3b2c5ae38c1699ffea318d37376665 Mon Sep 17 00:00:00 2001 From: hdw <496960745@qq.com> Date: 星期二, 27 十一月 2018 17:19:46 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/WebRoot/mobil/batt-traffic-statistics.html | 8 gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 52 +++- gx_tieta/WebRoot/mobil/ele-param.html | 491 +++++++++++++++++++++++++++++++++++++++++++++++++ gx_tieta/src/com/fgkj/services/BattInfServices.java | 15 + 4 files changed, 546 insertions(+), 20 deletions(-) diff --git a/gx_tieta/WebRoot/mobil/batt-traffic-statistics.html b/gx_tieta/WebRoot/mobil/batt-traffic-statistics.html index d0905b7..f625be3 100644 --- a/gx_tieta/WebRoot/mobil/batt-traffic-statistics.html +++ b/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> diff --git a/gx_tieta/WebRoot/mobil/ele-param.html b/gx_tieta/WebRoot/mobil/ele-param.html new file mode 100644 index 0000000..09abe58 --- /dev/null +++ b/gx_tieta/WebRoot/mobil/ele-param.html @@ -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)','鐢垫睜缁処D','鏈烘埧鍐呯數姹犵粍缂栧彿','鐢垫睜缁勫悕绉�','娴厖鐢靛帇闃�鍊�(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> \ No newline at end of file diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java index 0586a20..dd8c1f2 100644 --- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java +++ b/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; } //-----------鏍规嵁钃勭數姹犵粍鏌ヤ笉閲嶅鐨凪onCount(monNum)锛堝崟浣撶紪鍙凤級 public List serchByMonNum(Object obj){ diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java index eb5a36f..7f09cfc 100644 --- a/gx_tieta/src/com/fgkj/services/BattInfServices.java +++ b/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; } -- Gitblit v1.9.1