对接浙江平台

jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/publicinfo/BaseOperatorInfo.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.platform.common.publicinfo;
+package com.jsowell.pile.thirdparty.publicinfo;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.AllArgsConstructor;
@@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class OperatorInfo {
+public class BaseOperatorInfo {
     /**
      * 运营商ID  Y
      * 组织机构代码

jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/publicinfo/BaseStationInfo.java

@@ -1,12 +1,9 @@
-package com.jsowell.thirdparty.platform.common.publicinfo;
+package com.jsowell.pile.thirdparty.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;
@@ -15,11 +12,8 @@ import java.util.List;
  * 公共信息对象-充电站信息
  * 中电联协议定义
  */
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
 @Data
-public class StationInfo {
+public class BaseStationInfo {
     /**
      * 充电站ID  Y
      * 对接平台自定义的唯一编码

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;

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
      * 对接平台自定义的唯一编码

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 {
     /**
      * 充换电站唯一编码

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;

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;

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;