青浦充电量订单接入接口。

娄高锋
1 parent 4694ac94
Showing 4 changed files with 297 additions and 0 deletions
src/main/java/com/bsth/entity/JdlReception.java
src/main/java/com/bsth/repository/JdlReceptionRepository.java
src/main/java/com/bsth/repository/ScheduleRealInfoRepository.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;
+	}
+	
+}
 \ No newline at end of file
+package com.bsth.repository;
+
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import com.bsth.entity.JdlReception;
+
+@Repository
+public interface JdlReceptionRepository extends PagingAndSortingRepository<JdlReception, Integer>{
+	
+}
 \ No newline at end of file
@@ -59,4 +59,10 @@ public interface ScheduleRealInfoRepository extends PagingAndSortingRepository&lt;S
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
 	@Query("select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr=?1 and s.gsBm=?2 and s.updateDate>=?3")
 	List<ScheduleRealInfo> findByDateAndCompany(String schDate, String companyCode, Date timestamp);
+	
+	@Query("select s from ScheduleRealInfo s where s.clZbh = ?1 and s.scheduleDateStr = ?2 and s.realExecDate = ?3 order by fcsj asc")
+	List<ScheduleRealInfo> getFirstByClZbhAndScheduleDateStrAndRealExecDateOrderByFcsjAsc(String clZbh, String scheduleDateStr, String realExecDate);
+	
+	@Query("select s from ScheduleRealInfo s where s.clZbh = ?1 and s.scheduleDateStr >= ?2 and s.scheduleDateStr <= ?3 order by scheduleDateStr desc")
+	List<ScheduleRealInfo> getFirstByClZbhAndScheduleDateStrBetweenOrderByScheduleDateStrDesc(String clZbh, String scheduleDateStr1, String scheduleDateStr2);
 }
 package com.bsth.server_rs.electric;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.entity.JdlReception;
+import com.bsth.entity.ScheduleRealInfo;
+import com.bsth.repository.JdlReceptionRepository;
+import com.bsth.repository.ScheduleRealInfoRepository;
 import com.bsth.server_ws.electric_oil.entity.Electric;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,13 +12,20 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 /**
  * Created by panzhao on 2018/3/27.
@@ -27,6 +39,12 @@ public class ElectricService {
     @Autowired
     JdbcTemplate jdbcTemplate;
+    
+    @Autowired
+    JdlReceptionRepository jdlReceptionRepository;
+    
+    @Autowired
+    ScheduleRealInfoRepository scheduleRealInfoRepository;
     @GET
     @Path("/{company}/{rq}")
@@ -43,4 +61,56 @@ public class ElectricService {
         }
         return list;
     }
+    
+    @POST
+	@Path("/orderDataEnter")
+	public Map<String, Object> orderDataEnter(@RequestBody JSONObject body){
+		Map<String, Object> resMap = new HashMap<String, Object>();
+        try {
+        	System.out.println(body);
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			
+			String startTime = body.getString("startTime");
+			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.setStartTime(startTime);
+			jdlReception.setEndTime(endTime);
+			jdlReception.setStartSoc(body.getDouble("startSoc"));
+			jdlReception.setEndSoc(body.getDouble("endSoc"));
+			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.setOrigin(0);
+			jdlReception.setCreateBy("接口接入");
+			jdlReception.setCreateDate(new Date());
+			
+			String startDate = startTime.split(" ")[0];
+			
+			Date startTime_Date = df.parse(startTime);
+			Date endTime_Date = df.parse(endTime);
+			jdlReception.setDateStr(startDate);
+			jdlReception.setSumTime(Integer.valueOf(((endTime_Date.getTime() - startTime_Date.getTime()) / 60000)+""));
+			
+			jdlReceptionRepository.save(jdlReception);
+			
+			resMap.put("Status", 0);
+			resMap.put("msg", "成功");
+		}catch (Exception e){
+			logger.error("ElectricService.orderDataEnter", body);
+			logger.error("ElectricService.orderDataEnter", e);
+			resMap.put("Status", 1);
+			resMap.put("Msg", "内部错误");
+		}
+        return resMap;
+	}
 }