diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayChannelController.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayChannelController.java index 303438ce0..2d5dbcef8 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayChannelController.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayChannelController.java @@ -18,8 +18,6 @@ package com.pig4cloud.pigx.pay.controller; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.common.core.util.R; @@ -61,12 +59,8 @@ public class PayChannelController { @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") @HasPermission("pay_channel_view") - public R getpayChannelPage(Page page, PayChannel payChannel) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - wrapper.like(StrUtil.isNotBlank(payChannel.getChannelName()), PayChannel::getChannelName, - payChannel.getChannelName()); - wrapper.eq(StrUtil.isNotBlank(payChannel.getState()), PayChannel::getState, payChannel.getState()); - return R.ok(payChannelService.page(page, wrapper)); + public R page(Page page, PayChannel payChannel) { + return R.ok(payChannelService.queryPage(page, payChannel)); } /** @@ -78,7 +72,7 @@ public class PayChannelController { @GetMapping("/{id}") @HasPermission("pay_channel_view") public R getById(@PathVariable("id") Long id) { - return R.ok(payChannelService.getById(id)); + return R.ok(payChannelService.getChannel(id)); } /** diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/service/PayChannelService.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/service/PayChannelService.java index fcf26e2a8..0133aec65 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/service/PayChannelService.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/service/PayChannelService.java @@ -17,6 +17,7 @@ package com.pig4cloud.pigx.pay.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.pay.entity.PayChannel; @@ -35,4 +36,20 @@ public interface PayChannelService extends IService { */ Boolean saveChannel(PayChannel payChannel); + /** + * 分页查询 + * + * @param page 页 + * @param payChannel 付费频道 + * @return {@link Page }<{@link PayChannel }> + */ + Page queryPage(Page page, PayChannel payChannel); + + /** + * 获取channel + * + * @param id id + * @return {@link PayChannel } + */ + PayChannel getChannel(Long id); } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/service/impl/PayChannelServiceImpl.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/service/impl/PayChannelServiceImpl.java index 85f86f310..3c94018bf 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/service/impl/PayChannelServiceImpl.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/service/impl/PayChannelServiceImpl.java @@ -16,13 +16,20 @@ */ package com.pig4cloud.pigx.pay.service.impl; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pig4cloud.pigx.common.sensitive.util.DesensitizedUtils; import com.pig4cloud.pigx.pay.entity.PayChannel; import com.pig4cloud.pigx.pay.mapper.PayChannelMapper; import com.pig4cloud.pigx.pay.service.PayChannelService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import java.util.stream.Collectors; + /** * 渠道 * @@ -33,14 +40,59 @@ import org.springframework.stereotype.Service; @AllArgsConstructor public class PayChannelServiceImpl extends ServiceImpl implements PayChannelService { - /** - * 新增支付渠道 - * @param payChannel 支付渠道 - * @return - */ - @Override - public Boolean saveChannel(PayChannel payChannel) { - return save(payChannel); - } + /** + * 新增支付渠道 + * + * @param payChannel 支付渠道 + * @return + */ + @Override + public Boolean saveChannel(PayChannel payChannel) { + return save(payChannel); + } + + /** + * 分页查询 + * + * @param page 页 + * @param payChannel 付费频道 + * @return {@link Page }<{@link PayChannel }> + */ + @Override + public Page queryPage(Page page, PayChannel payChannel) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(StrUtil.isNotBlank(payChannel.getChannelName()), PayChannel::getChannelName, + payChannel.getChannelName()); + wrapper.eq(StrUtil.isNotBlank(payChannel.getState()), PayChannel::getState, payChannel.getState()); + + Page selectedPage = baseMapper.selectPage(page, wrapper); + + // 对敏感信息进行脱敏 + selectedPage.setRecords(selectedPage.getRecords().stream().peek(channel -> channel + .setParam(DesensitizedUtils.json(channel.getParam(), true, "key"))).collect(Collectors.toList())); + + return selectedPage; + } + + /** + * 获取channel + * + * @param id id + * @return {@link PayChannel } + */ + @Override + public PayChannel getChannel(Long id) { + + PayChannel channel = getById(id); + + if (channel == null) { + return null; + } + + // 手动对key进行脱敏 + channel.setParam(DesensitizedUtils.json(channel.getParam(), true, "key")); + return channel; + } + }