修改

81041

2019-12-27 fbf41bbd5d5775b7a43bdda60ddfbe9e7220e3c9

修改

 Device_Manage/src/com/fgkj/dao/impl/BattInfImpl.java

@@ -85,10 +85,10 @@
        BattInf binf=(BattInf) obj;
        String sql="select distinct db_battinf.tb_battinf.BattGroupId,db_battinf.tb_battinf.BattGroupName  "
                + ",db_ram_db.tb_batt_rtstate.group_vol,db_ram_db.tb_batt_rtstate.group_curr,db_ram_db.tb_batt_rtstate.batt_state "
                + ",(case when db_alarm.tb_battalarm_data.alm_signal_id  is null then 0 ELSE db_alarm.tb_battalarm_data.alm_signal_id end) AS alm_signal_id "
                //+ ",(case when db_alarm.tb_battalarm_data.alm_signal_id  is null then 0 ELSE db_alarm.tb_battalarm_data.alm_signal_id end) AS alm_signal_id "
                + " FROM  db_battinf.tb_battinf "
                + " LEFT OUTER JOIN db_ram_db.tb_batt_rtstate on db_battinf.tb_battinf.BattGroupId=db_ram_db.tb_batt_rtstate.BattGroupId "
                + " LEFT OUTER JOIN db_alarm.tb_battalarm_data on db_battinf.tb_battinf.BattGroupId=db_alarm.tb_battalarm_data.BattGroupId "
                //+ " LEFT OUTER JOIN db_alarm.tb_battalarm_data on db_battinf.tb_battinf.BattGroupId=db_alarm.tb_battalarm_data.BattGroupId "
                + " where db_battinf.tb_battinf.FBSDeviceId=? "
                + " order by db_battinf.tb_battinf.BattGroupId asc ";
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getFBSDeviceId()}, new CallBack() {
@@ -106,7 +106,7 @@
                        binf.setLoad_curr(rs.getFloat("group_curr"));
                        binf.setNum(rs.getInt("batt_state"));
                        //binf.setMonNum(rs.getInt("alm_signal_id"));
                        binf.setSignalName(AlarmDaoFactory.getAlarmName(rs.getInt("alm_signal_id")));
                        //binf.setSignalName(AlarmDaoFactory.getAlarmName(rs.getInt("alm_signal_id")));
                        list.add(binf);
                    }
                } catch (SQLException e) {