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 | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
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 e436c9d..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,11 +44,11 @@
//鏌ヨ鏈烘埧瀹炴椂鐘舵��
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_poff_tlong,station_fadian_start_time,station_fadian_tlong" +
- " ,station_diaozhan_start_time,station_diaozhan_tlong,station_temp,station_damp,station_dooropen_start_time,station_dooropen_tlong" +
+ String sql="select SQL_CALC_FOUND_ROWS distinct station_id,dev_id,record_datetime,station_stat,station_poff_start_time,station_fadian_start_time" +
+ " ,station_diaozhan_start_time,station_temp,station_damp,station_dooropen_start_time,station_xuhang_start_time" +
" ,tb_battinf.stationname,tb_battinf.stationname1,tb_battinf.stationname2,tb_battinf.stationname3 " +
" from db_ram_db.tb_bts_station_state,db_battinf.tb_battinf " +
" where tb_bts_station_state.dev_id=db_battinf.tb_battinf.FBSDeviceId " +
@@ -66,28 +66,28 @@
b.setDev_id(rs.getInt("dev_id"));
b.setRecord_datetime(rs.getTimestamp("record_datetime"));
b.setStation_stat(rs.getInt("station_stat"));
+ if(((b.getStation_stat()>>4)&1)==1){
+ b.setStation_stat_diaozhan(1);//鎺夌珯
+ }
if(((b.getStation_stat()>>3)&1)==1){
b.setStation_stat_dooropen(1);//寮�闂�
}
if(((b.getStation_stat()>>2)&1)==1){
- b.setStation_stat_diaozhan(1);//鎺夌珯
+ b.setStation_stat_fadian(1); //鍙戠數
}
if(((b.getStation_stat()>>1)&1)==1){
- b.setStation_stat_fadian(1); //鍙戠數
+ b.setStation_stat_xuhang(1);//缁埅
}
if((b.getStation_stat()&1)==1){
b.setStation_stat_poff(1); //鍋滅數
}
b.setStation_poff_start_time(rs.getTimestamp("station_poff_start_time"));
- b.setStation_poff_tlong(rs.getInt("station_poff_tlong"));
b.setStation_fadian_start_time(rs.getTimestamp("station_fadian_start_time"));
- b.setStation_fadian_tlong(rs.getInt("station_fadian_tlong"));
b.setStation_diaozhan_start_time(rs.getTimestamp("station_diaozhan_start_time"));
- b.setStation_diaozhan_tlong(rs.getInt("station_diaozhan_tlong"));
b.setStation_temp(rs.getFloat("station_temp"));
b.setStation_damp(rs.getFloat("station_damp"));
b.setStation_dooropen_start_time(rs.getTimestamp("station_dooropen_start_time"));
- b.setStation_dooropen_tlong(rs.getInt("station_dooropen_tlong"));
+ b.setStation_xuhang_start_time(rs.getTimestamp("station_xuhang_start_time"));
b.setStationName(rs.getString("stationName"));
b.setStationName1(rs.getString("stationName1"));
b.setStationName2(rs.getString("stationName2"));
@@ -123,14 +123,14 @@
binf.setStationName1("");
binf.setStationName2("");
binf.setStationName3("");
- binf.setStationId("35000004");
+ 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_dooropen()+" "+bs.getStation_stat_diaozhan()+" "+bs.getStation_stat_fadian()+" "+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