From ec279664b4b88a03cab5345173bbe8e142e4ad69 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 29 五月 2024 13:47:43 +0800
Subject: [PATCH] 花城 修改随手拍管理模块：第一次处理随手拍内容，提示：该随手拍已处理，不可重复操作。需修改为：该随手拍已处理。若是再次点击处理按钮才提示：该随手拍已处理，不可重复操作
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 150 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 148 insertions(+), 2 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 850afc5..d088504 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
@@ -8,6 +8,8 @@
import javax.annotation.Resource;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
@@ -18,6 +20,7 @@
import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.*;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
@@ -100,7 +103,7 @@
@Slf4j
@RestController
@RequestMapping("/")
-public class CommunityApi {
+public class CommunityApi extends BaseController {
@Resource
public ComMngPopulationDAO comMngPopulationDAO;
@Resource
@@ -151,6 +154,10 @@
private ComActActEvaluateDAO comActActEvaluateDAO;
@Resource
private ComActActivityInviteService comActActivityInviteService;
+ @Resource
+ private RabbitTemplate rabbitTemplate;
+ @Resource
+ private AutomessageSysUserService automessageSysUserService;
/**
* 新增社区活动
@@ -634,6 +641,10 @@
BeanUtils.copyProperties(comActDynVO, comActDynDO);
boolean save = comActDynService.save(comActDynDO);
if (save) {
+ if(comActDynVO.getCategory()!=null&&comActDynVO.getCategory()==4){
+ comActDynVO.setId(comActDynDO.getId());
+ rabbitTemplate.convertAndSend("huacheng.acid.message.exchange", "huacheng.acid.message.key", comActDynVO);
+ }
// 最多只能设置三条置顶状态，后边设置会取消先前设置的置顶
Integer isTopping = comActDynVO.getIsTopping();
boolean b = isTopping.intValue() == 1;
@@ -777,6 +788,17 @@
}
/**
+ * 分页查询随手拍 浪潮专用
+ *
+ * 查询参数
+ * @return 心愿列表
+ */
+ @GetMapping("pageEasyPhotoAdminLC")
+ public R pageEasyPhotoAdminLC(@RequestParam("pageNum") Long pageNum,@RequestParam("pageSize") Long pageSize) {
+ return comActEasyPhotoService.pageEasyPhotoAdminLC(pageNum,pageSize);
+ }
+
+ /**
* 城管安排
*
* @param comActEasyPhotoVO
@@ -794,6 +816,20 @@
@PostMapping("exportEasyPhoto")
public R exportEasyPhoto(@RequestBody ExportEasyPhotoDTO exportEasyPhotoDTO) {
return comActEasyPhotoService.export(exportEasyPhotoDTO);
+ }
+
+ /**
+ * 随手拍详情-脱敏
+ *
+ * @param id
+ * 随手拍主键
+ * @param userId
+ * 登录用户
+ * @return 详情内容
+ */
+ @PostMapping("detaileasyphotodesensitize")
+ public R detailEasyPhotoDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
+ return comActEasyPhotoService.detailEasyPhotoDesensitize(id, userId);
}
/**
@@ -850,6 +886,11 @@
return comActMicroWishService.pageMicroWishApplets(comActMicroWishVO);
}
+ @PostMapping("pagemicrowish/appletsDesensitize")
+ public R pageMicroWishAppletsDesensitize(@RequestBody ComActMicroWishVO comActMicroWishVO) {
+ return comActMicroWishService.pageMicroWishAppletsDesensitize(comActMicroWishVO);
+ }
+
/**
* 心愿详情
*
@@ -862,6 +903,19 @@
@PostMapping("detailmicrowish")
public R detailMicroWish(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
return comActMicroWishService.detailMicroWish(id, userId);
+ }
+ /**
+ * 心愿详情 - 脱敏
+ *
+ * @param id
+ * 查询主键
+ * @param userId
+ * 登录用户id
+ * @return 心愿内容
+ */
+ @PostMapping("detailmicrowishdesensitize")
+ public R detailMicroWishDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
+ return comActMicroWishService.detailMicroWishDesensitize(id, userId);
}
/**
@@ -1679,6 +1733,19 @@
return comActEasyPhotoService.pageEasyPhotoApplets(comActEasyPhotoVO);
}
+
+ /**
+ * 小程序分页查询随手拍 脱敏
+ *
+ * @param comActEasyPhotoVO
+ * 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("pageeasyphotoappletsdesensitize")
+ public R pageEasyPhotoAppletsDesensitize(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
+ return comActEasyPhotoService.pageEasyPhotoAppletsDesensitize(comActEasyPhotoVO);
+ }
+
/**
* 随手拍评论分页查询
*
@@ -1689,6 +1756,18 @@
@PostMapping("pagecomacteasyphotocomment")
public R pageComActEasyPhotoComment(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO) {
return comActEasyPhotoService.pageComActEasyPhotoComment(pageComActEasyPhotoCommentDTO);
+ }
+
+ /**
+ * 随手拍评论分页查询 - 脱敏
+ *
+ * @param pageComActEasyPhotoCommentDTO
+ * 查询参数
+ * @return 查询结果
+ */
+ @PostMapping("pagecomacteasyphotocommentdesensitize")
+ public R pageComActEasyPhotoCommentDesensitize(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO) {
+ return comActEasyPhotoService.pageComActEasyPhotoCommentDesensitize(pageComActEasyPhotoCommentDTO);
}
/**
@@ -2325,7 +2404,7 @@
*/
@GetMapping("/eventgrid/community/list")
public R getCommunityLists() {
- return comActService.getCommunityLists();
+ return comActService.getCommunityLists(this.getAppId());
}
/**
@@ -2378,6 +2457,10 @@
return comActEasyPhotoService.getUserReward(userId, communityId);
}
+ @PostMapping("easyphoto/getUserRewardsNew")
+ public R getUserRewardsNew(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId) {
+ return comActEasyPhotoService.getUserRewardNew(userId, communityId);
+ }
/**
* 读取用户随手拍奖励
*
@@ -2678,4 +2761,67 @@
public R activityInviteDelete(@RequestParam("id") Long id) {
return comActActivityInviteService.activityInviteDelete(id);
}
+
+ /**
+ * 根据id查询重复的社区id集合
+ * @param id
+ * @return
+ */
+ @GetMapping("selectCommunityIds")
+ public R selectCommunityIds(@RequestParam("id") Long id){
+ return comActService.selectIds(id);
+ }
+
+
+ /**
+ * 通过id查询用户
+ * @param id
+ * @return
+ */
+ @GetMapping("selectAutomessageSysUserById")
+ public R selectAutomessageSysUserById(@RequestParam("id") Long id){
+ return automessageSysUserService.selectAutomessageSysUserById(id);
+ }
+
+ /**
+ * 根据id查询重复的社区id集合
+ * @return
+ */
+ @GetMapping("selectBasicData")
+ public R selectBasicData(){
+ return comActService.selectBasicData();
+ }
+
+ /**
+ * 统计在职干部特长
+ * @return
+ */
+ @GetMapping("statisticsPbMemberType")
+ public R statisticsPbMemberType(){
+ return comActService.statisticsPbMemberType();
+ }
+
+ /**
+ * 统计单位
+ * @return
+ */
+ @GetMapping("selectUnitByNatureName")
+ public R selectUnitByNatureName(){
+ return comActService.selectUnitByNatureName();
+ }
+
+ /**
+ * 大屏-社区活动分页
+ * @return
+ */
+ @PostMapping("pageActivityBigScreen")
+ public R pageActivityBigScreen(@RequestBody PageBaseDTO pageBaseDTO){
+ return comActActivityService.pageActivityBigScreen(pageBaseDTO);
+ }
+
+ @GetMapping("easyphoto/selectStatisticsPhoto")
+ public R selectStatisticsPhoto() {
+ return comActEasyPhotoService.selectStatisticsPhoto();
+ }
+
}
--
Gitblit v1.7.1