From daf105a4c7cfd299d6473939b4d678a3e9f91f23 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期四, 01 十一月 2018 17:37:50 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/services/BattMap_informationService.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/BattMap_informationService.java b/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
index d231680..6e46763 100644
--- a/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
+++ b/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
@@ -14,6 +14,7 @@
import com.fgkj.dao.impl.BattMap_informationImpl;
import com.fgkj.dao.impl.Batt_rtstateDAOImpl;
import com.fgkj.dao.impl.Battalarm_dataDAOImpl;
+import com.fgkj.dao.impl.ram.Bts_station_stateImpl;
import com.fgkj.dao.impl.ram.Fbs9100_stateImpl;
import com.fgkj.db.DBUtil;
import com.fgkj.dto.BattInf;
@@ -107,6 +108,7 @@
int numBadBatt=0;
int numAlarm=0;
int numPlan=0;
+ int numPoff=0;
if(list!=null&&list.size()>0){
for(int i=0;i<list.size();i++){
state="item-normal";
@@ -117,25 +119,32 @@
binf.setFBSDeviceId(binformation.getFBSDeviceId());
state=(new Fbs9100_stateImpl().seachDevNow(binf));
}else{
+ numPoff=(new Bts_station_stateImpl()).serchByStationId(binformation); //鍋滅數鏁�
numBadBatt=(new BadBatt_monImpl()).serchByStationId(binformation); //钀藉悗鎬绘暟
numAlarm=(new Battalarm_dataDAOImpl()).serchByStationId(binformation); //鍛婅鎬绘暟
numPlan=(new BattDischarge_planImpl()).serchByStationId(binformation); //寤惰繜鎬绘暟
- if(numBadBatt>0){
- state="item-behind"; //钀藉悗鏈烘埧
+ if(numPoff>0){
+ state="item-poff"; //鍋滅數
}else{
- if(numAlarm > 0){
- state="item-warn"; //鍛婅鏈烘埧
+ if(numBadBatt>0){
+ state="item-behind"; //钀藉悗鏈烘埧
}else{
- if(numPlan > 0){
- state="item-timeout"; //寤惰繜鏈烘埧
+ if(numAlarm > 0){
+ state="item-warn"; //鍛婅鏈烘埧
+ }else{
+ if(numPlan > 0){
+ state="item-timeout"; //寤惰繜鏈烘埧
+ }
}
}
}
+
}
if("0".equals(list.get(i).getInformation())){
- state=""; //鑻ユ満鎴挎湭瀹夎灏嗘寚瀹氱殑鏈烘埧璁剧疆鎴愮伆鑹茬殑
+ state="item-install"; //鑻ユ満鎴挎湭瀹夎灏嗘寚瀹氱殑鏈烘埧璁剧疆鎴愮伆鑹茬殑
}
- model.setData(list.get(i));
+ model.setData(list.get(i));
+ model.setMsgO(String.valueOf(numPoff)); //鍋滅數鏁�
model.setCode(numAlarm); //鍛婅鎬绘暟
model.setSum(numBadBatt); //钀藉悗鎬绘暟
model.setNewsum(numPlan); //寤舵椂鎬绘暟
--
Gitblit v1.9.1