From 3a5655d1124cb56d7b7f045d18dd4855451507cc Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 23 十二月 2021 17:54:32 +0800
Subject: [PATCH] Merge branch 'bigscreen_dev'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageBaseDTO.java | 29 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml | 10
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireDOMapper.xml | 19 --
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenStatisticsService.java | 34 ++-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynDOMapper.xml | 8
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java | 54 ++++--
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 44 +++--
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java | 102 +++++++-----
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml | 12
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 15 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml | 8
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java | 60 ++++---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java | 3
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/GridsGovernanceStatisticsVO.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java | 7
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientMerchantDAO.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java | 8
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishDOMapper.xml | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java | 7
20 files changed, 272 insertions(+), 159 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageBaseDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageBaseDTO.java
new file mode 100644
index 0000000..91ad744
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageBaseDTO.java
@@ -0,0 +1,29 @@
+package com.panzhihua.common.model.dtos;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @title: PageBaseDTO
+ * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
+ * @description: 分页基础数据DTO
+ * @author: hans
+ * @date: 2021/12/21 14:22
+ */
+@Data
+@ApiModel(value = "分页基础数据DTO")
+public class PageBaseDTO {
+
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+
+ @ApiModelProperty(value = "查询参数id", example = "10")
+ private Long paramId;
+
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/GridsGovernanceStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/GridsGovernanceStatisticsVO.java
index 55ec7fe..1b1bb72 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/GridsGovernanceStatisticsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/GridsGovernanceStatisticsVO.java
@@ -100,6 +100,9 @@
@ApiModelProperty("事件分析累计折线数据")
private List<StatisticsCommVO> eventTotalPolylineData;
+ @ApiModelProperty("绘制事件类型统计圆形图")
+ private List<StatisticsCommVO> eventTypeCircleDrawData;
+
public void generateStatisticsData() {
this.eventTotal = this.eventTFTotal + this.eventZATotal + this.eventMDTotal +
this.eventTSTotal + this.eventMSTotal + this.eventFJTotal + this.otherTotal;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 9ad35a6..880a211 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -7534,12 +7535,10 @@
/**
* 首页二级页面-随手拍展示列表
- * @param communityId
- * @param classifyId
* @return
*/
- @GetMapping("/screen/index/easyPhotoList")
- R indexEasyPhotoList(@RequestParam("communityId") Long communityId, @RequestParam(value = "classifyId", required = false) Long classifyId);
+ @PostMapping("/screen/index/easyPhotoList")
+ R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO);
/**
* 首页二级页面-社区问卷
@@ -7559,12 +7558,11 @@
/**
* 首页二级页面-社区动态展示列表
- * @param communityId
- * @param type
+ * @param pageBaseDTO
* @return
*/
- @GetMapping("/screen/index/dynList")
- R indexDynList(@RequestParam("communityId") Long communityId, @RequestParam(value = "type", required = false) Long type);
+ @PostMapping("/screen/index/dynList")
+ R indexDynList(@RequestBody PageBaseDTO pageBaseDTO);
/**
* 首页二级页面-邻里圈
@@ -7576,12 +7574,11 @@
/**
* 首页二级页面-邻里圈展示列表
- * @param communityId
- * @param topicId
+ * @param pageBaseDTO
* @return
*/
- @GetMapping("/screen/index/neighborList")
- R indexNeighborList(@RequestParam("communityId") Long communityId, @RequestParam(value = "topicId", required = false) Long topicId);
+ @PostMapping("/screen/index/neighborList")
+ R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO);
/**
* 首页二级页面-便民商家
@@ -7593,10 +7590,25 @@
/**
* 首页二级页面-商家展示列表
- * @param communityId
- * @param categoryId
+ * @param pageBaseDTO
* @return
*/
- @GetMapping("/screen/index/merchantList")
- R indexMerchantList(@RequestParam("communityId") Long communityId, @RequestParam(value = "categoryId", required = false) Long categoryId);
+ @PostMapping("/screen/index/merchantList")
+ R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-微心愿展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/microWishList")
+ R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-社区问卷展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/questionnaireList")
+ R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
index a46d783..d9cbb91 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
@@ -7,6 +7,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.constants.HttpConstant;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActDynVO;
@@ -16,6 +17,7 @@
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
+import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
import com.panzhihua.common.model.vos.community.bigscreen.*;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
@@ -238,6 +240,16 @@
}
/**
+ * 首页二级页面-微心愿展示列表
+ */
+ @ApiOperation(value = "首页二级页面-微心愿展示列表", response = ComActMicroWishVO.class)
+ @PostMapping("/index/microWishList")
+ public R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.indexMicroWishList(pageBaseDTO);
+ }
+
+ /**
* 首页二级页面-随手拍
*/
@ApiOperation(value = "首页二级页面-随手拍", response = BigScreenEasyPhotoStatisticsInfo.class)
@@ -250,10 +262,10 @@
* 首页二级页面-随手拍展示列表
*/
@ApiOperation(value = "首页二级页面-随手拍展示列表", response = ComActEasyPhotoVO.class)
- @ApiImplicitParam(name = "classifyId", value = "随手拍分类id（全部则不传）", required = false)
- @GetMapping("/index/easyPhotoList")
- public R indexEasyPhotoList(@RequestParam(value = "classifyId", required = false) Long classifyId) {
- return communityService.indexEasyPhotoList(this.getCommunityId(), classifyId);
+ @PostMapping("/index/easyPhotoList")
+ public R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.indexEasyPhotoList(pageBaseDTO);
}
/**
@@ -263,6 +275,16 @@
@GetMapping("/index/questionnaire")
public R indexQuestionnaire() {
return communityService.indexQuestionnaire(this.getCommunityId());
+ }
+
+ /**
+ * 首页二级页面-社区问卷展示列表
+ */
+ @ApiOperation(value = "首页二级页面-随手拍展示列表", response = ComActQuestnaireVO.class)
+ @PostMapping("/index/questionnaireList")
+ public R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.indexQuestionnaireList(pageBaseDTO);
}
/**
@@ -278,10 +300,10 @@
* 首页二级页面-社区动态展示列表
*/
@ApiOperation(value = "首页二级页面-社区动态展示列表", response = ComActDynVO.class)
- @ApiImplicitParam(name = "type", value = "社区动态分类id（全部则不传）", required = false)
- @GetMapping("/index/dynList")
- public R indexDynList(@RequestParam(value = "type", required = false) Long type) {
- return communityService.indexDynList(this.getCommunityId(), type);
+ @PostMapping("/index/dynList")
+ public R indexDynList(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.indexDynList(pageBaseDTO);
}
/**
@@ -302,10 +324,10 @@
* 首页二级页面-邻里圈展示列表
*/
@ApiOperation(value = "首页二级页面-邻里圈展示列表", response = ComActNeighborCircleAdminVO.class)
- @ApiImplicitParam(name = "topicId", value = "邻里圈话题id（全部则不传）", required = false)
- @GetMapping("/index/neighborList")
- public R indexNeighborList(@RequestParam(value = "topicId", required = false) Long topicId) {
- return communityService.indexNeighborList(this.getCommunityId(), topicId);
+ @PostMapping("/index/neighborList")
+ public R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.indexNeighborList(pageBaseDTO);
}
@ApiOperation(value = "分页获取党建动态", response = BigScreenStatisticPartyOrg.class)
@@ -343,10 +365,10 @@
* 首页二级页面-商家展示列表
*/
@ApiOperation(value = "首页二级页面-商家展示列表", response = ConvenientMerchantVO.class)
- @ApiImplicitParam(name = "categoryId", value = "服务分类id（全部则不传）", required = false)
- @GetMapping("/index/merchantList")
- public R indexMerchantList(@RequestParam(value = "categoryId", required = false) Long categoryId) {
- return communityService.indexMerchantList(this.getCommunityId(), categoryId);
+ @PostMapping("/index/merchantList")
+ public R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO) {
+ pageBaseDTO.setCommunityId(this.getCommunityId());
+ return communityService.indexMerchantList(pageBaseDTO);
}
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
index b7916f3..0fd0d86 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
@@ -3,6 +3,7 @@
import javax.annotation.Resource;
import com.panzhihua.service_community.service.ComActService;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.service_community.service.BigScreenStatisticsService;
import com.panzhihua.service_community.service.BigScreenService;
@@ -142,14 +143,11 @@
/**
* 首页二级页面-随手拍展示列表
- * @param communityId
- * @param classifyId
* @return
*/
- @GetMapping("/index/easyPhotoList")
- public R indexEasyPhotoList(@RequestParam("communityId") Long communityId,
- @RequestParam(value = "classifyId", required = false) Long classifyId) {
- return bigScreenStatisticsService.indexEasyPhotoList(communityId, classifyId);
+ @PostMapping("/index/easyPhotoList")
+ public R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO) {
+ return bigScreenStatisticsService.indexEasyPhotoList(pageBaseDTO);
}
/**
@@ -174,14 +172,12 @@
/**
* 首页二级页面-社区动态展示列表
- * @param communityId
- * @param type
+ * @param pageBaseDTO
* @return
*/
- @GetMapping("/index/dynList")
- public R indexDynList(@RequestParam("communityId") Long communityId,
- @RequestParam(value = "type", required = false) Long type) {
- return bigScreenStatisticsService.indexDynList(communityId, type);
+ @PostMapping("/index/dynList")
+ public R indexDynList(@RequestBody PageBaseDTO pageBaseDTO) {
+ return bigScreenStatisticsService.indexDynList(pageBaseDTO);
}
/**
@@ -196,14 +192,12 @@
/**
* 首页二级页面-邻里圈展示列表
- * @param communityId
- * @param topicId
+ * @param pageBaseDTO
* @return
*/
- @GetMapping("/index/neighborList")
- public R indexNeighborList(@RequestParam("communityId") Long communityId,
- @RequestParam(value = "topicId", required = false) Long topicId) {
- return bigScreenStatisticsService.indexNeighborList(communityId, topicId);
+ @PostMapping("/index/neighborList")
+ public R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO) {
+ return bigScreenStatisticsService.indexNeighborList(pageBaseDTO);
}
/**
@@ -218,14 +212,32 @@
/**
* 首页二级页面-商家展示列表
- * @param communityId
- * @param categoryId
+ * @param pageBaseDTO
* @return
*/
- @GetMapping("/index/merchantList")
- public R indexMerchantList(@RequestParam("communityId") Long communityId,
- @RequestParam(value = "categoryId", required = false) Long categoryId) {
- return bigScreenStatisticsService.indexMerchantList(communityId, categoryId);
+ @PostMapping("/index/merchantList")
+ public R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO) {
+ return bigScreenStatisticsService.indexMerchantList(pageBaseDTO);
+ }
+
+ /**
+ * 首页二级页面-微心愿展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/index/microWishList")
+ public R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO) {
+ return bigScreenStatisticsService.indexMicroWishList(pageBaseDTO);
+ }
+
+ /**
+ * 首页二级页面-社区问卷展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/index/questionnaireList")
+ public R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO) {
+ return bigScreenStatisticsService.indexQuestionnaireList(pageBaseDTO);
}
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
index cb4530f..7a2c375 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java
@@ -3,6 +3,7 @@
import java.util.List;
import java.util.Map;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -82,5 +83,5 @@
StatisticsCommVO getDynTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);
- List<ComActDynVO> indexDynList(@Param("communityId") Long communityId, @Param("type") Long type, @Param("pageSize") Integer pageSize);
+ IPage<ComActDynVO> indexDynList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
index b0cdd5b..a75f186 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
@@ -403,10 +404,9 @@
/**
* 首页二级页面-随手拍展示列表
- * @param communityId
- * @param classifyId
- * @param pageSize
+ * @param page
+ * @param pageBaseDTO
* @return
*/
- List<ComActEasyPhotoVO> indexEasyPhotoList(@Param("communityId") Long communityId, @Param("classifyId") Long classifyId, @Param("pageSize") Integer pageSize);
+ IPage<ComActEasyPhotoVO> indexEasyPhotoList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
index d7b82db..dce6d33 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
@@ -277,9 +278,9 @@
/**
* 微心愿大屏展示列表
- * @param communityId
- * @param pageSize
+ * @param page
+ * @param pageBaseDTO
* @return
*/
- List<ComActMicroWishVO> selectScreenDisplayList(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
+ IPage<ComActMicroWishVO> selectScreenDisplayList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
index 0e8837c..bfea28b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -3,6 +3,7 @@
import java.util.List;
import java.util.Map;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -140,5 +141,5 @@
StatisticsCommVO getNeighborTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);
- List<ComActNeighborCircleAdminVO> indexNeighborList(@Param("communityId") Long communityId, @Param("topicId") Long topicId, @Param("pageSize") Integer pageSize);
+ IPage<ComActNeighborCircleAdminVO> indexNeighborList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java
index ac92701..5f18e07 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenQuestionnaireStatisticsInfo;
@@ -142,9 +143,9 @@
/**
* 大屏问卷展示列表
- * @param communityId
- * @param pageSize
+ * @param page
+ * @param pageBaseDTO
* @return
*/
- List<ComActQuestnaireVO> selectQuestionnaireDisplayList(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
+ IPage<ComActQuestnaireVO> selectQuestionnaireDisplayList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientMerchantDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientMerchantDAO.java
index 1bc1315..964310f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientMerchantDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientMerchantDAO.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.convenient.ExportMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
@@ -151,5 +152,5 @@
StatisticsCommVO getServiceTimesTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);
- List<ConvenientMerchantVO> indexMerchantList(@Param("communityId") Long communityId, @Param("categoryId") Long categoryId, @Param("pageSize") Integer pageSize);
+ IPage<ConvenientMerchantVO> indexMerchantList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenStatisticsService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenStatisticsService.java
index 965be1d..639bf1f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenStatisticsService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenStatisticsService.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.common.model.vos.R;
@@ -56,11 +57,9 @@
/**
* 首页二级页面-随手拍展示列表
- * @param communityId
- * @param classifyId
* @return
*/
- R indexEasyPhotoList(Long communityId, Long classifyId);
+ R indexEasyPhotoList(PageBaseDTO pageBaseDTO);
/**
* 首页二级页面-社区问卷
@@ -78,11 +77,10 @@
/**
* 首页二级页面-社区动态展示列表
- * @param communityId
- * @param type
+ * @param pageBaseDTO
* @return
*/
- R indexDynList(Long communityId, Long type);
+ R indexDynList(PageBaseDTO pageBaseDTO);
/**
* 首页二级页面-邻里圈
@@ -93,11 +91,10 @@
/**
* 首页二级页面-邻里圈展示列表
- * @param communityId
- * @param topicId
+ * @param pageBaseDTO
* @return
*/
- R indexNeighborList(Long communityId, Long topicId);
+ R indexNeighborList(PageBaseDTO pageBaseDTO);
/**
* 首页二级页面-便民商家
@@ -108,9 +105,22 @@
/**
* 首页二级页面-商家展示列表
- * @param communityId
- * @param categoryId
+ * @param pageBaseDTO
* @return
*/
- R indexMerchantList(Long communityId, Long categoryId);
+ R indexMerchantList(PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-微心愿展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ R indexMicroWishList(PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-社区问卷展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ R indexQuestionnaireList(PageBaseDTO pageBaseDTO);
}
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;
}
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynDOMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynDOMapper.xml
index 8c45aa1..b17d790 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynDOMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynDOMapper.xml
@@ -48,10 +48,10 @@
SELECT t1.id, t1.title, t1.cover, t2.`name` AS typeName
FROM com_act_dyn t1
LEFT JOIN com_act_dyn_type t2 ON t1.type = t2.id
- WHERE t1.community_id = #{communityId} AND t1.`status` = 1 AND t2.is_del = 2
- <if test="type != null">
- AND t1.type = #{type}
+ WHERE t1.community_id = #{pageBaseDTO.communityId} AND t1.`status` = 1 AND t2.is_del = 2
+ <if test="pageBaseDTO.paramId != null">
+ AND t1.type = #{pageBaseDTO.paramId}
</if>
- ORDER BY t1.id DESC LIMIT #{pageSize}
+ ORDER BY t1.id DESC
</select>
</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml
index 08e93fa..1548a41 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml
@@ -410,11 +410,11 @@
SELECT t1.id, t1.detail, t1.photo_path_list, t1.`status`, t2.`name` AS classifyName
FROM com_act_easy_photo t1
LEFT JOIN com_act_easy_photo_classify t2 ON t1.classify_id = t2.id
- WHERE t1.community_id = #{communityId} AND t1.`status` = 4 AND t1.del_tag = 0
- <if test="classifyId != null">
- AND t1.classify_id = #{classifyId}
+ WHERE t1.community_id = #{pageBaseDTO.communityId} AND t1.`status` = 4 AND t1.del_tag = 0
+ <if test="pageBaseDTO.paramId != null">
+ AND t1.classify_id = #{pageBaseDTO.paramId}
</if>
- ORDER BY t1.id DESC LIMIT #{pageSize}
+ ORDER BY t1.id DESC
</select>
<select id="selectBigscreenGridsGovern" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigscreenGridsGovernanceStatisticsVO">
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishDOMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishDOMapper.xml
index 573a06f..454fc20 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishDOMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishDOMapper.xml
@@ -198,7 +198,7 @@
resultType="com.panzhihua.common.model.vos.community.ComActMicroWishVO">
SELECT id, `status`, detail, photo_path_list
FROM com_act_micro_wish
- WHERE community_id = #{communityId} AND `status` NOT IN(1,4) ORDER BY create_at DESC LIMIT #{pageSize}
+ WHERE community_id = #{pageBaseDTO.communityId} AND `status` NOT IN(1,4) ORDER BY create_at DESC
</select>
</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml
index 2d97e8a..f457f56 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml
@@ -127,8 +127,8 @@
</select>
<select id="getIndexNeighborBaseData"
resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
- SELECT filed, sum, ROUND(sum/total,2) AS percent FROM
- (SELECT t2.`name` AS filed, COUNT(1) AS sum FROM com_act_neighbor_circle t1
+ SELECT filed, num, ROUND(num/total,2) AS percent FROM
+ (SELECT t2.`name` AS filed, COUNT(1) AS num FROM com_act_neighbor_circle t1
LEFT JOIN com_act_neighbor_circle_topic t2 ON t1.topic_id = t2.id
WHERE t1.community_id = #{communityId} AND t1.`status` IN (2,3) AND t1.is_del = 2 AND t2.`status` = 1 GROUP BY filed) temp1,
(SELECT COUNT(t1.id) AS total FROM com_act_neighbor_circle t1
@@ -154,11 +154,11 @@
SELECT t1.id, t1.release_content, t1.release_images, t1.comment_num, t1.fabulous_num, t2.`name` AS topicName
FROM com_act_neighbor_circle t1
LEFT JOIN com_act_neighbor_circle_topic t2 ON t1.topic_id = t2.id
- WHERE t1.community_id = #{communityId} AND t1.`status` IN (2,3) AND t1.is_del = 2 AND t2.`status` = 1
- <if test="topicId != null">
- AND t1.topic_id = #{topicId}
+ WHERE t1.community_id = #{pageBaseDTO.communityId} AND t1.`status` IN (2,3) AND t1.is_del = 2 AND t2.`status` = 1
+ <if test="pageBaseDTO.paramId != null">
+ AND t1.topic_id = #{pageBaseDTO.paramId}
</if>
- ORDER BY t1.id DESC LIMIT #{pageSize}
+ ORDER BY t1.id DESC
</select>
</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireDOMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireDOMapper.xml
index f316ac3..ebe4b5d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireDOMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireDOMapper.xml
@@ -230,25 +230,8 @@
<select id="selectQuestionnaireDisplayList"
resultType="com.panzhihua.common.model.vos.community.ComActQuestnaireVO">
SELECT id, title, `count`, view_num, join_count, is_cover, state FROM com_act_questnaire
- WHERE community_id = #{communityId} AND state IN (2,3) ORDER BY id DESC LIMIT #{pageSize}
+ WHERE community_id = #{pageBaseDTO.communityId} AND state IN (2,3) ORDER BY id DESC
</select>
- <select id="getIndexQuestionnaireBaseData"
- resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenQuestionnaireStatisticsInfo">
- SELECT COUNT(id) AS questionnaireNum, SUM(join_count) AS joinNum FROM com_act_questnaire WHERE community_id = #{communityId}
- </select>
- <select id="getQuestionnaireAddPolylineData"
- resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
- SELECT DATE_FORMAT( create_at, '%m' ) AS filed, COUNT(id) AS num
- FROM com_act_questnaire
- WHERE community_id = #{communityId}
- AND DATE_FORMAT( create_at, '%Y' ) = DATE_FORMAT( CURDATE( ) , '%Y' ) GROUP BY filed
- </select>
- <select id="getQuestionnaireTotalPolylineDate"
- resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
- SELECT COUNT(id) AS num FROM com_act_questnaire
- WHERE community_id = #{communityId} AND DATE_FORMAT( create_at, '%Y%m' ) <= #{date}
- </select>
-
<insert id="addNoNotice">
insert into com_act_questnaire_user(questnaire_id,user_id,create_at)
values(#{questId},#{userId},now())
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml
index 96c71b8..dee7c91 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml
@@ -241,7 +241,7 @@
</select>
<select id="getServiceTimesTotalPolylineDate"
resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
- SELECT SUM(t1.consultation_volume) AS num
+ SELECT IF(SUM(t1.consultation_volume) IS NULL,0,SUM(t1.consultation_volume)) AS num
FROM com_convenient_consultation_statistics t1
LEFT JOIN com_convenient_merchants t2 ON t1.merchant_id = t2.id
WHERE t2.community_id = #{communityId} AND DATE_FORMAT( t1.statistic_date, '%Y%m' ) <= #{date}
@@ -251,11 +251,11 @@
SELECT t1.id, t1.`name`, t1.logo, t1.introduction, GROUP_CONCAT(t2.`service_name`) serviceScope
FROM com_convenient_merchants t1
LEFT JOIN com_convenient_service_scope t2 ON t1.id = t2.merchant_id
- WHERE t1.community_id = #{communityId}
- <if test="categoryId != null">
- AND t2.service_category_id = #{categoryId}
+ WHERE t1.community_id = #{pageBaseDTO.communityId}
+ <if test="pageBaseDTO.paramId != null">
+ AND t2.service_category_id = #{pageBaseDTO.paramId}
</if>
- GROUP BY t1.id ORDER BY t1.id DESC LIMIT #{pageSize}
+ GROUP BY t1.id ORDER BY t1.id DESC
</select>
<update id="deleteMerchantById">
UPDATE com_convenient_merchants SET is_del = 1, updated_by = #{operator} WHERE id = #{merchantId}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
index 59147d0..048a816 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_grid.service.impl;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -2695,6 +2696,20 @@
statisticsVO.setDrawEventPopulationTotalVO(drawEventPopulationTotalVO);
statisticsVO.setAgeGroupStatistics(ageGroupStatistics);
statisticsVO.generateStatisticsData();
+ List<StatisticsCommVO> eventTypeCircleDrawData = new ArrayList<>();
+ if (!eventResultList.isEmpty()) {
+ Map<Integer, List<EventGridIncidentStatisticsVO>> collect = eventResultList.stream().collect(Collectors.groupingBy(EventGridIncidentStatisticsVO::getType));
+ for (Map.Entry<Integer, List<EventGridIncidentStatisticsVO>> entry : collect.entrySet()) {
+ StatisticsCommVO temp = new StatisticsCommVO();
+ int size = entry.getValue().size();
+ Integer eventTotal = statisticsVO.getEventTotal();
+ temp.setFiled(entry.getKey().toString());
+ temp.setNum(size);
+ temp.setPercent(new BigDecimal(size/eventTotal).setScale(2));
+ eventTypeCircleDrawData.add(temp);
+ }
+ }
+ statisticsVO.setEventTypeCircleDrawData(eventTypeCircleDrawData);
return R.ok(statisticsVO);
}
--
Gitblit v1.7.1