update 接口格式

jsowell-admin/src/main/java/com/jsowell/api/thirdparty/DianXingPlatformController.java

@@ -4,7 +4,7 @@ import com.jsowell.common.annotation.Anonymous;
 import com.jsowell.common.core.controller.BaseController;
 import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.response.RestApiResponse;
-import com.jsowell.thirdparty.platform.ThirdPartyPlatformService;
+import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.*;

jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HaiNanPlatformController.java

@@ -18,7 +18,7 @@ import com.jsowell.pile.thirdparty.CommonParamsDTO;
 import com.jsowell.thirdparty.lianlian.common.CommonResult;
 import com.jsowell.thirdparty.platform.util.Cryptos;
 import com.jsowell.thirdparty.platform.util.Encodes;
-import com.jsowell.thirdparty.platform.ThirdPartyPlatformService;
+import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.*;

jsowell-admin/src/main/java/com/jsowell/api/thirdparty/LianLianController.java

@@ -11,7 +11,7 @@ import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.dto.*;
 import com.jsowell.pile.thirdparty.CommonParamsDTO;
 import com.jsowell.thirdparty.lianlian.common.CommonResult;
-import com.jsowell.thirdparty.platform.ThirdPartyPlatformService;
+import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.*;

jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NMGController.java

@@ -8,7 +8,7 @@ import com.jsowell.pile.dto.QueryOperatorInfoDTO;
 import com.jsowell.pile.dto.QueryStationInfoDTO;
 import com.jsowell.pile.thirdparty.CommonParamsDTO;
 import com.jsowell.thirdparty.lianlian.common.CommonResult;
-import com.jsowell.thirdparty.platform.ThirdPartyPlatformService;
+import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.PostMapping;

jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NingXiaController.java

@@ -0,0 +1,22 @@
+package com.jsowell.api.thirdparty;
+
+import com.jsowell.common.annotation.Anonymous;
+import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 宁夏平台Controller
+ */
+@Anonymous
+@RestController
+@RequestMapping("/ningxia")
+public class NingXiaController extends ThirdPartyBaseController {
+    @Autowired
+    @Qualifier("ninaXiaPlatformServiceImpl")
+    private ThirdPartyPlatformService lianLianService;
+
+
+}

jsowell-admin/src/main/java/com/jsowell/api/thirdparty/QingHaiController.java

@@ -14,7 +14,7 @@ import com.jsowell.pile.dto.QueryStationInfoDTO;
 import com.jsowell.pile.service.ThirdPartyPlatformConfigService;
 import com.jsowell.pile.thirdparty.CommonParamsDTO;
 import com.jsowell.thirdparty.lianlian.common.CommonResult;
-import com.jsowell.thirdparty.platform.ThirdPartyPlatformService;
+import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
 import com.jsowell.thirdparty.platform.util.Cryptos;
 import com.jsowell.thirdparty.platform.util.Encodes;
 import org.springframework.beans.factory.annotation.Autowired;

jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java

@@ -21,6 +21,7 @@ public enum ThirdPlatformTypeEnum {
     NEI_MENG_GU_PLATFORM("10", "内蒙古平台", ""),
     QING_HAI_PLATFORM("11", "青海平台", "630000000"),
     DIAN_XING_PLATFORM("12", "宁波点行停车平台", ""),
+    NING_XIA_PLATFORM("13", "宁夏平台", ""),
     ;
 
     private String typeCode;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java

@@ -31,10 +31,10 @@ import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
 import com.jsowell.pile.vo.huawei.QueryStartChargeVO;
 import com.jsowell.pile.vo.web.PileStationVO;
 import com.jsowell.thirdparty.huawei.HuaweiServiceV2;
-import com.jsowell.thirdparty.platform.hainan.service.HaiNanPlatformServiceImpl;
+import com.jsowell.thirdparty.platform.service.impl.HaiNanPlatformServiceImpl;
 import com.jsowell.thirdparty.huawei.HuaWeiService;
 import com.jsowell.thirdparty.lianlian.service.LianLianService;
-import com.jsowell.thirdparty.platform.qinghai.service.QingHaiPlatformServiceImpl;
+import com.jsowell.thirdparty.platform.service.impl.QingHaiPlatformServiceImpl;
 import com.jsowell.thirdparty.platform.util.HttpRequestUtil;
 import com.jsowell.thirdparty.lutongyunting.service.LTYTService;
 import com.jsowell.thirdparty.nanrui.service.NRService;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/NotificationService.java

@@ -4,7 +4,7 @@ import com.jsowell.common.enums.ykc.ReturnCodeEnum;
 import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.vo.ThirdPartySecretInfoVO;
-import com.jsowell.thirdparty.platform.ThirdPartyPlatformService;
+import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
 import com.jsowell.thirdparty.platform.factory.ThirdPartyPlatformFactory;
 import com.jsowell.thirdparty.service.ThirdpartySecretInfoService;
 import org.apache.commons.collections4.CollectionUtils;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/ChargeOrderInfo.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.platform.neimenggu.domain;
+package com.jsowell.thirdparty.platform.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.*;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/HNStationInfo.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.platform.hainan.domain;
+package com.jsowell.thirdparty.platform.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.jsowell.pile.thirdparty.ZDLStationInfo;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupChargeDetails.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.platform.neimenggu.domain;
+package com.jsowell.thirdparty.platform.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Getter;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupConnectorStatusInfo.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.platform.neimenggu.domain;
+package com.jsowell.thirdparty.platform.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.*;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupOperatorInfo.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.platform.neimenggu.domain;
+package com.jsowell.thirdparty.platform.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.*;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupStationInfo.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.platform.neimenggu.domain;
+package com.jsowell.thirdparty.platform.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.jsowell.thirdparty.platform.common.StationInfo;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupStationStatusInfo.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.platform.neimenggu.domain;
+package com.jsowell.thirdparty.platform.domain;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.*;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/factory/ThirdPartyPlatformFactory.java

@@ -2,7 +2,7 @@ package com.jsowell.thirdparty.platform.factory;
 
 import com.google.common.collect.Maps;
 import com.jsowell.common.util.StringUtils;
-import com.jsowell.thirdparty.platform.ThirdPartyPlatformService;
+import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
 
 import java.util.Map;
 import java.util.Objects;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/ThirdPartyPlatformService.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.platform;
+package com.jsowell.thirdparty.platform.service;
 
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/DianXingPlatformServiceImpl.java

@@ -1,8 +1,6 @@
-package com.jsowell.thirdparty.platform.ningbodianxing.service;
+package com.jsowell.thirdparty.platform.service.impl;
 
-import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson2.JSONObject;
-import com.jsowell.common.enums.thirdparty.BusinessInformationExchangeEnum;
 import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
 import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.DateUtils;
@@ -11,7 +9,7 @@ import com.jsowell.common.util.http.HttpUtils;
 import com.jsowell.pile.domain.OrderBasicInfo;
 import com.jsowell.pile.service.OrderBasicInfoService;
 import com.jsowell.pile.vo.ThirdPartySecretInfoVO;
-import com.jsowell.thirdparty.platform.ThirdPartyPlatformService;
+import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
 import com.jsowell.thirdparty.platform.factory.ThirdPartyPlatformFactory;
 import com.jsowell.thirdparty.service.ThirdpartySecretInfoService;
 import org.bouncycastle.crypto.CryptoException;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/HaiNanPlatformServiceImpl.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.platform.hainan.service;
+package com.jsowell.thirdparty.platform.service.impl;
 
 import cn.hutool.core.util.PageUtil;
 import com.alibaba.fastjson2.JSON;
@@ -37,9 +37,9 @@ import com.jsowell.thirdparty.lianlian.vo.EquipmentAuthVO;
 import com.jsowell.thirdparty.lianlian.vo.QueryChargingStatusVO;
 import com.jsowell.thirdparty.lianlian.vo.QueryStartChargeVO;
 import com.jsowell.thirdparty.lianlian.vo.QueryStopChargeVO;
-import com.jsowell.thirdparty.platform.ThirdPartyPlatformService;
+import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
 import com.jsowell.thirdparty.platform.factory.ThirdPartyPlatformFactory;
-import com.jsowell.thirdparty.platform.hainan.domain.HNStationInfo;
+import com.jsowell.thirdparty.platform.domain.HNStationInfo;
 import com.jsowell.thirdparty.platform.util.Cryptos;
 import com.jsowell.thirdparty.platform.util.Encodes;
 import com.jsowell.thirdparty.platform.util.GBSignUtils;
@@ -48,7 +48,6 @@ import com.jsowell.thirdparty.zhongdianlian.service.ZDLService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.platform.lianlian.service;
+package com.jsowell.thirdparty.platform.service.impl;
 
 import cn.hutool.core.util.PageUtil;
 import com.alibaba.fastjson2.JSON;
@@ -37,7 +37,7 @@ 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.ThirdPartyPlatformService;
+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.StationInfo;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NeiMengGuPlatformServiceImpl.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.platform.neimenggu.service;
+package com.jsowell.thirdparty.platform.service.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
@@ -44,9 +44,10 @@ 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.lianlian.vo.QueryChargingStatusVO;
-import com.jsowell.thirdparty.platform.ThirdPartyPlatformService;
+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.neimenggu.domain.*;
+
 import com.jsowell.thirdparty.platform.util.Cryptos;
 import com.jsowell.thirdparty.platform.util.Encodes;
 import com.jsowell.thirdparty.platform.util.HttpRequestUtil;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java

@@ -0,0 +1,17 @@
+package com.jsowell.thirdparty.platform.service.impl;
+
+import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
+import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
+import com.jsowell.thirdparty.platform.factory.ThirdPartyPlatformFactory;
+import org.springframework.stereotype.Service;
+
+@Service
+public class NinaXiaPlatformServiceImpl implements ThirdPartyPlatformService {
+    // 平台类型
+    private final String thirdPlatformType = ThirdPlatformTypeEnum.NING_XIA_PLATFORM.getTypeCode();
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        ThirdPartyPlatformFactory.register(thirdPlatformType, this);
+    }
+}

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/QingHaiPlatformServiceImpl.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.platform.qinghai.service;
+package com.jsowell.thirdparty.platform.service.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
@@ -24,7 +24,6 @@ import com.jsowell.pile.service.*;
 import com.jsowell.pile.thirdparty.CommonParamsDTO;
 import com.jsowell.pile.thirdparty.ZDLEquipmentInfo;
 import com.jsowell.pile.thirdparty.ZDLStationInfo;
-import com.jsowell.pile.vo.ThirdPartySecretInfoVO;
 import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO;
 import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
 import com.jsowell.pile.vo.uniapp.BillingPriceVO;
@@ -34,7 +33,7 @@ import com.jsowell.pile.vo.web.PileMerchantInfoVO;
 import com.jsowell.pile.vo.zdl.EquipBusinessPolicyVO;
 import com.jsowell.thirdparty.lianlian.domain.ConnectorStatusInfo;
 import com.jsowell.thirdparty.lianlian.vo.AccessTokenVO;
-import com.jsowell.thirdparty.platform.ThirdPartyPlatformService;
+import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
 import com.jsowell.thirdparty.platform.common.ChargeOrderInfo;
 import com.jsowell.thirdparty.platform.common.ConnectorChargeStatusInfo;
 import com.jsowell.thirdparty.platform.common.SupStationPowerInfo;
@@ -51,7 +50,6 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ZhongDianLianPlatformServiceImpl.java

@@ -1,4 +1,4 @@
-package com.jsowell.thirdparty.platform.zhongdianlian.service;
+package com.jsowell.thirdparty.platform.service.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.google.common.collect.Lists;
@@ -9,7 +9,7 @@ import com.jsowell.pile.service.ThirdPartyPlatformConfigService;
 import com.jsowell.pile.thirdparty.CommonParamsDTO;
 import com.jsowell.pile.vo.ThirdPartySecretInfoVO;
 import com.jsowell.thirdparty.lianlian.vo.AccessTokenVO;
-import com.jsowell.thirdparty.platform.ThirdPartyPlatformService;
+import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
 import com.jsowell.thirdparty.platform.factory.ThirdPartyPlatformFactory;
 import com.jsowell.thirdparty.platform.util.Cryptos;
 import com.jsowell.thirdparty.platform.util.ThirdPartyPlatformUtils;