battinf加列显示

81041

2018-10-16 f89624df671ae03846e401f651a21bce3821d080

battinf加列显示

 gx_tieta/.settings/org.jboss.tools.jst.web.xml

@@ -8,28 +8,12 @@
 <file-system NAME="lib" location="%workspace.home%/lib" model-entity="FileSystemFolder"/>

 <file-system NAME="classes" location="%workspace.home%/classes" model-entity="FileSystemFolder"/>

 <file-system NAME="fuguang" location="%eclipse.project%" model-entity="FileSystemFolder"/>

 <file-system NAME="lib-javaee.jar"

  location="D:\Program Files\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\javaee.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-jsf-impl.jar"

  location="D:\Program Files\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-impl.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-jsf-api.jar"

  location="D:\Program Files\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-api.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-jstl-1.2.jar"

  location="D:\Program Files\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jstl-1.2.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-c3p0-0.9.5.jar"

  location="D:\GitWorkspace\gx_tieta\gx_tieta\lib\c3p0-0.9.5.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-c3p0-oracle-thin-extras-0.9.5.jar"

  location="D:\GitWorkspace\gx_tieta\gx_tieta\lib\c3p0-oracle-thin-extras-0.9.5.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-mchange-commons-java-0.2.9.jar"

  location="D:\GitWorkspace\gx_tieta\gx_tieta\lib\mchange-commons-java-0.2.9.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-resources.jar"

  location="D:\Program Files\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\resources.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-dnsns.jar"

  location="D:\Program Files\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\dnsns.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-localedata.jar"

  location="D:\Program Files\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\localedata.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-sunjce_provider.jar"

  location="D:\Program Files\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\sunjce_provider.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-commons-beanutils-1.7.0.jar"

  location="D:\GitWorkspace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-beanutils-1.7.0.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-commons-codec-1.10.jar"

@@ -76,6 +60,22 @@
  location="D:\GitWorkspace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\xwork-core-2.2.3.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-jacob.jar"

  location="D:\GitWorkspace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\jacob.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-javaee.jar"

  location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\javaee.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-jsf-impl.jar"

  location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-impl.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-jsf-api.jar"

  location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-api.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-jstl-1.2.jar"

  location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jstl-1.2.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-resources.jar"

  location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\resources.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-dnsns.jar"

  location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\dnsns.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-localedata.jar"

  location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\localedata.jar" model-entity="FileSystemJar"/>

 <file-system NAME="lib-sunjce_provider.jar"

  location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\sunjce_provider.jar" model-entity="FileSystemJar"/>

 <web SERVLET_VERSION="2.4" model-entity="JstWeb" model-path="/web.xml">

  <module URI="/WEB-INF/faces-config.xml" model-entity="WebJSFModule"

   model-path="/faces-config.xml" src="src" web-root="WEB-ROOT"/>


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

@@ -70,12 +70,12 @@
                String sql = "insert into db_battinf.tb_battinf(" +

                        "StationId,StationName,StationName1,StationName2,StationName3,StationName4,StationIp,FBSDeviceId,FbsDeviceIp,FbsDeviceIp_YM,FbsDeviceIp_WG,"

                        + "FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +

                        ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate" +

                        ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,DisCurrMax,station_phone" +

                        ") values('"+binf.getStationId()+"','"+binf.getStationName()+"','"+binf.getStationName1()+"','"+binf.getStationName2()+"','"+binf.getStationName3()+"','"+binf.getStationName4()+

                        "','"+binf.getStationIp()+"',"+binf.getFBSDeviceId()+",'"+binf.getFbsDeviceIp()+"','"+binf.getFbsDeviceIp_YM()+"','"+binf.getFbsDeviceIp_WG()+"','"+binf.getFBSDeviceName()+"',"+binf.getGroupIndexInFBSDevice()+

                        ","+binf.getBattGroupId()+","+binf.getBattGroupNum()+",'"+binf.getBattGroupName()+"',"+binf.getFloatVolLevel()+","+binf.getOfflineVolLevel()+","+binf.getBattFloatCurrent()+

                        ","+binf.getMonCount()+","+binf.getMonCapStd()+","+binf.getMonVolStd()+","+binf.getMonResStd()+","+binf.getMonSerStd()+","+binf.getMonVolLowToAvg()+

                        ",'"+binf.getBattProducer()+"','"+binf.getBattModel()+"','"+DAOHelper.sdf.format(binf.getBattProductDate())+"','"+DAOHelper.sdf.format(binf.getBattInUseDate())+"')";

                        ",'"+binf.getBattProducer()+"','"+binf.getBattModel()+"','"+DAOHelper.sdf.format(binf.getBattProductDate())+"','"+DAOHelper.sdf.format(binf.getBattInUseDate())+"',"+binf.getLoad_curr()+","+binf.getDisCurrMax()+",'"+binf.getStation_phone()+"')";

                

                if(binf.getStationId().equals(maxs)){

                    maxs++;

@@ -116,8 +116,8 @@
                }

                String sql = "update db_battinf.tb_battinf set StationId='"+binf.getStationId()+"',StationName='"+binf.getStationName()+"',StationName1='"+binf.getStationName1()+"',StationName2='"+binf.getStationName2()+"',StationName3='"+binf.getStationName3()+"',StationName4='"+binf.getStationName4()+"',StationIp='"+binf.getStationIp()+"',FBSDeviceId="+binf.getFBSDeviceId()+",FbsDeviceIp='"+binf.getFbsDeviceIp()+"',"

                        + "FBSDeviceName='"+binf.getFBSDeviceName()+"',GroupIndexInFBSDevice="+binf.getGroupIndexInFBSDevice()+",BattGroupNum="+binf.getBattGroupNum()+",BattGroupName='"+binf.getBattGroupName()+"',FloatVolLevel="+binf.getFloatVolLevel()+",OfflineVolLevel="+binf.getOfflineVolLevel()+",BattFloatCurrent="+binf.getBattFloatCurrent()+"," +

                          "MonCount="+binf.getMonCount()+",MonCapStd="+binf.getMonCapStd()+",monVolStd="+binf.getMonVolStd()+",monResStd="+binf.getMonResStd()+",MonSerStd="+binf.getMonSerStd()+",MonVolLowToAvg="+binf.getMonVolLowToAvg()+",BattProducer='"+binf.getBattProducer()+"',BattModel='"+binf.getBattModel()+"',BattProductDate='"+DAOHelper.sdf.format(binf.getBattProductDate())+"',BattInUseDate='"+DAOHelper.sdf.format(binf.getBattInUseDate())+"' "

                         +" where battgroupId="+binf.getBattGroupId();

                          "MonCount="+binf.getMonCount()+",MonCapStd="+binf.getMonCapStd()+",monVolStd="+binf.getMonVolStd()+",monResStd="+binf.getMonResStd()+",MonSerStd="+binf.getMonSerStd()+",MonVolLowToAvg="+binf.getMonVolLowToAvg()+",BattProducer='"+binf.getBattProducer()+"',BattModel='"+binf.getBattModel()+"',BattProductDate='"+DAOHelper.sdf.format(binf.getBattProductDate())+"',BattInUseDate='"+DAOHelper.sdf.format(binf.getBattInUseDate())+"', "

                         +" Load_curr="+binf.getLoad_curr()+",DisCurrMax="+binf.getDisCurrMax()+",station_phone='"+binf.getStation_phone()+"'  where battgroupId="+binf.getBattGroupId();

                sql_str.add(sql);

                {

                    String msg="修改"+binf.getStationName()+"机房"+binf.getBattGroupId()+"电池组的信息";

@@ -159,7 +159,7 @@
        Boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);

        return bl;

    }

    //根据维护区和机房名称查询电池组信息

    //根据维护区和机房名称查询电池组信息(电池组信息配置)

    public List searchInform(Object obj){

        Batt_Maint_Dealarm bmd=(Batt_Maint_Dealarm) obj;

        BattInf binf=bmd.getBinf();

@@ -168,7 +168,7 @@
        String numberSql=" SELECT FOUND_ROWS() number";

        String sql="select SQL_CALC_FOUND_ROWS distinct(StationId),StationName1,StationName2,StationName3,StationName4,StationIp,FBSDeviceId,FbsDeviceIp_YM,FbsDeviceIp_WG,FbsDeviceIp,"

                + "FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +

                 ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate " +

                 ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,DisCurrMax,station_phone  " +

                 " From db_battinf.tb_battinf " +

                 " Where StationName like ? and StationName1 like ? and StationName2 like ?  " +

                 " order by StationId  " +

@@ -211,7 +211,9 @@
                        binf.setBattModel(rs.getString("battModel"));

                        binf.setBattProductDate(rs.getDate("battProductDate"));

                        binf.setBattInUseDate(rs.getDate("battInUseDate"));



                        binf.setLoad_curr(rs.getFloat("load_curr"));

                        binf.setDisCurrMax(rs.getFloat("disCurrMax"));

                        binf.setStation_phone(rs.getString("station_phone"));

                        list.add(binf);



                    }

@@ -3434,7 +3436,7 @@
    //根据机房id查询机房下的电池组信息(左侧导航第四层,根据机房查询下面的电池组,num中存放uid)

    public List serchBattByStation(Object obj){

        BattInf binf=(BattInf) obj;

        String sql="select DISTINCT StationName,StationId,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice " +

        String sql="select DISTINCT StationName,StationId,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice,Load_curr,DisCurrMax " +

                "from db_battinf.tb_battinf  where StationName1 like ? and StationName2 like ?  and  StationName like ?  ";

        //机房id

        String idSqlT=" and  Stationid like ? ";

@@ -3471,6 +3473,8 @@
                        batt.setBattProducer(rs.getString("BattProducer"));

                        batt.setBattInUseDate(rs.getDate("BattInUseDate"));

                        batt.setGroupIndexInFBSDevice(rs.getInt("groupIndexInFBSDevice"));

                        batt.setLoad_curr(rs.getFloat("load_curr"));

                        batt.setDisCurrMax(rs.getFloat("disCurrMax"));

                        list.add(batt);

                    }

                } catch (SQLException e) {


 gx_tieta/src/com/fgkj/dto/BattInf.java

@@ -70,11 +70,13 @@
    private String SignalId;

    private Integer CInterFaceId;

    private Float Load_curr;// 负载电流

    private Float DisCurrMax;//最大核容电流

    private String SignalName;

    private Integer StartNum;             

    private Integer Size;                 

    private Page page;

    private Object obj;

    private String station_phone;

    public BattInf() {

        super();

    }

@@ -503,6 +505,19 @@
    public void setPage(Page page) {

        this.page = page;

    }

	
    public String getStation_phone() {

        return station_phone;

    }

    public void setStation_phone(String station_phone) {

        this.station_phone = station_phone;

    }

    public Float getDisCurrMax() {

        return DisCurrMax;

    }

    public void setDisCurrMax(Float disCurrMax) {

        DisCurrMax = disCurrMax;

    }

    @Override

    public String toString() {

        return "BattInf [num=" + num + ", StationId=" + StationId

@@ -539,9 +554,10 @@
                + BattInUseDate + ", BattInUseDate1=" + BattInUseDate1

                + ", BattGuarantDayCount=" + BattGuarantDayCount

                + ", SignalId=" + SignalId + ", CInterFaceId=" + CInterFaceId

                + ", Load_curr=" + Load_curr + ", SignalName=" + SignalName

                + ", StartNum=" + StartNum + ", Size=" + Size + ", page="

                + page + ", obj=" + obj + "]";

                + ", Load_curr=" + Load_curr + ", DisCurrMax=" + DisCurrMax

                + ", SignalName=" + SignalName + ", StartNum=" + StartNum

                + ", Size=" + Size + ", page=" + page + ", obj=" + obj

                + ", station_phone=" + station_phone + "]";

    }

    

    

@@ -549,4 +565,5 @@


    

    

	
}