潘钊 / control_service_data_Interface · Commits

Commit 71e3176e95726ee8f169b0b3272d61023a011880

Authored by 娄高锋
1 parent 0aa930c1
build: skipped

青浦电量接口添加充电站名称与充电站ID字段。

Inline Side-by-side
Showing 2 changed files with 16 additions and 3 deletions
src/main/java/com/bsth/entity/JdlReception.java
  View file @71e3176
@@ -64,6 +64,7 @@ public class JdlReception { @@ -64,6 +64,7 @@ public class JdlReception {
64 private Integer sumTime; 64 private Integer sumTime;
65 private String operatorName; 65 private String operatorName;
66 private String operatorId; 66 private String operatorId;
  67 + private String stationId;
67 private String createBy; 68 private String createBy;
68 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 69 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
69 private Date createDate; 70 private Date createDate;
@@ -204,6 +205,12 @@ public class JdlReception { @@ -204,6 +205,12 @@ public class JdlReception {
204 public void setOperatorId(String operatorId) { 205 public void setOperatorId(String operatorId) {
205 this.operatorId = operatorId; 206 this.operatorId = operatorId;
206 } 207 }
  208 + public String getStationId() {
  209 + return stationId;
  210 + }
  211 + public void setStationId(String stationId) {
  212 + this.stationId = stationId;
  213 + }
207 public String getCreateBy() { 214 public String getCreateBy() {
208 return createBy; 215 return createBy;
209 } 216 }
src/main/java/com/bsth/server_rs/electric/ElectricService.java
  View file @71e3176
@@ -75,7 +75,6 @@ public class ElectricService { @@ -75,7 +75,6 @@ public class ElectricService {
75 String endTime = body.getString("endTime"); 75 String endTime = body.getString("endTime");
76 76
77 JdlReception jdlReception = new JdlReception(); 77 JdlReception jdlReception = new JdlReception();
78 - jdlReception.setStationName(body.getString("stationName"));  
79 jdlReception.setConnectorId(body.getString("connectorId")); 78 jdlReception.setConnectorId(body.getString("connectorId"));
80 jdlReception.setOrderNo(body.getString("startChargeSeq")); 79 jdlReception.setOrderNo(body.getString("startChargeSeq"));
81 jdlReception.setStartTime(startTime); 80 jdlReception.setStartTime(startTime);
@@ -91,11 +90,18 @@ public class ElectricService { @@ -91,11 +90,18 @@ public class ElectricService {
91 jdlReception.setCardNo(body.getString("cardNo")); 90 jdlReception.setCardNo(body.getString("cardNo"));
92 jdlReception.setCarCode(body.getString("carCode")); 91 jdlReception.setCarCode(body.getString("carCode"));
93 jdlReception.setCarPlate(body.getString("carPlate")); 92 jdlReception.setCarPlate(body.getString("carPlate"));
94 - if(body.containsKey("operatorName")){ 93 + if(body.containsKey("operatorName") && body.get("operatorName") != null){
95 jdlReception.setOperatorName(body.getString("operatorName")); 94 jdlReception.setOperatorName(body.getString("operatorName"));
96 - }if(body.containsKey("operatorId")){ 95 + }
  96 + if(body.containsKey("operatorId") && body.get("operatorId") != null){
97 jdlReception.setOperatorId(body.getString("operatorId")); 97 jdlReception.setOperatorId(body.getString("operatorId"));
98 } 98 }
  99 + if(body.containsKey("stationName") && body.get("stationName") != null){
  100 + jdlReception.setStationName(body.getString("stationName"));
  101 + }
  102 + if(body.containsKey("stationId") && body.get("stationId") != null){
  103 + jdlReception.setStationId(body.getString("stationId"));
  104 + }
99 jdlReception.setOrigin(0); 105 jdlReception.setOrigin(0);
100 jdlReception.setCreateBy("接口接入"); 106 jdlReception.setCreateBy("接口接入");
101 jdlReception.setCreateDate(new Date()); 107 jdlReception.setCreateDate(new Date());