Skip to content

GitLab

Q
qk_backend
Commit d2b52403 authored by shiyu's avatar shiyu
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 8793603d 1e87e65a
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 111 deletions
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java
View file @ d2b52403
......@@ -43,7 +43,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.*;
import java.util.stream.Collectors;
@Service
public class ItemServiceImpl implements ItemService {
......@@ -123,18 +122,6 @@ public class ItemServiceImpl implements ItemService {
if (Objects.isNull(esPageInfo) || CollectionUtils.isEmpty(esPageInfo.getDataList())) {
return Result.success(result);
}
List<Long> ids = esPageInfo.getDataList().stream().map(s -> {
ItemOfEs itemOfEs = (ItemOfEs) s;
return itemOfEs.getId();
}).collect(Collectors.toList());
CoinRequestDto coinRequestDto = new CoinRequestDto();
coinRequestDto.setIds(ids);
List<Item> list = itemDao.findListNotDeleted(coinRequestDto);
if (CollectionUtils.isEmpty(list)) {
return Result.success(result);
}
Map<Long, Item> map = list.stream().collect(Collectors.toMap(Item::getId, s -> s, (k1, k2) -> k2));
result.setTotal(esPageInfo.getTotal());
result.setHasNextPage(esPageInfo.getTotal() == 10000);
......@@ -142,16 +129,15 @@ public class ItemServiceImpl implements ItemService {
esPageInfo.getDataList().forEach(s -> {
ItemResponseVo vo = new ItemResponseVo();
ItemOfEs es = (ItemOfEs) s;
Item item = map.get(es.getId());
// 设置基本信息
vo.setId(es.getId());
vo.setName(es.getName());
vo.setDetail(item.getDetail());
vo.setSourceType(item.getSourceType());
vo.setDetail(es.getDetail());
vo.setSourceType(es.getSourceType());
// 设置价格
vo.setPrice(getPrice(item.getPrice()));
vo.setPrice(getPrice(es.getPrice()));
// 设置图片或视频
vo.setHomePageImage(getImage(es, item));
vo.setHomePageImage(getImage(es));
// 设置是否收藏和是否是自己发布的
vo.setIsCollected(0);
vo.setIsMine(0);
......@@ -160,7 +146,7 @@ public class ItemServiceImpl implements ItemService {
vo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), es.getId()) ? 1 : 0);
}
// 设置收藏数
vo.setCollectCount(getCollectCount(es.getId(), item.getSourceType()));
vo.setCollectCount(getCollectCount(es.getId(), es.getSourceType()));
AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
agentTranceResponseVo.setAgentTraceInfo_("");
......@@ -561,21 +547,21 @@ public class ItemServiceImpl implements ItemService {
return null;
}
private Map<String, Object> getImage(ItemOfEs es, Item item) {
private Map<String, Object> getImage(ItemOfEs es) {
Map<String, Object> homePageMap = new HashMap<>();
homePageMap.put("url", "");
homePageMap.put("type", 2);
homePageMap.put("width", "0");
homePageMap.put("height", "0");
if (StringUtils.isNotBlank(es.getTop_image_path())) {
if (es.getTop_image_path().contains("_")) {
homePageMap = getImageMap(es.getTop_image_path());
homePageMap.put("url", es.getTop_image_path());
if (StringUtils.isNotBlank(es.getTopImage())) {
if (es.getTopImage().contains("_")) {
homePageMap = getImageMap(es.getTopImage());
homePageMap.put("url", es.getTopImage());
homePageMap.put("type", 2);
}
} else {
if (StringUtils.isNotBlank(item.getImages())) {
String[] image = item.getImages().split(";");
if (StringUtils.isNotBlank(es.getImages())) {
String[] image = es.getImages().split(";");
homePageMap.put("url", image[0]);
if (image[0].contains("_")) {
homePageMap = getImageMap(image[0]);
......@@ -584,8 +570,8 @@ public class ItemServiceImpl implements ItemService {
}
}
}
if (StringUtils.isNotBlank(item.getVideos())) {
String[] vedioImage = item.getVideos().split(";");
if (StringUtils.isNotBlank(es.getVideos())) {
String[] vedioImage = es.getVideos().split(";");
if (vedioImage[0].contains(",")) {
String[] video = vedioImage[0].split(",");
homePageMap = getImageMap(video[1]);
......@@ -596,89 +582,6 @@ public class ItemServiceImpl implements ItemService {
return homePageMap;
}
// @Override
// public Result page(ItemRequestDto dto) {
// try {
// CoinRequestDto coinRequestDto = new CoinRequestDto();
// coinRequestDto.setPage(dto.getPage());
// coinRequestDto.setLimit(dto.getSize());
// coinRequestDto.setIsExcluded(1);
// if (StringUtils.isNotBlank(dto.getName())) {
// coinRequestDto.setName(dto.getName());
// }
// PageInfo<Item> page = itemDao.findByPage(coinRequestDto);
// PageInfo<AgentTranceResponseVo> result = new PageInfo<>();
// result.setPageNum(page.getPageNum());
// result.setPageSize(page.getPageSize());
// result.setTotal(page.getTotal());
// result.setList(new ArrayList<>());
// result.setHasNextPage(page.isHasNextPage());
// if (CollectionUtils.isEmpty(page.getList())) {
// return Result.success(result);
// }
// List<AgentTranceResponseVo> resultList = new ArrayList<>();
// for (Item item : page.getList()) {
// ItemResponseVo vo = new ItemResponseVo();
// // 设置基本信息
// vo.setId(item.getId());
// vo.setName(item.getName());
// vo.setDetail(item.getDetail());
// vo.setImages(item.getImages());
// vo.setSourceType(item.getSourceType());
// // 设置价格
// vo.setPrice(getPrice(item.getPrice()));
// // 设置图片或视频
// vo.setHomePageImage(getImage(item));
// // 设置是否收藏和是否是自己发布的
// vo.setIsCollected(0);
// vo.setIsMine(0);
// if (!dto.getUserId().equals(0L)) {
// vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), item.getId()) ? 1 : 0);
// vo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), item.getId()) ? 1 : 0);
// }
// // 设置收藏数
// vo.setCollectCount(getCollectCount(item.getId(), item.getSourceType()));
//
// AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
// agentTranceResponseVo.setAgentTraceInfo_("");
// agentTranceResponseVo.setViewType(1);
// agentTranceResponseVo.setDetail(vo);
// resultList.add(agentTranceResponseVo);
// }
// result.setList(resultList);
// logger.info("【请求结束】查询首页列表成功");
// return Result.success(result);
// } catch (Exception e) {
// logger.error("查询首页列表失败", e);
// return Result.failed("查询首页列表失败");
// }
// }
//
// private Map<String, Object> getImage(Item item) {
// Map<String, Object> homePageMap = new HashMap<>();
// String[] image = item.getImages().split(";");
// homePageMap.put("url", image[0]);
// homePageMap.put("type", 2);
// homePageMap.put("width", "0");
// homePageMap.put("height", "0");
// if (StringUtils.isNotBlank(item.getVideos())) {
// String[] vedioImage = item.getVideos().split(";");
// if (vedioImage[0].contains(",")) {
// String[] video = vedioImage[0].split(",");
// homePageMap = getImageMap(video[1]);
// homePageMap.put("url", video[1]);
// homePageMap.put("type", 1);
// }
// } else {
// if (image[0].contains("_")) {
// homePageMap = getImageMap(image[0]);
// homePageMap.put("url", image[0]);
// homePageMap.put("type", 2);
// }
// }
// return homePageMap;
// }
private Map<String, Object> getImageMap(String image) {
Map<String, Object> map = new HashMap<>();
String[] _image = image.split("_");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment