From 41fed0566c924dc5aad6b86dd18284de73739cf7 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.25>
Date: 星期二, 04 十二月 2018 14:51:41 +0800
Subject: [PATCH] 电池组信息配置中修改和添加Station_install
---
gx_tieta/src/com/fgkj/services/BattMap_informationService.java | 57 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/BattMap_informationService.java b/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
index 6e46763..256b4d7 100644
--- a/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
+++ b/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
@@ -109,6 +109,7 @@
int numAlarm=0;
int numPlan=0;
int numPoff=0;
+ int dianzhanNum=0;
if(list!=null&&list.size()>0){
for(int i=0;i<list.size();i++){
state="item-normal";
@@ -119,21 +120,23 @@
binf.setFBSDeviceId(binformation.getFBSDeviceId());
state=(new Fbs9100_stateImpl().seachDevNow(binf));
}else{
- numPoff=(new Bts_station_stateImpl()).serchByStationId(binformation); //鍋滅數鏁�
+ numPoff=(new Bts_station_stateImpl()).serchByStationId(binformation); //鍋滅數鏁�
+ dianzhanNum=(new Bts_station_stateImpl()).serchByStationId_diaozhan(binformation); //鎺夌珯鏁�
numBadBatt=(new BadBatt_monImpl()).serchByStationId(binformation); //钀藉悗鎬绘暟
numAlarm=(new Battalarm_dataDAOImpl()).serchByStationId(binformation); //鍛婅鎬绘暟
- numPlan=(new BattDischarge_planImpl()).serchByStationId(binformation); //寤惰繜鎬绘暟
- if(numPoff>0){
- state="item-poff"; //鍋滅數
+ //numPlan=(new BattDischarge_planImpl()).serchByStationId(binformation); //寤惰繜鎬绘暟
+ if(dianzhanNum>0){
+ state="item-timeout"; //鎺夌珯
}else{
- 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"; //鍛婅鏈烘埧
}
}
}
@@ -147,7 +150,8 @@
model.setMsgO(String.valueOf(numPoff)); //鍋滅數鏁�
model.setCode(numAlarm); //鍛婅鎬绘暟
model.setSum(numBadBatt); //钀藉悗鎬绘暟
- model.setNewsum(numPlan); //寤舵椂鎬绘暟
+ //model.setNewsum(numPlan); //寤舵椂鎬绘暟
+ model.setMsgT(String.valueOf(dianzhanNum)); //鎺夌珯
model.setMsg(state); //61850鐘舵��
model.setMsgN(binformation.getFBSDeviceId().toString());
listAll.add(model);
@@ -163,6 +167,8 @@
int numBadBatt=0;
int numAlarm=0;
int numPlan=0;
+ int numPoff=0;
+ int dianzhanNum=0;
if(list!=null&&list.size()>0){
for(int i=0;i<list.size();i++){
state="item-normal";
@@ -173,25 +179,34 @@
binf.setFBSDeviceId(binformation.getFBSDeviceId());
state=(new Fbs9100_stateImpl().seachDevNow(binf));
}else{
+ numPoff=(new Bts_station_stateImpl()).serchByStationId(binformation); //鍋滅數鏁�
+ dianzhanNum=(new Bts_station_stateImpl()).serchByStationId_diaozhan(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"; //钀藉悗鏈烘埧
+ //numPlan=(new BattDischarge_planImpl()).serchByStationId(binformation); //寤惰繜鎬绘暟
+ if(dianzhanNum>0){
+ state="item-timeout"; //鎺夌珯
}else{
- if(numAlarm > 0){
- state="item-warn"; //鍛婅鏈烘埧
+ if(numPoff>0){
+ state="item-poff"; //鍋滅數
+
}else{
- if(numPlan > 0){
- state="item-timeout"; //寤惰繜鏈烘埧
+ if(numBadBatt>0){
+ state="item-behind"; //钀藉悗鏈烘埧
+ }else{
+ if(numAlarm > 0){
+ state="item-warn"; //鍛婅鏈烘埧
+ }
}
}
}
}
model.setData(list.get(i));
+ model.setMsgO(String.valueOf(numPoff)); //鍋滅數鏁�
model.setCode(numAlarm); //鍛婅鎬绘暟
model.setSum(numBadBatt); //钀藉悗鎬绘暟
- model.setNewsum(numPlan); //寤舵椂鎬绘暟
+ //model.setNewsum(numPlan); //寤舵椂鎬绘暟
+ model.setMsgT(String.valueOf(dianzhanNum)); //鎺夌珯
model.setMsg(state); //61850鐘舵��
model.setMsgN(binformation.getFBSDeviceId().toString());
listAll.add(model);
@@ -210,10 +225,14 @@
int numAlarm=(new Battalarm_dataDAOImpl()).serchByStationId(binformation);
int numBadBatt=(new BadBatt_monImpl()).serchByStationId(binformation);
int numPlan=(new BattDischarge_planImpl()).serchByStationId(binformation);
+ int numPoff=(new Bts_station_stateImpl()).serchByStationId(binformation); //鍋滅數鏁�
+ int dianzhanNum=(new Bts_station_stateImpl()).serchByStationId_diaozhan(binformation); //鎺夌珯鏁�
model.setData(list.get(i));
model.setCode(numAlarm); //鍛婅鎬绘暟
model.setSum(numBadBatt); //钀藉悗鎬绘暟
model.setNewsum(numPlan); //寤舵椂鎬绘暟
+ model.setMsgO(String.valueOf(numPoff)); //鍋滅數鏁�
+ model.setMsgT(String.valueOf(dianzhanNum)); //鎺夌珯
listAll.add(model);
}
}
--
Gitblit v1.9.1