From 9c4683383c498f5e784e19caa170348ae96aa080 Mon Sep 17 00:00:00 2001 From: 星伟 <星伟@192.168.10.25> Date: 星期三, 26 九月 2018 11:59:36 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/src/com/fgkj/services/BattMap_informationService.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gx_tieta/src/com/fgkj/services/BattMap_informationService.java b/gx_tieta/src/com/fgkj/services/BattMap_informationService.java index db0b9b4..69680d3 100644 --- a/gx_tieta/src/com/fgkj/services/BattMap_informationService.java +++ b/gx_tieta/src/com/fgkj/services/BattMap_informationService.java @@ -100,7 +100,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 +119,7 @@ } } } - } + }*/ model.setData(list.get(i)); model.setCode(numAlarm); //鍛婅鎬绘暟 model.setSum(numBadBatt); //钀藉悗鎬绘暟 -- Gitblit v1.9.1