From b6e8fdb6f9bb50d29aeb29aa62b19a75c9a1ef9d Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 02 十一月 2018 17:31:23 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/services/BattMap_informationService.java | 81 +++++++++++++++++++++++++++++++++++++---
1 files changed, 74 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/BattMap_informationService.java b/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
index 69680d3..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;
@@ -86,10 +87,77 @@
}
return listAll;
}
-
- //棣栭〉涓婃煡璇㈢敤鎴风鐞嗙殑宸茬粡璁剧疆杩囦綅缃殑鏈烘埧淇℃伅
- public List searchUserManageStation(Object obj){
- List<BattMap_information> list = ((BattMap_informationImpl)dao).serchInBattMapByUid(obj);
+ //棣栭〉涓婃煡璇㈢敤鎴风鐞嗙殑宸茬粡璁剧疆杩囦綅缃殑鏈烘埧淇℃伅(鐢ㄦ埛绠＄悊鐨�,l鏌ヨ鍏ㄩ儴鎵撳紑椤甸潰)
+ public ServiceModel searchUserManageStation(Object obj){
+ List list = ((BattMap_informationImpl)dao).serchInBattMapByUid(obj);
+ if(list!=null&&list.size()>0){
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
+ //棣栭〉涓婃煡璇㈢敤鎴风鐞嗙殑宸茬粡璁剧疆杩囦綅缃殑鏈烘埧淇℃伅(鐢ㄦ埛绠＄悊鐨勶紝鍒嗛〉鍒锋柊)
+ public List searchUserManageStation2(Object obj){
+ List<BattMap_information> list = ((BattMap_informationImpl)dao).serchInBattMapByUid2(obj);
+ List listAll=new ArrayList();//瀛樻斁鏈�鍚庣殑缁撴灉
+ String state="";
+ 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";
+ ServiceModel model=new ServiceModel();
+ BattMap_information binformation = list.get(i);
+ if(binformation.getFBSDeviceId()/100000==6185){
+ BattInf binf=new BattInf();
+ 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(numPoff>0){
+ state="item-poff"; //鍋滅數
+ }else{
+ if(numBadBatt>0){
+ state="item-behind"; //钀藉悗鏈烘埧
+ }else{
+ if(numAlarm > 0){
+ state="item-warn"; //鍛婅鏈烘埧
+ }else{
+ if(numPlan > 0){
+ state="item-timeout"; //寤惰繜鏈烘埧
+ }
+ }
+ }
+ }
+
+ }
+ if("0".equals(list.get(i).getInformation())){
+ state="item-install"; //鑻ユ満鎴挎湭瀹夎灏嗘寚瀹氱殑鏈烘埧璁剧疆鎴愮伆鑹茬殑
+ }
+ model.setData(list.get(i));
+ model.setMsgO(String.valueOf(numPoff)); //鍋滅數鏁�
+ model.setCode(numAlarm); //鍛婅鎬绘暟
+ model.setSum(numBadBatt); //钀藉悗鎬绘暟
+ model.setNewsum(numPlan); //寤舵椂鎬绘暟
+ model.setMsg(state); //61850鐘舵��
+ model.setMsgN(binformation.getFBSDeviceId().toString());
+ listAll.add(model);
+ }
+ }
+ return listAll;
+ }
+ //棣栭〉涓婃煡璇㈢敤鎴风鐞嗙殑宸茬粡璁剧疆杩囦綅缃殑鏈烘埧淇℃伅(鐢ㄦ埛绠＄悊鐨勶紝3.鏍规嵁鍏蜂綋id鏌ヨ鍛婅淇℃伅绛�)
+ public List searchUserManageStation3(Object obj){
+ List<BattMap_information> list = ((BattMap_informationImpl)dao).serchInBattMapByUid3(obj);
List listAll=new ArrayList();//瀛樻斁鏈�鍚庣殑缁撴灉
String state="";
int numBadBatt=0;
@@ -100,7 +168,7 @@
state="item-normal";
ServiceModel model=new ServiceModel();
BattMap_information binformation = list.get(i);
- /*if(binformation.getFBSDeviceId()/100000==6185){
+ if(binformation.getFBSDeviceId()/100000==6185){
BattInf binf=new BattInf();
binf.setFBSDeviceId(binformation.getFBSDeviceId());
state=(new Fbs9100_stateImpl().seachDevNow(binf));
@@ -119,7 +187,7 @@
}
}
}
- }*/
+ }
model.setData(list.get(i));
model.setCode(numAlarm); //鍛婅鎬绘暟
model.setSum(numBadBatt); //钀藉悗鎬绘暟
@@ -131,7 +199,6 @@
}
return listAll;
}
-
//9.1鐧惧害鍦板浘瀹氫綅鏍规嵁鐪佷唤鏌ヨ鎵�鏈夎鍖哄煙鐨勬満鎴�
public List serchByCondition(Object obj){
List<BattMap_information> list =dao.serchByCondition(obj);
--
Gitblit v1.9.1