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/dao/impl/ram/Fbs9100s_dcdc_stateImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dcdc_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dcdc_stateImpl.java
index 1f03434..670b23c 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dcdc_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dcdc_stateImpl.java
@@ -195,7 +195,6 @@
binf.setStationName9(BattResAndTest.alarm2Tostring(rs.getInt("dcdc_SMR_Alarm2")));
fbs9100.setBinf(binf);
list.add(fbs9100);
-
if(rs.isLast()&&list.size()<2){
list.add(cloneDcdc(fbs9100));
}
@@ -259,12 +258,12 @@
Fbs9100s_dcdc_stateImpl fimpl=new Fbs9100s_dcdc_stateImpl();
FBS9100 fbs=new FBS9100();
Fbs9100s_dcdc_state fbs9100=new Fbs9100s_dcdc_state();
- fbs9100.setDev_id(91000001);
+ fbs9100.setDev_id(910000001);
fbs.setFd(fbs9100);
BattInf binf=new BattInf();
- binf.setStationName("婀栧寳鐪�-閯傚窞甯�-涓佸鑰佸眿鍩虹珯-閾佸鍩虹珯");
- binf.setStationName1("婀栧寳鐪�");
- binf.setFBSDeviceName("FBS-9100S-6");
+ //binf.setStationName("婀栧寳鐪�-閯傚窞甯�-涓佸鑰佸眿鍩虹珯-閾佸鍩虹珯");
+ //binf.setStationName1("婀栧寳鐪�");
+ //binf.setFBSDeviceName("FBS-9100S-6");
fbs.setBinf(binf);
List<FBS9100> list=fimpl.serchByCondition(fbs);
for (FBS9100 fbs_91 : list) {
--
Gitblit v1.9.1