From 800fb356e6ced08c5341d6294b36eb92dd952710 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 24 七月 2024 19:21:46 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 87 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 83 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
index 85495af..8c91401 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
@@ -26,10 +26,7 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
/**
* Created by IntelliJ IDEA.
@@ -283,6 +280,33 @@
ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
ztContentListRequest.setId(id);
ZTProductInfoResponse response = zbomZhongTaiService.getProductInfo(ztContentListRequest);
+ if(Objects.nonNull(response)){
+ List<String> stringList = new ArrayList<String>();
+ if (StringUtils.isNotBlank(response.getCoverImage())) {
+ stringList.add(response.getCoverImage());
+ }
+ if(Objects.nonNull(response.getBannerImgList())){
+ stringList.addAll(Arrays.asList(response.getBannerImgList()));
+ }
+ if(StringUtils.isNotBlank(response.getContent())){
+ // 娣诲姞 瀵屾枃鏈� 鍥剧墖
+ stringList.addAll(Constants.getImgsFromHtmlText(response.getContent()));
+
+ }
+ List<ZTSpaceInfoResponse> ztSpaceInfoResponseList = response.getSpaceList();
+ if(CollectionUtils.isNotEmpty(ztSpaceInfoResponseList)){
+ for (ZTSpaceInfoResponse ztSpaceInfoResponse:ztSpaceInfoResponseList) {
+ if(StringUtils.isNotBlank(ztSpaceInfoResponse.getSpaceImg())){
+ stringList.add(ztSpaceInfoResponse.getSpaceImg());
+ }
+ if(StringUtils.isNotBlank(ztSpaceInfoResponse.getSpaceContent())){
+ //娣诲姞 瀵屾枃鏈� 鍥剧墖
+ stringList.addAll(Constants.getImgsFromHtmlText(ztSpaceInfoResponse.getSpaceContent()));
+ }
+ }
+ }
+ response.setImageurlList(stringList);
+ }
return response;
}
@@ -295,6 +319,25 @@
ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
ztContentListRequest.setId(id);
ZTCaseInfoResponse response = zbomZhongTaiService.getWholecaseInfo(ztContentListRequest);
+ List<String> stringList = new ArrayList<String>();
+ if (StringUtils.isNotBlank(response.getCoverImage())) {
+ stringList.add(response.getCoverImage());
+ }
+ if(Objects.nonNull(response.getLayoutUlr())){
+ stringList.add(response.getLayoutUlr());
+ }
+ APISpaceCaseVo[] apiSpaceCaseVoList = response.getApiSpaceCaseVos();
+ if(Objects.nonNull(apiSpaceCaseVoList)){
+ for (APISpaceCaseVo apiSpaceCaseVo:apiSpaceCaseVoList) {
+ if(StringUtils.isNotBlank(apiSpaceCaseVo.getCoverImage())){
+ stringList.add(apiSpaceCaseVo.getCoverImage());
+ }
+ if(Objects.nonNull(apiSpaceCaseVo.getImgList())){
+ stringList.addAll(Arrays.asList(apiSpaceCaseVo.getImgList()));
+ }
+ }
+ }
+ response.setImageurlList(stringList);
return response;
}
@@ -307,6 +350,32 @@
ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
ztContentListRequest.setId(id);
ZTProductNewsInfoResponse response = zbomZhongTaiService.getProductNewsInfo(ztContentListRequest);
+ if(Objects.nonNull(response)){
+ List<String> stringList = new ArrayList<String>();
+ if (StringUtils.isNotBlank(response.getCoverImage())) {
+ stringList.add(response.getCoverImage());
+ }
+ if(Objects.nonNull(response.getBannerImgList())){
+ stringList.addAll(Arrays.asList(response.getBannerImgList()));
+ }
+ if(StringUtils.isNotBlank(response.getContent())){
+ stringList.addAll(Constants.getImgsFromHtmlText(response.getContent()));
+
+ }
+ List<ZTSpaceInfoResponse> ztSpaceInfoResponseList = response.getSpaceList();
+ if(CollectionUtils.isNotEmpty(ztSpaceInfoResponseList)){
+ for (ZTSpaceInfoResponse ztSpaceInfoResponse:ztSpaceInfoResponseList) {
+ if(StringUtils.isNotBlank(ztSpaceInfoResponse.getSpaceImg())){
+ stringList.add(ztSpaceInfoResponse.getSpaceImg());
+ }
+ if(StringUtils.isNotBlank(ztSpaceInfoResponse.getSpaceContent())){
+ //娣诲姞 瀵屾枃鏈� 鍥剧墖
+ stringList.addAll(Constants.getImgsFromHtmlText(ztSpaceInfoResponse.getSpaceContent()));
+ }
+ }
+ }
+ response.setImageurlList(stringList);
+ }
return response;
}
@@ -319,6 +388,16 @@
ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
ztContentListRequest.setId(id);
ZTRealcaseInfoResponse response = zbomZhongTaiService.getRealcaseInfo(ztContentListRequest);
+ if(Objects.nonNull(response)){
+ List<String> stringList = new ArrayList<String>();
+ if (StringUtils.isNotBlank(response.getCoverImage())) {
+ stringList.add(response.getCoverImage());
+ }
+ if(Objects.nonNull(response.getContentImgList())){
+ stringList.addAll(Arrays.asList(response.getContentImgList()));
+ }
+ response.setImageurlList(stringList);
+ }
return response;
}
--
Gitblit v1.9.3