修改

81041

2018-11-20 85ded6fb67cebcf319a936a4cf5eecdc1ed635c8

修改

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

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

                        "StationId,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,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,Load_curr,DisCurrMax,station_phone" +

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

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

                        "','"+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.getLoad_curr()+","+binf.getDisCurrMax()+",'"+binf.getStation_phone()+"')";

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

                

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

                    maxs++;

@@ -119,7 +119,7 @@
                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()+"',StationName5='"+binf.getStationName5()+"',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())+"', "

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

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

                sql_str.add(sql);

                {

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

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

        String sql="select SQL_CALC_FOUND_ROWS distinct(StationId),StationName1,StationName2,StationName3,StationName4,StationName5,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,Load_curr,DisCurrMax,station_phone  " +

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

                 " From db_battinf.tb_battinf " +

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

                 " order by StationId  " +

@@ -215,6 +215,7 @@
                        binf.setBattProductDate(rs.getDate("battProductDate"));

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

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

                        binf.setInstall_user(rs.getString("install_user"));

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

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

                        list.add(binf);

@@ -237,7 +238,7 @@
    public List searchInform_ky(){

        String sql="select  distinct(StationId),StationId_ex,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,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,battGuarantDayCount,SignalId,CInterFaceId,Load_curr,DisCurrMax,SignalName,Station_install,station_phone  " +

                 ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,battGuarantDayCount,SignalId,CInterFaceId,Load_curr,install_user,DisCurrMax,SignalName,Station_install,station_phone  " +

                 " From db_battinf.tb_battinf " +

                 " order by StationId  ";

        List<BattInf> list=DAOHelper.executeQueryLimit(sql,DBUtil.getConn(), null,new CallBack() {

@@ -289,6 +290,7 @@
                        binf.setCInterFaceId(rs.getInt("cInterFaceId"));

                        binf.setStation_install(rs.getInt("station_install"));

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

                        binf.setInstall_user(rs.getString("install_user"));

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

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

                        list.add(binf);

@@ -4081,7 +4083,7 @@
                          batt.setSignalId(rs.getString("SignalId"));

                          

                          batt.setCInterFaceId(Integer.parseInt(rs.getString("CInterFaceId")));

						  
                          batt.setInstall_user(rs.getString("install_user"));

                          batt.setSignalName(rs.getString("SignalName"));

                          int BattGuarantDayCount=rs.getInt("BattGuarantDayCount")-ActionUtil.daysBetween(rs.getDate("BattInUseDate"), new Date());//剩余保修天数

                          batt.setBattGuarantDayCount(BattGuarantDayCount);

@@ -4234,7 +4236,7 @@
                binf.setBattProducer(rs.getString("battProducer"));

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

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



               
                //minf.setFault_type(rs.getString("fault_type"));

                if (rs.getString("maint_done_time") != null)

                    mainf.setMaint_done_time(DAOHelper.sdf.parse(rs


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

@@ -81,6 +81,8 @@
    private Object obj;

    private String station_phone;

    

    private String install_user;     //安装人

	
    private Battinf_ex binf_ex;

    

    public BattInf() {

@@ -543,6 +545,13 @@
    public void setBinf_ex(Battinf_ex binf_ex) {

        this.binf_ex = binf_ex;

    }

	
    public String getInstall_user() {

        return install_user;

    }

    public void setInstall_user(String install_user) {

        this.install_user = install_user;

    }

    @Override

    public String toString() {

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

@@ -584,7 +593,9 @@
                + ", SignalName=" + SignalName + ", StartNum=" + StartNum

                + ", Station_install=" + Station_install + ", Size=" + Size

                + ", page=" + page + ", obj=" + obj + ", station_phone="

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

                + station_phone + ", install_user=" + install_user

                + ", binf_ex=" + binf_ex + "]";

    }

    

	
}