From 2c6bda564197cd5887a63cf76f02f7557e4a26f7 Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期四, 27 九月 2018 15:02:26 +0800
Subject: [PATCH] 三级加设备名称
---
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dcdc_stateImpl.java | 9 ++++-----
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 3 ++-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 7d32c6a..c30fcd1 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -3304,7 +3304,7 @@
//鏌ヨ绠＄悊鐨勬満鎴�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鏈烘埧,num涓瓨鏀緐id)
public List serchStationName3(Object obj){
BattInf binf=(BattInf) obj;
- String sql="select DISTINCT StationName1,StationName2,StationName3,stationid,fbsdeviceid " +
+ String sql="select DISTINCT StationName1,StationName2,StationName3,stationid,fbsdeviceid,FBSDeviceName " +
" FROM db_battinf.tb_battinf " +
" where StationId in(" +
" select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
@@ -3321,6 +3321,7 @@
batt.setStationName2(rs.getString("stationName2"));
batt.setStationName3(rs.getString("stationName3"));
batt.setStationId(rs.getString("stationId"));
+ batt.setFBSDeviceName(rs.getString("fBSDeviceName"));
batt.setFBSDeviceId(rs.getInt("fBSDeviceId"));
list.add(batt);
}
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