From fa00382db413a8489d07983b66f0869305b51a9a Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 11 一月 2019 11:35:54 +0800
Subject: [PATCH] 批量读取系统参数

---
 gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java b/gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java
index c4fe854..2a134f2 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java
@@ -15,6 +15,7 @@
 import com.fgkj.dao.DAOHelper;
 import com.fgkj.db.DBUtil;
 import com.fgkj.dto.Stationtraffic;
+import com.sun.org.apache.bcel.internal.generic.IINC;
 
 public class StationtrafficImpl implements BaseDAO,CallBack{
 
@@ -46,24 +47,30 @@
 	public List serchByCondition(Object obj) {
 		final Stationtraffic straffic=(Stationtraffic) obj;
 		String sql=" select distinct tb_stationtraffic.num,dev_id,record_time,dayflow,nowflow" +
-				"  ,tb_battinf.stationName,tb_battinf.stationName1,tb_battinf.stationName2,tb_battinf.stationName3,tb_battinf.stationName5 " +
+				"  ,tb_battinf.StationId,tb_battinf.stationName,tb_battinf.stationName1,tb_battinf.stationName2,tb_battinf.stationName3,tb_battinf.stationName5 " +
 				"  from web_site.tb_stationtraffic,db_battinf.tb_battinf " +
 				"  where web_site.tb_stationtraffic.dev_id=db_battinf.tb_battinf.fBSDeviceId  " +
 				"  and record_time>? and record_time<? " +
-				"  and dev_id=? " +
-				"  order by dev_id,record_time asc ";
-		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{straffic.getRecord_time(),straffic.getRecord_time1(),straffic.getDev_id()}, new CallBack() {
+				"  and dev_id=? " ;
+		//鐢ㄦ埛绠$悊
+		String userSql=" and db_battinf.tb_battinf.StationId in(" +
+				" select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id  and db_user.tb_user_battgroup_baojigroup_usr.uId=? "+
+				" ) ";		
+		sql+=userSql;
+		String orderSql="  order by dev_id,record_time asc ";
+		sql+=orderSql;
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{straffic.getRecord_time(),straffic.getRecord_time1(),straffic.getDev_id(),Integer.parseInt(straffic.getNote())}, new CallBack() {
 			
 			public List getResults(ResultSet rs) {
 				List list=new ArrayList();
 				// 鏃堕棿娈�
 				String perid_Time = ""; 
 				Calendar now = Calendar.getInstance();
-				int nowflow=0;
+				int dayflow=0;
 				try {
 					while(rs.next()){
 						
-						int nowflows=rs.getInt("nowflow");
+						int dayflows=rs.getInt("dayflow");
 						// 骞翠唤锛屽搴︼紝鏈堜唤
 						Date dev_recordtime = rs.getTimestamp("record_time");
 						// 鑾峰彇鍏蜂綋骞翠唤锛屾湀浠藉拰璇ユ湀鐨勬�诲ぉ鏁�
@@ -90,16 +97,16 @@
 						}
                         //System.out.println(perid_Times+" "+perid_Time+" "+nowflows);
 						if(perid_Times.equals(perid_Time)){
-							nowflow+=nowflows;
+							dayflow+=dayflows;
 						}else{
 							if(perid_Time.equals("")){
 							     perid_Time=perid_Times;
-							     nowflow+=nowflows;
+							     dayflow+=dayflows;
 							     continue;
 							}
 							Stationtraffic st=new Stationtraffic();
 							st.setDev_id(rs.getInt("dev_id"));
-							st.setNowflow(nowflow);
+							st.setDayflow(dayflow);
 							st.setStationName(rs.getString("stationName"));
 							st.setStationName1(rs.getString("stationName1"));
 							st.setStationName2(rs.getString("stationName2"));
@@ -107,15 +114,15 @@
 							st.setStationName5(rs.getString("stationName5"));
 							st.setNote(perid_Time);
 							list.add(st);
-							nowflow=0;
-							nowflow+=nowflows;
+							dayflow=0;
+							dayflow+=dayflows;
 							perid_Time=perid_Times;
 							
 						}
 					if(rs.isLast()){
 						Stationtraffic st=new Stationtraffic();
 						st.setDev_id(rs.getInt("dev_id"));
-						st.setNowflow(nowflow);
+						st.setDayflow(dayflow);
 						st.setStationName(rs.getString("stationName"));
 						st.setStationName1(rs.getString("stationName1"));
 						st.setStationName2(rs.getString("stationName2"));
@@ -149,6 +156,7 @@
 	     Stationtraffic st=new Stationtraffic();
 	     st.setNum(3);
 	     st.setDev_id(910000001);
+	     st.setNote("1002");
 	     st.setRecord_time(ActionUtil.getSimpDate(date1));
 	     st.setRecord_time1(ActionUtil.getSimpDate(date2));
 	     List<Stationtraffic> list=simpl.serchByCondition(st);

--
Gitblit v1.9.1