From 43d0c4cc8eb7364415ce4b7e358a10747c6cfe1d Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 01 十一月 2018 17:48:25 +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/Bts_station_eventImpl.java | 16 +++++++++-------
gx_tieta/WebRoot/batt-state-statistical.jsp | 7 ++++---
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index 512da1e..69cafc8 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -163,7 +163,7 @@
,{field:'station_event_type_tempup', title:'娓╁害涓婇檺鍛婅', align:'center'}
,{field:'station_event_type_templow', title:'娓╁害涓嬮檺鍛婅', align:'center'}
,{field:'station_event_type_dampup', title:'婀垮害涓婇檺鍛婅', align:'center'}
- ,{field:'station_event_type_damplow', title:'娓╁害涓嬮檺鍛婅', align:'center'}
+ ,{field:'station_event_type_damplow', title:'婀垮害涓嬮檺鍛婅', align:'center'}
,{fixed: 'right', title:'璇︽儏', toolbar: '#toolBar', width: 70}
]]
,data:[]
@@ -252,9 +252,10 @@
dataType:'json',
data:"json="+json,
success:function(data){
+ console.info(data);
var data=JSON.parse(data.result);
if(data.code==1&&data!=null){
- //console.log(data.data);
+ console.log(data.data);
tOptions.data = data.data;
}else {
tOptions.data = [];
@@ -271,7 +272,7 @@
var temp={
StationName1:$('#station_name1').val(), // 鐪�
StationName2:$('#city').val(),
- Stationname5:$('#county').val(), // 甯�
+ StationName5:$('#county').val(), // 甯�
StationName3:$('#station_name3').val(), //鏈烘埧鍚嶇О
StationId: stationid?stationid:0,
BattInUseDate:$('#startalm').val()+" 00:00:00",
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 5fc9a3e..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 (" +
@@ -382,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));
@@ -393,14 +395,14 @@
bmd.setPage(p);
bmd.setBinf(binf);
bmd.setUinf(uinf);
- /*List<Bts_station_event> list=bimpl.serchByCondition(binf);
+ List<Bts_station_event> list=bimpl.serchByCondition(binf);
System.out.println(list.size());
for (Bts_station_event b : list) {
System.out.println(b.getNote()+" "+b.getDev_id()+" "+b.getStation_event_type_poff()+" "+b.getStation_event_type_xuhang()+" "+b.getStation_event_type_fadian()+" "+b.getStation_event_type_diaozhan()+" "+b.getStation_event_type_dooropen()+" "+b.getStation_event_type_tempup()+" "+b.getStation_event_type_templow()+" "+b.getStation_event_type_dampup()+" "+b.getStation_event_type_damplow()+" "+b.getStationName());
- }*/
+ }
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);
@@ -408,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