From d63d9a1b9bc573ece886b455b70cb20d7a04de96 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 01 十一月 2018 09:39:19 +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 | 32 ++----
gx_tieta/WebRoot/iframe/batt-fault-manage-add.html | 48 ++++++++-
gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java | 7
gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java | 7
gx_tieta/src/com/fgkj/dto/Batt_endurance.java | 13 ++
gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java | 11 ++
gx_tieta/WebRoot/batt-fault-manage.jsp | 151 ++++++++++++++++++++---------
gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java | 16 ++-
8 files changed, 195 insertions(+), 90 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
index 8a48b1b..e764ea4 100644
--- a/gx_tieta/WebRoot/batt-fault-manage.jsp
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -85,7 +85,7 @@
<div >
<!-- 鍒嗛〉鍐呭 -->
<div id="paging">
- <!-- <a href="javascript:" class="search">娣诲姞</a> 娣诲姞 -->
+ <a href="javascript:" id="search" class="layui-btn layui-btn-normal search">鏌ユ壘</a>
<a class="layui-btn layui-btn-normal addbtn">娣诲姞</a>
<script type="text/html" id="toolBar">
<a class="layui-btn layui-btn-xs" lay-event="details">娣诲姞</a>
@@ -143,18 +143,18 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
- $(document).ready(function(){
- console.info(1111);
- tOptions.data=getData(100,0);
- var tableObj = table.render(tOptions);
- tableObj.reload(tOptions);
- });
+ // $(document).ready(function(){
+ //console.info(1111);
+ // tOptions.data=getData(100,0);
+ // var tableObj = table.render(tOptions);
+ // tableObj.reload(tOptions);
+ // });
function getData(a,b){
var arr=[];
for(i=0;i<a;i++){
- arr.push({'station_name1':b,'city':b+i,'stationName3':b+i+1,'note':b+i+2,'question':'hahaha鍝堝搱鍗″崱鍗″崱鍗″崱鍗″崱'+i});
+ arr.push({'station_name1':b,'city':b+i,'stationName3':b+i+1,'note':b+i+2,'question':'hahaha鍝堝搱鍗″崱鍗″崱鍗″崱鍗″崱'+i});
}
return arr
}
@@ -164,10 +164,8 @@
});
function searchStationHistRecord(){
// 灏唒aram娣诲姞鍒�#detailsOpts
- //$('#detailsOpts').data('data', param);
-
+ //$('#detailsOpts').data('data', param);
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
-
// 鏄剧ず闈㈡澘
layer.open({
type: 2,
@@ -179,42 +177,35 @@
});
}
-
-
-
- // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
- $(document).ready(function() {
- //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup", null,
- function(data) {
- data = data.result;
- data = eval("(" + data + ")");
- //console.info(data);
- if (data.code == 1 && data.data.length > 0) {
- var $select = $("#station_name1");
- $select.text('');
- for (var i = 0; i <= data.data.length; i++) {
- $option = $("<option></option>");
- if (i == 0) {
- $option.html("鍏ㄩ儴(" + data.data.length + ")");
- $option.attr("value", "");
- } else {
- $option.text(data.data[i - 1]);
- $option.attr("value", data.data[i - 1]);
- }
- $select.append($option);
-
-
- }
-
- } else {
- $("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
-
- }
- findCity();
- });
- });
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ $(document).ready(function() {
+ //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
+ $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup", null,
+ function(data) {
+ data = data.result;
+ data = eval("(" + data + ")");
+ //console.info(data);
+ if (data.code == 1 && data.data.length > 0) {
+ var $select = $("#station_name1");
+ $select.text('');
+ for (var i = 0; i <= data.data.length; i++) {
+ $option = $("<option></option>");
+ if (i == 0) {
+ $option.html("鍏ㄩ儴(" + data.data.length + ")");
+ $option.attr("value", "");
+ } else {
+ $option.text(data.data[i - 1]);
+ $option.attr("value", data.data[i - 1]);
+ }
+ $select.append($option);
+ }
+ } else {
+ $("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
+ }
+ findCity();
+ });
+ });
function findCity() {
var data = {
@@ -293,10 +284,72 @@
}
});
+ }
+
+ function tempCondition(){
+ temp ={
+ StationId:"",
+ StationName1:$('#station_name1').val(),
+ StationName2:$('#city').val(),
+ StationName5:"",
+ page:{
+ pageSize:10,
+ pageCurr:1,
+ },
+ }
+ console.info(temp);
+ return temp;
}
-
-
- });
+
+ function searchfault()
+ {
+ var sData = tempCondition();
+ var loading = layer.load();
+ // 鏍规嵁鏌ヨ鏉′欢锛屾煡璇㈠唴瀹�
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'Deverror_recordAction!serchByCondition',
+ data: "json="+JSON.stringify(sData),
+ dataType: 'json',
+ success: function(result) {
+ //console.info(result);
+ var data = JSON.parse(result.result);
+ console.info(data)
+ if(data.code==1&&data.data.length>0){
+ console.info(data);
+ var data = data.data;
+ for(i=0;i<data.length;i++){
+ var tmp = {};
+ var data = data[i];
+ tmp.station_name1 = data.stationName1;
+ tmp.city = data.stationName2;
+ tmp.stationName3 = data.stationName;
+ tmp.note = data.record_time;
+ tmp.question = data.error_descript;
+ tOptions.data.push(tmp);
+ }
+ //tOptions.data.length = data.length;
+ }else {
+ layer.msg('鏆傛棤鏁版嵁锛�', {icon:0, shade: 0.1,shadeClose:true});
+ }
+ console.info(tOptions);
+ var pageNum = tOptions.data.length;
+ console.info(pageNum);
+ tOptions.limit = pageNum;
+ // 璁剧疆鍒嗛〉淇℃伅
+ $('#total').text(pageNum);
+ table.render(tOptions);
+ layer.close(loading);
+ }
+ });
+ }
+
+ $('#search').click(function(){
+ searchfault();
+ });
+
+});
diff --git a/gx_tieta/WebRoot/iframe/batt-fault-manage-add.html b/gx_tieta/WebRoot/iframe/batt-fault-manage-add.html
index 0a5512f..e9cb1f4 100644
--- a/gx_tieta/WebRoot/iframe/batt-fault-manage-add.html
+++ b/gx_tieta/WebRoot/iframe/batt-fault-manage-add.html
@@ -61,7 +61,7 @@
<div class="layui-form-item layui-form-text">
<label class="layui-form-label" style="text-align:center;">闂鎻忚堪</label>
<div class="layui-input-block">
- <textarea placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
+ <textarea placeholder="璇疯緭鍏ュ唴瀹�" id="faultcontex" class="layui-textarea"></textarea>
</div>
</div>
@@ -70,7 +70,7 @@
<div class="layui-form-item">
<div class="layui-input-block tr" >
- <a class="layui-btn" lay-submit="" lay-filter="sub">绔嬪嵆鎻愪氦</a>
+ <a class="layui-btn" id="falutsubmit" lay-submit="" lay-filter="sub">绔嬪嵆鎻愪氦</a>
<a type="reset" class="layui-btn layui-btn-primary">閲嶇疆</a>
</div>
</div>
@@ -127,8 +127,8 @@
form.on('submit(sub)',function(data){
$('#addtime').val(getNowFormatDate());
- console.warn(3333);
- console.info(data);
+ //console.warn(3333);
+ //console.info(data);
return false;
});
@@ -248,7 +248,45 @@
}
});
}
-
+
+ function creatAddFaultAdd(){
+ var date = new Date().format('yyyy-MM-dd');
+ var id = 42000570;
+ var temp = {
+ stationId:id,
+ record_time:date,
+ error_descript:$('#faultcontex').val(),
+ }
+ console.info(temp);
+ return temp;
+ }
+
+ function searchFaultAdd(){
+ var temp = creatAddFaultAdd();
+ var loading = layer.load();
+ // 鏍规嵁鏌ヨ鏉′欢锛屾煡璇㈠唴瀹�
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'Deverror_recordAction!add',
+ data: "json="+JSON.stringify(temp),
+ dataType: 'json',
+ success: function(result) {
+ layer.close(loading);
+ console.info(result);
+ var data = JSON.parse(result);
+ if(data.code==1){
+ layer.msg('娣诲姞鎴愬姛锛�', {icon:0, shade: 0.1,shadeClose:true});
+ }else{
+ layer.msg('娣诲姞澶辫触锛�', {icon:0, shade: 0.1,shadeClose:true});
+ }
+ }
+ });
+ }
+
+ $('#falutsubmit').click(function(){
+ searchFaultAdd();
+ });
});
</script>
</body>
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
index 0ec3770..875d6d5 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
@@ -48,7 +48,7 @@
Connection conn=DBUtil.getConn();
String numberSql=" SELECT FOUND_ROWS() number";
String sql="select SQL_CALC_FOUND_ROWS distinct tb_batt_endurance.num,tb_batt_endurance.deviceid,tb_batt_endurance.stationid,real_cap,tb_batt_endurance.moncapstd,real_curr,endurance_theory_timelong,endurance_actual_timelong,is_out_stand " +
- ",db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1,db_battinf.tb_battinf.StationName2 " +
+ ",db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1,db_battinf.tb_battinf.StationName2,db_battinf.tb_battinf.StationName5 " +
" from web_site.tb_batt_endurance,db_battinf.tb_battinf " +
" where tb_batt_endurance.stationid=db_battinf.tb_battinf.stationid "+
" and tb_batt_endurance.stationid in (" +
@@ -59,7 +59,7 @@
" 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=? ) " ;
//鏈烘埧绛涢��
- String stationSql=" and db_battinf.tb_battinf.StationName like ? and db_battinf.tb_battinf.StationName1 like ? and db_battinf.tb_battinf.StationName2 like ?";
+ String stationSql=" and db_battinf.tb_battinf.StationName like ? and db_battinf.tb_battinf.StationName1 like ? and db_battinf.tb_battinf.StationName2 like ? and db_battinf.tb_battinf.StationName5 like ?";
sql+=stationSql;
//瀹為檯缁埅鏃堕棿
String timelongSqlT=" and endurance_actual_timelong<=? ";//灏忎簬鏌愪竴鏃堕棿
@@ -86,7 +86,7 @@
//System.out.println(sql);
- List<Batt_endurance> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{bendurance.getNum(),"%"+bendurance.getStationName()+"%","%"+bendurance.getStationName1()+"%","%"+bendurance.getStationName2()+"%",bendurance.getEndurance_actual_timelong(),bendurance.getIs_out_stand()
+ List<Batt_endurance> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{bendurance.getNum(),"%"+bendurance.getStationName()+"%","%"+bendurance.getStationName1()+"%","%"+bendurance.getStationName2()+"%","%"+bendurance.getStationName5()+"%",bendurance.getEndurance_actual_timelong(),bendurance.getIs_out_stand()
,(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -105,6 +105,7 @@
b.setStationName(rs.getString("stationname"));
b.setStationName1(rs.getString("stationname1"));
b.setStationName2(rs.getString("stationname2"));
+ b.setStationName5(rs.getString("stationname5"));
Page p=new Page();
b.setPage(p);
list.add(b);
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java
index 1fd9d7b..0371f9a 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java
@@ -443,13 +443,13 @@
String baseSql=" SELECT DISTINCT(tb_batttestdata_inf.BattGroupId),tb_batttestdata_inf.test_starttime,tb_batttestdata_inf.record_time,tb_batttestdata_inf.test_cap," +
" tb_batttestdata_inf.max_monvol,tb_batttestdata_inf.min_monvol,tb_batttestdata_inf.test_record_count,tb_batttestdata_inf.test_curr " +
",db_battinf.tb_battinf.load_curr AS curr " +
- ",db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.MonCapStd,db_battinf.tb_battinf.monvolstd,db_battinf.tb_battinf.battgroupname " +
+ ",db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.stationname2,db_battinf.tb_battinf.stationname5,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.MonCapStd,db_battinf.tb_battinf.monvolstd,db_battinf.tb_battinf.battgroupname " +
" FROM db_batt_testdata.tb_batttestdata_inf " +
" LEFT OUTER JOIN db_battinf.tb_battinf ON db_batt_testdata.tb_batttestdata_inf.BattGroupId=db_battinf.tb_battinf.BattGroupId " +
" WHERE tb_batttestdata_inf.test_starttime>=? and tb_batttestdata_inf.test_starttime<=? " +
" and db_batt_testdata.tb_batttestdata_inf.data_available=1 ";
//鏈烘埧缁存姢鍖洪�夋嫨
- String stationSql=" AND db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname2 like ? ";
+ String stationSql=" AND db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname2 like ? and db_battinf.tb_battinf.stationname5 like ? ";
baseSql+=stationSql;
String endSql=" ORDER BY db_battinf.tb_battinf.stationid asc,tb_batttestdata_inf.BattGroupId asc,db_batt_testdata.tb_batttestdata_inf.test_starttime desc ";
sql=baseSql+endSql;
@@ -458,7 +458,7 @@
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),
new Object[]{
binf.getBattProductDate(),binf.getBattProductDate1(),
- "%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"
+ "%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%"
}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -470,6 +470,8 @@
BattInf binf=new BattInf();
binf.setStationId(rs.getString("stationId"));
binf.setStationName1(rs.getString("stationName1"));
+ binf.setStationName2(rs.getString("stationName2"));
+ binf.setStationName5(rs.getString("stationName5"));
binf.setStationName(rs.getString("stationName"));
binf.setMonVolStd(rs.getFloat("monVolStd"));
binf.setMonCapStd(rs.getFloat("monCapStd"));
@@ -512,7 +514,7 @@
"mon_res,mon_ser,mon_conn_res,mon_cap " +
",BINARY(curr1+curr2+curr3) AS curr " +
",db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.moncapstd,db_battinf.tb_battinf.monvolstd " +
- ",db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.BattGroupName,db_battinf.tb_battinf.deviceName " +
+ ",db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationname1,db_battinf.tb_battinf.stationname2,db_battinf.tb_battinf.stationname5,db_battinf.tb_battinf.BattGroupName,db_battinf.tb_battinf.deviceName " +
",MAX(binary tb_batt_rtdata.mon_vol) as maxmonvol,MIN(binary tb_batt_rtdata.mon_vol) as minmonvol " +
"FROM db_ram_db.tb_batt_rtstate " +
"LEFT OUTER JOIN db_ram_db.tb_batt_rtdata ON tb_batt_rtstate.BattGroupId = tb_batt_rtdata.BattGroupId " +
@@ -520,7 +522,7 @@
"LEFT OUTER JOIN db_ram_db.cmcc_power_data ON db_battinf.tb_battinf.fbsdeviceid=cmcc_power_data.dev_id " +
"where ";
//鏈烘埧缁存姢鍖洪�夋嫨
- String stationSql=" db_battinf.tb_battinf.stationname like ? AND db_battinf.tb_battinf.stationname1 like ? AND db_battinf.tb_battinf.stationname2 like ? ";
+ String stationSql=" db_battinf.tb_battinf.stationname like ? AND db_battinf.tb_battinf.stationname1 like ? AND db_battinf.tb_battinf.stationname2 like ? AND db_battinf.tb_battinf.stationname5 like ? ";
baseSql+=stationSql;
//鐢垫睜鐘舵��
String stateSqlT=" AND batt_state=? ";
@@ -536,7 +538,7 @@
String orderSql=" order by db_battinf.tb_battinf.stationid asc";
sql=baseSql+endSql+orderSql;
//System.out.println(sql);
- List<Batt_State> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"
+ List<Batt_State> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%"
,binf.getNum()}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -577,6 +579,8 @@
binf.setDeviceName(rs.getString("deviceName"));
binf.setStationName(rs.getString("stationName"));
binf.setStationName1(rs.getString("stationName1"));
+ binf.setStationName2(rs.getString("stationName2"));
+ binf.setStationName5(rs.getString("stationName5"));
binf.setStationName9(BattTestData.battState(rs.getInt("batt_state")));
state.setBstate(bstate);
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 288bc51..5fc9a3e 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,18 +54,14 @@
//鏈烘埧浜嬩欢缁熻
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 " +
+ 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 " +
" 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=? ) " +
+ " and tb_bts_station_event.station_id in (" +
+ " 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 record_datetime>=? and record_datetime<=? " +
- " and stationname1 like ? and stationname2 like ? and stationname3 like ? and stationid like ? " ;
+ " and stationname1 like ? and stationname2 like ? and stationname3 like ? and stationname5 like ? and stationid like ? " ;
/*//浜嬩欢绛涢��
String eventSqlT=" and station_event_type!=? ";
String eventSqlF=" and station_event_type=? ";
@@ -81,7 +77,7 @@
String orderSql=" order by station_id,record_datetime,station_event_type asc ";
sql+=orderSql;
//System.err.println(sql);
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum(),binf.getBattInUseDate(),binf.getBattInUseDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%"}, new CallBack() {
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum(),binf.getBattInUseDate(),binf.getBattInUseDate1(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationName5()+"%","%"+binf.getStationId()+"%"}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -308,12 +304,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<=? ";
//鍩虹珯鐘舵��
@@ -401,11 +393,11 @@
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);
@@ -416,8 +408,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());
}
}
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 09a7d35..11ae092 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
@@ -51,10 +51,10 @@
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" +
" ,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 " +
+ " ,tb_battinf.stationname,tb_battinf.stationname1,tb_battinf.stationname2,tb_battinf.stationname3,tb_battinf.stationname5 " +
" from db_ram_db.tb_bts_station_state,db_battinf.tb_battinf " +
" where tb_bts_station_state.dev_id=db_battinf.tb_battinf.FBSDeviceId " +
- " and tb_battinf.stationname1 like ? and tb_battinf.stationname2 like ? and tb_battinf.stationname3 like ? " +
+ " and tb_battinf.stationname1 like ? and tb_battinf.stationname2 like ? and tb_battinf.stationname3 like ? and tb_battinf.stationname5 like ? " +
" and stationid like ? " ;
/*" and tb_bts_station_state.station_id in (" +
" select distinct db_battinf.tb_battinf.stationid " +
@@ -120,7 +120,7 @@
String orderSql=" limit ? ,? ";
sql+=orderSql;
//System.out.println(sql);
- List<Bts_station_state> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%",binf.getNum(),(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()},new CallBack() {
+ List<Bts_station_state> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationName5()+"%","%"+binf.getStationId()+"%",binf.getNum(),(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()},new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -157,6 +157,7 @@
b.setStationName1(rs.getString("stationName1"));
b.setStationName2(rs.getString("stationName2"));
b.setStationName3(rs.getString("stationName3"));
+ b.setStationName5(rs.getString("stationName5"));
Page page=new Page();
b.setPage(page);
list.add(b);
diff --git a/gx_tieta/src/com/fgkj/dto/Batt_endurance.java b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
index 17179ac..5d31eee 100644
--- a/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
+++ b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
@@ -16,7 +16,7 @@
private String stationName;
private String stationName1;//鐪佺骇
private String stationName2;//甯傜骇
-
+ private String stationName5;//鍖哄幙
private Page page;//鍒嗛〉
public int getNum() {
return num;
@@ -103,6 +103,12 @@
public void setPage(Page page) {
this.page = page;
}
+ public String getStationName5() {
+ return stationName5;
+ }
+ public void setStationName5(String stationName5) {
+ this.stationName5 = stationName5;
+ }
@Override
public String toString() {
return "Batt_endurance [num=" + num + ", deviceId=" + deviceId
@@ -112,9 +118,10 @@
+ ", endurance_actual_timelong=" + endurance_actual_timelong
+ ", is_out_stand=" + is_out_stand + ", note=" + note
+ ", stationName=" + stationName + ", stationName1="
- + stationName1 + ", stationName2=" + stationName2 + ", page="
- + page + "]";
+ + stationName1 + ", stationName2=" + stationName2
+ + ", stationName5=" + stationName5 + ", page=" + page + "]";
}
+
}
diff --git a/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java b/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java
index 4d36200..6539372 100644
--- a/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java
+++ b/gx_tieta/src/com/fgkj/dto/ram/Bts_station_state.java
@@ -39,6 +39,7 @@
private String stationName1;
private String stationName2;
private String stationName3;
+ private String stationName5;
private Page page;
@@ -218,6 +219,12 @@
public void setStation_xuhang_tlong(int station_xuhang_tlong) {
this.station_xuhang_tlong = station_xuhang_tlong;
}
+ public String getStationName5() {
+ return stationName5;
+ }
+ public void setStationName5(String stationName5) {
+ this.stationName5 = stationName5;
+ }
@Override
public String toString() {
return "Bts_station_state [num=" + num + ", station_id=" + station_id
@@ -241,10 +248,12 @@
+ station_xuhang_tlong + ", note=" + note + ", stationName="
+ stationName + ", stationName1=" + stationName1
+ ", stationName2=" + stationName2 + ", stationName3="
- + stationName3 + ", page=" + page + "]";
+ + stationName3 + ", stationName5=" + stationName5 + ", page="
+ + page + "]";
}
+
}
--
Gitblit v1.9.1