From 1a21c37e2c41236c89e97a33e9da65c5fe7971b6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 01 六月 2022 18:11:08 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java | 277 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 253 insertions(+), 24 deletions(-)
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..7678a8a 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
@@ -2,7 +2,9 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.dtos.property.CommonPage;
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 +144,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 +173,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 +193,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 +213,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);
}
/**
@@ -284,4 +297,220 @@
return bigScreenStatisticsService.getScreenPopularMerchants(pagePopularMerchantDTO);
}
+ /**
+ * 首页二级页面-居民活动
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/index/residentAct")
+ public R indexResidentAct(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.indexResidentAct(communityId);
+ }
+
+ /**
+ * 首页二级页面-居民活动展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/index/residentActList")
+ public R indexResidentActList(@RequestBody PageBaseDTO pageBaseDTO) {
+ return bigScreenStatisticsService.indexResidentActList(pageBaseDTO);
+ }
+
+ /**
+ * 首页二级页面-志愿者活动
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/index/volunteerAct")
+ public R indexVolunteerAct(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.indexVolunteerAct(communityId);
+ }
+
+ /**
+ * 首页二级页面-志愿者活动展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/index/volunteerActList")
+ public R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO) {
+ return bigScreenStatisticsService.indexVolunteerActList(pageBaseDTO);
+ }
+
+ /**
+ * 清网治格-根据事件分类获取近1月的社区事件数据
+ * @param type
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/event/list")
+ public R getEventList(@RequestParam(value = "type") Integer type, @RequestParam(value = "communityId") Long communityId) {
+ return bigScreenStatisticsService.getEventList(type, communityId);
+ }
+
+ /**
+ * 清网治格-社区事件数据分页
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/event/page")
+ public R pageEventList(@RequestBody PageBaseDTO pageBaseDTO) {
+ return bigScreenStatisticsService.pageEventList(pageBaseDTO);
+ }
+ @PostMapping("/hmk/baseInfo")
+ public R getHmkBaseInfo(@RequestBody CommonPage commonPage){
+ return bigScreenStatisticsService.hmkBaseInfo(commonPage);
+ }
+ @GetMapping("/hmk/partyProjectActivityLine")
+ public R partyActivityLine(){
+ return bigScreenStatisticsService.partyProjectActivityLine();
+ }
+ @PostMapping("/hmk/projectActivityTop")
+ public R projectActivityTop(@RequestBody CommonPage commonPage){
+ return bigScreenStatisticsService.projectActivityProject(commonPage);
+ }
+ @GetMapping("/hmk/projectType")
+ public R projectType(@RequestParam("name") String name){
+ return bigScreenStatisticsService.projectType(name);
+ }
+
+ /**
+ * 金沙定制页面-党建引领基础数据
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/partyBuildIng/base")
+ public R getPartyBuildIngBaseData(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.getPartyBuildIngBaseData(communityId);
+ }
+
+ /**
+ * 党员活动展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/partyBuildIng/partyAct")
+ public R pagePartyBuildIngAct(@RequestBody PageBaseDTO pageBaseDTO) {
+ return bigScreenStatisticsService.pagePartyBuildIngAct(pageBaseDTO);
+ }
+
+ /**
+ * 议事投票展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/partyBuildIng/discuss")
+ public R pagePartyBuildIngDiscuss(@RequestBody PageBaseDTO pageBaseDTO) {
+ return bigScreenStatisticsService.pagePartyBuildIngDiscuss(pageBaseDTO);
+ }
+
+ /**
+ * 金沙定制页面-四长四员
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/fourMember/base")
+ public R getFourMemberBaseData(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.getFourMemberBaseData(communityId);
+ }
+
+ /**
+ * 杨家坪定制页面-五微服务
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/fms/base")
+ public R getFmsBaseData(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.getFmsBaseData(communityId);
+ }
+
+ /**
+ * 杨家坪定制页面-微团队展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/fms/team")
+ public R pageFmsTeam(@RequestBody PageBaseDTO pageBaseDTO) {
+ return bigScreenStatisticsService.pageFmsTeam(pageBaseDTO);
+ }
+
+ /**
+ * 杨家坪定制页面-居家养老基础数据
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/alarm/base")
+ public R getAlarmBaseData(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.getAlarmBaseData(communityId);
+ }
+
+ /**
+ * 杨家坪定制页面-报警记录展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/alarm/record")
+ public R pageAlarmRecord(@RequestBody PageBaseDTO pageBaseDTO) {
+ return bigScreenStatisticsService.pageAlarmRecord(pageBaseDTO);
+ }
+
+ /**
+ * 杨家坪定制页面-报警设备点位图
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/alarm/pointMap")
+ public R getAlarmPointMap(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.getAlarmPointMap(communityId);
+ }
+
+ /**
+ * 杨家坪定制页面-志愿服务
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/volunteer/base")
+ public R getVolunteerBaseData(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.getVolunteerBaseData(communityId);
+ }
+
+ /**
+ * 金沙定制页面-志愿线展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/partyBuildIng/microWish")
+ public R pagePartyBuildIngMicroWish(@RequestBody PageBaseDTO pageBaseDTO) {
+ return bigScreenStatisticsService.pagePartyBuildIngMicroWish(pageBaseDTO);
+ }
+
+ /**
+ * 金沙定制页面-四长四员解决问题展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/fourMember/resolve")
+ public R pageFourMemberResolve(@RequestBody PageBaseDTO pageBaseDTO) {
+ return bigScreenStatisticsService.pageFourMemberResolve(pageBaseDTO);
+ }
+
+ /**
+ * 金沙定制页面-四长四员院落议事展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/courtyard/list")
+ public R pageCourtyardDiscuss(@RequestBody PageBaseDTO pageBaseDTO) {
+ return bigScreenStatisticsService.pageCourtyardDiscuss(pageBaseDTO);
+ }
+
+ /**
+ * 金沙定制页面-院落议事
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/courtyard/base")
+ public R getCourtyardBaseData(@RequestParam("communityId") Long communityId) {
+ return bigScreenStatisticsService.getCourtyardBaseData(communityId);
+ }
}
--
Gitblit v1.7.1