From 89044714eef77f834078e878533e93060a0c5e17 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 21 十二月 2021 15:27:21 +0800
Subject: [PATCH] 通用大屏修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java | 102 +++++++++++++++++++++++++++++++--------------------
1 files changed, 62 insertions(+), 40 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
index 20588bd..7ab345f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
@@ -14,11 +14,14 @@
import javax.annotation.Resource;
+import org.springframework.stereotype.Service;
+
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
-import com.panzhihua.common.model.vos.community.ComActDynVO;
-import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
-import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCommunityStatisticsVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenDynStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenEasyPhotoStatisticsInfo;
@@ -27,27 +30,21 @@
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenNeighborStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenQuestionnaireStatisticsInfo;
import com.panzhihua.common.model.vos.community.bigscreen.GridsGovernanceStatisticsVO;
+import com.panzhihua.common.model.vos.community.bigscreen.ResidentAutonomyStatisticsVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridIncidentStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridStatisticsVO;
-import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO;
-import com.panzhihua.service_community.dao.ComActDynDAO;
-import com.panzhihua.service_community.dao.ComActQuestnaireDAO;
-import com.panzhihua.service_community.dao.ComMngPopulationDAO;
-import com.panzhihua.service_community.dao.ConvenientMerchantDAO;
-import org.springframework.stereotype.Service;
-
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
-import com.panzhihua.common.model.vos.community.StatisticsCommVO;
-import com.panzhihua.common.model.vos.community.bigscreen.ResidentAutonomyStatisticsVO;
import com.panzhihua.service_community.dao.ComActDiscussDAO;
+import com.panzhihua.service_community.dao.ComActDynDAO;
import com.panzhihua.service_community.dao.ComActEasyPhotoDAO;
import com.panzhihua.service_community.dao.ComActMicroWishDAO;
import com.panzhihua.service_community.dao.ComActNeighborCircleDAO;
+import com.panzhihua.service_community.dao.ComActQuestnaireDAO;
import com.panzhihua.service_community.dao.ComActWarehouseDonatesDao;
+import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.dao.ComPropertyDao;
+import com.panzhihua.service_community.dao.ConvenientMerchantDAO;
import com.panzhihua.service_community.service.BigScreenStatisticsService;
import lombok.extern.slf4j.Slf4j;
@@ -349,9 +346,6 @@
microWishTotalPolylineData.add(temp);
});
statisticsInfo.setMicroWishTotalPolylineData(microWishTotalPolylineData);
- //微心愿展示列表
- List<ComActMicroWishVO> microWishDisplayList = comActMicroWishDAO.selectScreenDisplayList(communityId, pageSize);
- statisticsInfo.setMicroWishDisplayList(microWishDisplayList);
return R.ok(statisticsInfo);
}
@@ -400,14 +394,12 @@
/**
* 首页二级页面-随手拍展示列表
- * @param communityId
- * @param classifyId
* @return
*/
@Override
- public R indexEasyPhotoList(Long communityId, Long classifyId) {
- List<ComActEasyPhotoVO> easyPhotoVOList = comActEasyPhotoDAO.indexEasyPhotoList(communityId, classifyId, pageSize);
- return R.ok(easyPhotoVOList);
+ public R indexEasyPhotoList(PageBaseDTO pageBaseDTO) {
+ Page page = retrievePage(pageBaseDTO);
+ return R.ok(comActEasyPhotoDAO.indexEasyPhotoList(page, pageBaseDTO));
}
/**
@@ -450,9 +442,6 @@
questionnaireTotalPolylineData.add(temp);
});
statisticsInfo.setQuestionnaireTotalPolylineData(questionnaireTotalPolylineData);
- //展示列表
- List<ComActQuestnaireVO> displayList = comActQuestnaireDAO.selectQuestionnaireDisplayList(communityId, pageSize);
- statisticsInfo.setQuestionnaireDisplayList(displayList);
return R.ok(statisticsInfo);
}
@@ -506,14 +495,13 @@
/**
* 首页二级页面-社区动态展示列表
- * @param communityId
- * @param type
+ * @param pageBaseDTO
* @return
*/
@Override
- public R indexDynList(Long communityId, Long type) {
- List<ComActDynVO> dynList = comActDynDAO.indexDynList(communityId, type, pageSize);
- return R.ok(dynList);
+ public R indexDynList(PageBaseDTO pageBaseDTO) {
+ Page page = retrievePage(pageBaseDTO);
+ return R.ok(comActDynDAO.indexDynList(page, pageBaseDTO));
}
/**
@@ -567,14 +555,13 @@
/**
* 首页二级页面-邻里圈展示列表
- * @param communityId
- * @param topicId
+ * @param pageBaseDTO
* @return
*/
@Override
- public R indexNeighborList(Long communityId, Long topicId) {
- List<ComActNeighborCircleAdminVO> neighborList = comActNeighborCircleDAO.indexNeighborList(communityId, topicId, pageSize);
- return R.ok(neighborList);
+ public R indexNeighborList(PageBaseDTO pageBaseDTO) {
+ Page page = retrievePage(pageBaseDTO);
+ return R.ok(comActNeighborCircleDAO.indexNeighborList(page, pageBaseDTO));
}
/**
@@ -631,13 +618,48 @@
/**
* 首页二级页面-商家展示列表
- * @param communityId
- * @param categoryId
+ * @param pageBaseDTO
* @return
*/
@Override
- public R indexMerchantList(Long communityId, Long categoryId) {
- List<ConvenientMerchantVO> merchantList = convenientMerchantDAO.indexMerchantList(communityId, categoryId, pageSize);
- return R.ok(merchantList);
+ public R indexMerchantList(PageBaseDTO pageBaseDTO) {
+ Page page = retrievePage(pageBaseDTO);
+ return R.ok(convenientMerchantDAO.indexMerchantList(page, pageBaseDTO));
+ }
+
+ /**
+ * 首页二级页面-微心愿展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @Override
+ public R indexMicroWishList(PageBaseDTO pageBaseDTO) {
+ Page page = retrievePage(pageBaseDTO);
+ return R.ok(comActMicroWishDAO.selectScreenDisplayList(page, pageBaseDTO));
+ }
+
+ /**
+ * 首页二级页面-社区问卷展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @Override
+ public R indexQuestionnaireList(PageBaseDTO pageBaseDTO) {
+ Page page = retrievePage(pageBaseDTO);
+ return R.ok(comActQuestnaireDAO.selectQuestionnaireDisplayList(page, pageBaseDTO));
+ }
+
+ private Page retrievePage(PageBaseDTO pageBaseDTO) {
+ Long pageNum = pageBaseDTO.getPageNum();
+ Long size = pageBaseDTO.getPageSize();
+ Page page = new Page<>();
+ if (nonNull(pageNum) && nonNull(size)) {
+ page.setCurrent(pageNum);
+ page.setSize(size);
+ } else {
+ page.setCurrent(1);
+ page.setSize(pageSize);
+ }
+ return page;
}
}
--
Gitblit v1.7.1