81041
2018-10-31 f8192dde9dbdbd063dec8f234a99df4ef57917eb
查询加区县
4个文件已修改
20 ■■■■ 已修改文件
gx_tieta/src/com/fgkj/dao/impl/Ld9/LD9_setparamImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9600_stateImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dto/ram/Fbs9600_state.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/Ld9/LD9_setparamImpl.java
@@ -55,7 +55,7 @@
    //根据机房信息查询参数
    public List serchByCondition(Object obj) {
        BattInf binf=(BattInf) obj;
        String sql="select db_battinf.tb_battinf.battgroupid,db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.FBSDeviceIp,db_battinf.tb_battinf.BattGroupName" +
        String sql="select db_battinf.tb_battinf.battgroupid,db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName5,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.FBSDeviceIp,db_battinf.tb_battinf.BattGroupName" +
                ",db_battinf.tb_battinf.MonCount,db_battinf.tb_battinf.MonVolStd,db_battinf.tb_battinf.MonCapStd,db_battinf.tb_battinf.GroupIndexInFBSDevice " +
                ",db_ram_db.tb_LD9_setparam.dev_id,db_ram_db.tb_LD9_setparam.op_cmd,db_ram_db.tb_LD9_setparam.param_teststart_batt_num,db_ram_db.tb_LD9_setparam.param_cap,param_discharge_curr" +
                ",db_ram_db.tb_LD9_setparam.param_mon_curr_high,db_ram_db.tb_LD9_setparam.param_charge_curr,db_ram_db.tb_LD9_setparam.param_mon_curr_low,db_ram_db.tb_LD9_setparam.param_online_vol" +
@@ -77,6 +77,7 @@
                        BattInf binf=new BattInf();
                        binf.setBattGroupId(rs.getInt("battGroupId"));
                        binf.setStationName(rs.getString("stationName"));
                        binf.setStationName5(rs.getString("stationName5"));
                        binf.setFBSDeviceId(rs.getInt("fBSDeviceId"));
                        binf.setFbsDeviceIp(rs.getString("fbsDeviceIp"));
                        binf.setBattGroupName(rs.getString("battGroupName"));
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
@@ -149,7 +149,7 @@
    //根据机房编号和维护区查询放电机房的信息和放电参数
    public List serchByCondition(Object obj) {
        BattInf binf=(BattInf) obj;
        String sql="select db_battinf.tb_battinf.battgroupid,db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.FBSDeviceIp,db_battinf.tb_battinf.BattGroupName" +
        String sql="select db_battinf.tb_battinf.battgroupid,db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName5,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.FBSDeviceIp,db_battinf.tb_battinf.BattGroupName" +
                ",db_battinf.tb_battinf.GroupIndexInFBSDevice,db_battinf.tb_battinf.MonCount,db_battinf.tb_battinf.MonVolStd,db_battinf.tb_battinf.MonCapStd" +
                ",db_ram_db.tb_fbs9100_setparam.HourRate,db_ram_db.tb_fbs9100_setparam.DisCurr,db_ram_db.tb_fbs9100_setparam.DisCap" +
                ",db_ram_db.tb_fbs9100_setparam.DisTime,db_ram_db.tb_fbs9100_setparam.GroupVol_LOW,db_ram_db.tb_fbs9100_setparam.MonomerVol_LOW" +
@@ -176,6 +176,7 @@
                        BattInf binf=new BattInf();
                        binf.setBattGroupId(rs.getInt("battGroupId"));
                        binf.setStationName(rs.getString("stationName"));
                        binf.setStationName5(rs.getString("stationName5"));
                        binf.setFBSDeviceId(rs.getInt("fBSDeviceId"));
                        binf.setFbsDeviceIp(rs.getString("fbsDeviceIp"));
                        binf.setBattGroupName(rs.getString("battGroupName"));
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9600_stateImpl.java
@@ -276,7 +276,7 @@
    //放电测试添加fbs9600设备的添加电池组的操作
    public List serchByInfo(Object obj) {
        BattInf binf=(BattInf) obj;
        String sql="select db_battinf.tb_battinf.battgroupid,db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.FBSDeviceIp,FbsDeviceName,db_battinf.tb_battinf.BattGroupName" +
        String sql="select db_battinf.tb_battinf.battgroupid,db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName5,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.FBSDeviceIp,FbsDeviceName,db_battinf.tb_battinf.BattGroupName" +
                ",db_battinf.tb_battinf.GroupIndexInFBSDevice,db_battinf.tb_battinf.MonCount,db_battinf.tb_battinf.MonVolStd,db_battinf.tb_battinf.MonCapStd" +
                ",db_ram_db.tb_fbs9600_state.dev_ip,db_ram_db.tb_fbs9600_state.dev_id,db_ram_db.tb_fbs9600_state.op_cmd" +
                ",db_ram_db.tb_fbs9600_state.dev_commcount,db_ram_db.tb_fbs9600_state.dev_errcommcount  " +
@@ -298,6 +298,7 @@
                        fstate.setDev_commcount(rs.getInt("dev_commcount"));
                        fstate.setDev_errcommcount(rs.getInt("dev_errcommcount"));
                        fstate.setStationName(rs.getString("stationName"));
                        fstate.setStationName5(rs.getString("stationName5"));
                        fstate.setDeviceName(rs.getString("FbsDeviceName"));
                        fstate.setBattgroupName(rs.getString("battgroupName"));
                        fstate.setGroupIndexInFBSDevice(rs.getInt("groupIndexInFBSDevice"));
gx_tieta/src/com/fgkj/dto/ram/Fbs9600_state.java
@@ -15,6 +15,7 @@
    private Integer dev_errcommcount;
    private Integer battgroupid;
    private String stationName;//机房名称
    private String stationName5;//区县名称
    private String deviceName;//设备名称
    private String battgroupName;//电池组名称
    private Integer GroupIndexInFBSDevice;//被测电池组号
@@ -109,6 +110,12 @@
    public void setBattgroupid(Integer battgroupid) {
        this.battgroupid = battgroupid;
    }
    public String getStationName5() {
        return stationName5;
    }
    public void setStationName5(String stationName5) {
        this.stationName5 = stationName5;
    }
    @Override
    public String toString() {
        return "Fbs9600_state [num=" + num + ", dev_ip=" + dev_ip + ", dev_id="
@@ -116,7 +123,8 @@
                + dev_workstate + ", dev_alarmstate=" + dev_alarmstate
                + ", dev_commcount=" + dev_commcount + ", dev_errcommcount="
                + dev_errcommcount + ", battgroupid=" + battgroupid
                + ", stationName=" + stationName + ", deviceName=" + deviceName
                + ", stationName=" + stationName + ", stationName5="
                + stationName5 + ", deviceName=" + deviceName
                + ", battgroupName=" + battgroupName
                + ", GroupIndexInFBSDevice=" + GroupIndexInFBSDevice
                + ", page=" + page + "]";
@@ -130,6 +138,7 @@
    
    
    
    
}