From e96ae5524e6fda4922f9da4ab5fea887eaf25e6e Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期三, 26 九月 2018 09:23:16 +0800
Subject: [PATCH] 修改首页地图上机房的经纬度
---
gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java | 2
gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java | 60 +++++++++++++++++++++++++++++-
gx_tieta/src/com/fgkj/dto/Batt_endurance.java | 11 +++++
3 files changed, 69 insertions(+), 4 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 a9032e1..ad27d5a 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
@@ -130,7 +130,7 @@
//9.1鏌ヨ宸茬粡娣诲姞鐗╃悊淇℃伅鐨勬満鎴�(鐢ㄦ埛绠＄悊鐨�)
public List serchInBattMapByUid(Object obj) {
User_inf uinf=(User_inf) obj;
- String sql="select tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId " +
+ String sql="select distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId " +
" from web_site.tb_battmap_information,db_battinf.tb_battinf " +
" where tb_battmap_information.StationId=db_battinf.tb_battinf.StationId " +
" and tb_battmap_information.StationId in (" +
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 61e3867..146d94b 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
@@ -1,10 +1,16 @@
package com.fgkj.dao.impl;
import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
import java.util.List;
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.CallBack;
+import com.fgkj.dao.DAOHelper;
+import com.fgkj.db.DBUtil;
+import com.fgkj.dto.Batt_endurance;
+import com.mysql.fabric.xmlrpc.base.Array;
public class Batt_enduranceImpl implements BaseDAO,CallBack{
@@ -34,8 +40,58 @@
}
//缁埅鏃堕棿鐨勬煡璇�
public List serchByCondition(Object obj) {
-
- return null;
+ Batt_endurance bendurance=(Batt_endurance) obj;
+ String sql="select distinct num,deviceid,tb_batt_endurance.stationid,endurance_state,real_cap,tb_batt_endurance.moncapstd,real_curr,endurance_timelong " +
+ ",db_battinf.tb_battinf.StationName " +
+ " from web_site.tb_batt_endurance,db_battinf.tb_battinf " +
+ " where tb_batt_endurance.stationid=db_battinf.tb_battinf.stationid " ;
+ //鏈烘埧绛涢��
+ String stationSql=" and tb_batt_endurance.stationid 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){
+ sql+=timelongSqlF;
+ }else{
+ sql+=timelongSqlT;
+ }
+ //鎺掑簭鏃堕棿
+ String orderSql=" order by endurance_timelong asc";
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+bendurance.getStationid()+"%",bendurance.getEndurance_state(),bendurance.getEndurance_timelong()}, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ Batt_endurance b=new Batt_endurance();
+ 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"));
+ list.add(b);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ return list;
}
public List serchByInfo(Object obj) {
diff --git a/gx_tieta/src/com/fgkj/dto/Batt_endurance.java b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
index 93a37d8..cbd384e 100644
--- a/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
+++ b/gx_tieta/src/com/fgkj/dto/Batt_endurance.java
@@ -11,6 +11,7 @@
private float moncapstd;
private float real_curr;
private int endurance_timelong;
+ private String note;
public int getNum() {
return num;
}
@@ -59,15 +60,23 @@
public void setEndurance_timelong(int endurance_timelong) {
this.endurance_timelong = endurance_timelong;
}
+ public String getNote() {
+ return note;
+ }
+ public void setNote(String note) {
+ this.note = note;
+ }
@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 + "]";
+ + ", endurance_timelong=" + endurance_timelong + ", note="
+ + note + "]";
}
+
}
--
Gitblit v1.9.1