From e08f56b973eb0c81e0bad1d00c8ac95ba6206cd4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 15 三月 2026 23:28:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpBannerServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpBannerServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpBannerServiceImpl.java
index 504f4cc..0cccb5e 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpBannerServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpBannerServiceImpl.java
@@ -2,10 +2,12 @@
import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xiaopeng.api.model.operation.XpWhitelist;
import com.xiaopeng.common.core.web.page.PageInfo;
+import com.xiaopeng.evi.oss.service.AliOssService;
import com.xiaopeng.operation.mapper.XpBannerMapper;
import com.xiaopeng.api.model.operation.XpBanner;
import com.xiaopeng.operation.query.BannerPageListQuery;
@@ -14,6 +16,8 @@
import com.xiaopeng.operation.vo.XpBannerListVo;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -29,10 +33,13 @@
@Service
public class XpBannerServiceImpl extends ServiceImpl<XpBannerMapper, XpBanner> implements XpBannerService {
+ @Resource
+ private AliOssService aliOssService;
+
@Override
public List<XpBannerListVo> getXpBannerList() {
LambdaQueryWrapper<XpBanner> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(XpBanner::getBannerStatus,1);
+ wrapper.eq(XpBanner::getBannerStatus, 1);
// 当前时间在开始和结束时间范围内
List<XpBanner> list = list(wrapper.last(" and now() between start_time and end_time"));
@@ -44,18 +51,23 @@
vo.setJumpType(item.getJumpType());
vo.setJumpUrl(item.getJumpUrl());
JSONObject jsonObject = JSON.parseArray(item.getBannerPictures()).getJSONObject(0);
- vo.setImageUrl(jsonObject.getString("url"));
+ String downloadUrl = null;
+ try {
+ downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ vo.setImageUrl(downloadUrl);
return vo;
}).collect(Collectors.toList());
}
-
return Collections.emptyList();
}
@Override
public PageInfo<XpBanner> pageList(BannerPageListQuery query) {
- PageInfo<XpBanner> pageInfo = new PageInfo<>(query.getPageNum(),query.getPageSize());
- List<XpBanner> list = this.baseMapper.pageList(pageInfo,query);
+ PageInfo<XpBanner> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<XpBanner> list = this.baseMapper.pageList(pageInfo, query);
pageInfo.setRecords(list);
return pageInfo;
}
--
Gitblit v1.7.1