From e1890b66e665c8860de00809f90ac57f5af651ba Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 19 三月 2026 15:43:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpBannerServiceImpl.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 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 b683e37..9ffe193 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,6 +2,7 @@
import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -50,14 +51,20 @@
vo.setId(item.getId());
vo.setJumpType(item.getJumpType());
vo.setJumpUrl(item.getJumpUrl());
- JSONObject jsonObject = JSON.parseArray(item.getBannerPictures()).getJSONObject(0);
- String downloadUrl = null;
- try {
- downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
+ JSONArray jsonArray = JSONArray.parseArray(item.getBannerPictures());
+ for (Object o : jsonArray) {
+ JSONObject jsonObject = (JSONObject) o;
+ String downloadUrl = null;
+ try {
+ // 1
+ downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ jsonObject.put("url", downloadUrl);
}
- vo.setImageUrl(downloadUrl);
+
+ vo.setImageUrl(JSONArray.toJSONString(jsonArray));
return vo;
}).collect(Collectors.toList());
}
@@ -69,14 +76,21 @@
PageInfo<XpBanner> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<XpBanner> list = this.baseMapper.pageList(pageInfo, query);
for (XpBanner xpBanner : list) {
- JSONObject jsonObject = JSON.parseArray(xpBanner.getBannerPictures()).getJSONObject(0);
- String downloadUrl = null;
- try {
- downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
+
+ JSONArray jsonArray = JSONArray.parse(xpBanner.getBannerPictures());
+ for (Object o : jsonArray) {
+ JSONObject jsonObject = (JSONObject) o;
+ String downloadUrl = null;
+ try {
+ // 1
+ downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ jsonObject.put("url", downloadUrl);
}
- xpBanner.setBannerPictures(downloadUrl);
+
+ xpBanner.setBannerPictures(JSONArray.toJSONString(jsonArray));
}
pageInfo.setRecords(list);
return pageInfo;
--
Gitblit v1.7.1