LiJun
2018-10-26 ad22ba26863980edd80a1f9adfebb8daba31d74d
添加机房的是否安装的标识
3个文件已修改
26 ■■■■■ 已修改文件
gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dto/BattInf.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/services/BattMap_informationService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/BattMap_informationImpl.java
@@ -175,7 +175,7 @@
        int uid=page.getPageAll();
        Connection conn=DBUtil.getConn();
        String numberSql="SELECT FOUND_ROWS() number";//存放总数
        String sql="select SQL_CALC_FOUND_ROWS distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId  " +
        String sql="select SQL_CALC_FOUND_ROWS distinct tb_battmap_information.num,tb_battmap_information.StationId,tb_battmap_information.StationName,address,longitude,latitude,information,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.station_install  " +
                "  from web_site.tb_battmap_information,db_battinf.tb_battinf " +
                "  where  tb_battmap_information.StationId=db_battinf.tb_battinf.StationId " +
                "  and tb_battmap_information.StationId in (" +
@@ -202,6 +202,7 @@
                        binformation.setLatitude(rs.getDouble("latitude"));
                        binformation.setInformation(rs.getString("information"));
                        binformation.setFBSDeviceId(rs.getInt("fBSDeviceId"));
                        binformation.setInformation(rs.getString("station_install"));
                        Page p=new Page();
                        binformation.setPage(p);
                        list.add(binformation);
gx_tieta/src/com/fgkj/dto/BattInf.java
@@ -74,6 +74,8 @@
    private Float DisCurrMax;//最大核容电流
    private String SignalName;
    private Integer StartNum;             
    private Integer Station_install;    //机房设备是否安装
    private Integer Size;                 
    private Page page;
    private Object obj;
@@ -526,6 +528,12 @@
    public void setStationId_ex(String stationId_ex) {
        StationId_ex = stationId_ex;
    }
    public Integer getStation_install() {
        return Station_install;
    }
    public void setStation_install(Integer station_install) {
        Station_install = station_install;
    }
    @Override
    public String toString() {
        return "BattInf [num=" + num + ", StationId=" + StationId
@@ -565,14 +573,8 @@
                + ", SignalId=" + SignalId + ", CInterFaceId=" + CInterFaceId
                + ", Load_curr=" + Load_curr + ", DisCurrMax=" + DisCurrMax
                + ", SignalName=" + SignalName + ", StartNum=" + StartNum
                + ", Size=" + Size + ", page=" + page + ", obj=" + obj
                + ", station_phone=" + station_phone + "]";
                + ", Station_install=" + Station_install + ", Size=" + Size
                + ", page=" + page + ", obj=" + obj + ", station_phone="
                + station_phone + "]";
    }
}
gx_tieta/src/com/fgkj/services/BattMap_informationService.java
@@ -131,6 +131,9 @@
                            }
                        }
                    }
                }
                if("0".equals(list.get(i).getInformation())){
                    state="";                            //若机房未安装将指定的机房设置成灰色的
                }
                model.setData(list.get(i));
                model.setCode(numAlarm);        //告警总数