From acf7627f5c57d62fd7d93dd9794911c6e7b4e42f Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.28>
Date: 星期五, 19 十月 2018 14:15:51 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 2f69c1c..4153aee 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" +
@@ -66,19 +66,19 @@
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){
+ if(((b.getStation_stat()>>5)&1)==1){
b.setStation_stat_diaozhan(1);//鎺夌珯
}
- if(((b.getStation_stat()>>3)&1)==1){
+ if(((b.getStation_stat()>>4)&1)==1){
b.setStation_stat_dooropen(1);//寮�闂�
}
- if(((b.getStation_stat()>>2)&1)==1){
+ if(((b.getStation_stat()>>3)&1)==1){
b.setStation_stat_fadian(1); //鍙戠數
}
- if(((b.getStation_stat()>>1)&1)==1){
+ if(((b.getStation_stat()>>2)&1)==1){
b.setStation_stat_xuhang(1);//缁埅
}
- if((b.getStation_stat()&1)==1){
+ if(((b.getStation_stat()>>1)&1)==1){
b.setStation_stat_poff(1); //鍋滅數
}
b.setStation_poff_start_time(rs.getTimestamp("station_poff_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