1.

王通
2 parents 3df97e6b 14977d1b
Showing 3 changed files with 231 additions and 220 deletions
src/main/java/com/bsth/entity/JdlReception.java
src/main/java/com/bsth/repository/JdlReceptionRepository.java
src/main/java/com/bsth/server_rs/electric/ElectricService.java
-package com.bsth.entity;
-
-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 '车牌号',
-  `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 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 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;
-	}
-	
+package com.bsth.entity;
+
+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 '车牌号',
+  `car_code` 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 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 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;
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
@@ -8,4 +11,7 @@ import com.bsth.entity.JdlReception;
 @Repository
 public interface JdlReceptionRepository extends PagingAndSortingRepository<JdlReception, Integer>{
+	@Query("SELECT inside_code from bsth_c_cars where REPLACE(car_plate, '-', '') = ?1 and scrap_state = 0 order by create_date desc ")
+	List<Object[]> selectNbbmByPlate(String carPlate);
+	
 }
@@ -75,21 +75,26 @@ public class ElectricService {
 			String endTime = body.getString("endTime");
 			JdlReception jdlReception = new JdlReception();
-			jdlReception.setStationName(body.getString("stationName"));
 			jdlReception.setConnectorId(body.getString("connectorId"));
-			jdlReception.setOrderNo(body.getString("orderNo"));
+			jdlReception.setOrderNo(body.getString("startChargeSeq"));
 			jdlReception.setStartTime(startTime);
 			jdlReception.setEndTime(endTime);
-			jdlReception.setStartSoc(body.getDouble("startSoc"));
-			jdlReception.setEndSoc(body.getDouble("endSoc"));
+			jdlReception.setChargeCapacity(body.getDouble("totalPower"));
+			jdlReception.setElectricCharge(body.getDouble("totalElecMoney"));
+			jdlReception.setServiceCharge(body.getDouble("totalSeviceMoney"));
+			jdlReception.setTotalAmount(body.getDouble("totalMoney"));
 			jdlReception.setStopReason(body.getString("stopReason"));
-			jdlReception.setChargeCapacity(body.getDouble("chargeCapacity"));
-			jdlReception.setElectricCharge(body.getDouble("electricCharge"));
-			jdlReception.setServiceCharge(body.getDouble("serviceCharge"));
-			jdlReception.setTotalAmount(body.getDouble("totalAmount"));
-			jdlReception.setVinCode(body.getString("vinCode"));
-			jdlReception.setCardNo(body.getString("cardNo"));
-			jdlReception.setCarCode(body.getString("carCode"));
+			jdlReception.setStationName(body.getString("sumPeriod")); // 时段数
+			jdlReception.setVinCode(body.getString("vinCode")); // 车架号
+			jdlReception.setCardNo(body.getString("carPlate")); // 车牌号
+			List<Object[]> selectNbbmByPlate = jdlReceptionRepository.selectNbbmByPlate(jdlReception.getCardNo().replaceAll("-", ""));
+			if(selectNbbmByPlate.size() > 0){
+				jdlReception.setCarCode(selectNbbmByPlate.get(0)[0].toString()); // 车辆自编号
+			} else {
+				resMap.put("Status", 1);
+				resMap.put("Msg", "该车牌号在系统中找不到相应车辆");
+				return resMap;
+			}
 			jdlReception.setOrigin(0);
 			jdlReception.setCreateBy("接口接入");
 			jdlReception.setCreateDate(new Date());