对接浙江平台

2026-04-21 03:25:12 +08:00 · 2024-08-07 16:34:34 +08:00
parent 08226606ff
commit 7dc343ad39
8 changed files with 26 additions and 31 deletions
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java
@@ -9,8 +9,6 @@ import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.jsowell.common.constant.Constants;
-import com.jsowell.pile.thirdparty.ConnectorInfo;
-import com.jsowell.pile.thirdparty.EquipmentInfo;
 import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
 import com.jsowell.common.enums.lianlian.LianLianPileStatusEnum;
 import com.jsowell.common.enums.lianlian.PayChannelEnum;
@@ -30,6 +28,9 @@ import com.jsowell.pile.domain.*;
 import com.jsowell.pile.domain.ykcCommond.StartChargingCommand;
 import com.jsowell.pile.dto.*;
 import com.jsowell.pile.service.*;
+import com.jsowell.pile.thirdparty.CommonParamsDTO;
+import com.jsowell.pile.thirdparty.ConnectorInfo;
+import com.jsowell.pile.thirdparty.EquipmentInfo;
 import com.jsowell.pile.util.MerchantUtils;
 import com.jsowell.pile.vo.base.*;
 import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
@@ -40,16 +41,15 @@ import com.jsowell.pile.vo.web.PileModelInfoVO;
 import com.jsowell.pile.vo.web.PileStationVO;
 import com.jsowell.thirdparty.common.CommonService;
 import com.jsowell.thirdparty.lianlian.domain.*;
-import com.jsowell.pile.thirdparty.CommonParamsDTO;
 import com.jsowell.thirdparty.lianlian.service.LianLianService;
+import com.jsowell.thirdparty.lianlian.vo.*;
 import com.jsowell.thirdparty.platform.common.ChargeDetail;
 import com.jsowell.thirdparty.platform.common.OrderInfo;
-import com.jsowell.thirdparty.platform.common.publicinfo.StationInfo;
+import com.jsowell.thirdparty.platform.common.StationInfo;
 import com.jsowell.thirdparty.platform.util.Cryptos;
 import com.jsowell.thirdparty.platform.util.Encodes;
 import com.jsowell.thirdparty.platform.util.GBSignUtils;
 import com.jsowell.thirdparty.platform.util.HttpRequestUtil;
-import com.jsowell.thirdparty.lianlian.vo.*;
 import com.jsowell.thirdparty.yongchengboche.dto.YCBCGetTokenDTO;
 import com.jsowell.thirdparty.yongchengboche.service.YCBCService;
 import org.apache.commons.collections4.CollectionUtils;
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/StationInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/StationInfo.java
@@ -3,6 +3,7 @@ package com.jsowell.thirdparty.platform.common;

 import com.alibaba.fastjson2.annotation.JSONField;
 import com.jsowell.pile.thirdparty.EquipmentInfo;
+import com.jsowell.pile.thirdparty.publicinfo.BaseStationInfo;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -14,11 +15,11 @@ import java.util.List;
 /**
 * 充电站信息
 */
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
@Data
-public class StationInfo extends com.jsowell.thirdparty.platform.common.publicinfo.StationInfo {
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class StationInfo extends BaseStationInfo {
    /**
     * 充电站ID  Y
     * 对接平台自定义的唯一编码
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/publicinfo/OperatorInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/publicinfo/OperatorInfo.java
@@ -1,65 +0,0 @@
-package com.jsowell.thirdparty.platform.common.publicinfo;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 公共信息对象-基础设施运营商信息
- * 中电联协议定义
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-public class OperatorInfo {
-    /**
-     * 运营商ID  Y
-     * 组织机构代码
-     * 9字符
-     */
-    @JSONField(name = "OperatorID")
-    private String operatorID;
-
-    /**
-     * 运营商名称  Y
-     * 机构全称
-     * <=64字符
-     */
-    @JSONField(name = "OperatorName")
-    private String operatorName;
-
-    /**
-     * 运营商电话1  Y
-     * 运营商客服电话1
-     * <=32字符
-     */
-    @JSONField(name = "OperatorTel1")
-    private String operatorTel1;
-
-    /**
-     * 运营商电话2  N
-     * 运营商客服电话2
-     * <=32字符
-     */
-    @JSONField(name = "OperatorTel2")
-    private String operatorTel2;
-
-    /**
-     * 运营商注册地址  N
-     * 运营商注册地址
-     * <=64字符
-     */
-    @JSONField(name = "OperatorRegAddress")
-    private String operatorRegAddress;
-
-    /**
-     * 备注  N
-     * 备注信息
-     * <=255字符
-     */
-    @JSONField(name = "OperatorNote")
-    private String operatorNote;
-}
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/publicinfo/StationInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/publicinfo/StationInfo.java
@@ -1,259 +0,0 @@
-package com.jsowell.thirdparty.platform.common.publicinfo;
-
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.jsowell.pile.thirdparty.EquipmentInfo;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * 公共信息对象-充电站信息
- * 中电联协议定义
- */
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@Data
-public class StationInfo {
-    /**
-     * 充电站ID  Y
-     * 对接平台自定义的唯一编码
-     * <=20字符
-     */
-    @JSONField(name = "StationID")
-    private String stationID;
-
-    /**
-     * 运营商ID  Y
-     * 运营商ID
-     * 9字符
-     */
-    @JSONField(name = "OperatorID")
-    private String operatorID;
-
-    /**
-     * 设备所属运营商ID  Y
-     * 设备所属运营商组织机构代码
-     * 9字符
-     */
-    @JSONField(name = "EquipmentOwnerID")
-    private String equipmentOwnerID;
-
-    /**
-     * 充电站名称  Y
-     * 充电站名称的描述
-     * <=50字符
-     */
-    @JSONField(name = "StationName")
-    private String stationName;
-
-    /**
-     * 充电站国家代码  Y
-     * 比如CN
-     * 2字符
-     */
-    @JSONField(name = "CountryCode")
-    private String countryCode;
-
-    /**
-     * 充电站省市辖区编码  Y
-     * 填写内容为参照GB/T 2260-2007
-     * 20字符
-     */
-    @JSONField(name = "AreaCode")
-    private String areaCode;
-
-    /**
-     * 详细地址  Y
-     * <=50字符
-     */
-    @JSONField(name = "Address")
-    private String address;
-
-    /**
-     * 站点电话  Y
-     * 能够联系场站工作人员进行协助的联系电话
-     * <=30字符
-     */
-    @JSONField(name = "StationTel")
-    private String stationTel;
-
-    /**
-     * 服务电话  Y
-     * 平台服务电话,例如400的电话
-     * <=30字符
-     */
-    @JSONField(name = "ServiceTel")
-    private String serviceTel;
-
-    /**
-     * 站点类型  Y
-     * 1-公共
-     * 50-个人
-     * 100-公交（专用）
-     * 101-环卫（专用）
-     * 102-物流（专用）
-     * 103-出租车（专用）
-     * 104-分时租赁（专用）
-     * 105-小区共享（专用）
-     * 106-单位（专用）
-     * 255-其他
-     */
-    @JSONField(name = "StationType")
-    private Integer stationType;
-
-    /**
-     * 站点状态  Y
-     * 0：未知
-     * 1：建设中
-     * 5：关闭下线
-     * 6：维护中
-     * 50：正常使用
-     */
-    @JSONField(name = "StationStatus")
-    private Integer stationStatus;
-
-    /**
-     * 车位数量  Y
-     * 可停放进行充电的车位总数(默认：0-未知)
-     */
-    @JSONField(name = "ParkNums")
-    private int parkNums;
-
-    /**
-     * 经度  Y
-     * GCJ-02坐标系
-     * 保留小数点后6位
-     */
-    @JSONField(name = "StationLng")
-    private BigDecimal stationLng;
-
-    /**
-     * 纬度  Y
-     * GCJ-02坐标系
-     * 保留小数点后6位
-     */
-    @JSONField(name = "StationLat")
-    private BigDecimal stationLat;
-
-    /**
-     * 站点引导  N
-     * 描述性文字，用于引导车主找到充电车位
-     * <=100字符
-     */
-    @JSONField(name = "SiteGuide")
-    private String siteGuide;
-
-    /**
-     * 建设场所  Y
-     * 1：居民区
-     * 2：公共机构
-     * 3：企事业单位
-     * 4：写字楼
-     * 5：工业园区
-     * 6：交通枢纽
-     * 7：大型文体设施
-     * 8：城市绿地
-     * 9：大型建筑配建停车场
-     * 10：路边停车位
-     * 11：城际高速服务区
-     * 12：风景区
-     * 13：公交场站
-     * 14：加油加气站
-     * 15：出租车
-     * 255：其他
-     */
-    @JSONField(name = "Construction")
-    private Integer construction;
-
-    /**
-     * 站点照片  N
-     * 充电设备照片、充电车位照片、停车场入口照片
-     */
-    @JSONField(name = "Pictures")
-    private List<String> pictures;
-
-    /**
-     * 使用车型描述  N
-     * 描述该站点接受的车大小以及类型，如大巴、物流车、私家乘用车、出租车等
-     * <=100字符
-     */
-    @JSONField(name = "MatchCars")
-    private String matchCars;
-
-    /**
-     * 车位楼层及数量描述  N
-     * 车位楼层以及数量信息
-     * <=100字符
-     */
-    @JSONField(name = "ParkInfo")
-    private String parkInfo;
-
-    /**
-     * 营业时间  N
-     * 营业时间描述,推荐格式：周一至周日00:00-24:00
-     * <=100字符
-     */
-    @JSONField(name = "BusineHours")
-    private String busineHours;
-
-    /**
-     * 充电电费率  N
-     * 充电费描述,推荐格式：XX 元/度
-     * <=256字符
-     */
-    @JSONField(name = "ElectricityFee")
-    private String electricityFee;
-
-    /**
-     * 服务费率  N
-     * 服务费率描述,推荐格式：XX 元/度
-     * <=100字符
-     */
-    @JSONField(name = "ServiceFee")
-    private String serviceFee;
-
-    /**
-     * 停车费  N
-     * 停车费率描述
-     * <=100字符
-     */
-    @JSONField(name = "ParkFree")
-    private Integer parkFree;
-
-    /**
-     * 支付方式  N
-     * 支付方式:刷卡、线上、现金  其中电子钱包类卡为刷卡，身份鉴权卡、微信/ 支付宝、APP为线上
-     * <=20字符
-     */
-    @JSONField(name = "Payment")
-    private String payment;
-
-    /**
-     * 是否支持预约  N
-     * 充电设备是否需要提前预约后才能使用。(0-不支持预约;1-支持预约)  不填默认为0
-     */
-    @JSONField(name = "SupportOrder")
-    private int supportOrder;
-
-    /**
-     * 备注  N
-     * 其他备注信息
-     * <=100字符
-     */
-    @JSONField(name = "Remark")
-    private String remark;
-
-    /**
-     * 充电设备信息列表  Y
-     * 该充电站所有充电设备信息对象集合
-     */
-    @JSONField(name = "EquipmentInfos")
-    private List<EquipmentInfo> equipmentInfos;
-
-}
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupStationInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupStationInfo.java
@@ -1,17 +1,13 @@
 package com.jsowell.thirdparty.platform.domain;

 import com.alibaba.fastjson2.annotation.JSONField;
-import com.jsowell.thirdparty.platform.common.publicinfo.StationInfo;
-import lombok.AllArgsConstructor;
+import com.jsowell.thirdparty.platform.common.StationInfo;
 import lombok.Data;
-import lombok.NoArgsConstructor;

 /**
 * 内蒙古平台站点信息
 */
@Data
-@AllArgsConstructor
-@NoArgsConstructor
 public class SupStationInfo extends StationInfo {
    /**
     * 充换电站唯一编码
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java
@@ -37,11 +37,11 @@ import com.jsowell.pile.vo.web.PileConnectorInfoVO;
 import com.jsowell.pile.vo.web.PileStationVO;
 import com.jsowell.thirdparty.lianlian.domain.*;
 import com.jsowell.thirdparty.lianlian.vo.*;
-import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
 import com.jsowell.thirdparty.platform.common.ChargeDetail;
 import com.jsowell.thirdparty.platform.common.OrderInfo;
-import com.jsowell.thirdparty.platform.common.publicinfo.StationInfo;
+import com.jsowell.thirdparty.platform.common.StationInfo;
 import com.jsowell.thirdparty.platform.factory.ThirdPartyPlatformFactory;
+import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
 import com.jsowell.thirdparty.platform.util.*;
 import com.jsowell.thirdparty.service.ThirdpartySecretInfoService;
 import org.apache.commons.collections4.CollectionUtils;
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java
@@ -39,10 +39,10 @@ import com.jsowell.thirdparty.lianlian.domain.ConnectorChargeStatusInfo;
 import com.jsowell.thirdparty.lianlian.domain.ConnectorStatusInfo;
 import com.jsowell.thirdparty.lianlian.domain.StationStatusInfo;
 import com.jsowell.thirdparty.lianlian.vo.AccessTokenVO;
-import com.jsowell.thirdparty.platform.common.publicinfo.StationInfo;
+import com.jsowell.thirdparty.platform.common.StationInfo;
 import com.jsowell.thirdparty.platform.domain.*;
-import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
 import com.jsowell.thirdparty.platform.factory.ThirdPartyPlatformFactory;
+import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
 import com.jsowell.thirdparty.platform.util.Cryptos;
 import com.jsowell.thirdparty.platform.util.HttpRequestUtil;
 import com.jsowell.thirdparty.platform.util.ThirdPartyPlatformUtils;
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ShenZhenPlatformServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ShenZhenPlatformServiceImpl.java
@@ -30,14 +30,18 @@ import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
 import com.jsowell.pile.vo.web.OrderListVO;
 import com.jsowell.pile.vo.web.PileConnectorInfoVO;
 import com.jsowell.pile.vo.web.PileStationVO;
-import com.jsowell.thirdparty.lianlian.domain.*;
+import com.jsowell.thirdparty.lianlian.domain.ConnectorChargeStatusInfo;
+import com.jsowell.thirdparty.lianlian.domain.ConnectorStatusInfo;
+import com.jsowell.thirdparty.lianlian.domain.StationStatusInfo;
 import com.jsowell.thirdparty.lianlian.vo.AccessTokenVO;
-import com.jsowell.thirdparty.platform.common.publicinfo.StationInfo;
+import com.jsowell.thirdparty.platform.common.StationInfo;
 import com.jsowell.thirdparty.platform.domain.BMSInfo;
 import com.jsowell.thirdparty.platform.domain.StationChargeStatsInfo;
 import com.jsowell.thirdparty.platform.factory.ThirdPartyPlatformFactory;
 import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
-import com.jsowell.thirdparty.platform.util.*;
+import com.jsowell.thirdparty.platform.util.Cryptos;
+import com.jsowell.thirdparty.platform.util.HttpRequestUtil;
+import com.jsowell.thirdparty.platform.util.ThirdPartyPlatformUtils;
 import com.jsowell.thirdparty.service.ThirdpartySecretInfoService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;