From 1a69de7ac9d58ad8482b1540e13ee66b1adae291 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 23 七月 2021 17:38:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 78 +++++++++++++++++++++++++++++++++++++--
1 files changed, 74 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 49e593d..3e94bd5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -310,7 +310,7 @@
}
/**
- * 活动报名名单
+ * 分页活动报名名单
*
* @param activitySignVO 查询参数
* @return 报名人员集合
@@ -318,6 +318,17 @@
@PostMapping("listactivitysign")
public R listActivitySign(@RequestBody ActivitySignVO activitySignVO) {
return comActActivityService.listActivitySign(activitySignVO);
+ }
+
+ /**
+ * 活动报名名单
+ *
+ * @param activitySignVO 查询参数
+ * @return 报名人员集合
+ */
+ @PostMapping("listactivitysigns")
+ public R listActivitySigns(@RequestBody ActivitySignVO activitySignVO) {
+ return comActActivityService.listActivitySigns(activitySignVO);
}
/**
@@ -367,12 +378,12 @@
Long id = comActDynVO.getId();
BeanUtils.copyProperties(comActDynVO, comActDynDO);
Integer isTopping = comActDynVO.getIsTopping();
- boolean b = isTopping.intValue() == 1;
+ boolean b = isTopping.equals(1);
if(b){
ComActDynDO comActDynDO1 = comActDynService.getById(id);
Integer status = comActDynDO1.getStatus();
- if (status.intValue()==0) {
- return R.fail("该动态还未发布");
+ if (status.equals(0)) {
+ return R.fail("待发布的社区动态不可置顶");
}
}
boolean update = comActDynService.updateById(comActDynDO);
@@ -1712,4 +1723,63 @@
R setCommunityAuthType(@RequestParam("communityId")Long communityId,@RequestParam("type") Integer type){
return eldersAuthService.setCommunityAuthType(communityId, type);
}
+
+ /**
+ * 随手拍活动定时任务
+ * @return 执行结果
+ */
+ @PostMapping("timeTaskEasyPhotoActivity")
+ public R timeTaskEasyPhotoActivity(){
+ return comActEasyPhotoActivityService.timeTaskEasyPhotoActivity();
+ }
+
+ /**
+ * 社区随手拍列表统计
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @GetMapping("easyphoto/statistics")
+ public R easyPhotoStatistics(@RequestParam("communityId")Long communityId) {
+ return comActEasyPhotoService.easyPhotoStatistics(communityId);
+ }
+
+ /**
+ * 综治后台-查询社区列表
+ * @return 社区列表
+ */
+ @GetMapping("/eventgrid/community/list")
+ public R getCommunityLists(){
+ return comActService.getCommunityLists();
+ }
+
+ /**
+ * 随手拍发放奖励
+ * @param grantRewardDTO 请求参数
+ * @return 发放结果
+ */
+ @PostMapping("/easyphoto/grantReward")
+ public R grantReward(@RequestBody GrantRewardDTO grantRewardDTO) {
+ return comActEasyPhotoService.grantReward(grantRewardDTO);
+ }
+
+ /**
+ * 获取最新活动和用户最新收益
+ * @param userId 用户id
+ * @param communityId 社区id
+ * @return 最新活动和用户最新收益
+ */
+ @PostMapping("easyphoto/getUserReward")
+ public R getUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId) {
+ return comActEasyPhotoService.getUserReward(userId,communityId);
+ }
+
+ /**
+ * 读取用户随手拍奖励
+ * @param userId 用户id
+ * @return 读取结果
+ */
+ @PostMapping("easyphoto/readUserReward")
+ public R readUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId) {
+ return comActEasyPhotoService.readUserReward(userId,communityId);
+ }
}
--
Gitblit v1.7.1