From 9efadbdc6ccc294c9fe3e95428240f5aa68081ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E4=BD=B3?= <14614659+dongjia-li@user.noreply.gitee.com> Date: Sat, 10 Aug 2024 09:03:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=AA=E6=8E=A5=E5=85=A5?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-pay-server/pom.xml | 5 +++++ .../OrderPayCustomerController.java | 19 +++++++++++++++---- .../pay/service/OrderPayCustomerService.java | 5 +++++ .../impl/OrderPayCustomerServiceImpl.java | 19 +++++++++++++++++++ 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/cloud-pay-server/pom.xml b/cloud-pay-server/pom.xml index 492f411..7513982 100644 --- a/cloud-pay-server/pom.xml +++ b/cloud-pay-server/pom.xml @@ -91,6 +91,11 @@ com.muyu cloud-pay-common + + + com.muyu + cloud-common-nacos-remote + diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java index 4473d80..4ea9467 100644 --- a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java @@ -6,14 +6,12 @@ import com.muyu.cloud.domain.resp.CustomerResp; import com.muyu.cloud.pay.service.OrderPayCustomerService; import com.muyu.common.core.domain.Result; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -49,4 +47,17 @@ public class OrderPayCustomerController { orderPayCustomerService.selectList(customerListReq) //查询客户集合 ); } + + /** + * 获取所有客户 + * @return 客户集合 + */ + @GetMapping("/all") + @Operation(summary = "获取未接入的客户", description = "调用nacosAPI获取所有的微服务名称,作为支付中台的客户") + @Schema(description = "获取未接入的客户", defaultValue = "[\"客户1\",\"客户2\"]", type = "List") + public Result> getCustomerAllList(){ + return Result.success( + orderPayCustomerService.getCustomerAllList() + ); + } } diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayCustomerService.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayCustomerService.java index edbfbc7..d3477b8 100644 --- a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayCustomerService.java +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayCustomerService.java @@ -23,4 +23,9 @@ public interface OrderPayCustomerService extends IService { */ public List selectList(CustomerListReq customerListReq); + /** + * 获取所有的客户 + * @return 客户集合 + */ + List getCustomerAllList(); } diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayCustomerServiceImpl.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayCustomerServiceImpl.java index f0d9aa8..e1be0e8 100644 --- a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayCustomerServiceImpl.java +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayCustomerServiceImpl.java @@ -12,13 +12,16 @@ import com.muyu.cloud.pay.service.OrderPayCustomerService; import com.muyu.cloud.pay.service.OrderPayService; import com.muyu.common.core.enums.SysPayType; import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.nacos.service.NacosServerService; import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; +import java.util.Set; import java.util.function.Function; +import java.util.stream.Collectors; /** * @Author:LiDongJia @@ -36,6 +39,9 @@ public class OrderPayCustomerServiceImpl @Resource(type = OrderPayServiceImpl.class) private OrderPayService orderPayService; + @Resource + private NacosServerService nacosServerService; + /** * 查询客户集合 * @@ -69,4 +75,17 @@ public class OrderPayCustomerServiceImpl ) .toList(); } + + @Override + public List getCustomerAllList() { + List nacosServerAllList = nacosServerService.nacosServerAllList(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.select(OrderPayCustomer::getAppCode); + List orderPayCustomerList = this.list(queryWrapper); + Set customerSet + = orderPayCustomerList.stream().map(OrderPayCustomer::getAppCode).collect(Collectors.toSet()); + return nacosServerAllList.stream() + .filter(nacosServer -> !customerSet.contains(nacosServer)) + .toList(); + } }