Skip to content

GitLab

Q
qk_backend
Commit 97b63558 authored by muhong's avatar muhong
Browse files
Options

修改 首页查询

parent 1f49a078
Show whitespace changes
Inline Side-by-side
Showing with 179 additions and 175 deletions
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java
View file @ 97b63558
...@@ -9,9 +9,12 @@ import com.wwdz.ch.core.consts.ResultCode; ...@@ -9,9 +9,12 @@ import com.wwdz.ch.core.consts.ResultCode;
import com.wwdz.ch.core.storage.QiniuStorage; import com.wwdz.ch.core.storage.QiniuStorage;
import com.wwdz.ch.core.type.Result; import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.core.util.MediaUtil; import com.wwdz.ch.core.util.MediaUtil;
import com.wwdz.ch.db.bean.EsPageInfo;
import com.wwdz.ch.db.bean.ItemOfEs;
import com.wwdz.ch.db.dao.*; import com.wwdz.ch.db.dao.*;
import com.wwdz.ch.db.domain.*; import com.wwdz.ch.db.domain.*;
import com.wwdz.ch.db.dto.request.CoinRequestDto; import com.wwdz.ch.db.dto.request.CoinRequestDto;
import com.wwdz.ch.db.dto.request.EsSearchRequestDto;
import com.wwdz.ch.db.es.ItemEsDao; import com.wwdz.ch.db.es.ItemEsDao;
import com.wwdz.ch.wx.entity.request.ItemRequestDto; import com.wwdz.ch.wx.entity.request.ItemRequestDto;
import com.wwdz.ch.wx.entity.vo.AgentTranceResponseVo; import com.wwdz.ch.wx.entity.vo.AgentTranceResponseVo;
...@@ -40,6 +43,7 @@ import java.io.IOException; ...@@ -40,6 +43,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URL; import java.net.URL;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
@Service @Service
public class ItemServiceImpl implements ItemService { public class ItemServiceImpl implements ItemService {
...@@ -99,79 +103,79 @@ public class ItemServiceImpl implements ItemService { ...@@ -99,79 +103,79 @@ public class ItemServiceImpl implements ItemService {
} }
// @Override @Override
// public Result page(ItemRequestDto dto) { public Result page(ItemRequestDto dto) {
// try { try {
// PageInfo<AgentTranceResponseVo> result = new PageInfo<>(); PageInfo<AgentTranceResponseVo> result = new PageInfo<>();
// result.setPageNum(dto.getPage()); result.setPageNum(dto.getPage());
// result.setPageSize(dto.getSize()); result.setPageSize(dto.getSize());
// result.setTotal(0L); result.setTotal(0L);
// result.setList(new ArrayList<>()); result.setList(new ArrayList<>());
// result.setHasNextPage(false); result.setHasNextPage(false);
//
// EsSearchRequestDto esSearchRequestDto = new EsSearchRequestDto(); EsSearchRequestDto esSearchRequestDto = new EsSearchRequestDto();
// esSearchRequestDto.setPage(dto.getPage()); esSearchRequestDto.setPage(dto.getPage());
// esSearchRequestDto.setSize(dto.getSize()); esSearchRequestDto.setSize(dto.getSize());
// if (StringUtils.isNotBlank(dto.getName())) { if (StringUtils.isNotBlank(dto.getName())) {
// esSearchRequestDto.setContent(dto.getName()); esSearchRequestDto.setContent(dto.getName());
// } }
// EsPageInfo esPageInfo = itemEsDao.findList(esSearchRequestDto); EsPageInfo esPageInfo = itemEsDao.findList(esSearchRequestDto);
// if (Objects.isNull(esPageInfo) || CollectionUtils.isEmpty(esPageInfo.getDataList())) { if (Objects.isNull(esPageInfo) || CollectionUtils.isEmpty(esPageInfo.getDataList())) {
// return Result.success(result); return Result.success(result);
// } }
//
// List<Long> ids = esPageInfo.getDataList().stream().map(s -> { List<Long> ids = esPageInfo.getDataList().stream().map(s -> {
// ItemOfEs itemOfEs = (ItemOfEs) s; ItemOfEs itemOfEs = (ItemOfEs) s;
// return itemOfEs.getId(); return itemOfEs.getId();
// }).collect(Collectors.toList()); }).collect(Collectors.toList());
// CoinRequestDto coinRequestDto = new CoinRequestDto(); CoinRequestDto coinRequestDto = new CoinRequestDto();
// coinRequestDto.setIds(ids); coinRequestDto.setIds(ids);
// List<Item> list = itemDao.findListNotDeleted(coinRequestDto); List<Item> list = itemDao.findListNotDeleted(coinRequestDto);
// if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {
// return Result.success(result); return Result.success(result);
// } }
// Map<Long, Item> map = list.stream().collect(Collectors.toMap(Item::getId, s -> s, (k1, k2) -> k2)); Map<Long, Item> map = list.stream().collect(Collectors.toMap(Item::getId, s -> s, (k1, k2) -> k2));
// result.setTotal(esPageInfo.getTotal()); result.setTotal(esPageInfo.getTotal());
// result.setHasNextPage(esPageInfo.getTotal() == 10000); result.setHasNextPage(esPageInfo.getTotal() == 10000);
//
// List<AgentTranceResponseVo> resultList = new ArrayList<>(); List<AgentTranceResponseVo> resultList = new ArrayList<>();
// esPageInfo.getDataList().forEach(s -> { esPageInfo.getDataList().forEach(s -> {
// ItemResponseVo vo = new ItemResponseVo(); ItemResponseVo vo = new ItemResponseVo();
// ItemOfEs es = (ItemOfEs) s; ItemOfEs es = (ItemOfEs) s;
// Item item = map.get(es.getId()); Item item = map.get(es.getId());
// // 设置基本信息 // 设置基本信息
// vo.setId(es.getId()); vo.setId(es.getId());
// vo.setName(es.getName()); vo.setName(es.getName());
// vo.setDetail(item.getDetail()); vo.setDetail(item.getDetail());
// vo.setSourceType(item.getSourceType()); vo.setSourceType(item.getSourceType());
// // 设置价格 // 设置价格
// vo.setPrice(getPrice(item.getPrice())); vo.setPrice(getPrice(item.getPrice()));
// // 设置图片或视频 // 设置图片或视频
// vo.setHomePageImage(getImage(es, item)); vo.setHomePageImage(getImage(es, item));
// // 设置是否收藏和是否是自己发布的 // 设置是否收藏和是否是自己发布的
// vo.setIsCollected(0); vo.setIsCollected(0);
// vo.setIsMine(0); vo.setIsMine(0);
// if (!dto.getUserId().equals(0L)) { if (!dto.getUserId().equals(0L)) {
// vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), es.getId()) ? 1 : 0); vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), es.getId()) ? 1 : 0);
// vo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), es.getId()) ? 1 : 0); vo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), es.getId()) ? 1 : 0);
// } }
// // 设置收藏数 // 设置收藏数
// vo.setCollectCount(getCollectCount(es.getId(), item.getSourceType())); vo.setCollectCount(getCollectCount(es.getId(), item.getSourceType()));
//
// AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo(); AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
// agentTranceResponseVo.setAgentTraceInfo_(""); agentTranceResponseVo.setAgentTraceInfo_("");
// agentTranceResponseVo.setViewType(1); agentTranceResponseVo.setViewType(1);
// agentTranceResponseVo.setDetail(vo); agentTranceResponseVo.setDetail(vo);
// resultList.add(agentTranceResponseVo); resultList.add(agentTranceResponseVo);
// }); });
// result.setList(resultList); result.setList(resultList);
// logger.info("【请求结束】查询首页列表成功"); logger.info("【请求结束】查询首页列表成功");
// return Result.success(result); return Result.success(result);
// } catch (Exception e) { } catch (Exception e) {
// logger.error("查询首页列表失败", e); logger.error("查询首页列表失败", e);
// return Result.failed("查询首页列表失败"); return Result.failed("查询首页列表失败");
// } }
// } }
@Override @Override
public Result list(ItemRequestDto dto) { public Result list(ItemRequestDto dto) {
...@@ -556,106 +560,29 @@ public class ItemServiceImpl implements ItemService { ...@@ -556,106 +560,29 @@ public class ItemServiceImpl implements ItemService {
return null; return null;
} }
// private Map<String, Object> getImage(ItemOfEs es, Item item) { private Map<String, Object> getImage(ItemOfEs es, Item item) {
// 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());
// homePageMap.put("type", 2);
// }
// } else {
// if (StringUtils.isNotBlank(item.getImages())) {
// String[] image = item.getImages().split(";");
// homePageMap.put("url", image[0]);
// if (image[0].contains("_")) {
// homePageMap = getImageMap(image[0]);
// homePageMap.put("url", image[0]);
// homePageMap.put("type", 2);
// }
// }
// }
// 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);
// }
// }
// 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<>(); Map<String, Object> homePageMap = new HashMap<>();
String[] image = item.getImages().split(";"); homePageMap.put("url", "");
homePageMap.put("url", image[0]);
homePageMap.put("type", 2); homePageMap.put("type", 2);
homePageMap.put("width", "0"); homePageMap.put("width", "0");
homePageMap.put("height", "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());
homePageMap.put("type", 2);
}
} else {
if (StringUtils.isNotBlank(item.getImages())) {
String[] image = item.getImages().split(";");
homePageMap.put("url", image[0]);
if (image[0].contains("_")) {
homePageMap = getImageMap(image[0]);
homePageMap.put("url", image[0]);
homePageMap.put("type", 2);
}
}
}
if (StringUtils.isNotBlank(item.getVideos())) { if (StringUtils.isNotBlank(item.getVideos())) {
String[] vedioImage = item.getVideos().split(";"); String[] vedioImage = item.getVideos().split(";");
if (vedioImage[0].contains(",")) { if (vedioImage[0].contains(",")) {
...@@ -664,16 +591,93 @@ public class ItemServiceImpl implements ItemService { ...@@ -664,16 +591,93 @@ public class ItemServiceImpl implements ItemService {
homePageMap.put("url", video[1]); homePageMap.put("url", video[1]);
homePageMap.put("type", 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; 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) { private Map<String, Object> getImageMap(String image) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
String[] _image = image.split("_"); 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