From 880eaffb3557deb7da44b32a637b61125655115c Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.24>
Date: 星期五, 28 九月 2018 14:33:45 +0800
Subject: [PATCH] 电池续航时间查询后台修改
---
gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java | 9 ++
gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java | 51 +++++++++-------
gx_tieta/src/com/fgkj/dto/Batt_endurance.java | 66 ++++++++++++++++------
3 files changed, 84 insertions(+), 42 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
index ad27d5a..0a540cc 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
@@ -248,7 +248,14 @@
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binformation.getStationId()}, new BattMap_informationImpl());
return list;
}
-
+ //鍦板浘涓婃牴鎹満鎴垮悕绉版煡璇㈢粡绾害
+ public List serchTudeByStationName(Object obj){
+ BattMap_information binformation=(BattMap_information) obj;
+ String sql="select num, StationId,StationName,address,longitude,latitude,information from web_site.tb_battmap_information " +
+ " where StationName like ?";
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binformation.getStationName()}, new BattMap_informationImpl());
+ return list;
+ }
public static void main(String[] args) {
BattMap_informationImpl bimpl=new BattMap_informationImpl();
Batt_Maint_Dealarm bmd=new Batt_Maint_Dealarm();
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 6fc39ff..0f02da4 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
@@ -41,33 +41,34 @@
//缁埅鏃堕棿鐨勬煡璇�
public List serchByCondition(Object obj) {
Batt_endurance bendurance=(Batt_endurance) obj;
- String sql="select distinct tb_batt_endurance.num,tb_batt_endurance.deviceid,tb_batt_endurance.stationid,endurance_state,real_cap,tb_batt_endurance.moncapstd,real_curr,endurance_timelong " +
- ",db_battinf.tb_battinf.StationName " +
+ String sql="select 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 " +
" from web_site.tb_batt_endurance,db_battinf.tb_battinf " +
" where tb_batt_endurance.stationid=db_battinf.tb_battinf.stationid " ;
//鏈烘埧绛涢��
- String stationSql=" and db_battinf.tb_battinf.StationName like ?";
+ String stationSql=" and db_battinf.tb_battinf.StationName like ? and db_battinf.tb_battinf.StationName1 like ? and db_battinf.tb_battinf.StationName2 like ?";
sql+=stationSql;
- //缁埅鐘舵��
- String enduranceSqlT=" and endurance_state=? ";
- String enduranceSqlF=" and endurance_state!=? ";//鍏ㄩ儴
- if(bendurance.getEndurance_state()==0){
- sql+=enduranceSqlF;
- }else{
- sql+=enduranceSqlT;
- }
- //缁埅鏃堕棿
- String timelongSqlT=" and endurance_timelong<=? ";//灏忎簬鏌愪竴鏃堕棿
- String timelongSqlF=" and endurance_timelong!=?";//鍏ㄩ儴
- if(bendurance.getEndurance_timelong()==0){
+ //瀹為檯缁埅鏃堕棿
+ String timelongSqlT=" and endurance_actual_timelong<=? ";//灏忎簬鏌愪竴鏃堕棿
+ String timelongSqlF=" and endurance_actual_timelong!=? ";//鍏ㄩ儴
+ if(bendurance.getEndurance_actual_timelong()==0){
sql+=timelongSqlF;
}else{
sql+=timelongSqlT;
}
+ //鏄惁鎺夌珯
+ String is_out_standSqlT=" and is_out_stand!=? ";//鍏ㄩ儴
+ String is_out_standSqlF=" and is_out_stand=? ";
+ if(bendurance.getIs_out_stand()==100){
+ sql+=is_out_standSqlT;
+ }else{
+ sql+=is_out_standSqlF;
+ }
//鎺掑簭鏃堕棿
- String orderSql=" order by endurance_timelong asc";
+ String orderSql=" order by endurance_actual_timelong asc ";
+ sql+=orderSql;
//System.out.println(sql);
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+bendurance.getNote()+"%",bendurance.getEndurance_state(),bendurance.getEndurance_timelong()}, new CallBack() {
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+bendurance.getStationName()+"%","%"+bendurance.getStationName1()+"%","%"+bendurance.getStationName2()+"%",bendurance.getEndurance_actual_timelong(),bendurance.getIs_out_stand()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -77,12 +78,14 @@
b.setNum(rs.getInt("num"));
b.setDeviceId(rs.getInt("deviceId"));
b.setStationid(rs.getString("stationid"));
- b.setEndurance_state(rs.getInt("endurance_state"));
b.setReal_cap(rs.getFloat("real_cap"));
b.setMoncapstd(rs.getFloat("moncapstd"));
b.setReal_curr(rs.getFloat("real_curr"));
- b.setEndurance_timelong(rs.getInt("endurance_timelong"));
- b.setNote(rs.getString("stationname"));
+ b.setEndurance_theory_timelong(rs.getInt("endurance_theory_timelong"));
+ b.setEndurance_actual_timelong(rs.getInt("endurance_actual_timelong"));
+ b.setStationName(rs.getString("stationname"));
+ b.setStationName1(rs.getString("stationname1"));
+ b.setStationName2(rs.getString("stationname2"));
list.add(b);
}
} catch (SQLException e) {
@@ -102,9 +105,11 @@
public static void main(String[] args) {
Batt_enduranceImpl bimpl=new Batt_enduranceImpl();
Batt_endurance ben=new Batt_endurance();
- ben.setNote("");
- ben.setEndurance_state(0);
- ben.setEndurance_timelong(0);
+ ben.setStationName("");
+ ben.setStationName1("");
+ ben.setStationName2("");
+ ben.setEndurance_actual_timelong(120);
+ ben.setIs_out_stand(100);
List list=bimpl.serchByCondition(ben);
System.out.println(list.size());
}
diff --git a/gx_tieta/src/com/fgkj/dto/Batt_endurance.java b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
index cbd384e..83c04bc 100644
--- a/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
+++ b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
@@ -6,12 +6,16 @@
private int num;
private int deviceId;
private String stationid;
- private int endurance_state;
private float real_cap;
private float moncapstd;
private float real_curr;
- private int endurance_timelong;
+ private int endurance_theory_timelong;//鐞嗚
+ private int endurance_actual_timelong;//瀹為檯
+ private int is_out_stand;
private String note;
+ private String stationName;
+ private String stationName1;//鐪佺骇
+ private String stationName2;//甯傜骇
public int getNum() {
return num;
}
@@ -29,12 +33,6 @@
}
public void setStationid(String stationid) {
this.stationid = stationid;
- }
- public int getEndurance_state() {
- return endurance_state;
- }
- public void setEndurance_state(int endurance_state) {
- this.endurance_state = endurance_state;
}
public float getReal_cap() {
return real_cap;
@@ -54,11 +52,24 @@
public void setReal_curr(float real_curr) {
this.real_curr = real_curr;
}
- public int getEndurance_timelong() {
- return endurance_timelong;
+
+ public int getEndurance_theory_timelong() {
+ return endurance_theory_timelong;
}
- public void setEndurance_timelong(int endurance_timelong) {
- this.endurance_timelong = endurance_timelong;
+ public void setEndurance_theory_timelong(int endurance_theory_timelong) {
+ this.endurance_theory_timelong = endurance_theory_timelong;
+ }
+ public int getEndurance_actual_timelong() {
+ return endurance_actual_timelong;
+ }
+ public void setEndurance_actual_timelong(int endurance_actual_timelong) {
+ this.endurance_actual_timelong = endurance_actual_timelong;
+ }
+ public int getIs_out_stand() {
+ return is_out_stand;
+ }
+ public void setIs_out_stand(int is_out_stand) {
+ this.is_out_stand = is_out_stand;
}
public String getNote() {
return note;
@@ -66,16 +77,35 @@
public void setNote(String note) {
this.note = note;
}
+ public String getStationName() {
+ return stationName;
+ }
+ public void setStationName(String stationName) {
+ this.stationName = stationName;
+ }
+ public String getStationName1() {
+ return stationName1;
+ }
+ public void setStationName1(String stationName1) {
+ this.stationName1 = stationName1;
+ }
+ public String getStationName2() {
+ return stationName2;
+ }
+ public void setStationName2(String stationName2) {
+ this.stationName2 = stationName2;
+ }
@Override
public String toString() {
return "Batt_endurance [num=" + num + ", deviceId=" + deviceId
- + ", stationid=" + stationid + ", endurance_state="
- + endurance_state + ", real_cap=" + real_cap + ", moncapstd="
- + moncapstd + ", real_curr=" + real_curr
- + ", endurance_timelong=" + endurance_timelong + ", note="
- + note + "]";
+ + ", stationid=" + stationid + ", real_cap=" + real_cap
+ + ", moncapstd=" + moncapstd + ", real_curr=" + real_curr
+ + ", endurance_theory_timelong=" + endurance_theory_timelong
+ + ", endurance_actual_timelong=" + endurance_actual_timelong
+ + ", is_out_stand=" + is_out_stand + ", note=" + note
+ + ", stationName=" + stationName + ", stationName1="
+ + stationName1 + ", stationName2=" + stationName2 + "]";
}
-
--
Gitblit v1.9.1