修改

81041

2019-01-08 c8e39b9cda12e97167e8328a70a07fe1315072cc

修改

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/Filters/HotlinkFilter.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/ram/Fbs9100_battparam.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_battparamService.class

Binary files differ

 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_sysparamService.class

Binary files differ

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

@@ -4596,6 +4596,112 @@
        }*/

        return list;

    }

    //批量设置系统参数时，根据省市区，电池单体型号（伏数），组数筛选出电池组<还需要获取实际容量>

    public List serchBySys_param(Object obj) {

        BattInf binf=(BattInf) obj;

        //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"

                 + ",db_ram_db.tb_fbs9100_state.dev_version  "

                + " from db_battinf.tb_battinf,db_ram_db.tb_fbs9100_state "

                + " where db_battinf.tb_battinf.FBSDeviceId=db_ram_db.tb_fbs9100_state.dev_id "

                + "  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()+"%",

        //条件

        String sql0=" and stationid=? "; //具体机房

        String sql1=" and stationname1=? ";//省

        String sql2=" and stationname2=? ";//市

        String sql5=" and stationname5=? ";//区县

        switch (binf.getNum()) {

        case 0:

            sql+=sql0;

            break;

        case 1:

            sql+=sql1;

            break;

        case 2:

            sql+=sql2;

            break;

        case 5:

            sql+=sql5;

             break;

        default:

            return null;

        }

		
        //排序

        String orderSql="  order by StationId asc,GroupIndexInFBSDevice asc ";

        sql+=orderSql;

        System.out.println(sql);

        List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[] {binf.getMonVolStd(),binf.getStationName()}, new CallBack() {

			
            @Override

            public List getResults(ResultSet rs) {

                List list=new ArrayList();

                try {

                    while(rs.next()) {

                        BattInf binf = new BattInf();

                        binf.setNum(0);

                        binf.setStationId(rs.getString("stationId"));

                        binf.setStationName(rs.getString("stationName"));

                        binf.setStationName1(rs.getString("stationName1"));

                        binf.setStationName2(rs.getString("stationName2"));

                        binf.setStationName3(rs.getString("stationName3"));

                        binf.setStationName4(rs.getString("stationName4"));

                        binf.setStationName5(rs.getString("stationName5"));

                        binf.setStationIp(rs.getString("stationIp"));

                        binf.setFBSDeviceId(rs.getInt("fBSDeviceId"));

						
                        /*binf.setFbsDeviceIp(rs.getString("fbsDeviceIp"));

                        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.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.setMonVolStd(rs.getFloat("monVolStd"));

                        binf.setMonResStd(rs.getFloat("monResStd"));

                        binf.setMonSerStd(rs.getFloat("monSerStd"));

                        binf.setMonTmpStd(rs.getFloat("monTmpStd"));

                        /*binf.setMonVolLowToAvg(rs.getFloat("monVolLowToAvg"));

                        binf.setBattProducer(rs.getString("battProducer"));

                        binf.setBattModel(rs.getString("battModel"));

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

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

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

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

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

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

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

                        
                        
                        binf.setStationName9(rs.getString("dev_version"));

                        list.add(binf);

                    }

                } catch (SQLException e) {

                    // TODO Auto-generated catch block

                    e.printStackTrace();

                }

                return list;

            }

        });

        /*//去掉limit条件后的总数

        int number=LimitNumberFactory.GetLimtitNumber(conn, numberSql);

        //System.out.println("number: "+number);

        if(list!=null&&list.size()>0){

            list.get(list.size()-1).setNum(number);

        }*/

        return list;

    }

    public static void main(String[] args) throws ParseException {

        //new BattInfImpl().searchAll();

        

@@ -4651,16 +4757,16 @@
        System.out.println(nums);*/

        /*boolean bl=biml.judgeBattInOrNot(binf);

        System.out.println(bl);*/

        /*List<BattInf> list=biml.serchByBatt_param(binf);

        List<BattInf> list=biml.serchBySys_param(binf);

        for (BattInf b : list) {

            System.out.println(b);

        }*/

        }

        /*List<BattInf> list=biml.serchByDischarge(binf);

        for (BattInf b : list) {

            System.out.println(b);

        }*/

        List list=biml.judgeBatt(binf);

        System.out.println(list);

        /*List list=biml.judgeBatt(binf);

        System.out.println(list);*/

        //System.out.println(list.size());

    }

    


 gx_tieta/src/com/fgkj/dto/ram/Fbs9100_battparam.java

@@ -27,6 +27,8 @@
    private String StationName3;

    private String StationName5;

    private String StationId;

	
    private Object obj;

    public int getNum() {

        return num;

    }

@@ -165,22 +167,22 @@
    public void setStationId(String stationId) {

        StationId = stationId;

    }

    public Object getObj() {

        return obj;

    }

    public void setObj(Object obj) {

        this.obj = obj;

    }

    @Override

    public String toString() {

        return "Fbs9100_battparam [num=" + num + ", dev_ip=" + dev_ip

                + ", dev_id=" + dev_id + ", op_cmd=" + op_cmd + ", STD_CAP="

                + STD_CAP + ", STD_RES=" + STD_RES + ", BattGroupCount="

                + BattGroupCount + ", EachGroupBattCount=" + EachGroupBattCount

                + ", MonomerVol=" + MonomerVol + ", GroupVol=" + GroupVol

                + ", BattTemp=" + BattTemp + ", FloatChargeVol="

                + FloatChargeVol + ", FloatChargeCurr=" + FloatChargeCurr

                + ", OnlineVolLow=" + OnlineVolLow + ", GroupConnType="

                + GroupConnType + ", note=" + note + ", DeviceName="

                + DeviceName + ", StationName=" + StationName

                + ", StationName1=" + StationName1 + ", StationName2="

                + StationName2 + ", StationName3=" + StationName3

                + ", StationName5=" + StationName5 + ", StationId=" + StationId

                + "]";

        return "Fbs9100_battparam [num=" + num + ", dev_ip=" + dev_ip + ", dev_id=" + dev_id + ", op_cmd=" + op_cmd

                + ", STD_CAP=" + STD_CAP + ", STD_RES=" + STD_RES + ", BattGroupCount=" + BattGroupCount

                + ", EachGroupBattCount=" + EachGroupBattCount + ", MonomerVol=" + MonomerVol + ", GroupVol=" + GroupVol

                + ", BattTemp=" + BattTemp + ", FloatChargeVol=" + FloatChargeVol + ", FloatChargeCurr="

                + FloatChargeCurr + ", OnlineVolLow=" + OnlineVolLow + ", GroupConnType=" + GroupConnType + ", note="

                + note + ", DeviceName=" + DeviceName + ", StationName=" + StationName + ", StationName1="

                + StationName1 + ", StationName2=" + StationName2 + ", StationName3=" + StationName3 + ", StationName5="

                + StationName5 + ", StationId=" + StationId + ", obj=" + obj + "]";

    }

    

}


 gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java

@@ -180,6 +180,8 @@
                          if(b) {

                              success+=1;

                              list.get(i).setNum(1);

                              List listbatt=dao.serchByCondition(fs);

                              list.get(i).setObj(listbatt);

                          }

                      }

                  }


 gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java

@@ -122,7 +122,7 @@
      }

  //批量设置系统参数时，根据省市区，电池单体型号（伏数），组数筛选出电池组并读取它的实际系统参数

      public ServiceModel serchBattinfAndParam(Object obj) {

          List<BattInf> list=(new BattInfImpl()).serchByBatt_param(obj);

          List<BattInf> list=(new BattInfImpl()).serchBySys_param(obj);

          if(list!=null&&list.size()>0) {

                Calendar c = Calendar.getInstance(); 

                //现在的时间(单位：毫秒)