gx_tieta/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,3 @@ #Thu Nov 15 16:53:51 CST 2018 eclipse.preferences.version=1 encoding//WebRoot/Top.jsp=UTF-8 encoding//WebRoot/addplan.jsp=UTF-8 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/Batttestdata_infAction.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batt_enduranceImpl$1.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batt_enduranceImpl$2.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batt_enduranceImpl$3.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batt_enduranceImpl$4.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batt_enduranceImpl.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batt_replaceImpl.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$1.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$10.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$11.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$12.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$13.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$14.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$15.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$16.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$17.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$18.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$2.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$3.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$4.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$5.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$6.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$7.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$8.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl$9.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/Batttestdata_infDAOImpl.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/Batt_endurance.classBinary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/Batttestdata_infService.classBinary files differ
gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
@@ -9,9 +9,11 @@ import com.fgkj.dao.impl.Batttestdata_infDAOImpl; import com.fgkj.dto.BattInf; import com.fgkj.dto.Batt_Maint_Dealarm; import com.fgkj.dto.Batt_endurance; import com.fgkj.dto.Batt_param_low; import com.fgkj.dto.Batttestdata_inf; import com.fgkj.dto.ServiceModel; import com.fgkj.dto.User_inf; import com.fgkj.services.Batttestdata_infService; import com.opensymphony.xwork2.ActionSupport; @@ -76,18 +78,20 @@ //电池组历史放电数据续航能力查询 public String serchBattLife(){ BattInf binf = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result, BattInf.class); //System.out.println(binf); ServiceModel model = new ServiceModel(); if(binf.getBattGroupId() == 0){ model = service.serchBattLifeNow(binf); }else if(binf.getBattGroupId() == 1){ model = service.serchBattLife(binf); } Batt_endurance ben = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result, Batt_endurance.class); User_inf uinf=(User_inf) getUser(); ben.setNum(uinf.getUId()); ServiceModel model = service.serchBattLife(ben); result = ActionUtil.tojson(model); return SUCCESS; } //电池组实时续航能力查询 public String serchBattLifeNow(){ BattInf binf = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result, BattInf.class); ServiceModel model = service.serchBattLifeNow(binf); result = ActionUtil.tojson(model); return SUCCESS; } /** * 根据电池组id查询电池组的inf表中的放电信息 <!------ 跨域访问 ---------> gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
@@ -49,7 +49,7 @@ Page page=bendurance.getPage(); Connection conn=DBUtil.getConn(); String numberSql=" SELECT FOUND_ROWS() number"; String sql="select SQL_CALC_FOUND_ROWS distinct tb_batt_endurance.num,tb_batt_endurance.deviceid,tb_batt_endurance.stationid,real_cap,tb_batt_endurance.moncapstd,real_curr,endurance_theory_timelong,endurance_actual_timelong,endurance_actual_timelong_max,endurance_actual_timelong_min,is_out_stand,batts_moncapstd " + String sql="select SQL_CALC_FOUND_ROWS distinct tb_batt_endurance.num,tb_batt_endurance.deviceid,tb_batt_endurance.stationid,real_cap,tb_batt_endurance.moncapstd,real_curr,endurance_theory_timelong,endurance_actual_timelong,endurance_actual_timelong_max,endurance_actual_timelong_min,is_out_stand,batts_moncapstd,batts_teststarttime " + ",db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1,db_battinf.tb_battinf.StationName2,db_battinf.tb_battinf.StationName5 " + " from web_site.tb_batt_endurance,db_battinf.tb_battinf " + " where tb_batt_endurance.stationid=db_battinf.tb_battinf.stationid "+ @@ -111,6 +111,7 @@ b.setMoncapstd(rs.getFloat("moncapstd")); b.setReal_curr(rs.getFloat("real_curr")); b.setBatts_moncapstd(rs.getString("batts_moncapstd")); b.setBatts_teststarttime(rs.getString("batts_teststarttime")); b.setEndurance_theory_timelong(rs.getFloat("endurance_theory_timelong")); b.setEndurance_actual_timelong(rs.getFloat("endurance_actual_timelong")); b.setEndurance_actual_timelong_max(rs.getFloat("endurance_actual_timelong_max")); gx_tieta/src/com/fgkj/dao/impl/Batttestdata_infDAOImpl.java
@@ -21,9 +21,11 @@ import com.fgkj.dto.BattInf; import com.fgkj.dto.Batt_Maint_Dealarm; import com.fgkj.dto.Batt_State; import com.fgkj.dto.Batt_endurance; import com.fgkj.dto.Batt_rtdata; import com.fgkj.dto.Batt_rtstate; import com.fgkj.dto.Batttestdata_inf; import com.fgkj.dto.Page; public class Batttestdata_infDAOImpl implements BaseDAO,CallBack{ private SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -493,7 +495,7 @@ return list; } //机房历史放电数据续航能力查询(历史) public List serchBattLife(Object obj){ /*public List serchBattLife(Object obj){ BattInf binf=(BattInf) obj; String sql=""; String baseSql=" SELECT DISTINCT(tb_batttestdata_inf.BattGroupId),tb_batttestdata_inf.test_starttime,tb_batttestdata_inf.record_time,tb_batttestdata_inf.test_cap," + @@ -564,7 +566,89 @@ } }); return list; }*/ public List serchBattLife(Object obj){ Batt_endurance bendurance=(Batt_endurance) obj; Page page=bendurance.getPage(); Connection conn=DBUtil.getConn(); String numberSql=" SELECT FOUND_ROWS() number"; String sql="select SQL_CALC_FOUND_ROWS distinct tb_batt_endurance.num,tb_batt_endurance.deviceid,tb_batt_endurance.stationid,real_cap,tb_batt_endurance.moncapstd,real_curr,endurance_theory_timelong,endurance_actual_timelong,endurance_actual_timelong_max" + ",endurance_actual_timelong_min,is_out_stand,batts_moncapstd,batts_teststarttime " + ",db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.StationName1,db_battinf.tb_battinf.StationName2,db_battinf.tb_battinf.StationName5 " + " from web_site.tb_batt_endurance,db_battinf.tb_battinf " + " where tb_batt_endurance.stationid=db_battinf.tb_battinf.stationid "+ " and tb_batt_endurance.stationid in (" + " select distinct db_battinf.tb_battinf.stationid " + " from db_battinf.tb_battinf " + " left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.stationid=db_battinf.tb_battinf.stationid " + " left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " + " left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " + " where db_user.tb_user_inf.uid=? and db_battinf.tb_battinf.station_install=1 ) " ; //机房筛选 String stationSql=" and db_battinf.tb_battinf.StationName like ? and db_battinf.tb_battinf.StationName1 like ? and db_battinf.tb_battinf.StationName2 like ? and db_battinf.tb_battinf.StationName5 like ? "; sql+=stationSql; //1U/2U设备筛选 String monvolSqlT=" and db_battinf.tb_battinf.monvolstd!=? ";//全部 String monvolSqlF=" and db_battinf.tb_battinf.monvolstd=? "; if(bendurance.getMonvolstd()==0) { sql+=monvolSqlT; }else { sql+=monvolSqlF; } //排序时间 String orderSql=" order by endurance_actual_timelong,tb_batt_endurance.deviceid asc "; sql+=orderSql; //分页 String limitSql=" limit ?,? "; sql+=limitSql; //System.out.println(sql); List<Batt_endurance> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{bendurance.getNum(),"%"+bendurance.getStationName()+"%","%"+bendurance.getStationName1()+"%","%"+bendurance.getStationName2()+"%","%"+bendurance.getStationName5()+"%",bendurance.getMonvolstd() ,(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() { public List getResults(ResultSet rs) { List list=new ArrayList(); try { while(rs.next()){ Batt_endurance b=new Batt_endurance(); b.setNum(rs.getInt("num")); b.setDeviceId(rs.getInt("deviceId")); b.setStationid(rs.getString("stationid")); b.setReal_cap(rs.getFloat("real_cap")); b.setMoncapstd(rs.getFloat("moncapstd")); b.setReal_curr(rs.getFloat("real_curr")); b.setBatts_moncapstd(rs.getString("batts_moncapstd")); b.setBatts_teststarttime(rs.getString("batts_teststarttime")); b.setEndurance_theory_timelong(rs.getFloat("endurance_theory_timelong")); b.setEndurance_actual_timelong(rs.getFloat("endurance_actual_timelong")); b.setEndurance_actual_timelong_max(rs.getFloat("endurance_actual_timelong_max")); b.setEndurance_actual_timelong_min(rs.getFloat("endurance_actual_timelong_min")); b.setIs_out_stand(rs.getInt("is_out_stand")); b.setStationName(rs.getString("stationname")); b.setStationName1(rs.getString("stationname1")); b.setStationName2(rs.getString("stationname2")); b.setStationName5(rs.getString("stationname5")); Page p=new Page(); b.setPage(p); list.add(b); } } 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).getPage().setPageAll(number); } return list; } //机房历史放电数据续航能力查询(实时) public List serchBattLifeNow(Object obj){ BattInf binf=(BattInf) obj; @@ -586,7 +670,7 @@ "LEFT OUTER JOIN db_ram_db.cmcc_power_data ON db_battinf.tb_battinf.fbsdeviceid=cmcc_power_data.dev_id " + "where "; //机房维护区选择 String stationSql=" db_battinf.tb_battinf.stationname like ? AND db_battinf.tb_battinf.stationname1 like ? AND db_battinf.tb_battinf.stationname2 like ? AND db_battinf.tb_battinf.stationname5 like ? "; String stationSql=" db_battinf.tb_battinf.stationname like ? AND db_battinf.tb_battinf.stationname1 like ? AND db_battinf.tb_battinf.stationname2 like ? AND db_battinf.tb_battinf.stationname5 like ? and db_battinf.tb_battinf.station_install=1"; baseSql+=stationSql; //1U/2U设备筛选 String monvolSqlT=" and db_battinf.tb_battinf.monvolstd!=? ";//全部 @@ -596,22 +680,21 @@ }else { baseSql+=monvolSqlF; } //电池状态 /*//电池状态 String stateSqlT=" AND batt_state=? "; String stateSqlF=" AND batt_state!=? "; if(binf.getNum()==100){ baseSql+=stateSqlF; }else{ baseSql+=stateSqlT; } }*/ //分组 String endSql=" GROUP BY tb_batt_rtstate.BattGroupId "; //排序 String orderSql=" order by db_battinf.tb_battinf.stationid asc"; sql=baseSql+endSql+orderSql; //System.out.println(sql); List<Batt_State> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",binf.getMonVolStd() ,binf.getNum()}, new CallBack() { List<Batt_State> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%",binf.getMonVolStd()}, new CallBack() { public List getResults(ResultSet rs) { List list=new ArrayList(); @@ -1108,11 +1191,24 @@ System.out.println(b); } System.out.println(list.size());*/ List<Batt_Maint_Dealarm> list=bimpl.serchBattLife(binf); Batt_endurance ben=new Batt_endurance(); ben.setNum(1002); ben.setStationName(""); ben.setStationName1(""); ben.setStationName2(""); ben.setStationName5(""); ben.setEndurance_actual_timelong(0); ben.setMonvolstd(0); ben.setIs_out_stand(100); Page page=new Page(); page.setPageCurr(1); page.setPageSize(10); ben.setPage(page); List<Batt_endurance> list=bimpl.serchBattLife(ben); System.out.println(list.size()); /*for (Batt_Maint_Dealarm b : list) { for (Batt_endurance b : list) { System.out.println(b); }*/ } }
@@ -7,7 +7,7 @@ private int deviceId; private String stationid; private float real_cap; private float moncapstd; private float moncapstd; //两组容量和 private float real_curr; private float endurance_theory_timelong;//理论 private float endurance_actual_timelong;//实际 @@ -15,6 +15,7 @@ private float endurance_actual_timelong_min;//实际最小 private int is_out_stand; private String batts_moncapstd;//机房电池组的标称容量 private String batts_teststarttime;//机房电池组的和容开始时间 private String note; private String stationName; private String stationName1;//省级 @@ -138,6 +139,12 @@ public void setBatts_moncapstd(String batts_moncapstd) { this.batts_moncapstd = batts_moncapstd; } public String getBatts_teststarttime() { return batts_teststarttime; } public void setBatts_teststarttime(String batts_teststarttime) { this.batts_teststarttime = batts_teststarttime; } @Override public String toString() { return "Batt_endurance [num=" + num + ", deviceId=" + deviceId + ", stationid=" + stationid + ", real_cap=" @@ -145,10 +152,11 @@ + endurance_theory_timelong + ", endurance_actual_timelong=" + endurance_actual_timelong + ", endurance_actual_timelong_max=" + endurance_actual_timelong_max + ", endurance_actual_timelong_min=" + endurance_actual_timelong_min + ", is_out_stand=" + is_out_stand + ", batts_moncapstd=" + batts_moncapstd + ", note=" + note + ", stationName=" + stationName + ", stationName1=" + stationName1 + ", stationName2=" + stationName2 + ", stationName5=" + stationName5 + ", monvolstd=" + monvolstd + ", page=" + page + "]"; + ", batts_moncapstd=" + batts_moncapstd + ", batts_teststarttime=" + batts_teststarttime + ", note=" + note + ", stationName=" + stationName + ", stationName1=" + stationName1 + ", stationName2=" + stationName2 + ", stationName5=" + stationName5 + ", monvolstd=" + monvolstd + ", page=" + page + "]"; } } gx_tieta/src/com/fgkj/services/Batttestdata_infService.java
@@ -402,7 +402,7 @@ } //电池组历史放电数据续航能力查询(历史) public ServiceModel serchBattLife(Object obj){ /*public ServiceModel serchBattLife(Object obj){ List<Batt_Maint_Dealarm> list=((Batttestdata_infDAOImpl)dao).serchBattLife(obj); float param = 0;//容量有效参数 double STDAH = 0;//标存容量 @@ -446,8 +446,19 @@ model.setData("查询失败!"); } return model; } }*/ public ServiceModel serchBattLife(Object obj){ List list=((Batttestdata_infDAOImpl)dao).serchBattLife(obj); if(list!=null && list.size()>0){ model.setCode(1); model.setData(list); model.setMsg("查询成功!"); }else{ model.setCode(0); model.setMsg("查询失败!"); } return model; } //机房历史放电数据续航能力查询(实时) public ServiceModel serchBattLifeNow(Object obj){ List list=((Batttestdata_infDAOImpl)dao).serchBattLifeNow(obj);
