From 98cd37e22ae11376692241a62a8b5d932cbcd24e Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 19 十月 2018 13:25:16 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java | 6 +-
gx_tieta/WebRoot/batt-state-manage.jsp | 104 +++++++++++++++++++++++----------------------------
2 files changed, 50 insertions(+), 60 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index 2c58c70..1c4e701 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -469,77 +469,67 @@
//console.info(data[0].dev_id);
for(i=0;i<data.length;i++){
var _data = data[i];
- arrTd[index++]=_data.stationName1; //鐪�
- arrTd[index++]=_data.stationName2; //甯�
- arrTd[index++]=_data.stationName3; //鏈烘埧
+ arrTd[index++] = _data.stationName1; //鐪�
+ arrTd[index++] = _data.stationName2; //甯�
+ arrTd[index++] = _data.stationName3; //鏈烘埧
// 鍋滅數
if(_data.station_stat_poff) {
- arrTd[index++]= create_ali_font('icon-tingdian-', 'red', {msg:'鍋滅數寮傚父'});
+ arrTd[index++] = create_ali_font('icon-tingdian-', 'red', {msg:'鍋滅數寮傚父'});
+ arrTd[index++] = _data.station_poff_start_time //鍋滅數寮�濮嬫椂闂�
+ arrTd[index++] = StringtoData(_data.station_poff_start_time); //鍋滅數鏃堕暱
}else {
- arrTd[index++]= create_ali_font('icon-tingdian-', 'green', {msg: '姝ｅ父'});
+ arrTd[index++] = create_ali_font('icon-tingdian-', 'green', {msg: '姝ｅ父'});
+ arrTd[index++] = "-";
+ arrTd[index++] = formartTime(0);
}
-
- arrTd[index++]=_data.station_poff_start_time //鍋滅數寮�濮嬫椂闂�
- if(_data.station_stat_poff){
- arrTd[index++]=StringtoData(_data.station_poff_start_time); //鍋滅數鏃堕暱
- }else{
- arrTd[index++]=formartTime(0);
- }
+
// 鍙戠數
if(_data.station_stat_fadian) {
- arrTd[index++]= create_ali_font('icon-dynamotor', 'red', {msg: '鍙戠數寮傚父'}); //鍙戠數
+ arrTd[index++] = create_ali_font('icon-dynamotor', 'red', {msg: '鍙戠數寮傚父'}); //鍙戠數
+ arrTd[index++] = _data.station_fadian_start_time; //鍙戠數寮�濮嬫椂闂�
+ arrTd[index++] = StringtoData(_data.station_fadian_start_time);
}else {
- arrTd[index++]= create_ali_font('icon-dynamotor', 'green', {msg: '姝ｅ父'}); //鍙戠數
+ arrTd[index++] = create_ali_font('icon-dynamotor', 'green', {msg: '姝ｅ父'}); //鍙戠數
+ arrTd[index++] = "-"; //鍙戠數寮�濮嬫椂闂�
+ arrTd[index++] = formartTime(0);
}
-
- arrTd[index++]=_data.station_fadian_start_time; //鍙戠數寮�濮嬫椂闂�
- if(_data.station_stat_fadian){
- arrTd[index++]=StringtoData(_data.station_fadian_start_time);
- }else{
- arrTd[index++]=formartTime(0);
- }
+
// 鎺夌珯
if(_data.station_stat_diaozhan) {
- arrTd[index++]= create_ali_font('icon-dianchi', 'red', {msg: '宸叉帀绔�'});
+ arrTd[index++] = create_ali_font('icon-dianchi', 'red', {msg: '宸叉帀绔�'});
+ arrTd[index++] = _data.station_diaozhan_start_time;//鎺夌珯寮�濮嬫椂闂�
+ arrTd[index++] = StringtoData(_data.station_diaozhan_start_time);
}else {
- arrTd[index++]= create_ali_font('icon-dianchi4', 'green', {msg: '姝ｅ父'});
+ arrTd[index++] = create_ali_font('icon-dianchi4', 'green', {msg: '姝ｅ父'});
+ arrTd[index++] = "-";//鎺夌珯寮�濮嬫椂闂�
+ arrTd[index++] = formartTime(0);
}
-
- arrTd[index++]=_data.station_diaozhan_start_time;//鎺夌珯寮�濮嬫椂闂�
- if(_data.station_stat_diaozhan){
- arrTd[index++]=StringtoData(_data.station_diaozhan_start_time);
- }else{
- arrTd[index++]=formartTime(0);
- }
-
+
//缁埅
if(_data.station_stat_xuhang){
- arrTd[index++]=create_fa_font('fa-television','red',{msg: '宸插紓甯�'});
+ arrTd[index++] = create_fa_font('fa-television','red',{msg: '缁埅寮傚父'});
+ arrTd[index++] = _data.station_xuhang_start_time;
+ arrTd[index++] = StringtoData(_data.station_xuhang_start_time);
}else{
- arrTd[index++]=create_fa_font('fa-television','green',{msg: '姝ｅ父'});
+ arrTd[index++] = create_fa_font('fa-television','green',{msg: '姝ｅ父'});
+ arrTd[index++] = "-";
+ arrTd[index++] = formartTime(0);
}
- arrTd[index++]=_data.station_xuhang_start_time;
- if(_data.station_stat_xuhang){
- arrTd[index++]=StringtoData(_data.station_xuhang_start_time);
- }else{
- arrTd[index++]=formartTime(0);
- }
+
// 寮�闂ㄥ叧闂ㄥ紓甯�
if(_data.station_stat_dooropen) {
arrTd[index++] = create_ali_font('icon-quankaimen', 'red', {msg: '寮�闂�'});
+ arrTd[index++] = _data.station_dooropen_start_time;//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
+ arrTd[index++] = StringtoData(_data.station_dooropen_start_time);
}else {
arrTd[index++] = create_ali_font('icon-quankaimen', 'green', {msg: '鍏抽棬'});
+ arrTd[index++] = "-";//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
+ arrTd[index++] = formartTime(0);
}
-
- arrTd[index++]=_data.station_dooropen_start_time;//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
- if(_data.station_stat_dooropen) {
- arrTd[index++]=StringtoData(_data.station_dooropen_start_time);
- }else{
- arrTd[index++]=formartTime(0);
- }
- arrTd[index++]=_data.station_temp; //娓╁害
- arrTd[index++]=_data.station_damp; //婀垮害
+
+ arrTd[index++] = _data.station_temp; //娓╁害
+ arrTd[index++] = _data.station_damp; //婀垮害
}
Page.pageAll = data.length;
var pageNum=Math.ceil(Page.pageAll/Page.pageSize);
@@ -554,25 +544,25 @@
var date1= value; //寮�濮嬫椂闂�
var date2 = new Date(); //缁撴潫鏃堕棿
var date3 = date2.getTime() - new Date(date1).getTime(); //鏃堕棿宸殑姣鏁�
- var date4 = Math.floor(date3/(24*3600*1000));
+ var date4 = Math.floor(date3/(1000));
return formartTime(date4);
}
- //鏍煎紡鍖栨椂闂�
+ //鏍煎紡鍖栨椂闂磛alue浼犲叆涓虹
function formartTime(value){
value = Math.abs(parseInt(value));
//console.info(value);
var day_num = 0;
var hour_num = 0;
var min_num = 0;
- if(value>=24*60){
- day_num = Math.floor(value/(24*60));
- value = value%(24*60);
+ if(value>=24*60*60){
+ day_num = Math.floor(value/(24*60*60));
+ value = value%(24*60*60);
}
- if(value>=60){
- hour_num = Math.floor(value/60);
- value = value%60;
+ if(value>=60*60){
+ hour_num = Math.floor(value/(60*60));
+ value = value%(60*60);
}
- min_num = value;
+ min_num = Math.floor(value/60);
return day_num+"澶�"+hour_num+"灏忔椂"+min_num+"鍒�";
}
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
index 2f69c1c..d01286e 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
@@ -44,7 +44,7 @@
//鏌ヨ鏈烘埧瀹炴椂鐘舵��
public List serchByCondition(Object obj) {
BattInf binf=(BattInf) obj;
- Page p=new Page();
+ Page p=binf.getPage();
Connection conn=DBUtil.getConn();
String numberSql="SELECT FOUND_ROWS() number";//瀛樻斁鎬绘暟
String sql="select SQL_CALC_FOUND_ROWS distinct station_id,dev_id,record_datetime,station_stat,station_poff_start_time,station_fadian_start_time" +
@@ -126,11 +126,11 @@
binf.setStationId("");
Page p=new Page();
p.setPageCurr(1);
- p.setPageSize(10);
+ p.setPageSize(1);
binf.setPage(p);
List<Bts_station_state> list=bimpl.serchByCondition(binf);
for (Bts_station_state bs : list) {
- System.out.println(bs.getStation_stat_diaozhan()+" "+bs.getStation_stat_dooropen()+" "+bs.getStation_stat_fadian()+" "+bs.getStation_stat_xuhang()+" "+bs.getStation_stat_poff());
+ //System.out.println(bs.getStation_stat_diaozhan()+" "+bs.getStation_stat_dooropen()+" "+bs.getStation_stat_fadian()+" "+bs.getStation_stat_xuhang()+" "+bs.getStation_stat_poff());
System.out.println(bs);
}
}
--
Gitblit v1.9.1