纯电车日报表统计电量和百公里能耗。

娄高锋
1 parent 79b3a7cd
Showing 4 changed files with 320 additions and 3 deletions
src/main/java/com/bsth/entity/oil/JdlReception.java
src/main/java/com/bsth/repository/oil/JdlReceptionRepository.java
src/main/java/com/bsth/service/impl/RefuelServiceImpl.java
src/main/resources/static/pages/forms/statement/refuelDc.html
+package com.bsth.entity.oil;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+--------------------------------------------------------
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `station_name` varchar(255) DEFAULT NULL COMMENT '站点名称',
+  `connector_id` varchar(255) DEFAULT NULL COMMENT '枪编号',
+  `order_no` varchar(255) DEFAULT NULL COMMENT '订单编号',
+  `start_time` varchar(255) DEFAULT NULL COMMENT '充电开始时间',
+  `end_time` varchar(255) DEFAULT NULL COMMENT '充电结束时间',
+  `start_soc` double(11,2) DEFAULT NULL COMMENT '开始 SOC(%)',
+  `end_soc` double(11,2) DEFAULT NULL COMMENT '结束 SOC(%)',
+  `stop_reason` varchar(255) DEFAULT NULL COMMENT '终止原因',
+  `charge_capacity` double(11,3) DEFAULT NULL COMMENT '充电量，单位：度',
+  `electric_charge` double(11,2) DEFAULT NULL COMMENT '电费，单位：元',
+  `service_charge` double(11,2) DEFAULT NULL COMMENT '服务费，单位：元',
+  `total_amount` double(11,2) DEFAULT NULL COMMENT '总费用，单位：元',
+  `vin_code` varchar(255) DEFAULT NULL COMMENT '卡号',
+  `card_no` varchar(255) DEFAULT NULL COMMENT 'VIN，车架号',
+  `car_code` varchar(255) DEFAULT NULL COMMENT '自编号',
+  `car_plate` varchar(255) DEFAULT NULL COMMENT '牌照号',
+  `date_str` varchar(255) DEFAULT NULL COMMENT '营运日期',
+  `origin` int(2) NOT NULL DEFAULT '0' COMMENT '数据源（0：接口获取；1：导入）',
+  `sum_time` bigint(11) DEFAULT NULL COMMENT '总计充电时间（分钟）',
+  `create_by` varchar(255) DEFAULT NULL COMMENT '创建人',
+  `create_date` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(255) DEFAULT NULL COMMENT '修改人',
+  `update_date` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+*/
+@Entity
+@Table(name = "bsth_c_jdl_reception")
+public class JdlReception {
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private	Long id;
+	private String stationName;
+	private String connectorId;
+	private String orderNo;
+	private String startTime;
+	private String endTime;
+	private Double startSoc;
+	private Double endSoc;
+	private String stopReason;
+	private Double chargeCapacity;
+	private Double electricCharge;
+	private Double serviceCharge;
+	private Double totalAmount;
+	private String vinCode;
+	private String cardNo;
+	private String carCode;
+	private String carPlate;
+	private String dateStr;
+	private Integer origin;
+	private Integer sumTime;
+	private String createBy;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date createDate;
+	private String updateBy;
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date updateDate;
+	
+	
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public String getStationName() {
+		return stationName;
+	}
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+	public String getConnectorId() {
+		return connectorId;
+	}
+	public void setConnectorId(String connectorId) {
+		this.connectorId = connectorId;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public String getStartTime() {
+		return startTime;
+	}
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
+	}
+	public String getEndTime() {
+		return endTime;
+	}
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
+	public Double getStartSoc() {
+		return startSoc;
+	}
+	public void setStartSoc(Double startSoc) {
+		this.startSoc = startSoc;
+	}
+	public Double getEndSoc() {
+		return endSoc;
+	}
+	public void setEndSoc(Double endSoc) {
+		this.endSoc = endSoc;
+	}
+	public String getStopReason() {
+		return stopReason;
+	}
+	public void setStopReason(String stopReason) {
+		this.stopReason = stopReason;
+	}
+	public Double getChargeCapacity() {
+		return chargeCapacity;
+	}
+	public void setChargeCapacity(Double chargeCapacity) {
+		this.chargeCapacity = chargeCapacity;
+	}
+	public Double getElectricCharge() {
+		return electricCharge;
+	}
+	public void setElectricCharge(Double electricCharge) {
+		this.electricCharge = electricCharge;
+	}
+	public Double getServiceCharge() {
+		return serviceCharge;
+	}
+	public void setServiceCharge(Double serviceCharge) {
+		this.serviceCharge = serviceCharge;
+	}
+	public Double getTotalAmount() {
+		return totalAmount;
+	}
+	public void setTotalAmount(Double totalAmount) {
+		this.totalAmount = totalAmount;
+	}
+	public String getVinCode() {
+		return vinCode;
+	}
+	public void setVinCode(String vinCode) {
+		this.vinCode = vinCode;
+	}
+	public String getCardNo() {
+		return cardNo;
+	}
+	public void setCardNo(String cardNo) {
+		this.cardNo = cardNo;
+	}
+	public String getCarCode() {
+		return carCode;
+	}
+	public void setCarCode(String carCode) {
+		this.carCode = carCode;
+	}
+	public String getCarPlate() {
+		return carPlate;
+	}
+	public void setCarPlate(String carPlate) {
+		this.carPlate = carPlate;
+	}
+	public String getDateStr() {
+		return dateStr;
+	}
+	public void setDateStr(String dateStr) {
+		this.dateStr = dateStr;
+	}
+	public Integer getOrigin() {
+		return origin;
+	}
+	public void setOrigin(Integer origin) {
+		this.origin = origin;
+	}
+	public Integer getSumTime() {
+		return sumTime;
+	}
+	public void setSumTime(Integer sumTime) {
+		this.sumTime = sumTime;
+	}
+	public String getCreateBy() {
+		return createBy;
+	}
+	public void setCreateBy(String createBy) {
+		this.createBy = createBy;
+	}
+	public Date getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+	public String getUpdateBy() {
+		return updateBy;
+	}
+	public void setUpdateBy(String updateBy) {
+		this.updateBy = updateBy;
+	}
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+	
+}
 \ No newline at end of file
+package com.bsth.repository.oil;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import com.bsth.entity.oil.JdlReception;
+
+@Repository
+public interface JdlReceptionRepository extends PagingAndSortingRepository<JdlReception, Integer>{
+	
+	@Query(value="SELECT j FROM JdlReception j where j.dateStr = ?")
+	List<JdlReception> queryListByDateStr(String dateStr);
+	
+}
 \ No newline at end of file
@@ -2,10 +2,13 @@ package com.bsth.service.impl;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Refuel;
+import com.bsth.entity.oil.JdlReception;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.RefuelRepository;
+import com.bsth.repository.oil.JdlReceptionRepository;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.RefuelService;
 import com.bsth.service.report.CulateMileageService;
@@ -43,6 +46,12 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 	@Autowired
 	private RefuelRepository repository;
+
+	@Autowired
+	private JdlReceptionRepository jdlReceptionRepository;
+
+	@Autowired
+	private ScheduleRealInfoRepository scheduleRealInfoRepository;
 	@Autowired
 	private CulateMileageService culateMileageService;
@@ -903,12 +912,13 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			m.put("in", "");
 			m.put("jdl", "");
 			m.put("hdl", "");
+			m.put("bglnh", "");
+			m.put("consume", "");
 			m.put("realMileage", realMileage);
 			m.put("ksMileage", ksMileage);
 			m.put("ssMileage", ssMileage);
 			m.put("ljgl", ljgl);
 			m.put("sjssgl", Arith.sub(ssMileage, ljgl)); // 实际损失公里（损失公里-加车公里，20250808青浦巴士工单）
-			m.put("consume", "");
 			m.put("bc", bc);
 			m.put("yybc", Integer.valueOf(sjbc)+Integer.valueOf(ljbc));
 			m.put("jhbc", jhbc);
@@ -928,12 +938,12 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		lastMap.put("in", "");
 		lastMap.put("jdl", "");
 		lastMap.put("hdl", "");
+		lastMap.put("consume", "");
 		lastMap.put("realMileage", realMileage_z);
 		lastMap.put("ksMileage", ksMileage_z);
 		lastMap.put("ssMileage", ssMileage_z);
 		lastMap.put("ljgl", ljgl_z);
 		lastMap.put("sjssgl", Arith.sub(ssMileage_z, ljgl_z)+""); // 实际损失公里（损失公里-加车公里，20250808青浦巴士工单）
-		lastMap.put("consume", "");
 		lastMap.put("bc", bc_z);
 		lastMap.put("yybc", yybc_z);
 		lastMap.put("jhbc", jhbc_z);
@@ -941,6 +951,78 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		lastMap.put("cr", cr_z);
 		lastMap.put("remark", "");
+//		Map<String, Double> mileageMap = new HashMap<String, Double>();
+		Set<String> carSet = new HashSet<String>();
+		for(Map<String, Object> m : resList){ // 合计还未添加进去前
+			String carCode = m.get("car").toString();
+			carSet.add(carCode);
+		}
+		
+		List<ScheduleRealInfo> scheduleDayList = scheduleRealInfoRepository.findByDate(date);
+		Map<String, List<ScheduleRealInfo>> scheduleDayMap = new HashMap<String, List<ScheduleRealInfo>>();
+		for(ScheduleRealInfo s : scheduleDayList){
+			String carCode = s.getClZbh();
+			if(carSet.contains(carCode) && !scheduleDayMap.containsKey(carCode)){
+				scheduleDayMap.put(carCode, new ArrayList<ScheduleRealInfo>());
+			}
+			scheduleDayMap.get(carCode).add(s);
+		}
+		Map<String, Double> mileageMap = new HashMap<String, Double>();
+		for(String carCode : scheduleDayMap.keySet()){
+			List<ScheduleRealInfo> tempList = scheduleDayMap.get(carCode);
+			Double sjgl = culateMileageService.culateSjgl(tempList);
+			Double ksgl = culateMileageService.culateKsgl(tempList);
+			Double jccgl = culateMileageService.culateJccgl(tempList);
+			Double ljgl = culateMileageService.culateLjgl(tempList);
+			Double realMileage = Arith.add(Arith.add(sjgl, ksgl), Arith.add(jccgl, ljgl));
+			mileageMap.put(carCode, realMileage);
+		}
+		
+		List<JdlReception> queryListByDateStr = jdlReceptionRepository.queryListByDateStr(date);
+		Map<String, Double> jdlMap = new HashMap<String, Double>();
+		for(JdlReception j : queryListByDateStr){
+			if(j.getCarCode() != null && j.getCarCode().trim().length() > 0
+					&& j.getChargeCapacity() != null){
+				String carCode = j.getCarCode().trim();
+				if(carSet.contains(carCode) && !jdlMap.containsKey(carCode)){
+					jdlMap.put(carCode, 0d);
+				}
+				jdlMap.put(carCode, Arith.add(jdlMap.get(carCode), j.getChargeCapacity()));
+			}
+		}
+		
+		String nh_z = "";
+		for(Map<String, Object> m : resList){
+			if(m.containsKey("realMileage") && m.get("realMileage").toString().length() > 0){
+				String realMileage = m.get("realMileage").toString();
+				String carCode = m.get("car").toString();
+				if(mileageMap.containsKey(carCode) && jdlMap.containsKey(carCode)){
+					Double mileageAll = mileageMap.get(carCode);
+					Double jdlAll = jdlMap.get(carCode);
+					if(Arith.compareTo(mileageAll, 0D) == 1){
+						double nh = Arith.mul(jdlAll, Arith.div(realMileage, mileageAll, 3));
+						nh = Arith.round(nh, 3);
+						m.put("jdl", nh);
+						m.put("hdl", nh);
+						
+						if(Arith.compareTo(realMileage, 0D) == 1){
+							double bglnh = Arith.mul(Arith.div(nh, realMileage, 5), 100);
+							m.put("consume", bglnh);
+						}
+						
+						nh_z = Arith.add(nh_z.length() == 0?0D:nh_z, nh) + "";
+					}
+				}
+			}
+		}
+		
+		lastMap.put("jdl", nh_z);
+		lastMap.put("hdl", nh_z);
+		if(nh_z.length() > 0 && realMileage_z.length() > 0 && Arith.compareTo(realMileage_z, 0D) == 1){
+			double bglnh = Arith.mul(Arith.div(nh_z, realMileage_z, 5), 100);
+			lastMap.put("consume", bglnh);
+		}
+		
 		resList.add(lastMap);
 		return resList;
@@ -229,7 +229,7 @@
 			<td></td>
 			<td>{{obj.jdl}}</td>
 			<td>{{obj.hdl}}</td>
-			<td></td>
+			<td>{{obj.consume}}</td>
 			<td>{{obj.realMileage}}</td>
 			<td>{{obj.ksMileage}}</td>
 			<td>{{obj.sjssgl}}</td>