From 4845b337be059e93621d353b5c2e57ac480a8e33 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期四, 20 十二月 2018 15:22:36 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/services/BattMap_informationService.java | 70 +++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 23 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/BattMap_informationService.java b/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
index 6bd556f..c08c94a 100644
--- a/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
+++ b/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
@@ -12,6 +12,7 @@
import com.fgkj.dao.impl.BattDischarge_planImpl;
import com.fgkj.dao.impl.BattInfImpl;
import com.fgkj.dao.impl.BattMap_informationImpl;
+import com.fgkj.dao.impl.Batt_enduranceImpl;
import com.fgkj.dao.impl.Batt_rtstateDAOImpl;
import com.fgkj.dao.impl.Battalarm_dataDAOImpl;
import com.fgkj.dao.impl.ram.Bts_station_stateImpl;
@@ -33,6 +34,18 @@
//9.1褰曞叆鏈烘埧淇℃伅
public ServiceModel add(Object obj){
Boolean bl=dao.add(obj);
+ if(bl){
+ model.setCode(1);
+ model.setMsg("娣诲姞鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("娣诲姞澶辫触!");
+ }
+ return model;
+ }
+ //9.1褰曞叆鏈烘埧淇℃伅(鎵嬫満绔�)
+ public ServiceModel replace(Object obj){
+ Boolean bl=((BattMap_informationImpl)dao).replace(obj);
if(bl){
model.setCode(1);
model.setMsg("娣诲姞鎴愬姛!");
@@ -110,6 +123,7 @@
int numPlan=0;
int numPoff=0;
int dianzhanNum=0;
+ int xuhangNum=0;
if(list!=null&&list.size()>0){
for(int i=0;i<list.size();i++){
state="item-normal";
@@ -120,30 +134,32 @@
binf.setFBSDeviceId(binformation.getFBSDeviceId());
state=(new Fbs9100_stateImpl().seachDevNow(binf));
}else{
+ xuhangNum=(new Batt_enduranceImpl()).serchxuhangNotInThree_stationid(binformation);//缁埅涓嶈冻3灏忔椂鏁�
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"; //鍋滅數
+ 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(xuhangNum>0){
+ state="item-xuhang"; //缁埅涓嶈冻
}else{
- /*if(numPlan > 0){
- state="item-timeout"; //寤惰繜鏈烘埧
- }*/
- if(dianzhanNum>0){
- state="item-timeout";
+ if(numBadBatt>0){
+ state="item-behind"; //钀藉悗鏈烘埧
+ }else{
+ if(numAlarm > 0){
+ state="item-warn"; //鍛婅鏈烘埧
+ }
}
}
}
}
-
}
if("0".equals(list.get(i).getInformation())){
state="item-install"; //鑻ユ満鎴挎湭瀹夎灏嗘寚瀹氱殑鏈烘埧璁剧疆鎴愮伆鑹茬殑
@@ -154,6 +170,7 @@
model.setSum(numBadBatt); //钀藉悗鎬绘暟
//model.setNewsum(numPlan); //寤舵椂鎬绘暟
model.setMsgT(String.valueOf(dianzhanNum)); //鎺夌珯
+ model.setMsgV(String.valueOf(xuhangNum));//缁埅涓嶈冻
model.setMsg(state); //61850鐘舵��
model.setMsgN(binformation.getFBSDeviceId().toString());
listAll.add(model);
@@ -171,6 +188,7 @@
int numPlan=0;
int numPoff=0;
int dianzhanNum=0;
+ int xuhangNum=0;
if(list!=null&&list.size()>0){
for(int i=0;i<list.size();i++){
state="item-normal";
@@ -181,25 +199,28 @@
binf.setFBSDeviceId(binformation.getFBSDeviceId());
state=(new Fbs9100_stateImpl().seachDevNow(binf));
}else{
+ xuhangNum=(new Batt_enduranceImpl()).serchxuhangNotInThree_stationid(binformation);//缁埅涓嶈冻3灏忔椂鏁�
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"; //鍋滅數
+ 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(xuhangNum>0){
+ state="item-xuhang"; //缁埅涓嶈冻
}else{
- /*if(numPlan > 0){
- state="item-timeout"; //寤惰繜鏈烘埧
- }*/
- if(dianzhanNum>0){
- state="item-timeout"; //鎺夌珯
+ if(numBadBatt>0){
+ state="item-behind"; //钀藉悗鏈烘埧
+ }else{
+ if(numAlarm > 0){
+ state="item-warn"; //鍛婅鏈烘埧
+ }
}
}
}
@@ -211,6 +232,7 @@
model.setSum(numBadBatt); //钀藉悗鎬绘暟
//model.setNewsum(numPlan); //寤舵椂鎬绘暟
model.setMsgT(String.valueOf(dianzhanNum)); //鎺夌珯
+ model.setMsgV(String.valueOf(xuhangNum));//缁埅涓嶈冻
model.setMsg(state); //61850鐘舵��
model.setMsgN(binformation.getFBSDeviceId().toString());
listAll.add(model);
@@ -231,12 +253,14 @@
int numPlan=(new BattDischarge_planImpl()).serchByStationId(binformation);
int numPoff=(new Bts_station_stateImpl()).serchByStationId(binformation); //鍋滅數鏁�
int dianzhanNum=(new Bts_station_stateImpl()).serchByStationId_diaozhan(binformation); //鎺夌珯鏁�
+ int xuhangNum=(new Batt_enduranceImpl()).serchxuhangNotInThree_stationid(binformation);//缁埅涓嶈冻3灏忔椂鏁�
model.setData(list.get(i));
model.setCode(numAlarm); //鍛婅鎬绘暟
model.setSum(numBadBatt); //钀藉悗鎬绘暟
model.setNewsum(numPlan); //寤舵椂鎬绘暟
model.setMsgO(String.valueOf(numPoff)); //鍋滅數鏁�
model.setMsgT(String.valueOf(dianzhanNum)); //鎺夌珯
+ model.setMsgV(String.valueOf(xuhangNum));//缁埅涓嶈冻
listAll.add(model);
}
}
--
Gitblit v1.9.1