From 030de8f10eee755bb99fd4b2de83f09e6be6ae72 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期二, 27 十一月 2018 16:06:12 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java | 2
gx_tieta/WebRoot/index.jsp | 305 +++++++++++++++++--------
gx_tieta/WebRoot/mobil/batt-state-statistical.html | 60 ----
gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java | 2
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 12
gx_tieta/WebRoot/css/login_layout.css | 3
gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java | 6
gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java | 8
gx_tieta/src/com/fgkj/dto/BattMap_information.java | 42 ++-
gx_tieta/WebRoot/Top.jsp | 20 +
gx_tieta/WebRoot/login.jsp | 37 --
/dev/null | 0
gx_tieta/WebRoot/pages/js/pages/index-common.js | 111 +++++----
gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java | 2
gx_tieta/src/com/fgkj/Filters/CrossDomainLimitFilter.java | 29 +
gx_tieta/src/com/fgkj/actions/BattInfAction.java | 2
gx_tieta/src/com/fgkj/actions/BatttestdataAction.java | 2
gx_tieta/WebRoot/images/verify.png | 0
gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java | 43 +++
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java | 2
gx_tieta/WebRoot/batt-state-manage.jsp | 4
gx_tieta/src/com/fgkj/services/Batt_enduranceService.java | 7
22 files changed, 420 insertions(+), 279 deletions(-)
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index 93433a6..053cabe 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -221,7 +221,7 @@
searchpoweroff(); //鏌ヨ鏈烘埧鍋滅數鎬绘暟
searchdevalarm(); //鏌ヨ璁惧瀹炴椂鍛婅鎬绘暟
searchnotcomplan(); //鏌ヨ鏈斁鐢电殑璁″垝鎬绘暟
-
+ searchWeakHome(); //鏌ヨ鏈烘埧缁埅涓嶈冻鐨勪釜鏁�
/* setInterval(function(){
searchlowmon(); //鏌ヨ钀藉悗鍗曚綋鎬绘暟
searchpoweroff(); //鏌ヨ鏈烘埧鍋滅數鎬绘暟
@@ -333,6 +333,23 @@
});
}
+ // 鏈烘埧缁埅涓嶈冻涓暟
+ function searchWeakHome() {
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: 'Batt_enduranceAction!serchxuhangNotInThree'
+ ,data: null
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ $('#weak_home').text(rs.sum);
+
+ setTimeout(searchWeakHome, 5000);
+ }
+ });
+ }
+
$(function(){
$.ajax({
@@ -361,7 +378,6 @@
// 娣诲姞澶╂皵鎻掍欢鍜岀數姹犱俊鎭暱搴︽帶鍒�
$(function() {
limitWidth();
- //addWeather();
});
// 闄愬埗鏄剧ず涓暟
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index 3719234..048ff45 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -713,8 +713,8 @@
// 缁欐瘡涓�琛屾坊鍔犳暟鎹�
var trList = tblBd.find('tbody tr');
// 閬嶅巻鍐呭缁檛r娣诲姞attr
- for(var i=0; i<model.data.length; i++) {
- trList.eq(i).data('attr', model.data[i]);
+ for(var i=0; i<data.length; i++) {
+ trList.eq(i).data('attr', data[i]);
}
window.clearTimeout(myTimeOut);
diff --git a/gx_tieta/WebRoot/css/login_layout.css b/gx_tieta/WebRoot/css/login_layout.css
index 4f72d2a..d9a2517 100644
--- a/gx_tieta/WebRoot/css/login_layout.css
+++ b/gx_tieta/WebRoot/css/login_layout.css
@@ -276,4 +276,7 @@
margin-left: -250px;
top: 50%;
margin-top: -150px;
+}
+.hdw-dialog-content-container {
+ position: relative;
}
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/images/1.jpg b/gx_tieta/WebRoot/images/1.jpg
deleted file mode 100644
index 0fdb8dd..0000000
--- a/gx_tieta/WebRoot/images/1.jpg
+++ /dev/null
Binary files differ
diff --git a/gx_tieta/WebRoot/images/2.jpg b/gx_tieta/WebRoot/images/2.jpg
deleted file mode 100644
index 6e73457..0000000
--- a/gx_tieta/WebRoot/images/2.jpg
+++ /dev/null
Binary files differ
diff --git a/gx_tieta/WebRoot/images/verify.png b/gx_tieta/WebRoot/images/verify.png
new file mode 100644
index 0000000..a2b51c3
--- /dev/null
+++ b/gx_tieta/WebRoot/images/verify.png
Binary files differ
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index e54a08e..4593492 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -219,16 +219,21 @@
<i class="fa fa-cog"></i>
</a>
</div>
- <!--鐢垫睜鏁呴殰淇鍥�-->
- <div class="repair-pie module"></div>
- <!-- 鐢垫睜鏁呴殰楗肩姸鍥� -->
- <div class="brdn-pie module"></div>
- <!-- 鐢垫睜鍛婅楗肩姸鍥� -->
- <div class="warn-pie module"></div>
- <!--鐢垫睜鍋ュ悍楗肩姸鍥�-->
- <div class="health-pie module"></div>
- <!--娓呴櫎娴姩-->
- <div class="clear"></div>
+ <div class="pie-item-con">
+ <!-- 鏈烘埧鍋滅數 -->
+ <div class="repair-pie module"></div>
+ <!-- 鐢垫睜鐘舵�侀ゼ鐘跺浘 -->
+ <div class="brdn-pie module"></div>
+ <!-- 鐢垫睜鍛婅楗肩姸鍥� -->
+ <div class="warn-pie module"></div>
+ <!--鐢垫睜瀹归噺楗肩姸鍥�-->
+ <div class="health-pie module"></div>
+ <!-- 鏈烘埧缁埅鑳藉姏楗肩姸鍥� -->
+ <div class="endur-pie module"></div>
+ <!--娓呴櫎娴姩-->
+ <div class="clear"></div>
+ </div>
+
</div>
<c:forEach var="cust" items="${sessionScope.custompages}">
<c:if test="${cust.submenu eq 'My_work' && cust.subflag eq 1}">
@@ -453,6 +458,15 @@
];
+
+ // 璁剧疆椤甸潰涓璸ie鐨勬ā鍧�
+ ;(function() {
+ var pieStatus = GLOBAL.Index.Pie.pieStatus; // 鏌ヨ楗肩姸鍥炬樉绀虹殑鐘舵��
+ var pieItemCon = $('.pie-con .pie-item-con');
+ pieItemCon.text('');
+ var pieItems = pieStatus();
+ pieItemCon.html(pieItems);
+ })();
var locationcity;
@@ -783,36 +797,23 @@
}
$(function() {
- flushFourPie();
-
- if($('#content .brdn-pie').length>0){
- //鐢熸垚鐢垫睜鐘舵�侀ゼ鐘跺浘
- var $brdn=$('#content .pie-con .brdn-pie'); //鑾峰彇鏁呴殰瀹瑰櫒鐨刯query瀵硅薄
- var brdn=$brdn.get(0); //灏嗗鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
- brdnPie=echarts.init(brdn); //鍒濆鍖栬〃鏍煎鍣�
- brdnPie.showLoading();
- }
-
- if($('#content .repair-pie').length>0){
- var $repair=$('#content .pie-con .repair-pie'); //鑾峰彇鏈烘埧鍋滅數鍥惧鍣ㄧ殑jquery瀵硅薄
- var repair=$repair.get(0); //灏嗘晠闅滃鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
- repairPie=echarts.init(repair); //鍒濆鍖栬〃鏍煎鍣�
- repairPie.showLoading();
- }
+ flushFourPie(true);
});
//鏇存柊鍥涚楗肩姸鍥�
- function flushFourPie(){
+ function flushFourPie(create){
var cityname = $('#panelCity').val();
locationcity = getCityByName(cityname);
+ if(create) {
+ initPieObj();
+ }
+
+
searchalarm_data(); //鏌ヨ鍛婅鐜�
searchGood(); //鏌ヨ鍋ュ悍鐜�
searchmaintByMap(); //鏌ヨ鐢垫睜鐘舵��
-
searchBatt_maint_inf(); //鏌ヨ鏈烘埧鍋滅數姣斾緥
-
-
-
+ searchEndurHome(); //鏌ヨ缁埅楗肩姸鍥�
}
//鏌ヨ鏈�杩戠殑鏁呴殰缁存姢璁板綍
@@ -919,20 +920,22 @@
});
}
-
+ var warnPie;
//鏌ヨ鍛婅淇℃伅骞舵樉绀哄憡璀︾巼
function searchalarm_data(){
if($('#content .warn-pie').length==0){
return;
}
-
//鐢熸垚鐢垫睜鍛婅鐜囬ゼ鐘跺浘
var $warn=$('#content .pie-con .warn-pie'); //鑾峰彇鍛婅瀹瑰櫒鐨刯query瀵硅薄
if($warn.length!=0){
- var warn=$warn.get(0); //灏嗗憡璀﹀鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
- var warnPie=echarts.init(warn); //鍒濆鍖栧浘琛ㄥ鍣�
- window.warnPie = warnPie;
- warnPie.showLoading();
+ var isEcharts = isObject(warnPie)?true:false;
+ if(!isEcharts) {
+ var warn=$warn.get(0); //灏嗗憡璀﹀鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
+ warnPie=echarts.init(warn); //鍒濆鍖栧浘琛ㄥ鍣�
+ warnPie.showLoading();
+ }
+
var cityname='';
//console.info("="+locationcity.pinyin+"=");
@@ -1004,47 +1007,63 @@
}
//鍒涘缓鐢垫睜鍛婅楗肩姸鍥�
var warnTle="<s:text name='Battery_alarm_rate'/>"; /* 鐢垫睜鍛婅鐜� */
- createPie(warnPie,warnTle,Almarr);
- warnPie.on('click', function(param) {
- // 0:鍦ㄧ嚎鐢靛帇 1:缁勭鐢靛帇 2:鍏呯數鐢垫祦 3:鏀剧數鐢垫祦 4:鍗曚綋鐢靛帇 5:瀹归噺鍛婅
- if(param.dataIndex == 5) {
+ if(!isEcharts) {
+ createPie(warnPie,warnTle,Almarr);
+ warnPie.on('click', function(param) {
+ // 0:鍦ㄧ嚎鐢靛帇 1:缁勭鐢靛帇 2:鍏呯數鐢垫祦 3:鏀剧數鐢垫祦 4:鍗曚綋鐢靛帇 5:瀹归噺鍛婅
+ if(param.dataIndex == 5) {
+
+ }else {
+ window.open('elewarn.jsp?warntype='+param.dataIndex+'&warntxt='+param.name);
+ }
- }else {
- window.open('elewarn.jsp?warntype='+param.dataIndex+'&warntxt='+param.name);
- }
-
- });
+ });
+ }else {
+ var opts = getOpt(warnTle, Almarr);
+ warnPie.setOption(opts);
+ }
+
+ setTimeout(searchalarm_data, 10000)
+
}
});
}
}
- var battstate_isExist = true;
var brdnPie;
//鏌ヨ鍚勪釜鏈烘埧鐨勭數姹犵姸鎬�
function searchmaintByMap(){
if($('#content .brdn-pie').length==0){
return;
}
+
+ // 鍒ゆ柇鏄惁涓篍charts瀵硅薄
+ var isEcharts = isObject(brdnPie)?true:false;
+
+ if(!isEcharts) {
+ //鐢熸垚鐢垫睜鐘舵�侀ゼ鐘跺浘
+ var $brdn=$('#content .pie-con .brdn-pie'); //鑾峰彇鏁呴殰瀹瑰櫒鐨刯query瀵硅薄
+ var brdn=$brdn.get(0); //灏嗗鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
+ brdnPie=echarts.init(brdn); //鍒濆鍖栬〃鏍煎鍣�
+ }
+
+
var brdnTle="<s:text name='Batte_state'/>"; /* 鐢垫睜鐘舵�� */
$.post("Batt_rtstateAction!serchBattStateRate",null,function(data){
var model=eval("("+data.result+")");
//console.info(model);
var maintarr = new Array();
setBatt_list(maintarr,model.data);
- if(battstate_isExist){
+ if(!isEcharts){
//鍒涘缓鐢垫睜鏁呴殰鐜囩姸鍥�
createPie(brdnPie,brdnTle,maintarr);
- battstate_isExist = false;
brdnPie.on('click', function(param) {
- console.info(param);
window.open('elestatus.jsp?battstate='+param.dataIndex);
});
}else{
brdnPie.setOption(getOpt(brdnTle, maintarr));
- //console.info("鏇存柊鎴愬姛");
}
- setTimeout("searchmaintByMap()",10000);
+ setTimeout(searchmaintByMap, 10000);
});
}
@@ -1084,13 +1103,21 @@
{state:4,value:"<s:text name='Average_charge'/>",color:'#800080'}, //鍧囧厖
];
- var repairPie;
- var powercut_isNew = true;
+ var repairPie;
//鏌ヨ鏈烘埧鍋滅數鐘舵��
function searchBatt_maint_inf(){
if($('#content .repair-pie').length==0){
return;
}
+ // 鍒ゆ柇鏄惁涓篍charts瀵硅薄
+ var isEcharts = isObject(repairPie)?true:false;
+ if(!isEcharts) {
+ var $repair=$('#content .pie-con .repair-pie'); //鑾峰彇鏈烘埧鍋滅數鍥惧鍣ㄧ殑jquery瀵硅薄
+ var repair=$repair.get(0); //灏嗘晠闅滃鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
+ repairPie=echarts.init(repair); //鍒濆鍖栬〃鏍煎鍣�
+ }
+
+ // 璇锋眰鍚庡彴
$.ajax({
type: "post",
//url: "BattPower_offAction!serchPowerOff",
@@ -1113,9 +1140,7 @@
{name:"鏈烘埧鎺夌珯", val: model.code}]; /* '鏈慨澶�' */
}
var repairTle="<s:text name='Computer_room'/><s:text name='Power_cut'/>"; /* '鏈烘埧鍋滅數' */
- if(powercut_isNew){
- //鍒涘缓鏈烘埧鍋滅數楗肩姸鍥�
- powercut_isNew = false;
+ if(!isEcharts){
createPie(repairPie,repairTle,repairObj);
repairPie.on('click', function() {
window.open('batt-state-manage.jsp');
@@ -1124,8 +1149,8 @@
var opt = getOpt(repairTle, repairObj);
repairPie.setOption(opt);
}
- //console.info(repairPie);
- setTimeout("searchBatt_maint_inf()", 10000);
+
+ setTimeout(searchBatt_maint_inf, 10000);
},
error:function(){
//setTimeout("searchBatt_maint_inf()", 10000);
@@ -1134,6 +1159,7 @@
}
//鏌ヨ鍋ュ悍鐜�
+ var healthPie;
function searchGood(){
if($('#content .health-pie').length==0){
return;
@@ -1141,16 +1167,18 @@
//鐢熸垚鐢垫睜鍋ュ悍鐜�
var $health=$('#content .pie-con .health-pie'); //鑾峰彇鏁呴殰瀹瑰櫒鐨刯query瀵硅薄
if($health.length!=0){
- var health=$health.get(0); //灏嗘晠闅滃鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
- var healthPie=echarts.init(health); //鍒濆鍖栬〃鏍煎鍣�
- window.healthPie = healthPie;
+ // 鏄惁echarts瀵硅薄
+ var isEcharts = isObject(healthPie)?true:false;
+ if(!isEcharts) {
+ var health=$health.get(0); //灏嗘晠闅滃鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
+ healthPie=echarts.init(health); //鍒濆鍖栬〃鏍煎鍣�
+ healthPie.showLoading();
+ }
+
var healthTle="<s:text name='Monomer_cap_health_rate'/>"; /* '鐢垫睜鍋ュ悍鐜�' */
- healthPie.showLoading();
$.post("Battalarm_dataAction!serchGood",null,function(data){
var model=eval("("+data.result+")");
- //console.info(model);
var healthObj;
- //console.info(model);
if(model.code==1){
healthObj=[
{name:"鍗曚綋瀹归噺鍋ュ悍",val:model.sum-model.data[0]-model.data[1],color:'#31CB36'}, /* '鍋ュ悍鐢垫睜' */
@@ -1164,16 +1192,106 @@
{name:"鍗曚綋瀹归噺鏇存崲",val:0,color:'#FF0000'}
];
}
- //鍒涘缓鐢垫睜鏁呴殰楗肩姸鍥�
- createPie(healthPie,healthTle,healthObj);
+ if(!isEcharts) {
+ //鍒涘缓鐢垫睜鏁呴殰楗肩姸鍥�
+ createPie(healthPie,healthTle,healthObj);
+
+ // 鐐瑰嚮楗肩姸鍥捐繘琛岃烦杞�
+ healthPie.on('click', function(param) {
+ window.open('taskplan.jsp'); // 璺宠浆鍒拌惤鍚庡崟浣撴煡璇�
+ });
+ }else {
+ var opt = getOpt(healthTle, healthObj);
+ healthPie.setOption(opt);
+ }
- // 鐐瑰嚮楗肩姸鍥捐繘琛岃烦杞�
- healthPie.on('click', function(param) {
- window.open('taskplan.jsp'); // 璺宠浆鍒拌惤鍚庡崟浣撴煡璇�
- });
+ setTimeout(searchGood, 10000);
});
}
}
+
+ // 鏌ヨ缁埅涓嶈冻鐨勬満鎴挎暟
+ var endurPie;
+ function searchEndurHome() {
+ if($('#content .endur-pie').length==0){
+ return;
+ }
+
+ //鐢熸垚鐢垫睜鍛婅鐜囬ゼ鐘跺浘
+ var $endur=$('#content .pie-con .endur-pie'); //鑾峰彇鍛婅瀹瑰櫒鐨刯query瀵硅薄
+ if($endur.length!=0){
+ var isEcharts = endurPie?true:false;
+ if(!isEcharts) {
+ var endur=$endur.get(0); //灏嗘晠闅滃鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
+ endurPie=echarts.init(endur); //鍒濆鍖栬〃鏍煎鍣�
+ }
+
+ var endurTle="鏈烘埧缁埅鑳藉姏"; /* 鏈烘埧缁埅鑳藉姏 */
+ // 鏌ヨ鍚庡彴鍐呭
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: 'Batt_enduranceAction!serchByState_xuhang'
+ ,data: null
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ if(rs.code == 1) {
+ var data = rs.data;
+ var endurObj =[
+ {name:"缁埅涓嶈冻1灏忔椂",val:data[0],color:'#FF0000'}
+ ,{name:"缁埅1~2灏忔椂",val:data[1],color:'#D1D105'}
+ ,{name:"缁埅2~3灏忔椂",val:data[2],color:'#31CB36'}
+ ,{name:"缁埅3灏忔椂浠ヤ笂",val:data[3],color:'#800080'}
+ ];
+
+ if(!isEcharts) {
+ //鍒涘缓鐢垫睜鏁呴殰楗肩姸鍥�
+ createPie(endurPie,endurTle,endurObj);
+ }else {
+ var opts = getOpt(endurTle, endurObj);
+ endurPie.setOption(opts);
+ }
+ }
+
+ setTimeout(searchEndurHome, 10000);
+ }
+ });
+
+ }
+ }
+
+ // 鍒濆鍖栭ゼ鐘跺浘瀹瑰櫒瀵硅薄
+ function initPieObj() {
+ warnPie = false;
+ brdnPie = false;
+ repairPie = false;
+ healthPie = false;
+ endurPie = false;
+ }
+
+ //璁╁湴鍥惧拰楗肩姸鍥鹃殢娴忚鍣ㄧ獥鍙ｇ殑鏀瑰彉鑰屾敼鍙�
+ $(window).resize(function(){
+ getMapHt();
+ if(isObject(warnPie))
+ {
+ warnPie.resize();
+ }
+ if(isObject(brdnPie))
+ {
+ brdnPie.resize();
+ }
+ if(isObject(repairPie))
+ {
+ repairPie.resize();
+ }
+ if(isObject(healthPie)) {
+ healthPie.resize();
+ }
+ if(isObject(endurPie)) {
+ endurPie.resize();
+ }
+ });
//鏌ヨ鎵�鏈夌殑鍏憡淇℃伅
function searchAnnounceall(){
@@ -1202,15 +1320,12 @@
//鏌ヨ鏀剧數娴嬭瘯鐨勬瘮渚�
function searchTestsCale(){
if($('#content .discharge-test').length==0){
- //alert();
return;
}
//鐢熸垚鐢垫睜鏈斁鐢垫瘮渚嬪浘
var $health=$('#content .discharge-test .test-pie'); //鑾峰彇鏁呴殰瀹瑰櫒鐨刯query瀵硅薄
if($health.length!=0){
var health=$health.get(0); //灏嗘晠闅滃鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
- //console.info(health);
- //healthPie.showLoading();
var healthTle="<s:text name='Battery_discharge_scale_map'/>"; /* '鐢垫睜鏀剧數姣斾緥鍥�' */
Batttest_Td=new Array();
$.post("Batttestdata_infAction!searchTestsCale",$('#batttest_form').serialize(),function(data){
@@ -1457,10 +1572,7 @@
});
});
- $(window).resize(function() {
- console.log(123);
- getMapHt();
- });
+
// 鏀瑰彉div鐨勫ぇ灏�
function changeDivBig(ele) {
// 闅愯棌闈㈡澘
@@ -2478,7 +2590,6 @@
var _data = data[i];
var _list = formatUpdateStation(_data);
updateStationData.push(_list);
- //_list.msg = 'item-nuclear_cap';
// 鍒ゆ柇鏄惁鏇存柊
if(mapPages.pageNew) {
bmap.updateDots(_list);
@@ -3092,25 +3203,6 @@
$(function() {
searchProvince();
- });
-
- //璁╁湴鍥惧拰楗肩姸鍥鹃殢娴忚鍣ㄧ獥鍙ｇ殑鏀瑰彉鑰屾敼鍙�
- $(window).resize(function(){
- if(warnPie != undefined)
- {
- warnPie.resize();
- }
- if(brdnPie != undefined)
- {
- brdnPie.resize();
- }
- if(repairPie != undefined)
- {
- repairPie.resize();
- }
- if(healthPie != undefined) {
- healthPie.resize();
- }
});
// 鐐瑰嚮鍒囨崲鍐呭
@@ -3629,6 +3721,7 @@
var model = eval('('+data.result+')');
if(model.code == 1) {
var result = model.data;
+ //console.log(result);
var formatData = formatPieRsData(result[0]);
laytpl(pieConfTpl).render(formatData, function(html) {
layer.open({
@@ -3704,6 +3797,7 @@
// 鏇存柊褰撳墠鐢ㄦ埛璁剧疆楗肩姸鍥剧殑浣胯兘鐘舵��
function updateUserBieState(temp, dialog, load){
+ var pieItemCon = $('.pie-con .pie-item-con');
// 鏇存柊鍚庡彴鏁版嵁
$.ajax({
type:"post",
@@ -3713,9 +3807,22 @@
data:'json='+JSON.stringify(temp),
success: function(data){
layer.closeAll();
-
var model = eval('('+data.result+')');
if(model.code == 1) {
+ // 鏇村叿temp鐨勫�艰缃ゼ鐘跺浘鐨勫唴瀹�
+ var formaterTmp = GLOBAL.Index.Pie.formaterPieStauts(temp);
+ //console.log(formaterTmp);
+ var pieItems = GLOBAL.Index.Pie.getPieList(formaterTmp);
+ //console.log(pieItems);
+ pieItemCon.text('');
+ pieItemCon.append(pieItems);
+
+ // 璁剧疆楂樺害
+ getMapHt();
+
+ // 鏇存柊楗肩姸鍥�
+ flushFourPie(true);
+
layer.msg('閰嶇疆鎴愬姛锛侊紒锛�');
}else {
layer.msg('閰嶇疆澶辫触锛侊紒锛�');
diff --git a/gx_tieta/WebRoot/login.jsp b/gx_tieta/WebRoot/login.jsp
index 5035c84..1b72337 100644
--- a/gx_tieta/WebRoot/login.jsp
+++ b/gx_tieta/WebRoot/login.jsp
@@ -139,35 +139,12 @@
initDBpool();
- // 閰嶇疆鎷栧姩楠岃瘉鍥惧儚
- $('#lVerify').slideVerify({
- type : 2, //绫诲瀷
- vOffset : 5, //璇樊閲忥紝鏍规嵁闇�姹傝嚜琛岃皟鏁�
- vSpace : 5, //闂撮殧
- imgName : ['1.jpg', '2.jpg'],
- imgSize : {
- width: '498px',
- height: '250px',
- },
- blockSize : {
- width: '40px',
- height: '40px',
- },
- barSize : {
- width : '498px',
- height : '40px',
- },
- ready : function() {
-
- },
- success : function() {
- $('#lVerify-dialog').addClass('hdw-dialog-hide'); // 闅愯棌楠岃瘉
- checkuser(); // 楠岃瘉鐢ㄦ埛
- },
- error : function() {
- // alert('楠岃瘉澶辫触锛�');
- }
- });
+ // 鐐瑰嚮绌虹櫧鍖哄煙鍏抽棴楠岃瘉
+ $('#lVerify-dialog .hdw-dialog-bg').click(function() {
+ $('#sub').children('.faa-spin').css('visibility', 'hidden');
+ $('#sub').removeClass('page-loading');
+ $('#lVerify-dialog').addClass('hdw-dialog-hide');
+ });
});
// 鍒濆鍖杤erify鎷栧姩楠岃瘉
@@ -179,7 +156,7 @@
type : 2, //绫诲瀷
vOffset : 5, //璇樊閲忥紝鏍规嵁闇�姹傝嚜琛岃皟鏁�
vSpace : 5, //闂撮殧
- imgName : ['1.jpg', '2.jpg'],
+ imgName : ['verify.png'],
imgSize : {
width: '498px',
height: '250px',
diff --git a/gx_tieta/WebRoot/mobil/batt-state-statistical.html b/gx_tieta/WebRoot/mobil/batt-state-statistical.html
index e3d8203..274f4b7 100644
--- a/gx_tieta/WebRoot/mobil/batt-state-statistical.html
+++ b/gx_tieta/WebRoot/mobil/batt-state-statistical.html
@@ -413,61 +413,11 @@
updataSelStation($Ostation_name1, arr);
}
- findserchByBattGroupNamebystationname();
+ // findserchByBattGroupNamebystationname();
}
});
}
-
- //鏍规嵁鏈烘埧鑾峰彇鐢垫睜缁�
- function findserchByBattGroupNamebystationname(){
- var stationid = $("#country").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
-
- var data = {
- StationName1: $("#mainteArea").val(),
- StationName2:$("#city").val(),
- StationName5:$("#country").val(),
- StationName: $("#homeName").val(),
- StationId: stationid
- };
-
- //console.info(data);
- $.ajax({
- type: "post",
- url: "BattInfAction!serchBattByStation",
- async:true,
- dataType:'json',
- data:"json = "+JSON.stringify(data),
- success: function(data){
- data = data.result;
- data = eval("("+data+")");
- //console.warn();
- //console.info(data);
- //console.info(data.code);
- if(data.code==1&&data.data.length>0){
- var $Ostation_name1=$("#battgroup_name");
- $Ostation_name1.text("");
- var arr = new Array();
- for(var i=0;i<=data.data.length;i++)
- {
- if(i == 0){
- arr.push({
- val:0,
- txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
- });
- }else{
- arr.push({
- val:data.data[i-1].BattGroupId,
- txt:data.data[i-1].BattGroupName,
- });
- }
- }
- updataSel($Ostation_name1, arr);
- }
-
- }
- });
- }
-
+
//褰撶渷鏀瑰彉鏃舵洿鏂板競
$('#mainteArea').change(function(){
findCity();
@@ -480,11 +430,7 @@
$('#country').change(function(){
findStationNamebyStationname1();
});
- //褰撴満鎴挎敼鍙樻椂锛屾洿鏂扮數姹犵粍
- $('#homeName').change(function(){
- findserchByBattGroupNamebystationname();
- });
-
+
$(function() {
diff --git a/gx_tieta/WebRoot/pages/js/pages/index-common.js b/gx_tieta/WebRoot/pages/js/pages/index-common.js
index 5223704..6a683c0 100644
--- a/gx_tieta/WebRoot/pages/js/pages/index-common.js
+++ b/gx_tieta/WebRoot/pages/js/pages/index-common.js
@@ -3,76 +3,87 @@
gl.namespace('Index.Pie');
var pieType = [
+ {
+ name: '鏈烘埧鍋滅數'
+ ,cla: 'repair-pie'
+ },
{
- name: '鐢垫睜鐘舵��',
- action: 'Batt_rtstateAction!serchBattStateRate',
- formatData: eleStatus
+ name: '鐢垫睜鐘舵��'
+ ,cla: 'brdn-pie'
},
{
- name: '鐢垫睜鍛婅鐜�',
- action: 'Battalarm_dataAction!serchAlm',
- formatData: eleWarn
+ name: '鐢垫睜鍛婅鐜�'
+ ,cla: 'warn-pie'
},
{
- name: '鏈烘埧鍋滅數',
- action: 'BattPower_offAction!serchPowerOff',
- formatData: homeCut
+ name: '鍗曚綋瀹归噺鍋ュ悍鐜�'
+ ,cla: 'health-pie'
},
{
- name: '鍗曚綋瀹归噺鍋ュ悍鐜�',
- action: 'Battalarm_dataAction!serchGood',
- formatData: monCapGood
+ name: '鏈烘埧缁埅鑳藉姏'
+ ,cla: 'endur-pie'
}
];
// 灏唒ieType缁戝畾鍒癐ndex.Pie鍛藉悕绌洪棿涓�
gl.Index.Pie.pieType = pieType;
- // 鏍规嵁鏁扮粍璋冪敤鏌ヨ鍐呭
- function search(arr) {
- for(var i=0; i<arr.length; i++) {
- if(arr[i]) {
- ajax(pieType[i]);
- }
- }
- }
-
- // 灏唖earch缁戝畾鍒癐ndex.Pie鍛藉悕绌洪棿涓�
- gl.Index.Pie.search = search;
-
- // 璇锋眰鍚庡彴
- function ajax(obj) {
- // ajax璇锋眰鍚庡彴
+ // 鏌ヨ楗肩姸鍥剧姸鎬佽繑鍥為渶瑕佹樉绀洪ゼ鐘跺浘
+ function pieStatus() {
+ // 璁剧疆涓�涓悓姝ユ煡璇㈣繑鍥炰竴涓猟iv.pie-item-list
+ var pieItems;
$.ajax({
- type: 'post',
- url: obj.action,
- data: null,
- async: true,
- dataType: 'json',
- success:function(result) {
- var rs = JSON.parse(result.result);
- var pieData = obj.formatData(rs);
-
+ type: 'post'
+ ,async: false
+ ,url: 'Echarts_usrAction!serchByCondition'
+ ,data: null
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ //console.log(rs);
+ if(rs.code == 1) {
+ var data = rs.data[0];
+ var rsStatus = formaterPieStauts(data);
+ pieItems = getPieList(rsStatus);
+ }
}
});
+
+ return pieItems;
}
- // 鐢垫睜鐘舵��
- function eleStatus(data) {
- console.log(data);
+ // 灏唒ieStatus缁戝畾鍒癐ndex.Pie鍛藉悕绌洪棿涓�
+ gl.Index.Pie.pieStatus = pieStatus;
+
+ // 鏍规嵁鏁扮粍杩斿洖
+ function getPieList(arr) {
+ var pieItems = $('<div class="pie-item-list"></div>');
+ for(var i=0; i<arr.length; i++) {
+ if(arr[i] == 1) {
+ var cla = pieType[i].cla;
+ var pieItem = $('<div class="'+cla+' module"></div>');
+ pieItems.append(pieItem);
+ }
+
+ }
+ return pieItems;
}
- // 鐢垫睜鍛婅
- function eleWarn(data) {
- console.log(data);
+ // 灏唃etPieList缁戝畾鍒癐ndex.Pie鍛藉悕绌洪棿涓�
+ gl.Index.Pie.getPieList = getPieList;
+
+ // 鏋勯�犳洿鏂伴ゼ鐘跺浘鍙傛暟
+ function formaterPieStauts(obj) {
+ var rs = [];
+ // 閬嶅巻pieType鐨勭被鍨�
+ for(var i=0; i<pieType.length; i++) {
+ var num = i+1;
+ var key = 'echarts'+num+'_enable';
+ rs.push(obj[key]);
+ }
+ return rs;
}
- // 鏈烘埧鍋滅數
- function homeCut(data) {
- console.log(data);
- }
- // 鍗曚綋瀹归噺鍋ュ悍鐜�
- function monCapGood(data) {
- console.log(data);
- }
+ // 灏唃etPieList缁戝畾鍒癐ndex.Pie鍛藉悕绌洪棿涓�
+ gl.Index.Pie.formaterPieStauts = formaterPieStauts;
})(jQuery, window, document, GLOBAL);
\ No newline at end of file
diff --git a/gx_tieta/src/com/fgkj/Filters/CrossDomainLimitFilter.java b/gx_tieta/src/com/fgkj/Filters/CrossDomainLimitFilter.java
index 0338b17..6fa53e0 100644
--- a/gx_tieta/src/com/fgkj/Filters/CrossDomainLimitFilter.java
+++ b/gx_tieta/src/com/fgkj/Filters/CrossDomainLimitFilter.java
@@ -14,6 +14,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.omg.CORBA.Request;
+
import com.fgkj.actions.ActionUtil;
import com.fgkj.dto.ServiceModel;
@@ -22,17 +24,22 @@
public final static String CROSS_DOMAIN_KEY = "44c4a294cb66d13727c14b065dbe8548"; //璺ㄥ煙璇锋眰 key
- public void doFilter(ServletRequest req, ServletResponse response,
+ public void doFilter(ServletRequest req, ServletResponse resp,
FilterChain chain) throws IOException, ServletException {
HttpServletRequest request=(HttpServletRequest)req;
+ HttpServletResponse response =(HttpServletResponse)resp;
String URL=request.getRequestURI();
+ request.setCharacterEncoding("UTF-8");
+ response.setCharacterEncoding("UTF-8");
+ response.setContentType("text/html;charset=utf-8");
//妫�娴嬭法鍩熻闂殑璇锋眰
if(URL != null && URL.endsWith("_ky") && false){
String key = req.getParameter("key"); //鑾峰彇鏍￠獙鐮�
- ServiceModel model = new ServiceModel(); //鏄惁鍏佽璁块棶
- boolean isAlowVisit = false;
- System.out.println(key+"=="+CROSS_DOMAIN_KEY);
+ ServiceModel model = new ServiceModel();
+ boolean isAlowVisit = false; //鏄惁鍏佽璁块棶
+ //System.out.println(key+"=="+CROSS_DOMAIN_KEY);
if(key != null && CROSS_DOMAIN_KEY.equals(key)){
+ isAlowCrossDomain(response);
//System.out.println("寮�濮嬩紤鐪�500姣绉�");
try {
Thread.sleep(500);
@@ -46,11 +53,11 @@
isAlowVisit = true;
}else{
- model.setMsg("鏍￠獙鐮佸彂閫佸け璐�");
+ model.setMsg("鏍￠獙鐮佸彂閫佸け璐�,key:"+key);
}
if(isAlowVisit){
//閫氳繃璇锋眰
- chain.doFilter(request, response); //涓嶅厑璁歌法鍩�
+ chain.doFilter(request, response); //鍏佽璺ㄥ煙
}else{
//涓嶈兘鏀捐鐨勮姹�
PrintWriter out = response.getWriter();
@@ -75,6 +82,16 @@
}
+ /**
+ * 鍏佽璺ㄥ煙璁块棶
+ * @param response
+ */
+ public void isAlowCrossDomain(HttpServletResponse response){
+ response.setHeader("Access-Control-Allow-Origin", "*"); //鍏佽璺ㄥ煙璁块棶
+ response.setHeader("Access-Control-Allow-Headers", "X-Requested-With,content-type,token");
+ response.setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, PATCH");
+ }
+
public static void main(String[] args) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
System.out.println(sdf.format(new Date()));
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index c7a3da5..8520b5f 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -386,7 +386,7 @@
//璺ㄥ煙璁块棶鑾峰彇鎵�鏈夌數姹犵粍鐨勪俊鎭�<-------璺ㄥ煙----------->
public String searchInform_ky(){
- isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ //isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
ServiceModel model = new ServiceModel();
model = service.searchInform_ky();
result = ActionUtil.tojson(model);
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java b/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java
index b831f5c..8afc13e 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java
@@ -27,7 +27,13 @@
return SUCCESS;
}
-
+ //瀵艰埅涓婄画鑸笉瓒�3灏忔椂鐨勪釜鏁�
+ public String serchxuhangNotInThree() {
+ User_inf uinf=(User_inf) getUser();
+ ServiceModel model=service.serchxuhangNotInThree(uinf);
+ result=tojson(model);
+ return SUCCESS;
+ }
public String getResult() {
return result;
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java b/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
index bb15585..ecff064 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
@@ -29,7 +29,7 @@
//璺ㄥ煙璁块棶鏌ヨ鐢垫睜缁勭殑鍗曚綋鏁版嵁 < ! ---- ---- 璺ㄥ煙璁块棶 ------------>
public String serchByCondition_ky(){
- ActionUtil.isAllowHeaders();
+ //ActionUtil.isAllowHeaders();
ServiceModel model = new ServiceModel();
Batt_rtdata rtdata=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_rtdata.class);
model=service.serchByCondition_ky(rtdata);
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java b/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
index 09d13cc..74ee71d 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
@@ -90,7 +90,7 @@
//瀹炴椂鐩戞祴涓殑鏌ヨ瀹炴椂缁勭淇℃伅 <!-- 璺ㄥ煙璁块棶 --->
public String serchByCondition_ky(){
- ActionUtil.isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ //ActionUtil.isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
model = new ServiceModel();
//System.out.println("寮�濮嬫煡璇tstate");
rtstate = ActionUtil.getGson().fromJson(json, Batt_rtstate.class);
diff --git a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
index 8064b68..ac4e031 100644
--- a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
@@ -39,7 +39,7 @@
* @return
*/
public String findhistory_ky(){
- isAllowHeaders();
+ //isAllowHeaders();
ServiceModel model = new ServiceModel();
btd = ActionUtil.getGson().fromJson(json, Batttestdata.class);
model = service.serchByCondition_ky(btd);
diff --git a/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java b/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
index 89c21c4..00a9aca 100644
--- a/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
@@ -93,7 +93,7 @@
* 鏍规嵁鐢垫睜缁刬d鏌ヨ鐢垫睜缁勭殑inf琛ㄤ腑鐨勬斁鐢典俊鎭� <!------ 璺ㄥ煙璁块棶 --------->
*/
public String searchBattTestInfDataById_ky(){
- isAllowHeaders();
+ //isAllowHeaders();
Batttestdata_inf bti = ActionUtil.getGson().fromJson(json, Batttestdata_inf.class);
model=service.serchByCondition_ky(bti);
result=ActionUtil.tojson(model);
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
index f06e421..081c8ba 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
@@ -112,7 +112,7 @@
//11.1FBS9100璁惧閫氫俊鐘舵�佹煡璇� <-- 璺ㄥ煙 -->
public String serchByCondition_ky(){
- isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ //isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
ServiceModel model = new ServiceModel();
model = service.serchByCondition_ky();
result = tojson(model);
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index b5ff2d0..0586a20 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -1083,11 +1083,11 @@
public int serchByDeviceId(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=? and db_battinf.tb_battinf.Station_install=1 " +
- " limit 1";
+ " 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=? " +
+ " ) " +
+ " and db_battinf.tb_battinf.station_install=1";
List<BattInf> list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -1120,7 +1120,7 @@
" 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";
+ " limit 1 ";
List<BattInf> list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
public List getResults(ResultSet rs) {
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
index f7606c3..2430d17 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
@@ -133,7 +133,7 @@
//9.1鏌ヨ宸茬粡娣诲姞鐗╃悊淇℃伅鐨勬満鎴�(鐢ㄦ埛绠＄悊鐨�,l鏌ヨ鍏ㄩ儴鎵撳紑椤甸潰)
public List serchInBattMapByUid(Object obj) {
User_inf uinf=(User_inf) 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,db_battinf.tb_battinf.monvolstd " +
" 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 (" +
@@ -158,6 +158,7 @@
binformation.setLatitude(rs.getDouble("latitude"));
binformation.setInformation(rs.getString("information"));
binformation.setFBSDeviceId(rs.getInt("fBSDeviceId"));
+ binformation.setMonvolstd(rs.getFloat("monvolstd")); //琛ㄦ槑璁惧鏄�2V杩樻槸12V
list.add(binformation);
}
} catch (SQLException e) {
@@ -175,7 +176,7 @@
int uid=page.getPageAll();
Connection conn=DBUtil.getConn();
String numberSql="SELECT FOUND_ROWS() number";//瀛樻斁鎬绘暟
- String sql="select SQL_CALC_FOUND_ROWS distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.station_install " +
+ String sql="select SQL_CALC_FOUND_ROWS distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.station_install,db_battinf.tb_battinf.monvolstd " +
" 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 (" +
@@ -203,6 +204,7 @@
binformation.setInformation(rs.getString("information"));
binformation.setFBSDeviceId(rs.getInt("fBSDeviceId"));
binformation.setInformation(rs.getString("station_install"));
+ binformation.setMonvolstd(rs.getFloat("monvolstd")); //琛ㄦ槑璁惧鏄�2V杩樻槸12V
Page p=new Page();
binformation.setPage(p);
list.add(binformation);
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
index a251909..73fa1ae 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
@@ -173,7 +173,41 @@
});
return list;
}
- public List serchByInfo(Object obj) {
+ //瀵艰埅涓婄画鑸笉瓒�3灏忔椂鐨勪釜鏁�
+ public int serchxuhangNotInThree(Object obj) {
+ User_inf uinf=(User_inf) obj;
+ String sql="select count(distinct tb_batt_endurance.deviceid) as nums from web_site.tb_batt_endurance " +
+ " where endurance_actual_timelong<180 " +
+ " and tb_batt_endurance.stationid in (" +
+ " select distinct db_battinf.tb_battinf.stationid " +
+ " from db_battinf.tb_battinf " +
+ " left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.stationid=db_battinf.tb_battinf.stationid " +
+ " 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=? and db_battinf.tb_battinf.station_install=1) " ;
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ int nums=rs.getInt("nums");
+ list.add(nums);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ int nums=0;//缁埅涓嶈冻3灏忔椂鏁�
+ if(list!=null&&list.size()>0){
+ nums=(Integer) list.get(list.size()-1);
+ }
+ return nums;
+ }
+ public List serchByInfo(Object obj) {
// TODO Auto-generated method stub
return null;
}
@@ -198,12 +232,15 @@
User_inf uinf=new User_inf();
uinf.setUId(1002);
- List<Integer> list=bimpl.serchByState_xuhang(uinf);
+ /*List<Integer> list=bimpl.serchByState_xuhang(uinf);
for (int num : list) {
System.out.println(num);
- }
+ }*/
//System.out.println(list.size());
+ int nums=bimpl.serchxuhangNotInThree(uinf);
+ System.out.println(nums);
}
+
}
diff --git a/gx_tieta/src/com/fgkj/dto/BattMap_information.java b/gx_tieta/src/com/fgkj/dto/BattMap_information.java
index 7e10eef..4eb5d00 100644
--- a/gx_tieta/src/com/fgkj/dto/BattMap_information.java
+++ b/gx_tieta/src/com/fgkj/dto/BattMap_information.java
@@ -16,6 +16,7 @@
private String stationName2;
private String stationName3;
private String stationName5;
+ private float monvolstd; //璁惧鏄�2v杩樻槸12鐨勭數姹�
public BattMap_information() {
super();
@@ -111,21 +112,6 @@
}
-
-
- @Override
- public String toString() {
- return "BattMap_information [num=" + num + ", StationId=" + StationId
- + ", StationName=" + StationName + ", Address=" + Address
- + ", longitude=" + longitude + ", latitude=" + latitude
- + ", information=" + information + ", FBSDeviceId="
- + FBSDeviceId + ", page=" + page + ", stationName1="
- + stationName1 + ", stationName2=" + stationName2
- + ", stationName3=" + stationName3 + ", stationName5="
- + stationName5 + "]";
- }
-
-
public String getStationName1() {
return stationName1;
}
@@ -168,6 +154,32 @@
+ public float getMonvolstd() {
+ return monvolstd;
+ }
+
+
+ public void setMonvolstd(float monvolstd) {
+ this.monvolstd = monvolstd;
+ }
+
+
+ @Override
+ public String toString() {
+ return "BattMap_information [num=" + num + ", StationId=" + StationId
+ + ", StationName=" + StationName + ", Address=" + Address
+ + ", longitude=" + longitude + ", latitude=" + latitude
+ + ", information=" + information + ", FBSDeviceId="
+ + FBSDeviceId + ", page=" + page + ", stationName1="
+ + stationName1 + ", stationName2=" + stationName2
+ + ", stationName3=" + stationName3 + ", stationName5="
+ + stationName5 + ", monvolstd=" + monvolstd + "]";
+ }
+
+
+
+
+
}
diff --git a/gx_tieta/src/com/fgkj/services/Batt_enduranceService.java b/gx_tieta/src/com/fgkj/services/Batt_enduranceService.java
index 307c099..7517bac 100644
--- a/gx_tieta/src/com/fgkj/services/Batt_enduranceService.java
+++ b/gx_tieta/src/com/fgkj/services/Batt_enduranceService.java
@@ -42,5 +42,12 @@
}
return model;
}
+ //瀵艰埅涓婄画鑸笉瓒�3灏忔椂鐨勪釜鏁�
+ public ServiceModel serchxuhangNotInThree(Object obj) {
+ int nums=((Batt_enduranceImpl)dao).serchxuhangNotInThree(obj);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ model.setSum(nums);
+ return model;
+ }
}
--
Gitblit v1.9.1