From 160f973ce4eb04e690c396ebd45bffbc6fb99961 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 28 十一月 2022 15:43:18 +0800
Subject: [PATCH] fix: 预警研判报警事间未显示
---
ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
index bd15859..2c77c16 100644
--- a/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
@@ -9,9 +9,11 @@
import com.ycl.enums.common.ResultCode;
import com.ycl.exception.ApiException;
import com.ycl.mapper.store.StoreInfoMapper;
+import com.ycl.mapper.video.VideoPointMapper;
import com.ycl.service.store.StoreInfoService;
import com.ycl.utils.ExcelUtils;
import com.ycl.vo.store.StoreInfoExcelVo;
+import com.ycl.vo.store.StoreInfoVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -34,16 +36,21 @@
@Slf4j
public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo> implements StoreInfoService {
+ @Resource
+ StoreInfoMapper storeInfoMapper;
+
+ @Resource
+ VideoPointMapper videoPointMapper;
@Override
- public Page<StoreInfo> list(String keyword, Integer pageSize, Integer pageNum) {
- Page<StoreInfo> page = new Page<>(pageSize, pageNum);
- Page<StoreInfo> storeInfoPage = page(page, new LambdaQueryWrapper<StoreInfo>()
- .like(StringUtils.isNotBlank(keyword), StoreInfo::getStoreName, keyword));
- storeInfoPage.setRecords(list(new LambdaQueryWrapper<StoreInfo>()
- .like(StringUtils.isNotBlank(keyword), StoreInfo::getStoreName, keyword)));
- return storeInfoPage;
+ public Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum,String status) {
+ Page<StoreInfo> storeInfoPage = new Page<>();
+ storeInfoPage.setSize(pageSize);
+ storeInfoPage.setCurrent(pageNum);
+ Page<StoreInfoVO> page = storeInfoMapper.selectStorePage(storeInfoPage, keyword,status);
+ page.getRecords().forEach(x->x.setVideoPoint(videoPointMapper.selectById(x.getVideoId())));
+ return page;
}
@Override
--
Gitblit v1.8.0