81041
2019-01-08 2f9007b0402d4a9e30c0826cc7c51949d66895e5
修改系统参数的获取方法
1个文件已添加
4个文件已修改
135 ■■■■■ 已修改文件
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl$72.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/BattInf.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dto/BattInf.java 107 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl$72.class
Binary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class
Binary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/BattInf.class
Binary files differ
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -4602,12 +4602,15 @@
        //Page page=binf.getPage();
        /*Connection conn=DBUtil.getConn();
        String numberSql=" SELECT FOUND_ROWS() number";SQL_CALC_FOUND_ROWS*/
        String sql=" select  distinct(StationId),StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,"
                + "FBSDeviceName,battGroupNum" +
                 ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,Load_curr,DisCurrMax,montmpstd,floatVolLevel,offlineVolLevel,battFloatCurrent"
        String sql=" select  distinct(tb_battinf.StationId),StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,"
                + "FBSDeviceName,count(FBSDeviceId) as batt_num" +
                 ",MonCount,monVolStd,monResStd,MonSerStd,Load_curr,DisCurrMax,montmpstd,floatVolLevel,offlineVolLevel,battFloatCurrent"
                 + ",GROUP_CONCAT(tb_battinf.MonCapStd) as moncapstds "
                 + ",db_ram_db.tb_fbs9100_state.dev_version  "
                + " from db_battinf.tb_battinf,db_ram_db.tb_fbs9100_state "
                 + ",web_site.tb_batt_endurance.real_cap_group1 ,web_site.tb_batt_endurance.real_cap_group2,web_site.tb_batt_endurance.real_cap_group3,web_site.tb_batt_endurance.real_cap_group4 "
                + " from db_battinf.tb_battinf,db_ram_db.tb_fbs9100_state,web_site.tb_batt_endurance  "
                + " where db_battinf.tb_battinf.FBSDeviceId=db_ram_db.tb_fbs9100_state.dev_id "
                + " and db_battinf.tb_battinf.FBSDeviceId=web_site.tb_batt_endurance.deviceid "
                + "  and MonVolStd=?  and Station_install=1 ";
                //+ "  limit ?,? ";StationName1 like ? and StationName2 like ? and StationName3 like ? and StationName5 like ? "
        //,(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%",
@@ -4634,9 +4637,9 @@
        }
        
        //排序
        String orderSql="  order by StationId asc,GroupIndexInFBSDevice asc ";
        String orderSql=" GROUP BY  FBSDeviceId  order by StationId asc,GroupIndexInFBSDevice asc ";
        sql+=orderSql;
        System.out.println(sql);
        //System.out.println(sql);
        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[] {binf.getMonVolStd(),binf.getStationName()}, new CallBack() {
            
            @Override
@@ -4660,13 +4663,20 @@
                        binf.setFbsDeviceIp_YM(rs.getString("fbsDeviceIp_YM"));
                        binf.setFbsDeviceIp_WG(rs.getString("fbsDeviceIp_WG"));*/
                        binf.setFBSDeviceName(rs.getString("fBSDeviceName"));
                        binf.setBattGroupNum(rs.getInt("battGroupNum"));
                        binf.setBattGroupNum(rs.getInt("batt_num"));
                        
                        binf.setFloatVolLevel(rs.getFloat("floatVolLevel"));
                        binf.setOfflineVolLevel(rs.getFloat("offlineVolLevel"));
                        binf.setBattFloatCurrent(rs.getFloat("battFloatCurrent"));
                        binf.setMonCount(rs.getInt("monCount"));
                        binf.setMonCapStd(rs.getFloat("monCapStd"));
                        //binf.setMonCapStd(rs.getFloat("monCapStd"));
                        binf.setMoncapstds(rs.getString("moncapstds"));
                        binf.setReal_cap_group1(rs.getFloat("real_cap_group1"));
                        binf.setReal_cap_group2(rs.getFloat("real_cap_group2"));
                        binf.setReal_cap_group3(rs.getFloat("real_cap_group3"));
                        binf.setReal_cap_group4(rs.getFloat("real_cap_group4"));
                        binf.setMonVolStd(rs.getFloat("monVolStd"));
                        binf.setMonResStd(rs.getFloat("monResStd"));
                        binf.setMonSerStd(rs.getFloat("monSerStd"));
@@ -4709,7 +4719,7 @@
        BattInf binf = new BattInf();
        binf.setNum(2);
        binf.setBattGroupId(1000001);
        binf.setStationName("广西省-玉林-玉林玉州区西城里-BTS设备");
        binf.setStationName("百色");
        binf.setStationName1("");
        binf.setStationName2("");
        binf.setStationName3("");
gx_tieta/src/com/fgkj/dto/BattInf.java
@@ -55,7 +55,15 @@
    private String DeviceId;
    private String DeviceName;
    private Integer MonCount;
    private Float  MonCapStd;   //标存容量
    private String moncapstds;
    private float real_cap_group1;
    private float real_cap_group2;
    private float real_cap_group3;
    private float real_cap_group4;
    private Float  MonResStd;
    private Float MonSerStd;
    private Float  MonTmpStd;
@@ -568,51 +576,66 @@
    public void setCharge_curr_max(float charge_curr_max) {
        this.charge_curr_max = charge_curr_max;
    }
    public String getMoncapstds() {
        return moncapstds;
    }
    public void setMoncapstds(String moncapstds) {
        this.moncapstds = moncapstds;
    }
    public float getReal_cap_group2() {
        return real_cap_group2;
    }
    public void setReal_cap_group2(float real_cap_group2) {
        this.real_cap_group2 = real_cap_group2;
    }
    public float getReal_cap_group3() {
        return real_cap_group3;
    }
    public void setReal_cap_group3(float real_cap_group3) {
        this.real_cap_group3 = real_cap_group3;
    }
    public float getReal_cap_group4() {
        return real_cap_group4;
    }
    public void setReal_cap_group4(float real_cap_group4) {
        this.real_cap_group4 = real_cap_group4;
    }
    public float getReal_cap_group1() {
        return real_cap_group1;
    }
    public void setReal_cap_group1(float real_cap_group1) {
        this.real_cap_group1 = real_cap_group1;
    }
    @Override
    public String toString() {
        return "BattInf [num=" + num + ", StationId=" + StationId
                + ", StationId_ex=" + StationId_ex + ", StationName="
                + StationName + ", StationName1=" + StationName1
                + ", StationName2=" + StationName2 + ", StationName3="
                + StationName3 + ", StationName4=" + StationName4
                + ", StationName5=" + StationName5 + ", StationName6="
                + StationName6 + ", StationName7=" + StationName7
                + ", StationName8=" + StationName8 + ", StationName9="
                + StationName9 + ", StationIp=" + StationIp + ", FBSDeviceId="
                + FBSDeviceId + ", FbsDeviceIp=" + FbsDeviceIp
                + ", FbsDeviceIp_YM=" + FbsDeviceIp_YM + ", FbsDeviceIp_WG="
                + FbsDeviceIp_WG + ", FbsDeviceIp_old=" + FbsDeviceIp_old
                + ", FbsDeviceIp_YM_old=" + FbsDeviceIp_YM_old
                + ", FbsDeviceIp_WG_old=" + FbsDeviceIp_WG_old
                + ", FBSDeviceName=" + FBSDeviceName
                + ", GroupIndexInFBSDevice=" + GroupIndexInFBSDevice
                + ", BattModel=" + BattModel + ", BattGroupId=" + BattGroupId
                + ", BattGroupNum=" + BattGroupNum + ", BattGroupName="
                + BattGroupName + ", BattGroupName1=" + BattGroupName1
                + ", BattGroupName2=" + BattGroupName2 + ", BattGroupName3="
                + BattGroupName3 + ", BattGroupName4=" + BattGroupName4
                + ", BattGroupName5=" + BattGroupName5 + ", BattGroupName6="
                + BattGroupName6 + ", FloatVolLevel=" + FloatVolLevel
                + ", OfflineVolLevel=" + OfflineVolLevel
                + ", BattFloatCurrent=" + BattFloatCurrent + ", DeviceId="
                + DeviceId + ", DeviceName=" + DeviceName + ", MonCount="
                + MonCount + ", MonCapStd=" + MonCapStd + ", MonResStd="
                + MonResStd + ", MonSerStd=" + MonSerStd + ", MonTmpStd="
                + MonTmpStd + ", MonVolStd=" + MonVolStd + ", MonVolLowToAvg="
                + MonVolLowToAvg + ", MonNum=" + MonNum + ", BattProducer="
                + BattProducer + ", BattProductDate=" + BattProductDate
                + ", BattProductDate1=" + BattProductDate1 + ", BattInUseDate="
                + BattInUseDate + ", BattInUseDate1=" + BattInUseDate1
                + ", BattGuarantDayCount=" + BattGuarantDayCount
                + ", SignalId=" + SignalId + ", CInterFaceId=" + CInterFaceId
                + ", Load_curr=" + Load_curr + ", DisCurrMax=" + DisCurrMax
                + ", SignalName=" + SignalName + ", StartNum=" + StartNum
                + ", Station_install=" + Station_install + ", Size=" + Size
                + ", page=" + page + ", obj=" + obj + ", station_phone="
                + station_phone + ", install_user=" + install_user
                + ", binf_ex=" + binf_ex + ", charge_curr_max="
                + charge_curr_max + ", VideoOrImage=" + VideoOrImage + "]";
        return "BattInf [num=" + num + ", StationId=" + StationId + ", StationId_ex=" + StationId_ex + ", StationName="
                + StationName + ", StationName1=" + StationName1 + ", StationName2=" + StationName2 + ", StationName3="
                + StationName3 + ", StationName4=" + StationName4 + ", StationName5=" + StationName5 + ", StationName6="
                + StationName6 + ", StationName7=" + StationName7 + ", StationName8=" + StationName8 + ", StationName9="
                + StationName9 + ", StationIp=" + StationIp + ", FBSDeviceId=" + FBSDeviceId + ", FbsDeviceIp="
                + FbsDeviceIp + ", FbsDeviceIp_YM=" + FbsDeviceIp_YM + ", FbsDeviceIp_WG=" + FbsDeviceIp_WG
                + ", FbsDeviceIp_old=" + FbsDeviceIp_old + ", FbsDeviceIp_YM_old=" + FbsDeviceIp_YM_old
                + ", FbsDeviceIp_WG_old=" + FbsDeviceIp_WG_old + ", FBSDeviceName=" + FBSDeviceName
                + ", GroupIndexInFBSDevice=" + GroupIndexInFBSDevice + ", BattModel=" + BattModel + ", BattGroupId="
                + BattGroupId + ", BattGroupNum=" + BattGroupNum + ", BattGroupName=" + BattGroupName
                + ", BattGroupName1=" + BattGroupName1 + ", BattGroupName2=" + BattGroupName2 + ", BattGroupName3="
                + BattGroupName3 + ", BattGroupName4=" + BattGroupName4 + ", BattGroupName5=" + BattGroupName5
                + ", BattGroupName6=" + BattGroupName6 + ", FloatVolLevel=" + FloatVolLevel + ", OfflineVolLevel="
                + OfflineVolLevel + ", BattFloatCurrent=" + BattFloatCurrent + ", DeviceId=" + DeviceId
                + ", DeviceName=" + DeviceName + ", MonCount=" + MonCount + ", MonCapStd=" + MonCapStd + ", moncapstds="
                + moncapstds + ", real_cap_group1=" + real_cap_group1 + ", real_cap_group2=" + real_cap_group2
                + ", real_cap_group3=" + real_cap_group3 + ", real_cap_group4=" + real_cap_group4 + ", MonResStd="
                + MonResStd + ", MonSerStd=" + MonSerStd + ", MonTmpStd=" + MonTmpStd + ", MonVolStd=" + MonVolStd
                + ", MonVolLowToAvg=" + MonVolLowToAvg + ", MonNum=" + MonNum + ", BattProducer=" + BattProducer
                + ", BattProductDate=" + BattProductDate + ", BattProductDate1=" + BattProductDate1 + ", BattInUseDate="
                + BattInUseDate + ", BattInUseDate1=" + BattInUseDate1 + ", BattGuarantDayCount=" + BattGuarantDayCount
                + ", SignalId=" + SignalId + ", CInterFaceId=" + CInterFaceId + ", Load_curr=" + Load_curr
                + ", DisCurrMax=" + DisCurrMax + ", SignalName=" + SignalName + ", StartNum=" + StartNum
                + ", Station_install=" + Station_install + ", Size=" + Size + ", page=" + page + ", obj=" + obj
                + ", station_phone=" + station_phone + ", install_user=" + install_user + ", binf_ex=" + binf_ex
                + ", charge_curr_max=" + charge_curr_max + ", VideoOrImage=" + VideoOrImage + "]";
    }
    
    
}