From ff4de26cd84bd83fd140b4f34775a5e9e52bddf9 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 8 Aug 2024 10:59:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B5=99=E6=B1=9F=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/api/thirdparty/NingXiaController.java | 2 +- .../com/jsowell/thirdparty/common/CommonService.java | 5 ++--- .../platform/service/impl/HaiNanPlatformServiceImpl.java | 2 +- .../service/impl/LianLianPlatformServiceImpl.java | 3 +++ ...mServiceImpl.java => NingXiaPlatformServiceImpl.java} | 5 ++++- .../service/impl/ZhongDianLianPlatformServiceImpl.java | 9 ++++----- 6 files changed, 15 insertions(+), 11 deletions(-) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/{NinaXiaPlatformServiceImpl.java => NingXiaPlatformServiceImpl.java} (99%) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NingXiaController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NingXiaController.java index 677d66602..7591672e3 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NingXiaController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NingXiaController.java @@ -29,7 +29,7 @@ public class NingXiaController extends ThirdPartyBaseController { private final String platformName = "宁夏平台"; @Autowired - @Qualifier("ninaXiaPlatformServiceImpl") + @Qualifier("ningXiaPlatformServiceImpl") private ThirdPartyPlatformService platformLogic; /** diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java index ca0aa317d..3a41dc35f 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java @@ -36,7 +36,7 @@ import com.jsowell.thirdparty.platform.service.impl.DianXingPlatformServiceImpl; 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.service.impl.NinaXiaPlatformServiceImpl; +import com.jsowell.thirdparty.platform.service.impl.NingXiaPlatformServiceImpl; import com.jsowell.thirdparty.platform.service.impl.QingHaiPlatformServiceImpl; import com.jsowell.thirdparty.platform.util.HttpRequestUtil; import com.jsowell.thirdparty.lutongyunting.service.LTYTService; @@ -48,7 +48,6 @@ import com.jsowell.thirdparty.yongchengboche.dto.YCBCGetTokenDTO; import com.jsowell.thirdparty.yongchengboche.service.YCBCService; import com.jsowell.thirdparty.zhongdianlian.service.ZDLService; import lombok.extern.slf4j.Slf4j; -import lombok.val; import org.apache.commons.collections4.CollectionUtils; import org.bouncycastle.crypto.CryptoException; import org.springframework.beans.factory.annotation.Autowired; @@ -123,7 +122,7 @@ public class CommonService { private QingHaiPlatformServiceImpl qingHaiPlatformService; @Autowired - private NinaXiaPlatformServiceImpl ninaXiaPlatformService; + private NingXiaPlatformServiceImpl ninaXiaPlatformService; @Autowired private DianXingPlatformServiceImpl dianXingPlatformService; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/HaiNanPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/HaiNanPlatformServiceImpl.java index 8ebdd1022..0e03d9365 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/HaiNanPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/HaiNanPlatformServiceImpl.java @@ -62,7 +62,7 @@ import java.util.Map; import java.util.stream.Collectors; /** - * TODO + * 海南平台 * * @author Lemon * @Date 2024/1/18 10:05:23 diff --git 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 index 2257cb4e8..561829278 100644 --- 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 @@ -56,6 +56,9 @@ import java.math.RoundingMode; import java.util.*; import java.util.stream.Collectors; +/** + * 上海联联平台 + */ @Service public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git 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/NingXiaPlatformServiceImpl.java similarity index 99% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NingXiaPlatformServiceImpl.java index b91ea0bcd..58ef0e58e 100644 --- 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/NingXiaPlatformServiceImpl.java @@ -56,8 +56,11 @@ import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; +/** + * 宁夏平台 + */ @Service -public class NinaXiaPlatformServiceImpl implements ThirdPartyPlatformService { +public class NingXiaPlatformServiceImpl implements ThirdPartyPlatformService { // 平台类型 private final String thirdPlatformType = ThirdPlatformTypeEnum.NING_XIA_PLATFORM.getTypeCode(); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ZhongDianLianPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ZhongDianLianPlatformServiceImpl.java index f7a000daa..93757e180 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ZhongDianLianPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ZhongDianLianPlatformServiceImpl.java @@ -5,12 +5,11 @@ import com.google.common.collect.Lists; import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.util.JWTUtils; import com.jsowell.common.util.StringUtils; -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.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.ThirdPartyPlatformUtils; import com.jsowell.thirdparty.service.ThirdpartySecretInfoService; @@ -20,14 +19,14 @@ import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; +/** + * 中电联 + */ @Service public class ZhongDianLianPlatformServiceImpl implements ThirdPartyPlatformService { // 平台类型 private final String thirdPlatformType = ThirdPlatformTypeEnum.NING_BO_PLATFORM.getTypeCode(); - @Autowired - private ThirdPartyPlatformConfigService thirdPartyPlatformConfigService; - @Autowired private ThirdpartySecretInfoService thirdpartySecretInfoService;