Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/domain/ThirdPartySettingInfo.java

@@ -25,6 +25,12 @@ public class ThirdPartySettingInfo extends BaseEntity {
     @Excel(name = "对接类型", readConverterExp = "1=-联联平台")
     private String type;
 
+    /**
+     * 对接平台url地址
+     */
+    @Excel(name = "url地址")
+    private String urlAddress;
+
     /**
      * 站点id
      */
@@ -82,6 +88,14 @@ public class ThirdPartySettingInfo extends BaseEntity {
         return type;
     }
 
+    public String getUrlAddress() {
+        return urlAddress;
+    }
+
+    public void setUrlAddress(String urlAddress) {
+        this.urlAddress = urlAddress;
+    }
+
     public void setStationId(Long stationId) {
         this.stationId = stationId;
     }
@@ -143,6 +157,7 @@ public class ThirdPartySettingInfo extends BaseEntity {
         return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)
                 .append("id", getId())
                 .append("type", getType())
+                .append("urlAddress", getType())
                 .append("stationId", getStationId())
                 .append("operatorId", getOperatorId())
                 .append("operatorSecret", getOperatorSecret())

jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java

@@ -153,10 +153,10 @@ public interface IOrderBasicInfoService {
 
 	/**
 	 * 获取充电实时数据
-	 * @param orderCode 订单编号
+	 * @param transactionCode 交易流水号
 	 * @return
 	 */
-	List<RealTimeMonitorData> getChargingRealTimeData(String orderCode);
+	List<RealTimeMonitorData> getChargingRealTimeData(String transactionCode);
 
 	/**
 	 * 首页订单数据展示

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartySettingInfoServiceImpl.java

@@ -113,6 +113,7 @@ public class ThirdPartySettingInfoServiceImpl implements IThirdPartySettingInfoS
             return insertThirdPartySettingInfo(info);
         }else {
             // 修改
+            info.setId(infoByStationId.getId());
             return updateThirdPartySettingInfo(info);
         }
     }