From ad22ba26863980edd80a1f9adfebb8daba31d74d Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.12>
Date: 星期五, 26 十月 2018 11:50:23 +0800
Subject: [PATCH] 添加机房的是否安装的标识
---
gx_tieta/src/com/fgkj/dto/BattInf.java | 22 ++++++++++++----------
gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java | 3 ++-
gx_tieta/src/com/fgkj/services/BattMap_informationService.java | 5 ++++-
3 files changed, 18 insertions(+), 12 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 ae67a22..876cf42 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
@@ -175,7 +175,7 @@
int uid=page.getPageAll();
Connection conn=DBUtil.getConn();
String numberSql="SELECT FOUND_ROWS() number";//瀛樻斁鎬绘暟
- String sql="select SQL_CALC_FOUND_ROWS distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId " +
+ String sql="select SQL_CALC_FOUND_ROWS distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.station_install " +
" 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 (" +
@@ -202,6 +202,7 @@
binformation.setLatitude(rs.getDouble("latitude"));
binformation.setInformation(rs.getString("information"));
binformation.setFBSDeviceId(rs.getInt("fBSDeviceId"));
+ binformation.setInformation(rs.getString("station_install"));
Page p=new Page();
binformation.setPage(p);
list.add(binformation);
diff --git a/gx_tieta/src/com/fgkj/dto/BattInf.java b/gx_tieta/src/com/fgkj/dto/BattInf.java
index 29e00ba..59b57ef 100644
--- a/gx_tieta/src/com/fgkj/dto/BattInf.java
+++ b/gx_tieta/src/com/fgkj/dto/BattInf.java
@@ -73,7 +73,9 @@
private Float Load_curr;// 璐熻浇鐢垫祦
private Float DisCurrMax;//鏈�澶ф牳瀹圭數娴�
private String SignalName;
- private Integer StartNum;
+ private Integer StartNum;
+ private Integer Station_install; //鏈烘埧璁惧鏄惁瀹夎
+
private Integer Size;
private Page page;
private Object obj;
@@ -526,6 +528,12 @@
public void setStationId_ex(String stationId_ex) {
StationId_ex = stationId_ex;
}
+ public Integer getStation_install() {
+ return Station_install;
+ }
+ public void setStation_install(Integer station_install) {
+ Station_install = station_install;
+ }
@Override
public String toString() {
return "BattInf [num=" + num + ", StationId=" + StationId
@@ -565,14 +573,8 @@
+ ", SignalId=" + SignalId + ", CInterFaceId=" + CInterFaceId
+ ", Load_curr=" + Load_curr + ", DisCurrMax=" + DisCurrMax
+ ", SignalName=" + SignalName + ", StartNum=" + StartNum
- + ", Size=" + Size + ", page=" + page + ", obj=" + obj
- + ", station_phone=" + station_phone + "]";
+ + ", Station_install=" + Station_install + ", Size=" + Size
+ + ", page=" + page + ", obj=" + obj + ", station_phone="
+ + station_phone + "]";
}
-
-
-
-
-
-
-
}
diff --git a/gx_tieta/src/com/fgkj/services/BattMap_informationService.java b/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
index 6d48fbb..d231680 100644
--- a/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
+++ b/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
@@ -108,7 +108,7 @@
int numAlarm=0;
int numPlan=0;
if(list!=null&&list.size()>0){
- for(int i=0;i<list.size();i++){
+ for(int i=0;i<list.size();i++){
state="item-normal";
ServiceModel model=new ServiceModel();
BattMap_information binformation = list.get(i);
@@ -132,6 +132,9 @@
}
}
}
+ if("0".equals(list.get(i).getInformation())){
+ state=""; //鑻ユ満鎴挎湭瀹夎灏嗘寚瀹氱殑鏈烘埧璁剧疆鎴愮伆鑹茬殑
+ }
model.setData(list.get(i));
model.setCode(numAlarm); //鍛婅鎬绘暟
model.setSum(numBadBatt); //钀藉悗鎬绘暟
--
Gitblit v1.9.1