You've already forked FrameTour-BE
Merge branch 'rem_scenic_device'
This commit is contained in:
@@ -306,6 +306,8 @@ public class AppScenicServiceImpl implements AppScenicService {
|
||||
}
|
||||
List<DeviceRespVO> extraDeviceList = extraDeviceMapper.listExtraDeviceByScenicId(scenicId);
|
||||
for (DeviceRespVO deviceRespVO : extraDeviceList) {
|
||||
ScenicV2DTO scenicBasic = scenicRepository.getScenicBasic(deviceRespVO.getScenicId());
|
||||
deviceRespVO.setScenicName(scenicBasic.getName());
|
||||
if (redisTemplate.hasKey("ext_device:online:"+deviceRespVO.getNo())) {
|
||||
String onlineTs = redisTemplate.opsForValue().get("ext_device:online:"+deviceRespVO.getNo());
|
||||
if (!StringUtils.isNumeric(onlineTs)) {
|
||||
|
@@ -3,6 +3,8 @@ package com.ycwl.basic.service.mobile.impl;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.extra.qrcode.QrCodeUtil;
|
||||
import cn.hutool.http.HttpUtil;
|
||||
import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2DTO;
|
||||
import com.ycwl.basic.model.pc.scenic.entity.ScenicEntity;
|
||||
import com.ycwl.basic.utils.JacksonUtil;
|
||||
import com.ycwl.basic.biz.CouponBiz;
|
||||
import com.ycwl.basic.biz.OrderBiz;
|
||||
@@ -117,7 +119,12 @@ public class GoodsServiceImpl implements GoodsService {
|
||||
GoodsPageVO goodsPageVO = new GoodsPageVO();
|
||||
goodsPageVO.setGoodsName(videoRespVO.getTemplateName());
|
||||
goodsPageVO.setScenicId(videoRespVO.getScenicId());
|
||||
goodsPageVO.setScenicName(videoRespVO.getScenicName());
|
||||
try {
|
||||
ScenicV2DTO scenic = scenicRepository.getScenicBasic(videoRespVO.getScenicId());
|
||||
goodsPageVO.setScenicName(scenic.getName());
|
||||
} catch (Exception e) {
|
||||
goodsPageVO.setScenicName("");
|
||||
}
|
||||
goodsPageVO.setGoodsType(0);
|
||||
goodsPageVO.setFaceId(videoRespVO.getFaceId());
|
||||
goodsPageVO.setGoodsId(videoRespVO.getId());
|
||||
@@ -206,7 +213,12 @@ public class GoodsServiceImpl implements GoodsService {
|
||||
goodsDetailVO.setGoodsName(goodsNamePrefix + i + " " + shootingTime);
|
||||
}
|
||||
goodsDetailVO.setScenicId(sourceRespVO.getScenicId());
|
||||
goodsDetailVO.setScenicName(sourceRespVO.getScenicName());
|
||||
try {
|
||||
ScenicV2DTO scenic = scenicRepository.getScenicBasic(sourceRespVO.getScenicId());
|
||||
goodsDetailVO.setScenicName(scenic.getName());
|
||||
} catch (Exception e) {
|
||||
goodsDetailVO.setScenicName("");
|
||||
}
|
||||
goodsDetailVO.setGoodsType(sourceType);
|
||||
goodsDetailVO.setFaceId(face.getId());
|
||||
goodsDetailVO.setGoodsId(sourceRespVO.getId());
|
||||
@@ -245,7 +257,12 @@ public class GoodsServiceImpl implements GoodsService {
|
||||
}
|
||||
goodsDetailVO.setGoodsName(videoRespVO.getTemplateName());
|
||||
goodsDetailVO.setScenicId(videoRespVO.getScenicId());
|
||||
goodsDetailVO.setScenicName(videoRespVO.getScenicName());
|
||||
try {
|
||||
ScenicV2DTO scenic = scenicRepository.getScenicBasic(videoRespVO.getScenicId());
|
||||
goodsDetailVO.setScenicName(scenic.getName());
|
||||
} catch (Exception e) {
|
||||
goodsDetailVO.setScenicName("");
|
||||
}
|
||||
goodsDetailVO.setGoodsType(0);
|
||||
goodsDetailVO.setGoodsId(videoRespVO.getId());
|
||||
goodsDetailVO.setVideoUrl(videoRespVO.getVideoUrl());
|
||||
@@ -483,7 +500,12 @@ public class GoodsServiceImpl implements GoodsService {
|
||||
GoodsDetailVO goodsDetailVO = new GoodsDetailVO();
|
||||
goodsDetailVO.setGoodsName("原片");
|
||||
goodsDetailVO.setScenicId(sourceRespVO.getScenicId());
|
||||
goodsDetailVO.setScenicName(sourceRespVO.getScenicName());
|
||||
try {
|
||||
ScenicV2DTO scenic = scenicRepository.getScenicBasic(sourceRespVO.getScenicId());
|
||||
goodsDetailVO.setScenicName(scenic.getName());
|
||||
} catch (Exception e) {
|
||||
goodsDetailVO.setScenicName("");
|
||||
}
|
||||
goodsDetailVO.setGoodsType(sourceRespVO.getType());
|
||||
goodsDetailVO.setGoodsId(sourceRespVO.getId());
|
||||
if (sourceRespVO.getVideoUrl() != null) {
|
||||
|
@@ -6,11 +6,15 @@ import com.ycwl.basic.mapper.BrokerMapper;
|
||||
import com.ycwl.basic.model.pc.broker.entity.BrokerEntity;
|
||||
import com.ycwl.basic.model.pc.broker.req.BrokerReqQuery;
|
||||
import com.ycwl.basic.model.pc.broker.resp.BrokerRespVO;
|
||||
import com.ycwl.basic.repository.ScenicRepository;
|
||||
import com.ycwl.basic.service.pc.BrokerService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @Author:longbinbin
|
||||
@@ -21,18 +25,53 @@ public class BrokerServiceImpl implements BrokerService {
|
||||
|
||||
@Autowired
|
||||
private BrokerMapper brokerMapper;
|
||||
@Autowired
|
||||
private ScenicRepository scenicRepository;
|
||||
|
||||
@Override
|
||||
public PageInfo<BrokerRespVO> pageQuery(BrokerReqQuery brokerReqQuery) {
|
||||
PageHelper.startPage(brokerReqQuery.getPageNum(),brokerReqQuery.getPageSize());
|
||||
List<BrokerRespVO> list = brokerMapper.list(brokerReqQuery);
|
||||
|
||||
// 批量获取景区名称
|
||||
List<Long> scenicIds = list.stream()
|
||||
.map(BrokerRespVO::getScenicId)
|
||||
.filter(Objects::nonNull)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
Map<Long, String> scenicNames = scenicRepository.batchGetScenicNames(scenicIds);
|
||||
|
||||
// 设置景区名称
|
||||
list.forEach(item -> {
|
||||
if (item.getScenicId() != null) {
|
||||
item.setScenicName(scenicNames.get(item.getScenicId()));
|
||||
}
|
||||
});
|
||||
|
||||
PageInfo<BrokerRespVO> pageInfo = new PageInfo(list);
|
||||
return pageInfo;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BrokerRespVO> list(BrokerReqQuery brokerReqQuery) {
|
||||
return brokerMapper.list(brokerReqQuery);
|
||||
List<BrokerRespVO> list = brokerMapper.list(brokerReqQuery);
|
||||
|
||||
// 批量获取景区名称
|
||||
List<Long> scenicIds = list.stream()
|
||||
.map(BrokerRespVO::getScenicId)
|
||||
.filter(Objects::nonNull)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
Map<Long, String> scenicNames = scenicRepository.batchGetScenicNames(scenicIds);
|
||||
|
||||
// 设置景区名称
|
||||
list.forEach(item -> {
|
||||
if (item.getScenicId() != null) {
|
||||
item.setScenicName(scenicNames.get(item.getScenicId()));
|
||||
}
|
||||
});
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -3,17 +3,23 @@ import com.ycwl.basic.mapper.CouponMapper;
|
||||
import com.ycwl.basic.model.pc.coupon.entity.CouponEntity;
|
||||
import com.ycwl.basic.model.pc.coupon.req.CouponQueryReq;
|
||||
import com.ycwl.basic.model.pc.coupon.resp.CouponRespVO;
|
||||
import com.ycwl.basic.repository.ScenicRepository;
|
||||
import com.ycwl.basic.service.pc.CouponService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Service
|
||||
public class CouponServiceImpl implements CouponService {
|
||||
|
||||
@Autowired
|
||||
private CouponMapper couponMapper;
|
||||
@Autowired
|
||||
private ScenicRepository scenicRepository;
|
||||
|
||||
@Override
|
||||
public Integer add(CouponEntity coupon) {
|
||||
@@ -38,6 +44,22 @@ public class CouponServiceImpl implements CouponService {
|
||||
@Override
|
||||
public List<CouponRespVO> list(CouponQueryReq query) {
|
||||
List<CouponRespVO> list = couponMapper.selectByQuery(query);
|
||||
|
||||
// 批量获取景区名称
|
||||
List<Long> scenicIds = list.stream()
|
||||
.map(CouponRespVO::getScenicId)
|
||||
.filter(Objects::nonNull)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
Map<Long, String> scenicNames = scenicRepository.batchGetScenicNames(scenicIds);
|
||||
|
||||
// 设置景区名称
|
||||
list.forEach(item -> {
|
||||
if (item.getScenicId() != null) {
|
||||
item.setScenicName(scenicNames.get(item.getScenicId()));
|
||||
}
|
||||
});
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
|
@@ -53,6 +53,7 @@ import com.ycwl.basic.pay.adapter.IPayAdapter;
|
||||
import com.ycwl.basic.pay.entity.PayResponse;
|
||||
import com.ycwl.basic.repository.FaceRepository;
|
||||
import com.ycwl.basic.repository.PriceRepository;
|
||||
import com.ycwl.basic.repository.ScenicRepository;
|
||||
import com.ycwl.basic.repository.TemplateRepository;
|
||||
import com.ycwl.basic.repository.VideoRepository;
|
||||
import com.ycwl.basic.repository.VideoTaskRepository;
|
||||
@@ -129,6 +130,8 @@ public class OrderServiceImpl implements OrderService {
|
||||
@Autowired
|
||||
private ScenicService scenicService;
|
||||
@Autowired
|
||||
private ScenicRepository scenicRepository;
|
||||
@Autowired
|
||||
private VideoMapper videoMapper;
|
||||
@Autowired
|
||||
private IVoucherService iVoucherService;
|
||||
@@ -139,7 +142,21 @@ public class OrderServiceImpl implements OrderService {
|
||||
public ApiResponse<PageInfo<OrderRespVO>> pageQuery(OrderReqQuery query) {
|
||||
PageHelper.startPage(query.getPageNum(), query.getPageSize());
|
||||
List<OrderRespVO> list = orderMapper.list(query);
|
||||
|
||||
// 批量获取景区名称
|
||||
List<Long> scenicIds = list.stream()
|
||||
.map(OrderRespVO::getScenicId)
|
||||
.filter(Objects::nonNull)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
Map<Long, String> scenicNames = scenicRepository.batchGetScenicNames(scenicIds);
|
||||
|
||||
list.forEach(item -> {
|
||||
// 设置景区名称
|
||||
if (item.getScenicId() != null) {
|
||||
item.setScenicName(scenicNames.get(item.getScenicId()));
|
||||
}
|
||||
|
||||
if (Integer.valueOf(-1).equals(item.getType())) {
|
||||
item.setGoodsName("一口价");
|
||||
item.setOrderType("一口价");
|
||||
@@ -181,8 +198,21 @@ public class OrderServiceImpl implements OrderService {
|
||||
public ApiResponse<PageInfo<OrderRespVO>> pageQueryDetail(OrderReqQuery query) {
|
||||
PageHelper.startPage(query.getPageNum(), query.getPageSize());
|
||||
List<OrderRespVO> list = orderMapper.listDetail(query);
|
||||
|
||||
// 批量获取景区名称
|
||||
List<Long> scenicIds = list.stream()
|
||||
.map(OrderRespVO::getScenicId)
|
||||
.filter(Objects::nonNull)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
Map<Long, String> scenicNames = scenicRepository.batchGetScenicNames(scenicIds);
|
||||
|
||||
for (OrderRespVO item : list) {
|
||||
item.setPrice(item.getPayPrice());
|
||||
// 设置景区名称
|
||||
if (item.getScenicId() != null) {
|
||||
item.setScenicName(scenicNames.get(item.getScenicId()));
|
||||
}
|
||||
}
|
||||
PageInfo<OrderRespVO> pageInfo = new PageInfo<>(list);
|
||||
return ApiResponse.success(pageInfo);
|
||||
@@ -191,8 +221,21 @@ public class OrderServiceImpl implements OrderService {
|
||||
@Override
|
||||
public ApiResponse<List<OrderRespVO>> list(OrderReqQuery query) {
|
||||
List<OrderRespVO> list = orderMapper.list(query);
|
||||
|
||||
// 批量获取景区名称
|
||||
List<Long> scenicIds = list.stream()
|
||||
.map(OrderRespVO::getScenicId)
|
||||
.filter(Objects::nonNull)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
Map<Long, String> scenicNames = scenicRepository.batchGetScenicNames(scenicIds);
|
||||
|
||||
for (OrderRespVO item : list) {
|
||||
item.setPrice(item.getPayPrice());
|
||||
// 设置景区名称
|
||||
if (item.getScenicId() != null) {
|
||||
item.setScenicName(scenicNames.get(item.getScenicId()));
|
||||
}
|
||||
}
|
||||
return ApiResponse.success(list);
|
||||
}
|
||||
@@ -307,6 +350,18 @@ public class OrderServiceImpl implements OrderService {
|
||||
}
|
||||
});
|
||||
order.setGoodsList(goodsList);
|
||||
|
||||
// 设置景区名称
|
||||
if (order.getScenicId() != null) {
|
||||
try {
|
||||
String scenicName = scenicRepository.batchGetScenicNames(List.of(order.getScenicId()))
|
||||
.get(order.getScenicId());
|
||||
order.setScenicName(scenicName);
|
||||
} catch (Exception e) {
|
||||
log.warn("获取景区名称失败: {}", order.getScenicId(), e);
|
||||
}
|
||||
}
|
||||
|
||||
return ApiResponse.success(order);
|
||||
}
|
||||
|
||||
@@ -426,6 +481,22 @@ public class OrderServiceImpl implements OrderService {
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// 批量获取景区名称
|
||||
List<Long> scenicIds = list.stream()
|
||||
.map(OrderAppRespVO::getScenicId)
|
||||
.filter(Objects::nonNull)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
Map<Long, String> scenicNames = scenicRepository.batchGetScenicNames(scenicIds);
|
||||
|
||||
// 设置景区名称
|
||||
list.forEach(order -> {
|
||||
if (order.getScenicId() != null) {
|
||||
order.setScenicName(scenicNames.get(order.getScenicId()));
|
||||
}
|
||||
});
|
||||
|
||||
PageInfo<OrderAppRespVO> pageInfo = new PageInfo<>(list);
|
||||
return ApiResponse.success(pageInfo);
|
||||
}
|
||||
@@ -433,6 +504,18 @@ public class OrderServiceImpl implements OrderService {
|
||||
@Override
|
||||
public ApiResponse<OrderAppRespVO> appDetail(Long id) {
|
||||
OrderAppRespVO orderAppRespVO = orderMapper.appDetail(id);
|
||||
|
||||
// 设置景区名称
|
||||
if (orderAppRespVO != null && orderAppRespVO.getScenicId() != null) {
|
||||
try {
|
||||
String scenicName = scenicRepository.batchGetScenicNames(List.of(orderAppRespVO.getScenicId()))
|
||||
.get(orderAppRespVO.getScenicId());
|
||||
orderAppRespVO.setScenicName(scenicName);
|
||||
} catch (Exception e) {
|
||||
log.warn("获取景区名称失败: {}", orderAppRespVO.getScenicId(), e);
|
||||
}
|
||||
}
|
||||
|
||||
return ApiResponse.success(orderAppRespVO);
|
||||
}
|
||||
|
||||
@@ -473,7 +556,21 @@ public class OrderServiceImpl implements OrderService {
|
||||
public ApiResponse<PageInfo<OrderRespVO>> refundPageQuery(OrderReqQuery query) {
|
||||
PageHelper.startPage(query.getPageNum(), query.getPageSize());
|
||||
List<OrderRespVO> list = orderMapper.refundList(query);
|
||||
|
||||
// 批量获取景区名称
|
||||
List<Long> scenicIds = list.stream()
|
||||
.map(OrderRespVO::getScenicId)
|
||||
.filter(Objects::nonNull)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
Map<Long, String> scenicNames = scenicRepository.batchGetScenicNames(scenicIds);
|
||||
|
||||
list.forEach(item -> {
|
||||
// 设置景区名称
|
||||
if (item.getScenicId() != null) {
|
||||
item.setScenicName(scenicNames.get(item.getScenicId()));
|
||||
}
|
||||
|
||||
if (Integer.valueOf(-1).equals(item.getType())) {
|
||||
item.setGoodsName("一口价");
|
||||
item.setOrderType("一口价");
|
||||
|
@@ -3,6 +3,7 @@ package com.ycwl.basic.service.pc.impl;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.ycwl.basic.exception.BaseException;
|
||||
import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2DTO;
|
||||
import com.ycwl.basic.mapper.SourceMapper;
|
||||
import com.ycwl.basic.model.pc.device.entity.DeviceEntity;
|
||||
import com.ycwl.basic.model.pc.scenic.entity.ScenicEntity;
|
||||
@@ -28,6 +29,9 @@ import java.net.MalformedURLException;
|
||||
import java.net.URL;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static com.ycwl.basic.constant.StorageConstant.PHOTO_PATH;
|
||||
|
||||
@@ -52,14 +56,31 @@ public class SourceServiceImpl implements SourceService {
|
||||
public ApiResponse<PageInfo<SourceRespVO>> pageQuery(SourceReqQuery sourceReqQuery) {
|
||||
PageHelper.startPage(sourceReqQuery.getPageNum(), sourceReqQuery.getPageSize());
|
||||
List<SourceRespVO> list = sourceMapper.list(sourceReqQuery);
|
||||
|
||||
// 批量获取景区名称
|
||||
List<Long> scenicIds = list.stream()
|
||||
.map(SourceRespVO::getScenicId)
|
||||
.filter(Objects::nonNull)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
Map<Long, String> scenicNames = scenicRepository.batchGetScenicNames(scenicIds);
|
||||
|
||||
// 批量获取设备名称
|
||||
List<Long> deviceIds = list.stream()
|
||||
.map(SourceRespVO::getDeviceId)
|
||||
.filter(Objects::nonNull)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
Map<Long, String> deviceNames = deviceRepository.batchGetDeviceNames(deviceIds);
|
||||
|
||||
list.forEach(sourceRespVO -> {
|
||||
ScenicEntity scenic = scenicRepository.getScenic(sourceRespVO.getScenicId());
|
||||
if (scenic != null) {
|
||||
sourceRespVO.setScenicName(scenic.getName());
|
||||
// 设置景区名称
|
||||
if (sourceRespVO.getScenicId() != null) {
|
||||
sourceRespVO.setScenicName(scenicNames.get(sourceRespVO.getScenicId()));
|
||||
}
|
||||
DeviceEntity device = deviceRepository.getDevice(sourceRespVO.getDeviceId());
|
||||
if (device != null) {
|
||||
sourceRespVO.setDeviceName(device.getName());
|
||||
// 设置设备名称
|
||||
if (sourceRespVO.getDeviceId() != null) {
|
||||
sourceRespVO.setDeviceName(deviceNames.get(sourceRespVO.getDeviceId()));
|
||||
}
|
||||
if (sourceRespVO.getVideoUrl() != null) {
|
||||
try {
|
||||
@@ -82,7 +103,32 @@ public class SourceServiceImpl implements SourceService {
|
||||
@Override
|
||||
public ApiResponse<List<SourceRespVO>> list(SourceReqQuery sourceReqQuery) {
|
||||
List<SourceRespVO> list = sourceMapper.list(sourceReqQuery);
|
||||
|
||||
// 批量获取景区名称
|
||||
List<Long> scenicIds = list.stream()
|
||||
.map(SourceRespVO::getScenicId)
|
||||
.filter(Objects::nonNull)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
Map<Long, String> scenicNames = scenicRepository.batchGetScenicNames(scenicIds);
|
||||
|
||||
// 批量获取设备名称
|
||||
List<Long> deviceIds = list.stream()
|
||||
.map(SourceRespVO::getDeviceId)
|
||||
.filter(Objects::nonNull)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
Map<Long, String> deviceNames = deviceRepository.batchGetDeviceNames(deviceIds);
|
||||
|
||||
list.forEach(sourceRespVO -> {
|
||||
// 设置景区名称
|
||||
if (sourceRespVO.getScenicId() != null) {
|
||||
sourceRespVO.setScenicName(scenicNames.get(sourceRespVO.getScenicId()));
|
||||
}
|
||||
// 设置设备名称
|
||||
if (sourceRespVO.getDeviceId() != null) {
|
||||
sourceRespVO.setDeviceName(deviceNames.get(sourceRespVO.getDeviceId()));
|
||||
}
|
||||
if (sourceRespVO.getVideoUrl() != null) {
|
||||
try {
|
||||
URL url = new URL(sourceRespVO.getVideoUrl());
|
||||
@@ -116,6 +162,12 @@ public class SourceServiceImpl implements SourceService {
|
||||
sourceRespVO.setVideoUrl(sourceRespVO.getVideoUrl());
|
||||
}
|
||||
}
|
||||
try {
|
||||
ScenicV2DTO scenicBasic = scenicRepository.getScenicBasic(sourceRespVO.getScenicId());
|
||||
sourceRespVO.setScenicName(scenicBasic.getName());
|
||||
} catch (Exception e) {
|
||||
sourceRespVO.setScenicName("");
|
||||
}
|
||||
return ApiResponse.success(sourceRespVO);
|
||||
}
|
||||
|
||||
|
@@ -11,6 +11,7 @@ import com.ycwl.basic.pricing.enums.ProductType;
|
||||
import com.ycwl.basic.pricing.service.IPricingManagementService;
|
||||
import com.ycwl.basic.service.pc.TemplateService;
|
||||
import com.ycwl.basic.repository.TemplateRepository;
|
||||
import com.ycwl.basic.repository.ScenicRepository;
|
||||
import com.ycwl.basic.utils.ApiResponse;
|
||||
import com.ycwl.basic.utils.SnowFlakeUtil;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -18,8 +19,11 @@ import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @Author:longbinbin
|
||||
@@ -33,19 +37,54 @@ public class TemplateServiceImpl implements TemplateService {
|
||||
@Autowired
|
||||
private TemplateRepository templateRepository;
|
||||
@Autowired
|
||||
private ScenicRepository scenicRepository;
|
||||
@Autowired
|
||||
private IPricingManagementService pricingManagementService;
|
||||
|
||||
@Override
|
||||
public ApiResponse<PageInfo<TemplateRespVO>> pageQuery(TemplateReqQuery templateReqQuery) {
|
||||
PageHelper.startPage(templateReqQuery.getPageNum(), templateReqQuery.getPageSize());
|
||||
List<TemplateRespVO> list = templateMapper.list(templateReqQuery);
|
||||
|
||||
// 批量获取景区名称
|
||||
List<Long> scenicIds = list.stream()
|
||||
.map(TemplateRespVO::getScenicId)
|
||||
.filter(Objects::nonNull)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
Map<Long, String> scenicNames = scenicRepository.batchGetScenicNames(scenicIds);
|
||||
|
||||
// 设置景区名称
|
||||
list.forEach(item -> {
|
||||
if (item.getScenicId() != null) {
|
||||
item.setScenicName(scenicNames.get(item.getScenicId()));
|
||||
}
|
||||
});
|
||||
|
||||
PageInfo<TemplateRespVO> pageInfo = new PageInfo<>(list);
|
||||
return ApiResponse.success(pageInfo);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ApiResponse<List<TemplateRespVO>> list(TemplateReqQuery templateReqQuery) {
|
||||
return ApiResponse.success(templateMapper.list(templateReqQuery));
|
||||
List<TemplateRespVO> list = templateMapper.list(templateReqQuery);
|
||||
|
||||
// 批量获取景区名称
|
||||
List<Long> scenicIds = list.stream()
|
||||
.map(TemplateRespVO::getScenicId)
|
||||
.filter(Objects::nonNull)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
Map<Long, String> scenicNames = scenicRepository.batchGetScenicNames(scenicIds);
|
||||
|
||||
// 设置景区名称
|
||||
list.forEach(item -> {
|
||||
if (item.getScenicId() != null) {
|
||||
item.setScenicName(scenicNames.get(item.getScenicId()));
|
||||
}
|
||||
});
|
||||
|
||||
return ApiResponse.success(list);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -5,12 +5,16 @@ import com.github.pagehelper.PageInfo;
|
||||
import com.ycwl.basic.mapper.VideoMapper;
|
||||
import com.ycwl.basic.model.pc.video.req.VideoReqQuery;
|
||||
import com.ycwl.basic.model.pc.video.resp.VideoRespVO;
|
||||
import com.ycwl.basic.repository.ScenicRepository;
|
||||
import com.ycwl.basic.service.pc.VideoService;
|
||||
import com.ycwl.basic.utils.ApiResponse;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @Author:longbinbin
|
||||
@@ -21,18 +25,53 @@ public class VideoServiceImpl implements VideoService {
|
||||
|
||||
@Autowired
|
||||
private VideoMapper videoMapper;
|
||||
@Autowired
|
||||
private ScenicRepository scenicRepository;
|
||||
|
||||
@Override
|
||||
public ApiResponse<PageInfo<VideoRespVO>> pageQuery(VideoReqQuery videoReqQuery) {
|
||||
PageHelper.startPage(videoReqQuery.getPageNum(), videoReqQuery.getPageSize());
|
||||
List<VideoRespVO> list = videoMapper.list(videoReqQuery);
|
||||
|
||||
// 批量获取景区名称
|
||||
List<Long> scenicIds = list.stream()
|
||||
.map(VideoRespVO::getScenicId)
|
||||
.filter(Objects::nonNull)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
Map<Long, String> scenicNames = scenicRepository.batchGetScenicNames(scenicIds);
|
||||
|
||||
// 设置景区名称
|
||||
list.forEach(item -> {
|
||||
if (item.getScenicId() != null) {
|
||||
item.setScenicName(scenicNames.get(item.getScenicId()));
|
||||
}
|
||||
});
|
||||
|
||||
PageInfo<VideoRespVO> pageInfo = new PageInfo<>(list);
|
||||
return ApiResponse.success(pageInfo);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ApiResponse<List<VideoRespVO>> list(VideoReqQuery videoReqQuery) {
|
||||
return ApiResponse.success(videoMapper.list(videoReqQuery));
|
||||
List<VideoRespVO> list = videoMapper.list(videoReqQuery);
|
||||
|
||||
// 批量获取景区名称
|
||||
List<Long> scenicIds = list.stream()
|
||||
.map(VideoRespVO::getScenicId)
|
||||
.filter(Objects::nonNull)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
Map<Long, String> scenicNames = scenicRepository.batchGetScenicNames(scenicIds);
|
||||
|
||||
// 设置景区名称
|
||||
list.forEach(item -> {
|
||||
if (item.getScenicId() != null) {
|
||||
item.setScenicName(scenicNames.get(item.getScenicId()));
|
||||
}
|
||||
});
|
||||
|
||||
return ApiResponse.success(list);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Reference in New Issue
Block a user