电量表计算时刻统计表计算

廖磊
1 parent d2f2a2a8
Showing 5 changed files with 700 additions and 12 deletions
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/entity/oil/Dlb.java
src/main/java/com/bsth/service/oil/DlbService.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
@@ -84,8 +84,14 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 	@RequestMapping(value = "/obtain",method = RequestMethod.GET)
-	public Map<String, Object> obtain(@RequestParam Map<String, Object> map){
-		Map<String, Object> list=service.obtain(map);
+	public Map<String, Object> obtain(@RequestParam Map<String, Object> map) throws Exception{
+		Map<String, Object> list=new HashMap<String, Object>();
+		try {
+			list = service.obtain(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			throw e;
+		}
 		return list;
 	}
@@ -54,6 +54,7 @@ public class Dlb {
 	private String edituser;
 	private Date edittime;
 	private Date createtime;
+	private Date updatetime;
 	private int nylx;
 	//进场顺序（根据最先出场和最后进场来关联车辆的存电量）
 	private int jcsx;
@@ -374,4 +375,14 @@ public class Dlb {
 	public void setFgsname(String fgsname) {
 		this.fgsname = fgsname;
 	}
+
+	public Date getUpdatetime() {
+		return updatetime;
+	}
+
+	public void setUpdatetime(Date updatetime) {
+		this.updatetime = updatetime;
+	}
+	
+	
 }
@@ -7,7 +7,7 @@ import com.bsth.entity.oil.Dlb;
 import com.bsth.service.BaseService;
 public interface DlbService extends BaseService<Dlb, Integer>{
-	Map<String, Object> obtain(Map<String, Object> map);
+	Map<String, Object> obtain(Map<String, Object> map) throws Exception;
 	Map<String, Object> sort(Map<String, Object> map);
@@ -2,6 +2,8 @@ package com.bsth.service.oil.impl;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -22,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import com.alibaba.fastjson.JSONArray;
@@ -211,7 +214,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 	 * 获取进存电信息
 	 * @Transactional 回滚事物
 	 */
-	@Transactional  
+	/*@Transactional  
 	@Override
 	public Map<String, Object> obtain(Map<String, Object> map2) {
 		List<Cars> carsList=carsRepository.findCars();
@@ -224,6 +227,16 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			if(map2.get("ssgsdm_like")!=null){
 				gsbm=map2.get("ssgsdm_like").toString();
 			}
+			
+			String nbbm="";
+			if(map2.get("nbbm_eq")!=null){
+				nbbm=map2.get("nbbm_eq").toString();
+			}
+			String fgsbm="";
+			if(map2.get("fgsdm_like")!=null){
+				fgsbm=map2.get("fgsdm_like").toString();
+			}
+				
 		String rq=map2.get("rq").toString();
 		String line="";
 		if(map2.get("xlbm_eq")!=null){
@@ -236,16 +249,16 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		// TODO Auto-generated method stub
 		Map<String, Object> newMap=new HashMap<String,Object>();
 		//当天DLB信息
-		List<Dlb> dlList=repository.obtainDl(rq, gsbm, "", line, "", "nbbm");
+		List<Dlb> dlList=repository.obtainDl(rq, gsbm, fgsbm, line, nbbm, "nbbm");
 		//当天YLXXB信息
 		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq,1,gsbm);
 		//当天加电信息表
 		List<Jdl> jdlList=jdlRepository.JdlList(rq);
 		//前一天所有车辆最后进场班次信息
-		List<Dlb> dlListBe=repository.obtainYlbefore(rq, "", "", "", "");
+		List<Dlb> dlListBe=repository.obtainYlbefore(rq, gsbm, fgsbm, line, nbbm);
 		List<Cdl> cdyList=cdlRepository.obtainCdl();
 		//从排班表中计算出行驶的总里程
-		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line,rq,"","","","");
+		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line, rq, gsbm, fgsbm, "", nbbm);
 		List<Dlb> addList=new ArrayList<Dlb>();
 		List<Dlb> updateList=new ArrayList<Dlb>();
 		for(int x=0;x<listpb.size();x++){
@@ -371,6 +384,240 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			newMap.put("status", ResponseCode.ERROR);
 		}
 		return newMap;
+	}*/
+	
+	/**
+	 * 获取进存油信息
+	 * @Transactional 回滚事物
+	 */
+	@Transactional  
+	@Override
+	public Map<String, Object> obtain(Map<String, Object> map2) throws Exception{
+		Map<String, Object> newMap = new HashMap<String, Object>();
+		try {
+			Date date=new Date();
+			List<Cars> carsList = carsRepository.findCars();
+			Map<String, Boolean> carsMap = new HashMap<String, Boolean>();
+			for (int i = 0; i < carsList.size(); i++) {
+				Cars c = carsList.get(i);
+				carsMap.put(c.getInsideCode(), c.getSfdc());
+			}
+			String rq = map2.get("rq").toString();
+			String line = "";
+			if (map2.get("xlbm_like") != null) {
+				line = map2.get("xlbm_like").toString().trim();
+			}
+			String gsbm="";
+			if(map2.get("ssgsdm_like")!=null){
+				gsbm=map2.get("ssgsdm_like").toString();
+			}
+			String fgsbm="";
+			if(map2.get("fgsdm_like")!=null){
+				fgsbm=map2.get("fgsdm_like").toString();
+			}
+			String nbbm="";
+			if(map2.get("nbbm_eq")!=null){
+				nbbm=map2.get("nbbm_eq").toString();
+			}
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			// 保留两位小数
+			DecimalFormat df = new DecimalFormat("#.00");
+			// TODO Auto-generated method stub
+			// 当天YLB信息
+			List<Dlb> dlList = this.listOrderBy(rq,gsbm,fgsbm,line,nbbm,"nbbm");
+//					repository.obtainYl(rq,gsbm,fgsbm,line,nbbm,"nbbm");
+			// 当天YLXXB信息
+			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
+			// 前一天所有车辆最后进场班次信息
+//			List<Ylb> ylListBe = repository.obtainYlbefore(rq, gsbm, fgsbm, line, nbbm);
+//			List<Dlb> ylListBe =repository.listMaxRqJcsx(rq, gsbm, fgsbm, line, nbbm);
+//			List<Cyl> clyList = cylRepository.obtainCyl(nbbm,gsbm);
+			// 从排班表中计算出行驶的总里程
+			List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>();
+			List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList(line, rq, gsbm, fgsbm, "", nbbm);
+			List<Jdl> jdlList=jdlRepository.JdlList(rq);
+			String sxtj=map2.get("sxtj").toString();
+			if(sxtj.equals("0")){
+				listpb=listpbs;
+			}else{
+				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, line,nbbm);
+				List<String> stringList=new ArrayList<String>();
+				for (int i = 0; i < objectLists.size(); i++) {
+					String clbm=objectLists.get(i)[0].toString();
+					int cs=Integer.parseInt(objectLists.get(i)[1].toString());
+					//一车一单
+					if(sxtj.equals("1")){
+						if(cs==1){
+							stringList.add(clbm);
+						}
+					}	
+					//一车多单
+					if(sxtj.equals("2")){
+						if(cs>1){
+							stringList.add(clbm);
+						}
+					}
+				}
+				
+				for (int i = 0; i < stringList.size(); i++) {
+					String strNbbm=stringList.get(i);
+					for (int j = 0; j < listpbs.size(); j++) {
+						Map<String, Object> map = listpbs.get(j);
+						String mapNbbm=map.get("clZbh").toString();
+						if(strNbbm.equals(mapNbbm)){
+							listpb.add(map);
+						}
+					}
+				}
+			}
+			
+			List<Dlb> addList = new ArrayList<Dlb>();
+			List<Dlb> updateList = new ArrayList<Dlb>();
+			String ins="";
+			Map<String, Object> ylMap=new HashMap<String, Object>();
+			for (int x = 0; x < listpb.size(); x++) {
+				String type = "add";
+				boolean sfdc = false;
+				Map<String, Object> map = listpb.get(x);
+				if (carsMap.get(map.get("clZbh").toString()) != null) {
+					sfdc = carsMap.get(map.get("clZbh").toString());
+				} else {
+					sfdc = false;
+				}
+				if (sfdc) {
+					// 判断驾驶员驾驶的该车辆是否已经存入了（查出的结果集中日期是相同的，根据驾驶员、内部编号、线路编码判断）
+					Dlb t = new Dlb();
+					for (int k = 0; k < dlList.size(); k++) {
+						Dlb t1 = dlList.get(k);
+						if (t1.getNbbm().equals(map.get("clZbh").toString())
+								&& t1.getJsy().equals(map.get("jGh").toString())
+								&& t1.getXlbm().equals(map.get("xlBm").toString())) {
+							t = t1;
+							type = "update";
+						}
+					}
+
+					// 当日的第一个班次，出场油量等于前一天的最后一个班次的进场油量
+				/*	if (map.get("seqNumber").toString().equals("1")) {
+						boolean fage = true;
+						for (int i = 0; i < ylListBe.size(); i++) {
+							Ylb ylb = ylListBe.get(i);
+							if (map.get("clZbh").toString().equals(ylb.getNbbm())) {
+								if(ylb.getJzyl()>0){
+									t.setCzyl(ylb.getJzyl());
+									fage = false;
+									break;
+								}
+								
+							}
+						}
+						if (fage) {
+							for (int y = 0; y < clyList.size(); y++) {
+								Cyl cyl = clyList.get(y);
+								if (map.get("clZbh").toString().equals(cyl.getNbbm())) {
+									if(cyl!=null){
+										if(cyl.getCyl()>=0){
+											t.setCzyl(cyl.getCyl());
+											fage = false;
+											break;
+										}else {
+											if(cyl.getCxrl()!=null){
+												if(cyl.getCxrl()>0){
+													t.setCzyl(cyl.getCxrl());
+													fage = false;
+													break;
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+						if (fage) {
+							t.setCzyl(0.0);
+						}
+					}
+					*/
+					Double jzl = 0.0;
+					//一人一车加注量只匹配一次
+					if(ylMap.get(map.get("clZbh").toString()+"_"+ map.get("jGh").toString())!=null){
+						
+					}else{
+						// 把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
+						for (int j = 0; j < ylxxList.size(); j++) {
+							Ylxxb ylxxb = ylxxList.get(j);
+							if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
+									&& map.get("jGh").toString().equals(ylxxb.getJsy())) {
+								jzl +=Arith.add(jzl, ylxxb.getJzl());
+							}
+						}
+						ylMap.put(map.get("clZbh").toString()+"_"+ map.get("jGh").toString(),map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+					}
+					for (int i = 0; i < jdlList.size(); i++) {
+						Jdl jdl=jdlList.get(i);
+						if(map.get("clZbh").toString().equals(jdl.getNbbm()) 
+								&&map.get("jGh").toString().equals(jdl.getJsy())
+								&&map.get("bCompany").toString().equals(jdl.getFgsBm())){
+							jzl+=jdl.getJdl();
+						}
+					}
+				
+					t.setCdl(jzl);
+					t.setCzcd(100.0);
+					t.setJzcd(100.0);
+					t.setHd(jzl);
+					t.setNbbm(map.get("clZbh").toString());
+					t.setJsy(map.get("jGh") == null ? "" : map.get("jGh").toString());
+					t.setZlc(map.get("totalKilometers") == null ? 0.0
+							: Double.parseDouble(map.get("totalKilometers").toString()));
+					t.setXlbm(map.get("xlBm") == null ? "" : map.get("xlBm").toString());
+					t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
+					t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
+					t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
+					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
+					t.setRq(sdf.parse(rq));
+					
+					 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
+						 if(type.equals("add")){
+							 t.setCreatetime(date);
+							 addList.add(t); 
+						 }else{
+							 t.setUpdatetime(date);
+						     updateList.add(t); 
+						     ins += t.getId().toString()+",";
+						  }
+					 }
+//					repository.save(t);
+					newMap.put("status", ResponseCode.SUCCESS);
+
+				}
+			}
+			if(addList.size()>0){ 
+				try {
+					new BatchSaveUtils<Dlb>().saveList2(addList, Dlb.class); 
+				} catch (Exception e) {
+					// TODO: handle exception
+					if(e.getMessage().indexOf("PK_YLB_UK")>0){
+						newMap.put("fage", "存在相同数据,数据已经过滤");
+						logger.info("获取:存在相同数据,数据已经过滤");
+					}
+				}
+				
+			}
+			
+			if(updateList.size()>0){
+				for (int i = 0; i < updateList.size(); i++) {
+					repository.save(updateList.get(i));
+				}
+			}
+			newMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			newMap.put("status", ResponseCode.ERROR);
+			throw e;
+		}
+
+		return newMap;
 	}
 	/**
@@ -727,4 +974,43 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		}
 		return newMap;
 	}
+	
+	public  List<Dlb> listOrderBy(String rq,String gsdm,
+			String fgsdm,String xlbm,String nbbm,
+			String px) {
+		// TODO Auto-generated method stub
+		String sql="SELECT * FROM bsth_c_dlb  "
+				+ " where to_days('"+rq+"')=to_days(rq) and ssgsdm like '%"+gsdm+"%' "
+				+ " and fgsdm like '%"+fgsdm+"%'";
+		if(xlbm.equals("")){
+			sql+= " and xlbm like '%"+xlbm+"%' ";
+		}else{
+			sql+= " and xlbm = '"+xlbm+"' ";
+		}
+				
+		sql += "and nbbm like '%"+nbbm+"%' order by "+px+" asc ";
+		
+		List<Dlb> list = jdbcTemplate.query(sql, new RowMapper<Dlb>() {
+			@Override
+			public Dlb mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Dlb y = new Dlb();
+				y.setId(arg0.getInt("id"));
+				return y;
+			}
+		});
+		List<Dlb> lists=new ArrayList<Dlb>();
+		List<Dlb> dlbLists=repository.obtainDl(rq,gsdm,fgsdm,xlbm,nbbm,"jcsx");
+		for (int i = 0; i < list.size(); i++) {
+			Dlb t=list.get(i);
+			for (int j = 0; j < dlbLists.size(); j++) {
+				Dlb t2=dlbLists.get(j);
+				if(t.getId().intValue()==t2.getId().intValue()){
+					lists.add(t2);
+					break;
+				}
+			}
+		}
+		
+		return lists;
+	}
 }
@@ -39,6 +39,8 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import javax.persistence.criteria.CriteriaBuilder.In;
+
 @Service
 public class ReportServiceImpl implements ReportService{
@@ -893,8 +895,391 @@ public class ReportServiceImpl implements ReportService{
 						return m;
 					}
 				});
-
-		List<Map<String, Object>> newList=new ArrayList<Map<String,Object>>();
+		List<Map<String, Object>> newList=new ArrayList<Map<String,Object>>();		
+		int yysxZq=0,yyxxZq=0,tzsxZq=0,tzxxZq=0,minZqcj=0,maxZqcj=0,sxcountZqbc=0,xxcountZqbc=0; //早前
+		int yysxZgf=0,yyxxZgf=0,tzsxZgf=0,tzxxZgf=0,minZgfcj=0,maxZgfcj=0,sxcountZgfbc=0,xxcountZgfbc=0;//早高峰
+		int yysxZw=0,yyxxZw=0,tzsxZw=0,tzxxZw=0,minZwcj=0,maxZwcj=0,sxcountZwbc=0,xxcountZwbc=0;//中午
+		int yysxWgf=0,yyxxWgf=0,tzsxWgf=0,tzxxWgf=0,minWgfcj=0,maxWgfcj=0,sxcountWgfbc=0,xxcountWgfbc=0;//晚高峰
+		int yysxWh=0,yyxxWh=0,tzsxWh=0,tzxxWh=0,minWhcj=0,maxWhcj=0,sxcountWhbc=0,xxcountWhbc=0;//晚后
+		List<Integer> zqFcsj0=new ArrayList<Integer>();
+		List<Integer> zgfFcsj0=new ArrayList<Integer>();
+		List<Integer> zwFcsj0=new ArrayList<Integer>();
+		List<Integer> wgfFcsj0=new ArrayList<Integer>();
+		List<Integer> whFcsj0=new ArrayList<Integer>();
+		
+		List<Integer> zqFcsj1=new ArrayList<Integer>();
+		List<Integer> zgfFcsj1=new ArrayList<Integer>();
+		List<Integer> zwFcsj1=new ArrayList<Integer>();
+		List<Integer> wgfFcsj1=new ArrayList<Integer>();
+		List<Integer> whFcsj1=new ArrayList<Integer>();
+		int temp = 48*60+1, zcj = 0;
+		boolean ists = true;
+		String lpname="";
+		for (int i = 0; i < list.size(); i++) {
+			Map<String, Object> m=list.get(i);
+			int xlDir = Integer.valueOf(m.get("dir").toString());
+			String[] split = m.get("fcsj").toString().split(":");
+			int fcsjT = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
+			String bcType=m.get("bcType").toString();
+			int bcsj = Integer.valueOf(m.get("bcsj").toString());
+			if(i==0){
+				lpname=m.get("lp").toString();
+				if(temp>fcsjT){
+					temp=fcsjT+bcsj;
+				}
+			}else{
+				if(temp>fcsjT){
+					temp=fcsjT+bcsj;
+				}
+				if(bcType.equals("in") || bcType.equals("out")){
+					temp = fcsjT+bcsj;
+					lpname=m.get("lp").toString();
+					ists=false;
+				}else{
+//					if(ists){
+//						temp = fcsjT+bcsj;
+//						lpname=m.get("lp").toString();
+//					}else{
+						if(xlDir==0){
+							//上行数据
+							if(fcsjT>= minSj && fcsjT <= 6*60+30){
+								//早高峰前
+								yysxZq +=bcsj;
+								sxcountZqbc ++;
+								zqFcsj0.add(fcsjT);
+								if(ists){
+									if(lpname.equals(m.get("lp").toString())){
+										tzsxZq +=fcsjT-temp;
+									}
+								}
+								temp = fcsjT+bcsj;
+								
+							}else if(fcsjT > 6*60+30 && fcsjT <= 8*60+30){
+								//早高峰
+								yysxZgf +=bcsj;
+								sxcountZgfbc ++;
+								zgfFcsj0.add(fcsjT);
+								if(ists){
+									if(lpname.equals(m.get("lp").toString())){
+										tzsxZgf +=fcsjT-temp;
+									}
+								}
+								temp =fcsjT+bcsj;
+								
+							}else if(fcsjT > 8*60+30 && fcsjT <= 16*60){
+								//中午
+								yysxZw +=bcsj;
+								sxcountZwbc ++;
+								zwFcsj0.add(fcsjT);
+								if(ists){
+									if(lpname.equals(m.get("lp").toString())){
+										tzsxZw +=fcsjT-temp;
+									}
+								}
+								temp =fcsjT+bcsj;
+							}else if(fcsjT > 16*60 && fcsjT <= 18*60){
+								//晚高峰
+								yysxWgf +=bcsj;
+								sxcountWgfbc ++;
+								wgfFcsj0.add(fcsjT);
+								if(ists){
+									if(lpname.equals(m.get("lp").toString())){
+										tzsxWgf +=fcsjT-temp;
+									}
+								}
+								temp =fcsjT+bcsj;
+							}else{
+								//晚高峰后
+								yysxWh +=bcsj;
+								sxcountWhbc ++;
+								whFcsj0.add(fcsjT);
+								if(ists){
+									if(lpname.equals(m.get("lp").toString())){
+										tzsxWh +=fcsjT-temp;
+									}
+								}
+								temp =fcsjT+bcsj;
+							}
+							lpname=m.get("lp").toString();
+						}else{
+							//下行数据
+							if(fcsjT>= minSj && fcsjT <= 6*60+30){
+								//早高峰前
+								yyxxZq +=bcsj;
+								xxcountZqbc ++;
+								zqFcsj1.add(fcsjT);
+								if(ists){
+									if(lpname.equals(m.get("lp").toString())){
+										tzxxZq +=fcsjT-temp;
+									}
+								}
+								temp =fcsjT+bcsj;
+							}else if(fcsjT > 6*60+30 && fcsjT <= 8*60+30){
+								//早高峰
+								yyxxZgf +=bcsj;
+								xxcountZgfbc ++;
+								zgfFcsj1.add(fcsjT);
+								if(ists){
+									if(lpname.equals(m.get("lp").toString())){
+										tzxxZgf +=fcsjT-temp;
+									}
+								}
+								temp =fcsjT+bcsj;
+							}else if(fcsjT > 8*60+30 && fcsjT <= 16*60){
+								//中午
+								yyxxZw +=bcsj;
+								xxcountZwbc ++;
+								zwFcsj1.add(fcsjT);
+								if(ists){
+									if(lpname.equals(m.get("lp").toString())){
+										tzxxZw +=fcsjT-temp;
+									}
+								}
+								temp =fcsjT+bcsj;
+							}else if(fcsjT > 16*60 && fcsjT <= 18*60){
+								//晚高峰
+								yyxxWgf +=bcsj;
+								xxcountWgfbc ++;
+								wgfFcsj1.add(fcsjT);
+								if(ists){
+									if(lpname.equals(m.get("lp").toString())){
+										tzxxWgf +=fcsjT-temp;
+									}
+								}
+								temp =fcsjT+bcsj;
+							}else{
+								//晚高峰后
+								yyxxWh +=bcsj;
+								xxcountWhbc ++;
+								whFcsj1.add(fcsjT);
+								if(ists){
+									if(lpname.equals(m.get("lp").toString())){
+										tzxxWh +=fcsjT-temp;
+									}
+								}
+								temp =fcsjT+bcsj;
+							}
+//						}
+					}
+			    }
+			}
+			if(m.get("ists").toString().trim().equals("1")){
+				ists=false;
+			}else{
+				ists = true;
+			}
+		}
+			
+		//---------------------------------------早前
+		List<Integer> cjs = new ArrayList<Integer>();
+		Collections.sort(zqFcsj0);
+		int fcsjs=0;
+		for (int i = 0; i < zqFcsj0.size(); i++) {
+			if(i==0){
+				fcsjs =zqFcsj0.get(i);
+			}else{
+				cjs.add(zqFcsj0.get(i)-fcsjs);
+				fcsjs=zqFcsj0.get(i);
+			}
+			
+		}
+		Collections.sort(zqFcsj1);
+		int fcsjx=0;
+		for (int i = 0; i < zqFcsj1.size(); i++) {
+			if(i==0){
+				fcsjx =zqFcsj1.get(i);
+			}else{
+				cjs.add(zqFcsj1.get(i)-fcsjx);
+				fcsjx =zqFcsj1.get(i);
+			}
+			
+		}
+		Collections.sort(cjs);
+		for(int i : cjs){
+			zcj += i;
+		}
+		Map<String, Object> tempMap = new HashMap<String, Object>();
+		tempMap.put("sjd", "(首)——6:30");
+		tempMap.put("sxsj", sxcountZqbc != 0 ? yysxZq / sxcountZqbc : "0");
+		tempMap.put("xxsj", xxcountZqbc != 0 ? yyxxZq / xxcountZqbc : "0");
+		tempMap.put("sxtssj",  sxcountZqbc!= 0 ? tzsxZq / sxcountZqbc : "0");
+		tempMap.put("xxtssj", xxcountZqbc != 0 ? tzxxZq / xxcountZqbc : "0");
+		tempMap.put("fqsj", Integer.valueOf(tempMap.get("sxsj").toString()) + Integer.valueOf(tempMap.get("xxsj").toString())
+					+ Integer.valueOf(tempMap.get("sxtssj").toString()) + Integer.valueOf(tempMap.get("xxtssj").toString()));
+		tempMap.put("cjqj", cjs.size()>0?cjs.get(0)+"——"+cjs.get(cjs.size()-1):"——");
+		tempMap.put("pjcj", cjs.size()>0?zcj/cjs.size():"/");
+		newList.add(tempMap);
+		
+		//----------------------------------早高峰
+		cjs = new ArrayList<Integer>();
+		zcj =0;
+		
+		Collections.sort(zgfFcsj0);
+		 fcsjs=0;
+		for (int i = 0; i < zgfFcsj0.size(); i++) {
+			if(i==0){
+				fcsjs =zgfFcsj0.get(i);
+			}else{
+				cjs.add(zgfFcsj0.get(i)-fcsjs);
+				fcsjs=zgfFcsj0.get(i);
+			}
+			
+		}
+		Collections.sort(zgfFcsj1);
+		 fcsjx=0;
+		for (int i = 0; i < zgfFcsj1.size(); i++) {
+			if(i==0){
+				fcsjx =zgfFcsj1.get(i);
+			}else{
+				cjs.add(zgfFcsj1.get(i)-fcsjx);
+				fcsjx =zgfFcsj1.get(i);
+			}
+			
+		}
+		Collections.sort(cjs);
+		for(int i : cjs){
+			zcj += i;
+		}
+		
+		tempMap = new HashMap<String, Object>();
+		tempMap.put("sjd", "6:31——8:30");
+		tempMap.put("sxsj", sxcountZgfbc != 0 ? yysxZgf / sxcountZgfbc : "0");
+		tempMap.put("xxsj", xxcountZgfbc != 0 ? yyxxZgf / xxcountZgfbc : "0");
+		tempMap.put("sxtssj", sxcountZgfbc!= 0 ? tzsxZgf / sxcountZgfbc : "0");
+		tempMap.put("xxtssj", xxcountZgfbc != 0 ? tzxxZgf / xxcountZgfbc : "0");
+		tempMap.put("fqsj", Integer.valueOf(tempMap.get("sxsj").toString()) + Integer.valueOf(tempMap.get("xxsj").toString())
+					+ Integer.valueOf(tempMap.get("sxtssj").toString()) + Integer.valueOf(tempMap.get("xxtssj").toString()));
+		tempMap.put("cjqj", cjs.size()>0?cjs.get(0)+"——"+cjs.get(cjs.size()-1):"——");
+		tempMap.put("pjcj", cjs.size()>0?zcj/cjs.size():"/");
+		newList.add(tempMap);
+		//----------------------------------------------中午
+		cjs = new ArrayList<Integer>();
+		zcj =0;
+		
+		Collections.sort(zwFcsj0);
+		 fcsjs=0;
+		for (int i = 0; i < zwFcsj0.size(); i++) {
+			if(i==0){
+				fcsjs =zwFcsj0.get(i);
+			}else{
+				cjs.add(zwFcsj0.get(i)-fcsjs);
+				fcsjs=zwFcsj0.get(i);
+			}
+			
+		}
+		Collections.sort(zwFcsj1);
+		 fcsjx=0;
+		for (int i = 0; i < zwFcsj1.size(); i++) {
+			if(i==0){
+				fcsjx =zwFcsj1.get(i);
+			}else{
+				cjs.add(zwFcsj1.get(i)-fcsjx);
+				fcsjx =zwFcsj1.get(i);
+			}
+			
+		}
+		Collections.sort(cjs);
+		for(int i : cjs){
+			zcj += i;
+		}
+		
+		tempMap = new HashMap<String, Object>();
+		tempMap.put("sjd", "8:31——16:00");
+		tempMap.put("sxsj", sxcountZwbc != 0 ? yysxZw / sxcountZwbc : "0");
+		tempMap.put("xxsj", xxcountZwbc != 0 ? yyxxZw / xxcountZwbc : "0");
+		tempMap.put("sxtssj", sxcountZwbc!= 0 ? tzsxZw / sxcountZwbc : "0");
+		tempMap.put("xxtssj", xxcountZwbc != 0 ? tzxxZw / xxcountZwbc : "0");
+		tempMap.put("fqsj", Integer.valueOf(tempMap.get("sxsj").toString()) + Integer.valueOf(tempMap.get("xxsj").toString())
+					+ Integer.valueOf(tempMap.get("sxtssj").toString()) + Integer.valueOf(tempMap.get("xxtssj").toString()));
+		tempMap.put("cjqj", cjs.size()>0?cjs.get(0)+"——"+cjs.get(cjs.size()-1):"——");
+		tempMap.put("pjcj", cjs.size()>0?zcj/cjs.size():"/");
+		newList.add(tempMap);
+		//-------------------------------------------------晚高峰
+		cjs = new ArrayList<Integer>();
+		zcj =0;
+		
+		Collections.sort(wgfFcsj0);
+		 fcsjs=0;
+		for (int i = 0; i < wgfFcsj0.size(); i++) {
+			if(i==0){
+				fcsjs =wgfFcsj0.get(i);
+			}else{
+				cjs.add(wgfFcsj0.get(i)-fcsjs);
+				fcsjs=wgfFcsj0.get(i);
+			}
+			
+		}
+		Collections.sort(wgfFcsj1);
+		 fcsjx=0;
+		for (int i = 0; i < wgfFcsj1.size(); i++) {
+			if(i==0){
+				fcsjx =wgfFcsj1.get(i);
+			}else{
+				cjs.add(wgfFcsj1.get(i)-fcsjx);
+				fcsjx =wgfFcsj1.get(i);
+			}
+			
+		}
+		Collections.sort(cjs);
+		for(int i : cjs){
+			zcj += i;
+		}
+		
+		tempMap = new HashMap<String, Object>();
+		tempMap.put("sjd", "16:01——18:00");
+		tempMap.put("sxsj", sxcountWgfbc != 0 ? yysxWgf / sxcountWgfbc : "0");
+		tempMap.put("xxsj", xxcountWgfbc != 0 ? yyxxWgf / xxcountWgfbc : "0");
+		tempMap.put("sxtssj", sxcountWgfbc!= 0 ? tzsxWgf / sxcountWgfbc : "0");
+		tempMap.put("xxtssj", xxcountWgfbc != 0 ? tzxxWgf / xxcountWgfbc : "0");
+		tempMap.put("fqsj", Integer.valueOf(tempMap.get("sxsj").toString()) + Integer.valueOf(tempMap.get("xxsj").toString())
+					+ Integer.valueOf(tempMap.get("sxtssj").toString()) + Integer.valueOf(tempMap.get("xxtssj").toString()));
+		tempMap.put("cjqj", cjs.size()>0?cjs.get(0)+"——"+cjs.get(cjs.size()-1):"——");
+		tempMap.put("pjcj", cjs.size()>0?zcj/cjs.size():"/");
+		newList.add(tempMap);
+		
+		//----------------------------------晚后
+		cjs = new ArrayList<Integer>();
+		zcj =0;
+		
+		Collections.sort(whFcsj0);
+		 fcsjs=0;
+		for (int i = 0; i < whFcsj0.size(); i++) {
+			if(i==0){
+				fcsjs =whFcsj0.get(i);
+			}else{
+				cjs.add(whFcsj0.get(i)-fcsjs);
+				fcsjs=whFcsj0.get(i);
+			}
+			
+		}
+		Collections.sort(whFcsj1);
+		 fcsjx=0;
+		for (int i = 0; i < whFcsj1.size(); i++) {
+			if(i==0){
+				fcsjx =whFcsj1.get(i);
+			}else{
+				cjs.add(whFcsj1.get(i)-fcsjx);
+				fcsjx =whFcsj1.get(i);
+			}
+			
+		}
+		Collections.sort(cjs);
+		for(int i : cjs){
+			zcj += i;
+		}
+		
+		tempMap = new HashMap<String, Object>();
+		tempMap.put("sjd", "18:01——(末)");
+		tempMap.put("sxsj", sxcountWhbc != 0 ? yysxWh / sxcountWhbc : "0");
+		tempMap.put("xxsj", xxcountWhbc != 0 ? yyxxWh / xxcountWhbc : "0");
+		tempMap.put("sxtssj", sxcountWhbc!= 0 ? tzsxWh / sxcountWhbc : "0");
+		tempMap.put("xxtssj", xxcountWhbc != 0 ? tzxxWh / xxcountWhbc : "0");
+		tempMap.put("fqsj", Integer.valueOf(tempMap.get("sxsj").toString()) + Integer.valueOf(tempMap.get("xxsj").toString())
+					+ Integer.valueOf(tempMap.get("sxtssj").toString()) + Integer.valueOf(tempMap.get("xxtssj").toString()));
+		tempMap.put("cjqj", cjs.size()>0?cjs.get(0)+"——"+cjs.get(cjs.size()-1):"——");
+		tempMap.put("pjcj", cjs.size()>0?zcj/cjs.size():"/");
+		newList.add(tempMap);
+		/*
 		Map<String, List<Map<String, Object>>> keyMap = new HashMap<String, List<Map<String, Object>>>();
 		Map<String, Map<String, Object>> maps = new HashMap<String, Map<String, Object>>();
 		keyMap.put("(首)——6:30", new ArrayList<Map<String, Object>>());
@@ -985,10 +1370,10 @@ public class ReportServiceImpl implements ReportService{
 						}
 					}
-					/*if(temp < fcsj){
+					if(temp < fcsj){
 						cjs.add(fcsj - temp);
 						temp = fcsj;
-					}*/
+					}
 					if(m.get("ists").toString().trim().equals("1")){
 						ists = true;
 					}else{
@@ -1037,7 +1422,7 @@ public class ReportServiceImpl implements ReportService{
 		newList.add(maps.get("6:31——8:30"));
 		newList.add(maps.get("8:31——16:00"));
 		newList.add(maps.get("16:01——18:00"));
-		newList.add(maps.get("18:01——(末)"));
+		newList.add(maps.get("18:01——(末)"));*/
 		return newList;
 	}