报表

廖磊
1 parent b27fab8e
Showing 11 changed files with 904 additions and 16 deletions
src/main/java/com/bsth/controller/oil/CwjyController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/entity/excep/ArrivalInfo.java
src/main/java/com/bsth/entity/oil/Cwjy.java
src/main/java/com/bsth/repository/oil/CwjyRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/oil/CwjyService.java
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/ReportService.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
+package com.bsth.controller.oil;
+
+
+import java.util.Date;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.oil.Cwjy;
+import com.bsth.entity.oil.Ylxxb;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.oil.CwjyService;
+import com.bsth.util.PageObject;
+
+@RestController
+@RequestMapping("cwjy")
+public class CwjyController extends BaseController<Cwjy, Integer>{
+	@Autowired
+	private CwjyService service;
+	@RequestMapping(method = RequestMethod.POST)
+	public Map<String, Object> save(Cwjy t){
+		SysUser sysUser = SecurityUtils.getCurrentUser();
+		t.setCreateDate(new Date());
+		t.setXgr(sysUser.getUserName());
+		return service.save(t);
+	}
+	
+	@RequestMapping(value = "/pagequery",method = RequestMethod.GET)
+	public PageObject<Ylxxb> pagequery(@RequestParam Map<String, Object> map){
+		PageObject<Ylxxb> pagequery=null;
+		map.put("curPage", map.get("page").toString());
+		map.put("pageData","10");
+		pagequery=service.Pagequery(map);
+		return pagequery;
+	}
+	
+	@RequestMapping(value="/bynbbm",method = RequestMethod.GET)
+	public Ylxxb bynbbm(@RequestParam Map<String, Object> map){
+		
+		return service.bynbbm(map);
+	}
+	
+	/**
+	 * 
+	 * @Title: save 
+	 * @Description: TODO(持久化对象) 
+	 * @param @param t
+	 * @param @return    设定文件 
+	 * @return Map<String,Object>  {status: 1（成功），-1（失败）}
+	 * @throws
+	 */
+	@RequestMapping(value="/savejzl",method = RequestMethod.POST)
+	public Map<String, Object> savejzl(Ylxxb t){
+		Map<String, Object> map=service.savejzl(t);
+		return map;
+	}
+	
+	
+}
+package com.bsth.controller.report;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.entity.excep.ArrivalInfo;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.report.ReportService;
+
+@RestController
+@RequestMapping("report")
+public class ReportController {
+	
+	@Autowired
+	ReportService service;
+	
+	@RequestMapping(value="/queryListBczx" ,method = RequestMethod.POST)
+	public List<ScheduleRealInfo> queryListBczx(@RequestParam String clzbh,@RequestParam String line,@RequestParam String date){
+		return service.queryListBczx(line,date,clzbh);
+	}
+	
+	@RequestMapping(value="/queryListZdxx" ,method = RequestMethod.POST)
+	public List<ArrivalInfo> queryListZdxx(@RequestParam String clzbh,@RequestParam String line,
+			@RequestParam String date,@RequestParam String fcsj,@RequestParam String ddsj){
+		return service.queryListZdxx(line,date,clzbh,fcsj,ddsj);
+	}
+	@RequestMapping(value="/queryListClzd" ,method = RequestMethod.POST)
+	public List<ArrivalInfo> queryListClzd(@RequestParam String zd,@RequestParam String line,
+			@RequestParam String zdlx,@RequestParam String fcsj,@RequestParam String ddsj){
+		return service.queryListClzd(line,zd,zdlx,fcsj,ddsj);
+	}
+	
+	@RequestMapping(value = "/sreachZd", method = RequestMethod.GET)
+	public List<Map<String, String>> sreachPersonnel(@RequestParam String line,@RequestParam int zdlx,@RequestParam String zd) {
+		return service.sreachZd(line,zdlx, zd);
+	}
+
+}
+package com.bsth.entity.excep;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.bsth.data.BasicData;
+
+/**
+ * 
+ * @ClassName: ArrivalEntity 
+ * @Description: TODO(进出站实体) 
+ * @author PanZhao 
+ * @date 2016年8月19日 上午9:32:20 
+ *
+ */
+public class ArrivalInfo {
+	
+	/** 设备号*/
+	private String deviceId;
+	
+	private String nbbm;
+	
+	/** 站点名称 */
+	private String stopName;
+	
+	/** 时间戳*/
+	private Long ts;
+	
+	/** 线路编码*/
+	private String lineCode;
+
+	/** 上下行*/
+	private Integer upDown;
+
+	/**站点编码*/
+	private String stopNo;
+	
+	/** 0: 进 1：出*/
+	private Integer inOut;
+
+	private Long createDate;
+	
+	/** 是否有效 */
+	private boolean enable;
+	
+	/**分区字段，当年的第几周*/
+	private Integer weeksYear;
+	
+	private boolean tcc;
+	
+	//是否被纠正
+	private boolean correct;
+	
+	private String correctText;
+	
+	
+	private String czsj;
+	
+	private String jzsj;
+	/** -1 则信号有效，但程序标记为不使用 */
+	private int flag = 0;
+	
+	public ArrivalInfo(){}
+	
+	public ArrivalInfo(String deviceId, long ts, String lineCode, int upDown, String stopNo, int inOut, long createDate,
+			int weeksYear, String stopName) {
+		
+		this.deviceId = deviceId;
+		this.ts = ts;
+		this.lineCode = lineCode;
+		this.upDown = upDown;
+		this.stopNo = stopNo;
+		this.stopName = stopName;
+		this.inOut = inOut;
+		this.createDate = createDate;
+	}
+
+/*	@Override
+	public boolean equals(Object obj) {
+		ArrivalEntity a2 = (ArrivalEntity)obj;
+		
+		return this.toString().equals(a2.toString())
+				&& Math.abs(this.ts - a2.ts) < EQ_RANGE;
+	}
+	
+	@Override
+	public int hashCode() {
+		return this.toString().hashCode();
+	}*/
+	
+	
+	@Override
+	public String toString() {
+		try {
+			SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+			return "["+BasicData.deviceId2NbbmMap.get(this.deviceId)+"， "+sdfHHmm.format(new Date(this.ts))
+			+"，"+(this.getUpDown()==0?"上行":"下行")+"，"+(this.inOut==0?"进":"出")+"，"+this.stopNo+" （"+this.stopName+"）]";
+		} catch (Exception e) {
+			return "";
+		}
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public Integer getUpDown() {
+		return upDown;
+	}
+
+	public void setUpDown(Integer upDown) {
+		this.upDown = upDown;
+	}
+
+	public String getStopNo() {
+		return stopNo;
+	}
+
+	public void setStopNo(String stopNo) {
+		this.stopNo = stopNo;
+	}
+
+	public Integer getInOut() {
+		return inOut;
+	}
+
+	public void setInOut(Integer inOut) {
+		this.inOut = inOut;
+	}
+
+	public Long getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Long createDate) {
+		this.createDate = createDate;
+	}
+
+	public Integer getWeeksYear() {
+		return weeksYear;
+	}
+
+	public void setWeeksYear(Integer weeksYear) {
+		this.weeksYear = weeksYear;
+	}
+
+	public String getDeviceId() {
+		return deviceId;
+	}
+
+	public void setDeviceId(String deviceId) {
+		this.deviceId = deviceId;
+	}
+
+	public Long getTs() {
+		return ts;
+	}
+
+	public void setTs(Long ts) {
+		this.ts = ts;
+	}
+
+	public String getStopName() {
+		return stopName;
+	}
+
+	public void setStopName(String stopName) {
+		this.stopName = stopName;
+	}
+	
+	public String getId(){
+		return this.deviceId + "_" + this.ts;
+	}
+
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public boolean isEnable() {
+		return enable;
+	}
+
+	public void setEnable(boolean enable) {
+		this.enable = enable;
+	}
+
+	public boolean isTcc() {
+		return tcc;
+	}
+
+	public void setTcc(boolean tcc) {
+		this.tcc = tcc;
+	}
+
+	public boolean isOutTcc() {
+		return isTcc() && inOut == 1;
+	}
+
+	public boolean isCorrect() {
+		return correct;
+	}
+
+	public void setCorrect(boolean correct) {
+		this.correct = correct;
+	}
+
+	public String getCorrectText() {
+		return correctText;
+	}
+
+	public void setCorrectText(String correctText) {
+		this.correctText = correctText;
+	}
+
+	public Integer getFlag() {
+		return flag;
+	}
+
+	public void setFlag(Integer flag) {
+		this.flag = flag;
+	}
+
+	public String getCzsj() {
+		return czsj;
+	}
+
+	public void setCzsj(String czsj) {
+		this.czsj = czsj;
+	}
+
+	public String getJzsj() {
+		return jzsj;
+	}
+
+	public void setJzsj(String jzsj) {
+		this.jzsj = jzsj;
+	}
+	
+	
+	
+}
+package com.bsth.entity.oil;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "bsth_c_cwjy")
+public class Cwjy {
+	@Id
+	@GeneratedValue
+	private Integer id;
+	
+	private String gsdm;
+	
+	private String fgsdm;
+	
+	private String nbbm;
+	
+	private String xgr;
+	
+	private Date createDate;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getGsdm() {
+		return gsdm;
+	}
+
+	public void setGsdm(String gsdm) {
+		this.gsdm = gsdm;
+	}
+
+	public String getFgsdm() {
+		return fgsdm;
+	}
+
+	public void setFgsdm(String fgsdm) {
+		this.fgsdm = fgsdm;
+	}
+
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public String getXgr() {
+		return xgr;
+	}
+
+	public void setXgr(String xgr) {
+		this.xgr = xgr;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	
+	
+}
+package com.bsth.repository.oil;
+
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.bsth.entity.oil.Cwjy;
+import com.bsth.entity.oil.Ylxxb;
+import com.bsth.repository.BaseRepository;
+
+@Repository
+public interface CwjyRepository extends BaseRepository<Cwjy, Integer>{
+	/**
+	 * 当天手动添加的加油信息 
+	 * @param rq
+	 * @return
+	 */
+	@Transactional
+	@Modifying
+	@Query(value="SELECT a.gsdm as gsdm,a.nbbm as nbbm,b.jsy as jsy,b.jzl as jzl ,b.stationid as stationid,"
+			+ "b.nylx as nylx,b.yj as yj,b.bz as bz,c.jsy as ldgh  FROM  bsth_c_cwjy  a "+ 
+   " left  join ( select * from bsth_c_ylxxb b where to_days(b.yyrq)=to_days(?1) and jylx=1) b " +
+  " on a.nbbm=b.nbbm left join (select nbbm,group_concat(jsy) as jsy  from bsth_c_ylb where  to_days(rq)= to_days(?1 ) group by nbbm "+
+   " ) c on a.nbbm=c.nbbm  where  a.nbbm like %?2% ",nativeQuery=true)
+	List<Object[]> obtainCwjycl(String rq,String nbbm);
+	
+}
@@ -29,10 +29,15 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 order by bcs")
 	List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName);
-	@Query(value="select new map(clZbh as clZbh,jGh as jGh,jName as jName,sum(jhlc) as zgl,sum(addMileage) as ksgl,count(jName) as bcs) from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh")
+	@Query(value="select new map(clZbh as clZbh,jGh as jGh,jName as jName,sum(jhlc) as zgl,"
+			+ "sum(addMileage) as ksgl,count(jName) as bcs) from ScheduleRealInfo s where"
+			+ " s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 group by clZbh,jGh,jName")
 	List<Map<String, Object>> dailyInfo(String line,String date);
-	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,d.sender,d.timestamp,d.txt_content FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 d ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm = ?1 AND r.schedule_date = ?2 and r.cl_zbh = ?3 order by d.timestamp",nativeQuery=true)
+	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,d.sender,d.timestamp,"
+			+ " d.txt_content FROM bsth_c_s_sp_info_real r RIGHT JOIN bsth_v_directive_60 "
+			+ "d ON r.id = d.sch WHERE d.is_dispatch = 1 AND r.xl_bm like %?1% AND "
+			+ "r.schedule_date like %?2% and r.cl_zbh like %?3% order by d.timestamp",nativeQuery=true)
 	List<Object[]> historyMessage(String line,String date,String code);
 	@Query(value = "select max(id) from ScheduleRealInfo")
@@ -45,6 +50,10 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value = "select s from ScheduleRealInfo s where s.scheduleDateStr = ?1")
 	List<ScheduleRealInfo> findByDate(String dateStr);
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and cl_zbh=?3 order by bcs")
+	List<ScheduleRealInfo> findByDate2(String line,String date,String clzbh);
+	
 	@Query(value="select count(jName) from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.status = -1")
 	int findCjbc(String jName,String clZbh,String lpName);
@@ -54,8 +63,10 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="SELECT c.company,r.request_code,FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d %T') FROM bsth_v_report_80 r LEFT JOIN bsth_c_cars c ON c.equipment_code = r.device_id where FROM_UNIXTIME(r.timestamp/1000,'%Y-%m-%d') = ?2 and r.line_id = ?1 and c.inside_code = ?3",nativeQuery=true)
 	List<Object[]> account(String line,String date,String code);
-	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') and s.scheduleDate <= str_to_date(?3,'%Y-%m-%d') and s.lpName = ?4 order by s.fcsj")
-	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName);
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and s.scheduleDate >= str_to_date(?2,'%Y-%m-%d') "
+			+ " and s.scheduleDate <= str_to_date(?3,'%Y-%m-%d') and s.lpName like  %?4% "
+			+ " and clZbh like %?5% order by s.fcsj")
+	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code);
 	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') order by bcs")
 	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date);
@@ -78,7 +89,8 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value = "delete ScheduleRealInfo s where s.xlBm=?1 and s.scheduleDateStr=?2")
 	void deleteByLineCodeAndDate(String xlBm, String schDate);
-	@Query(value="select s from ScheduleRealInfo s where (s.xlBm = ?1 or s.xlBm is not null) and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
+	//去掉了 xlBm is not null 
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2")
 	List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
 	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where (s.xlBm = ?1 or s.xlBm is not null) and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY xlBm,clZbh,jGh ORDER BY xlBm,clZbh,realExecDate,fcsjActual")
+package com.bsth.service.oil;
+
+
+import java.util.Map;
+
+import com.bsth.entity.oil.Cwjy;
+import com.bsth.entity.oil.Ylxxb;
+import com.bsth.service.BaseService;
+import com.bsth.util.PageObject;
+
+public interface CwjyService extends BaseService<Cwjy, Integer>{
+	PageObject<Ylxxb> Pagequery(Map<String, Object> map) ;
+	Ylxxb bynbbm(Map<String, Object> map);
+	
+	Map<String, Object> savejzl(Ylxxb t);
+}
+package com.bsth.service.oil.impl;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.oil.Cwjy;
+import com.bsth.entity.oil.Ylxxb;
+import com.bsth.repository.oil.CwjyRepository;
+import com.bsth.repository.oil.YlxxbRepository;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.oil.CwjyService;
+import com.bsth.util.PageHelper;
+import com.bsth.util.PageObject;
+
+@Service
+public class CwjyServiceImpl extends BaseServiceImpl<Cwjy,Integer> implements CwjyService
+{
+	@Autowired
+	CwjyRepository repository;
+	@Autowired
+	YlxxbRepository ylxxbRepository;
+	
+	@SuppressWarnings("unchecked")
+	public PageObject<Ylxxb> Pagequery(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		List<Ylxxb> yList=new ArrayList<Ylxxb>();
+		String rq=map.get("rq").toString();
+		String nbbm="";
+		if(map.get("nbbm")!=null){
+			nbbm=map.get("nbbm").toString();
+		}
+		List<Object[]> list=repository.obtainCwjycl(rq,nbbm);
+		for (int i = 0; i < list.size(); i++) {
+			Ylxxb y=new Ylxxb();
+			y.setGsdm(list.get(i)[0]==null?"":list.get(i)[0].toString());
+			y.setNbbm(list.get(i)[1]==null?"":list.get(i)[1].toString());
+			y.setJsy(list.get(i)[2]==null?"":list.get(i)[2].toString());
+			y.setJzl(list.get(i)[3]==null?0.0:Double.parseDouble(list.get(i)[3].toString()));
+			y.setStationid(list.get(i)[4]==null?"":list.get(i)[4].toString());
+			y.setNylx(list.get(i)[5]==null?0:Integer.parseInt(list.get(i)[5].toString()));
+			y.setYj(list.get(i)[6]==null?0.0:Double.parseDouble(list.get(i)[6].toString()));
+			y.setBz(list.get(i)[7]==null?"":list.get(i)[7].toString());
+			y.setLdgh(list.get(i)[8]==null?"":list.get(i)[8].toString());
+			try {
+				y.setYyrq(sdf.parse(rq));
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			yList.add(y);
+		}
+		PageHelper pageHelper = new PageHelper(yList.size(), map);
+		pageHelper.getMap();
+		PageObject<Ylxxb> pageObject=pageHelper.getPageObject();
+		pageObject.setDataList(yList);
+		return pageObject;
+	}
+
+	@Override
+	public Ylxxb bynbbm(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		// TODO Auto-generated method stub
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		String rq = map.get("rq").toString();
+		String nbbm = "";
+		if (map.get("nbbm") != null) {
+			nbbm = map.get("nbbm").toString();
+		}
+		List<Object[]> list = repository.obtainCwjycl(rq, nbbm);
+		Ylxxb y = new Ylxxb();
+		if (list.size() > 0) {
+			y.setGsdm(list.get(0)[0] == null ? "" : list.get(0)[0].toString());
+			y.setNbbm(list.get(0)[1] == null ? "" : list.get(0)[1].toString());
+			y.setJsy(list.get(0)[2] == null ? "" : list.get(0)[2].toString());
+			y.setJzl(list.get(0)[3] == null ? 0.0 : Double.parseDouble(list.get(0)[3].toString()));
+			y.setStationid(list.get(0)[4] == null ? "" : list.get(0)[4].toString());
+			y.setNylx(list.get(0)[5] == null ? 0 : Integer.parseInt(list.get(0)[5].toString()));
+			y.setYj(list.get(0)[6] == null ? 0.0 : Double.parseDouble(list.get(0)[6].toString()));
+			y.setBz(list.get(0)[7] == null ? "" : list.get(0)[7].toString());
+			y.setLdgh(list.get(0)[8] == null ? "" : list.get(0)[8].toString());
+			try {
+				y.setYyrq(sdf.parse(rq));
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		return y;
+	}
+
+	@Override
+	public Map<String, Object> savejzl(Ylxxb t) {
+		// TODO Auto-generated method stub
+		Map<String, Object> map=new HashMap<String,Object>();
+		try {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			String rq = sdf.format(t.getYyrq());
+			String nbbm=t.getNbbm();
+			List<Ylxxb> yList=ylxxbRepository.obtainYlxx2(rq,nbbm);
+			if(yList.size()>0){
+				t.setId(yList.get(0).getId());
+				ylxxbRepository.save(t);
+			}else{
+				ylxxbRepository.save(t);
+			}
+			map.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			map.put("status", ResponseCode.ERROR);
+			e.printStackTrace();
+			// TODO: handle exception
+		}
+		return map;
+	}
+
+}
@@ -1158,7 +1158,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public List<ScheduleRealInfo> correctForm(String line, String startDate,
 			String endDate, String lpName, String code) {
-		List<ScheduleRealInfo> list = scheduleRealInfoRepository.correctForm(line,startDate,endDate,lpName);
+		List<ScheduleRealInfo> list = scheduleRealInfoRepository.correctForm(line,startDate,endDate,lpName,code);
 		return list;
 	}
@@ -1215,25 +1215,25 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 						sjgl += tempJhlc;
 					}else if(scheduleRealInfo.getStatus() == -1){
 						ssgl += tempJhlc;
-						if(scheduleRealInfo.getRemarks().indexOf("路阻") != -1){
+						if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("路阻") != -1){
 							ssgl_lz += tempJhlc;
-						}else if(scheduleRealInfo.getRemarks().indexOf("吊慢") != -1){
+						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("吊慢") != -1){
 							ssgl_dm += tempJhlc;
-						}else if(scheduleRealInfo.getRemarks().indexOf("故障") != -1){
+						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("故障") != -1){
 							ssgl_gz += tempJhlc;
-						}else if(scheduleRealInfo.getRemarks().indexOf("纠纷") != -1){
+						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("纠纷") != -1){
 							ssgl_jf += tempJhlc;
-						}else if(scheduleRealInfo.getRemarks().indexOf("肇事") != -1){
+						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("肇事") != -1){
 							ssgl_zs += tempJhlc;
-						}else if(scheduleRealInfo.getRemarks().indexOf("缺人") != -1){
+						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("缺人") != -1){
 							ssgl_qr += tempJhlc;
-						}else if(scheduleRealInfo.getRemarks().indexOf("缺车") != -1){
+						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("缺车") != -1){
 							ssgl_qc += tempJhlc;
-						}else if(scheduleRealInfo.getRemarks().indexOf("客稀") != -1){
+						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("客稀") != -1){
 							ssgl_kx += tempJhlc;
-						}else if(scheduleRealInfo.getRemarks().indexOf("气候") != -1){
+						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("气候") != -1){
 							ssgl_qh += tempJhlc;
-						}else if(scheduleRealInfo.getRemarks().indexOf("援外") != -1){
+						}else if((scheduleRealInfo.getRemarks()==null?"":scheduleRealInfo.getRemarks()).indexOf("援外") != -1){
 							ssgl_yw += tempJhlc;
 						}else{
 							ssgl_other += tempJhlc;
+package com.bsth.service.report;
+
+import java.util.List;
+import java.util.Map;
+
+import com.bsth.entity.excep.ArrivalInfo;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+
+public interface ReportService {
+
+	List<ScheduleRealInfo> queryListBczx(String line,String date,String clzbh);
+	
+	List<ArrivalInfo> queryListZdxx(String line,String date,String clzbh,String sjfc,String sjdd);
+	
+	List<ArrivalInfo> queryListClzd(String line,String zd,String zdlx,String fcsj,String ddsj);
+	
+	List<Map<String, String>>  sreachZd(String line,int zdlx,String zd);
+}
+package com.bsth.service.report.impl;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import com.bsth.data.BasicData;
+import com.bsth.entity.StationRoute;
+import com.bsth.entity.excep.ArrivalInfo;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.repository.StationRouteRepository;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.service.report.ReportService;
+import com.bsth.util.db.DBUtils_MS;
+
+@Service
+public class ReportServiceImpl implements ReportService{
+	
+	
+	private Logger logger = LoggerFactory.getLogger(this.getClass());
+	
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+	
+	@Autowired
+	ScheduleRealInfoRepository scheduleRealInfoRepository;
+	@Autowired
+	StationRouteRepository stationRoutRepository;
+	@Override
+	public List<ScheduleRealInfo> queryListBczx(String line, String date,String clzbh) {
+		// TODO Auto-generated method stub
+		List<ScheduleRealInfo> list=scheduleRealInfoRepository.findByDate2(line,date,clzbh);
+		
+//				jdbcTemplate.query("select * from bsth_c_s_sp_info_real where line=?1  "
+//				+ "and  DATE_FORMAT(schedule_date,'%Y-%m-%d')=?2 and cl_zbl=?3",   
+//                new Object[]{line,date,clzbh},   
+//                new RowMapper(){  
+//                    @Override  
+//                    public Object mapRow(ResultSet rs, int rowNum) throws SQLException {  
+//                    	ScheduleRealInfo s  = new ScheduleRealInfo();  
+////                    	s.
+//                        return s;  
+//                    }  
+//        });  
+		
+		return list;
+	}
+	@Override
+	public List<ArrivalInfo> queryListZdxx(String line, String date, String clzbh, String sjfc, String sjdd) {
+		// TODO Auto-generated method stub
+		List<ArrivalInfo> list=new ArrayList<ArrivalInfo>();
+		try {
+			String sbbb=BasicData.deviceId2NbbmMap.inverse().get(clzbh);
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
+			Long date1=simpleDateFormat.parse(date+" "+sjfc+":00").getTime();
+			Long date2=simpleDateFormat.parse(date+" "+sjdd+":00").getTime();
+			Date dates=simpleDateFormat.parse(date+" 00:00:00");
+			List<ArrivalInfo> lists=load(line,sbbb,date1,date2,dates);
+			
+			for(int i=0;i<lists.size();i++){
+				ArrivalInfo t1=lists.get(i);
+				if(t1.getInOut()==0){
+					t1.setJzsj(sdf.format(new Date(t1.getTs())));
+					for(int j=0;j<lists.size();j++){
+						ArrivalInfo t2=lists.get(j);
+						if(t2.getInOut()==1 && t2.getDeviceId().equals(t1.getDeviceId()) && t2.getStopNo().equals(t1.getStopNo())){
+							t1.setCzsj(sdf.format(new Date(t2.getTs())));
+						}
+					}
+					list.add(t1);
+				}
+				
+			}
+			
+			
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		return list;
+	}
+
+	
+	public List<ArrivalInfo> load(String line,String sbbb,Long date1,Long date2,Date dates){
+		List<ArrivalInfo> list = null;
+			Calendar cal = Calendar.getInstance();
+			cal.setTime(dates);
+			//周数，表分区字段
+			int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
+			
+			Connection conn = null;
+			PreparedStatement ps = null;
+			ResultSet rs = null;
+			
+			String sql = "select * from bsth_c_arrival_info where  device_id=? AND line_id=? AND weeks_year=? AND ts > ? AND ts <=? order by ts";
+			try{
+				conn = DBUtils_MS.getConnection();
+				ps = conn.prepareStatement(sql);
+				ps.setString(1, sbbb);
+				ps.setString(2,line);
+				ps.setInt(3, weeks_year);
+				ps.setLong(4, date1);
+				ps.setLong(5, date2);
+				rs = ps.executeQuery();
+				
+				list = resultSet2Set(rs);
+			}catch(Exception e){
+				logger.error("", e);
+			}finally {
+				DBUtils_MS.close(rs, ps, conn);
+			}
+		return list;
+	}
+	
+	public List<ArrivalInfo> resultSet2Set(ResultSet rs) throws SQLException{
+		List<ArrivalInfo> list = new ArrayList<>();
+		
+		ArrivalInfo arr;
+		while(rs.next()){
+			arr = new ArrivalInfo();
+			arr.setDeviceId(rs.getString("device_id"));
+			arr.setNbbm(BasicData.deviceId2NbbmMap.get(arr.getDeviceId()));
+			if(null == arr.getNbbm()){
+				logger.warn("未注册的设备号，" + arr.getDeviceId());
+				continue;
+			}
+			
+			arr.setTs(rs.getLong("ts"));
+			arr.setLineCode(rs.getString("line_id"));
+			arr.setUpDown(rs.getInt("up_down"));
+			arr.setStopNo(rs.getString("stop_no"));
+			arr.setStopName(BasicData.stationCode2NameMap.get(arr.getStopNo()));
+			arr.setInOut(rs.getInt("in_out"));
+			arr.setCreateDate(rs.getLong("create_timestamp"));
+			arr.setWeeksYear(rs.getInt("weeks_year"));
+			arr.setEnable(true);
+			
+			list.add(arr);
+		}
+		return list;
+	}
+	@Override
+	public List<ArrivalInfo> queryListClzd(String line, String zd, String zdlx, String fcsj, String ddsj) {
+		// TODO Auto-generated method stub
+				List<ArrivalInfo> list=new ArrayList<ArrivalInfo>();
+				try {
+					SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+					SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
+					Long date1=simpleDateFormat.parse(fcsj+" 00:00:00").getTime();
+					Long date2=simpleDateFormat.parse(ddsj+" 23:59:59").getTime();
+					Date dates1=simpleDateFormat.parse(fcsj+" 00:00:00");
+					Date dates2=simpleDateFormat.parse(ddsj+" 00:00:00");
+					List<ArrivalInfo> lists=load2(line,date1,date2,dates1,dates2,zd,zdlx);
+					
+					for(int i=0;i<lists.size();i++){
+						ArrivalInfo t1=lists.get(i);
+						if(t1.getInOut()==0){
+							t1.setJzsj(sdf.format(new Date(t1.getTs())));
+							for(int j=0;j<lists.size();j++){
+								ArrivalInfo t2=lists.get(j);
+								if(t2.getInOut()==1 && t2.getDeviceId().equals(t1.getDeviceId()) 
+										&& t2.getStopNo().equals(t1.getStopNo())
+										&& t2.getTs()>t1.getTs()){
+									t1.setCzsj(sdf.format(new Date(t2.getTs())));
+									break;
+								}
+							}
+							list.add(t1);
+						}
+						
+					}
+					
+					
+				} catch (ParseException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				
+				return list;
+	}
+	
+	
+	public List<ArrivalInfo> load2(String line,Long date1,Long date2,Date dates1,Date dates2,String zd,String zdlx){
+		List<ArrivalInfo> list = null;
+			Calendar cal = Calendar.getInstance();
+			cal.setTime(dates1);
+			//周数，表分区字段
+			int weeks_year1 = cal.get(Calendar.WEEK_OF_YEAR);
+			cal.setTime(dates2);
+			int weeks_year2 = cal.get(Calendar.WEEK_OF_YEAR);
+			Connection conn = null;
+			PreparedStatement ps = null;
+			ResultSet rs = null;
+			
+			String sql = "select * from bsth_c_arrival_info where line_id=? AND weeks_year>=? "
+					+ " AND weeks_year<=? AND ts > ? AND ts <=? AND up_down=? AND stop_no like ? order by ts";
+			try{
+				conn = DBUtils_MS.getConnection();
+				ps = conn.prepareStatement(sql);
+				ps.setString(1, line);
+				ps.setInt(2, weeks_year1);
+				ps.setInt(3, weeks_year2);
+				ps.setLong(4, date1);
+				ps.setLong(5, date2);
+				ps.setString(6, zdlx);
+				ps.setString(7, "%"+zd+"%");
+				rs = ps.executeQuery();
+				
+				list = resultSet2Set(rs);
+			}catch(Exception e){
+				logger.error("", e);
+			}finally {
+				DBUtils_MS.close(rs, ps, conn);
+			}
+		return list;
+	}
+	@Override
+	public List<Map<String, String>> sreachZd(String line, int zdlx,String zd) {
+		List<Map<String, String>> list = new ArrayList<>();
+		// TODO Auto-generated method stub
+		List<StationRoute> listSr=stationRoutRepository.findByLine(line,zdlx);
+		for (int i = 0; i < listSr.size(); i++) {
+			StationRoute t=listSr.get(i);
+			if(t.getStationName().indexOf(zd)!=-1){
+				Map<String, String> newMap=new HashMap<String,String>();
+				newMap.put("id",t.getStationCode());
+				newMap.put("text", t.getStationName());
+				list.add(newMap);
+			}
+		}
+		return list;
+	}
+	
+}