From 8dd5c057222ea4f6d22d6bc3fba468600f14a330 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 28 十二月 2021 16:28:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 264 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 261 insertions(+), 3 deletions(-)
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 856d653..a087a2c 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;
@@ -245,6 +246,7 @@
import com.panzhihua.common.model.vos.community.BatchhouseVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
+import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
import com.panzhihua.common.model.vos.community.ComActColumnVO;
@@ -299,6 +301,7 @@
import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
+import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
@@ -1067,10 +1070,11 @@
*
* @param userId
* 用户id
+ * @param status
* @return 活动列表
*/
@PostMapping("listactivity")
- R listActivity(@RequestParam("userId") Long userId);
+ R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status);
/**
* 用户确认心愿
@@ -4940,6 +4944,14 @@
R getWestCommunityLists();
/**
+ * 综治app-小区列表
+ * @param villageListAppDTO 请求参数
+ * @return 小区列表
+ */
+ @PostMapping("/village/grid/list/app")
+ R getGridVillageListApp(@RequestBody ComMngVillageListAppDTO villageListAppDTO);
+
+ /**
* 分页查询退役军人列表
*
* @param comExServicemanDTO
@@ -5292,11 +5304,11 @@
R addIntegralTradeAdmin(@RequestBody AddComActIntegralUserDTO integralUserDTO);
/**
- * 根据社区活动id查询社区活动报名人员列表
+ * 根据社区活动id查询社区活动报名且未参与人员列表
*
* @param activityId
* 活动id
- * @return 社区活动报名人员列表
+ * @return 社区活动报名且未参与人员列表
*/
@PostMapping("/integral/act/activity/admin")
R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId);
@@ -7006,6 +7018,22 @@
R applyDonates(@RequestBody ComActWarehouseApplyDTO comActWarehouseApplyDTO);
/**
+ * 生成二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @PostMapping("/comActActivityCode/getQRCode")
+ public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
+
+ /**
+ * 重置二维码
+ * @param qrCodeVO
+ * @return
+ */
+ @PostMapping("/comActActivityCode/resetQRCode")
+ public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
+
+ /**
* 实有房屋数据修复定时任务
* @return 实有房屋数据修复定时任务
*/
@@ -7128,6 +7156,48 @@
*/
@PostMapping("/elders/pensionAuthRecord/add")
R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
+ /**
+ * 活动报名签到情况
+ * @param id 活动主键id
+ * @return
+ */
+ @GetMapping("/activity/sign-in/list")
+ R listSignInRecord(@RequestParam("id") Long id);
+
+ /**
+ * 活动签到记录
+ * @param id 活动主键
+ * @param userId 用户id
+ * @return
+ */
+ @GetMapping("/activity/regist/list")
+ R listRegistRecord(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+ /**
+ * 获取活动类型（目前只有志愿者活动需要获取）
+ * @param communityId
+ * @param type
+ * @return
+ */
+ @GetMapping("/activity/type/list")
+ R listActivityType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);
+
+ /**
+ * 添加活动类型
+ * @param comActActivityTypeVO
+ * @return
+ */
+ @PostMapping("/activity/type/add")
+ R addActivityType(@RequestBody ComActActivityTypeVO comActActivityTypeVO);
+
+ /**
+ * 我的评价
+ * @param userId
+ * @param activityId
+ * @return
+ */
+ @GetMapping("/activity/my-evaluate")
+ R listMyActivityEvaluate(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId);
/**
* 分页查询居家隔离统计
@@ -7422,4 +7492,192 @@
@GetMapping("/rentingHourseRegister/updateAllHouseUnionAppCode")
@Async
void updateAllHouseUnionAppCode();
+
+ /**
+ * 西区大屏治理数据
+ */
+ @GetMapping("/screen/getWestScreenStatics")
+ R westScreenStatics();
+
+ /**
+ * 西区大屏一标三实数据
+ * @return 西区大屏一标三实数据
+ */
+ @GetMapping("/screen/getComprehensivePopulationStatics")
+ R getComprehensivePopulationStatics(@RequestParam("streetId") Long streetId);
+
+ @GetMapping("/screen/getComprehensiveStreetList")
+ R getComprehensiveStreetList();
+
+ /**
+ * 通过社区id查询社区账号密码
+ * @param communityId 社区id
+ * @return 查询社区账号密码
+ */
+ @GetMapping("/screen/getCommunityPassword")
+ R getCommunityPassword(@RequestParam("communityId") Long communityId);
+
+ @GetMapping("/reserve/bigScreenStaticsReserve")
+ R bigScreenStaticsReserve(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 党员活动折线图
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/bigscreen/party/partyActivityLine")
+ R partyActivityLine(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 党员积分前3
+ * @param pageBigScreenStatisticPartyOrg
+ * @return
+ */
+ @PostMapping("/bigscreen/party/partyActivityTop")
+ R partyActivityTop(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg);
+
+ /**
+ * 社区服务大屏数据分析接口
+ */
+ @GetMapping("/screen/serviceData")
+ R serviceData(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 服务居民接口
+ */
+ @GetMapping("/screen/serviceUser")
+ R serviceUser(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大数据分析平台-居民自治
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/resident/autonomy")
+ R getResidentAutonomy(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大数据分析平台-清网治格
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/grids/governance")
+ R getGridsGovernance(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大数据分析平台-社区服务
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/community/service")
+ R getCommunityServiceStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页获取热度排行商家
+ * @param pagePopularMerchantDTO
+ * @return
+ */
+ @PostMapping("/screen/merchant/popular")
+ R getScreenPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO);
+
+ /**
+ * 新版大屏首页接口
+ */
+ @GetMapping("/screen/indexInfo")
+ R indexInfo(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-微心愿
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/microWish")
+ R indexMicroWish(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-随手拍
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/easyPhoto")
+ R indexEasyPhoto(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-随手拍展示列表
+ * @return
+ */
+ @PostMapping("/screen/index/easyPhotoList")
+ R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-社区问卷
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/questionnaire")
+ R indexQuestionnaire(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-社区动态
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/dyn")
+ R indexDyn(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-社区动态展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/dynList")
+ R indexDynList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-邻里圈
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/neighbor")
+ R indexNeighbor(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-邻里圈展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @PostMapping("/screen/index/neighborList")
+ R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 首页二级页面-便民商家
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/index/merchant")
+ R indexMerchant(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 首页二级页面-商家展示列表
+ * @param pageBaseDTO
+ * @return
+ */
+ @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);
}
--
Gitblit v1.7.1