From 9cb17eb3f0036c1babe19d1cc9e3719b2452d31b Mon Sep 17 00:00:00 2001 From: zhang chengzhi <3144712872@qq.com> Date: Mon, 5 Aug 2024 19:01:54 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E6=96=B0=E5=A2=9E=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-pay-server/pom.xml | 5 ++++ .../OrderPayCustomerController.java | 25 ++++++++++++++++--- .../pay/service/OrderPayCustomerService.java | 9 +++++++ .../impl/OrderPayCustomerServiceImpl.java | 20 +++++++++++++++ 4 files changed, 55 insertions(+), 4 deletions(-) diff --git a/cloud-pay-server/pom.xml b/cloud-pay-server/pom.xml index 07de2be..09cf1ee 100644 --- a/cloud-pay-server/pom.xml +++ b/cloud-pay-server/pom.xml @@ -89,6 +89,11 @@ 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 6830043..07f8bde 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.pay.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; @@ -48,6 +46,25 @@ public class OrderPayCustomerController { return Result.success(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 7f11113..dd8cecc 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 @@ -26,4 +26,13 @@ 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 14a9d66..bf76380 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 @@ -13,13 +13,17 @@ import com.muyu.cloud.pay.service.OrderPayCustomerService; import com.muyu.cloud.pay.service.OrderPayInfoService; import com.muyu.common.core.enums.SysPayType; import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.nacos.remote.service.NacosServerService; +import jakarta.annotation.Resource; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.Set; import java.util.function.Function; +import java.util.stream.Collectors; /** * @Author:zhangchengzhi @@ -36,6 +40,8 @@ public class OrderPayCustomerServiceImpl extends ServiceImpl selectList(CustomerListReq customerListReq) { @@ -69,4 +75,18 @@ public class OrderPayCustomerServiceImpl extends ServiceImpl getCustomerAllList() { + List naocsServiceAllList = nacosServerService.naocsServiceAllList(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.select(OrderPayCustomer::getAppCode); + List orderPayCustomerList = this.list(queryWrapper); + Set customerSet + = orderPayCustomerList.stream().map(OrderPayCustomer::getAppCode).collect(Collectors.toSet()); + + return naocsServiceAllList.stream() + .filter(nacosServer -> !customerSet.contains(nacosServer)) + .toList(); + } }