From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/src/com/fgkj/dao/impl/Bts_station_eventImpl.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Bts_station_eventImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Bts_station_eventImpl.java
index 58f2c78..cbe910a 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Bts_station_eventImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Bts_station_eventImpl.java
@@ -54,7 +54,8 @@
//鏈烘埧浜嬩欢缁熻
public List serchByCondition(Object obj) {
final BattInf binf=(BattInf) obj;
- String sql="select station_id,dev_id,station_event_type,record_datetime,station_event_trig ,tb_battinf.StationName,tb_battinf.StationName1,tb_battinf.StationName2,tb_battinf.StationName3,tb_battinf.StationName5 " +
+ //System.out.println(binf);
+ String sql="select distinct station_id,dev_id,station_event_type,record_datetime,station_event_trig ,tb_battinf.StationName,tb_battinf.StationName1,tb_battinf.StationName2,tb_battinf.StationName3,tb_battinf.StationName5 " +
" from db_alarm.tb_bts_station_event,db_battinf.tb_battinf " +
" where tb_bts_station_event.dev_id=tb_battinf.FBSDeviceId " +
" and tb_bts_station_event.station_id in (" +
@@ -304,12 +305,8 @@
" from db_alarm.tb_bts_station_event,db_battinf.tb_battinf " +
" where tb_bts_station_event.dev_id=tb_battinf.FBSDeviceId " +
" and tb_bts_station_event.station_id 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=? ) " +
+ " 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 dev_id=? " +
" and record_datetime>=? and record_datetime<=? ";
//鍩虹珯鐘舵��
@@ -386,7 +383,8 @@
binf.setStationName1("");
binf.setStationName2("");
binf.setStationName3("");
- binf.setStationId("");
+ binf.setStationName5("");
+ binf.setStationId("42000524");
binf.setBattGroupNum(1);
binf.setBattInUseDate(ActionUtil.getSimpDate(date1));
binf.setBattInUseDate1(ActionUtil.getSimpDate(date2));
@@ -404,7 +402,7 @@
}
Bts_station_event b=new Bts_station_event();
b.setNum(1002);
- b.setDev_id(910000001);
+ b.setDev_id(910000534);
b.setRecord_datetime(ActionUtil.getSimpDate(date1));
b.setRecord_datetime_end(ActionUtil.getSimpDate(date2));
b.setStation_event_type(0);
@@ -412,8 +410,8 @@
page.setPageCurr(1);
page.setPageSize(10);
b.setPage(page);
- /*List list=bimpl.serchByInfo(b);
- System.out.println(list.size());*/
+ //List list=bimpl.serchByInfo(b);
+ //System.out.println(list.size());
}
}
--
Gitblit v1.9.1