去掉原大间隔统计表的计算方法

廖磊
1 parent d2550f64
Showing 5 changed files with 98 additions and 199 deletions
src/main/java/com/bsth/entity/calc/CalcInterval.java
src/main/java/com/bsth/service/calc/impl/CalcToolServiceImpl.java
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
@@ -7,86 +7,72 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
+/**
+ * @author bsth-a
+ *
+ */
 @Entity
-@Table(name = "calc_interval")
+@Table(name = "bsth_c_calc_interval")
 public class CalcInterval {
 	/* 主键*/
 	@Id
 	@GeneratedValue
-	private Long id;
+	private Integer id;
 	/* 公司代码*/
-	private String gsdm;
-	/* 公司名称*/
-	private String gsname;
+	private String gsbm;
 	/* 分公司代码*/
-	private String fgsdm;
-	/* 分公司名称*/
-	private String fgsname;
-	/* 日期*/
-	private Date rq;
+	private String fgsbm;
 	/* 日期字符串*/
-	private String rqStr;
+	private String date;
 	/* 线路编码*/
-	private String xl;
+	private String xlBm;
 	/* 线路名称*/
 	private String xlName;
-	/* 大间隔次数*/
-	private int djg;
-	/* 大间隔次数(早高峰)*/
-	private int djgM;
-	/* 大间隔次数(晚高峰)*/
-	private int djgA;
-	/* 最大大间隔时间*/
-	private int djgTime;
-	/* 备注*/
-	private String remark;
-	public Long getId() {
+	/*大间隔等级*/
+	private String level;
+	/*等级具体时间*/
+	private Integer levelTime;
+	/*全日大间隔次数*/
+	private Integer djgAll;
+	/*高峰大间隔次数*/
+	private Integer djgGf;
+	/*低谷大间隔次数*/
+	private Integer djgDg;
+	/*最大间隔时间*/
+	private Integer djgTime;
+	/*数据创建时间*/
+	private Date createtime;
+	/*数据修改时间*/
+	private Date updatetime;
+	public Integer getId() {
 		return id;
 	}
-	public void setId(Long id) {
+	public void setId(Integer id) {
 		this.id = id;
 	}
-	public String getGsdm() {
-		return gsdm;
+	public String getGsbm() {
+		return gsbm;
 	}
-	public void setGsdm(String gsdm) {
-		this.gsdm = gsdm;
+	public void setGsbm(String gsbm) {
+		this.gsbm = gsbm;
 	}
-	public String getGsname() {
-		return gsname;
+	public String getFgsbm() {
+		return fgsbm;
 	}
-	public void setGsname(String gsname) {
-		this.gsname = gsname;
+	public void setFgsbm(String fgsbm) {
+		this.fgsbm = fgsbm;
 	}
-	public String getFgsdm() {
-		return fgsdm;
+	public String getDate() {
+		return date;
 	}
-	public void setFgsdm(String fgsdm) {
-		this.fgsdm = fgsdm;
+	public void setDate(String date) {
+		this.date = date;
 	}
-	public String getFgsname() {
-		return fgsname;
+	public String getXlBm() {
+		return xlBm;
 	}
-	public void setFgsname(String fgsname) {
-		this.fgsname = fgsname;
-	}
-	public Date getRq() {
-		return rq;
-	}
-	public void setRq(Date rq) {
-		this.rq = rq;
-	}
-	public String getRqStr() {
-		return rqStr;
-	}
-	public void setRqStr(String rqStr) {
-		this.rqStr = rqStr;
-	}
-	public String getXl() {
-		return xl;
-	}
-	public void setXl(String xl) {
-		this.xl = xl;
+	public void setXlBm(String xlBm) {
+		this.xlBm = xlBm;
 	}
 	public String getXlName() {
 		return xlName;
@@ -94,35 +80,53 @@ public class CalcInterval {
 	public void setXlName(String xlName) {
 		this.xlName = xlName;
 	}
-	public int getDjg() {
-		return djg;
+	public String getLevel() {
+		return level;
 	}
-	public void setDjg(int djg) {
-		this.djg = djg;
+	public void setLevel(String level) {
+		this.level = level;
 	}
-	public int getDjgM() {
-		return djgM;
+	public Integer getLevelTime() {
+		return levelTime;
 	}
-	public void setDjgM(int djgM) {
-		this.djgM = djgM;
+	public void setLevelTime(Integer levelTime) {
+		this.levelTime = levelTime;
 	}
-	public int getDjgA() {
-		return djgA;
+	public Integer getDjgAll() {
+		return djgAll;
 	}
-	public void setDjgA(int djgA) {
-		this.djgA = djgA;
+	public void setDjgAll(Integer djgAll) {
+		this.djgAll = djgAll;
 	}
-	public int getDjgTime() {
+	public Integer getDjgGf() {
+		return djgGf;
+	}
+	public void setDjgGf(Integer djgGf) {
+		this.djgGf = djgGf;
+	}
+	public Integer getDjgDg() {
+		return djgDg;
+	}
+	public void setDjgDg(Integer djgDg) {
+		this.djgDg = djgDg;
+	}
+	public Integer getDjgTime() {
 		return djgTime;
 	}
-	public void setDjgTime(int djgTime) {
+	public void setDjgTime(Integer djgTime) {
 		this.djgTime = djgTime;
 	}
-	public String getRemark() {
-		return remark;
+	public Date getCreatetime() {
+		return createtime;
+	}
+	public void setCreatetime(Date createtime) {
+		this.createtime = createtime;
+	}
+	public Date getUpdatetime() {
+		return updatetime;
 	}
-	public void setRemark(String remark) {
-		this.remark = remark;
+	public void setUpdatetime(Date updatetime) {
+		this.updatetime = updatetime;
 	}
 }
 package com.bsth.service.calc.impl;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -10,7 +8,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import com.bsth.entity.calc.CalcInterval;
 import com.bsth.entity.calc.CalcWaybill;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -19,14 +16,12 @@ import com.bsth.repository.calc.CalcIntervalRepository;
 import com.bsth.repository.calc.CalcWaybillRepository;
 import com.bsth.service.calc.CalcToolService;
 import com.bsth.service.calc.CalcCulateMileageService;
-import com.bsth.service.report.CulateMileageService;
 import com.bsth.util.Arith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 /**
@@ -35,11 +30,6 @@ import org.springframework.stereotype.Service;
 @Service
 public class CalcToolServiceImpl implements CalcToolService {
-	@Autowired
-	private CalcWaybillRepository clacRepository;
-
-	@Autowired
-	private CalcIntervalRepository culcIntervalRepository;
 	@Autowired
 	private CalcCulateMileageService culateMileageService;
@@ -114,50 +104,6 @@ public class CalcToolServiceImpl implements CalcToolService {
 				listCal.addAll(this.cul(list_, lists_, xlList, djgList));
 			}
 		}
-
-		//按线路计算大间隔
-       /* if(list.size() > 0){
-			ScheduleRealInfo s = list.get(0);
-			Map<String, Object> culateDjg = culateMileageService.culateDjg(list, lineCode, xlList, djgList);
-			CalcInterval interval = new CalcInterval();
-			interval.setGsdm(s.getGsBm());
-			interval.setGsname(s.getGsName());
-			interval.setFgsdm(s.getFgsBm());
-			interval.setFgsname(s.getFgsName());
-			interval.setRq(s.getScheduleDate());
-			interval.setRqStr(s.getScheduleDateStr());
-			interval.setXl(s.getXlBm());
-			interval.setXlName(s.getXlName());
-			if(culateDjg.keySet().size() > 0){
-				if(culateDjg.containsKey("djgcsq")){
-					interval.setDjg(Integer.valueOf(culateDjg.get("djgcsq").toString()));
-				} else {
-					interval.setDjg(0);
-				}
-				if(culateDjg.containsKey("djgcsz")){
-					interval.setDjgM(Integer.valueOf(culateDjg.get("djgcsz").toString()));
-				} else {
-					interval.setDjgM(0);
-				}
-				if(culateDjg.containsKey("djgcsw")){
-					interval.setDjgA(Integer.valueOf(culateDjg.get("djgcsw").toString()));
-				} else {
-					interval.setDjgA(0);
-				}
-				if(culateDjg.containsKey("djgsj")){
-					interval.setDjgTime(Integer.valueOf(culateDjg.get("djgsj").toString()));
-				} else {
-					interval.setDjgTime(0);
-				}
-			} else {
-				interval.setDjg(0);
-				interval.setDjgM(0);
-				interval.setDjgA(0);
-				interval.setDjgTime(0);
-			}
-			culcIntervalRepository.save(interval);
-        }*/
-		
         while(true){
 			int i = 0, l = 0;
 			boolean flag = false;
@@ -23,7 +23,6 @@ import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.entity.Line;
 import com.bsth.entity.calc.CalcBusMileage;
-import com.bsth.entity.calc.CalcInterval;
 import com.bsth.entity.calc.CalcLineMileage;
 import com.bsth.entity.calc.CalcStatistics;
 import com.bsth.entity.calc.CalcWaybill;
@@ -32,7 +31,6 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.sys.Interval;
 import com.bsth.repository.LineRepository;
 import com.bsth.repository.calc.CalcBusMileageRepository;
-import com.bsth.repository.calc.CalcIntervalRepository;
 import com.bsth.repository.calc.CalcLineMileageRepository;
 import com.bsth.repository.calc.CalcStatisticsRepository;
 import com.bsth.repository.calc.CalcWaybillRepository;
@@ -68,9 +66,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	private CalcWaybillRepository calcRepository;
 	@Autowired
-	private CalcIntervalRepository calcIntervalRepository;
-	
-	@Autowired
 	private CalcStatisticsRepository calcStatisticsRepository;
 	@Autowired
@@ -163,10 +158,8 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			}
 			if(date.length() != 0 && line.length() != 0){
 				calcRepository.deleteByDateAndLine(date, line);
-				//calcIntervalRepository.deleteByDateAndLine(date, line);
 			} else if(date.length() != 0){
 				calcRepository.deleteByDate(date);
-				//calcIntervalRepository.deleteByDate(date);
 			} else {
 				newMap.put("status", ResponseCode.ERROR);
 				logger.error("save erro.", "日期不能为空");
@@ -283,19 +276,15 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		List<String> keyList = new ArrayList<String>();
 		List<CalcWaybill> list = new ArrayList<CalcWaybill>();
 		List<CalcWaybill> lists = new ArrayList<CalcWaybill>();
-	//	List<CalcInterval> list_ = new ArrayList<CalcInterval>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		Map<String, List<CalcWaybill>> keyMap = new HashMap<String, List<CalcWaybill>>();
-	//	Map<String, List<CalcInterval>> keyMap_ = new HashMap<String, List<CalcInterval>>();
 		if(line.equals("")){
             //查询所有线路
             list = calcRepository.scheduleByDateAndLineTj(line,date,date2,gsdm,fgsdm);
-          //  list_ = calcIntervalRepository.selectByDateAndLine(line, date, date2, gsdm, fgsdm);
         }else{
             //查询单条线路
             list = calcRepository.scheduleByDateAndLineTj2(line,date,date2);
-         //  list_ = calcIntervalRepository.selectByDateAndLine(line, date, date2);
         }
 		for(CalcWaybill c : list){
@@ -306,12 +295,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			}
 			keyMap.get(key).add(c);
 		}
-		/*for(CalcInterval c : list_){
-			String key = c.getXlName();
-			if(!keyMap_.containsKey(key))
-				keyMap_.put(key, new ArrayList<CalcInterval>());
-			keyMap_.get(key).add(c);
-		}*/
 		Collections.sort(keyList, new AccountXlbmStr());
 		for(String key : keyList){
 			CalcWaybill calc = keyMap.get(key).get(0);
@@ -356,26 +339,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			calc.setSjfyylc(Arith.add(calc.getSjfyylc(), calc.getLjfyylc()));
 			lists.add(calc);
 		}
-		/*CalcInterval sum_ = new CalcInterval();
-		sum_.setXlName("合计");
-		sum_.setDjgTime(0);
-		for(String key : keyMap_.keySet()){
-			CalcInterval calc = keyMap_.get(key).get(0);
-			for(int i = 1; i < keyMap_.get(key).size(); i++){
-				CalcInterval calc_ = keyMap_.get(key).get(i);
-				calc.setDjg(calc.getDjg() + calc_.getDjg());
-				calc.setDjgM(calc.getDjgM() + calc_.getDjgM());
-				calc.setDjgA(calc.getDjgA() + calc_.getDjgA());
-				if(calc_.getDjgTime() > calc.getDjgTime())
-					calc.setDjgTime(calc_.getDjgTime());
-			}
-			sum_.setDjg(sum_.getDjg() + calc.getDjg());
-			sum_.setDjgM(sum_.getDjgM() + calc.getDjgM());
-			sum_.setDjgA(sum_.getDjgA() + calc.getDjgA());
-			if(calc.getDjgTime() > sum_.getDjgTime())
-				sum_.setDjgTime(calc.getDjgTime());
-		}*/
-		
 		CalcWaybill sum = new CalcWaybill();
 		sum.setXlName("合计");
 		for(CalcWaybill c : lists){
@@ -459,22 +422,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			m.put("dtbc", c.getDtbc());
 			m.put("dtbc_m", c.getDtbczgf());
 			m.put("dtbc_a", c.getDtbcwgf());
-			/*if(keyMap_.containsKey(c.getXlName()) || c.getXlName().equals("合计")){
-				CalcInterval calc;
-				if(c.getXlName().equals("合计"))
-					calc = sum_;
-				else
-					calc = keyMap_.get(c.getXlName()).get(0);
-				m.put("djg", calc.getDjg());
-				m.put("djg_m", calc.getDjgM());
-				m.put("djg_a", calc.getDjgA());
-				m.put("djg_time", calc.getDjgTime());
-			} else {
-				m.put("djg", 0);
-				m.put("djg_m", 0);
-				m.put("djg_a", 0);
-				m.put("djg_time", 0);
-			}*/
 			resList.add(m);
 		}
@@ -5285,20 +5285,22 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 		fcsjm = String.valueOf(fcsjActural_ - fcsj_);
                 	}
                 }
-                String[] dfsj_s =schedule.getDfsj().split(":");
-                Long dfsj_ = Long.parseLong(dfsj_s[0]) * 60 + Long.parseLong(dfsj_s[1]);
-                if ((dfsj_ - fcsjActural_) > 0) {
-                	if(dfsj_ - fcsjActural_>1200){
-                		dfsjm=String.valueOf(1440-(dfsj_ - fcsjActural_));
-                	}else{
-                		dfsjk = String.valueOf(dfsj_ - fcsjActural_);
-                	}
-                } else {
-                	if(fcsjActural_ - dfsj_>1200){
-                		dfsjk=  String.valueOf(1440-(fcsjActural_ - dfsj_));
-                	}else{
-                    	dfsjm = String.valueOf(fcsjActural_ - dfsj_);
-                	}
+                if(df.equals("df")){
+	                String[] dfsj_s =schedule.getDfsj().split(":");
+	                Long dfsj_ = Long.parseLong(dfsj_s[0]) * 60 + Long.parseLong(dfsj_s[1]);
+	                if ((dfsj_ - fcsjActural_) > 0) {
+	                	if(dfsj_ - fcsjActural_>1200){
+	                		dfsjm=String.valueOf(1440-(dfsj_ - fcsjActural_));
+	                	}else{
+	                		dfsjk = String.valueOf(dfsj_ - fcsjActural_);
+	                	}
+	                } else {
+	                	if(fcsjActural_ - dfsj_>1200){
+	                		dfsjk=  String.valueOf(1440-(fcsjActural_ - dfsj_));
+	                	}else{
+	                    	dfsjm = String.valueOf(fcsjActural_ - dfsj_);
+	                	}
+	                }
                 }
             }
             if(df.equals("df")){
@@ -852,12 +852,12 @@ public class ReportServiceImpl implements ReportService{
 		String sqlPc=" (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,ists,2 as xh FROM "
 				+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"' and "
 				+ " fcsj <='"+minfcsj+"'  and bc_type!='ldks'"
-				+ " and bc_type !='region') "
+				+ " and bc_type !='region' and bc_type !='venting' and bc_type !='major') "
 				+ " union "
 				+ " (SELECT jhlc,fcsj,bcsj,bc_type,lp,xl_dir,ists,1 as xh FROM "
 				+ " bsth_c_s_ttinfo_detail  where  ttinfo ='"+ttinfo+"'  and "
 				+ " fcsj > '"+minfcsj+"'  and bc_type!='ldks' "
-				+ " and bc_type !='region') "
+				+ " and bc_type !='region' and bc_type !='venting' and bc_type !='major') "
 				+ " order by  xh, lp,fcsj";
 		Map<String, Object> map=new HashMap<String,Object>();
 		List<Map<String, Object>> list= jdbcTemplate.query(sqlPc,