From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期一, 09 六月 2025 11:54:00 +0800 Subject: [PATCH] 6.9新增登录失败冻结逻辑 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 309 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 279 insertions(+), 30 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 76c6ccd..fa4f27b 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 @@ -9,6 +9,7 @@ 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; @@ -636,37 +637,153 @@ */ @PostMapping("adddynamic") public R addDynamic(@RequestBody ComActDynVO comActDynVO) { - ComActDynDO comActDynDO = new ComActDynDO(); - 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); + + if(comActDynVO==null) + { + return R.fail("参数不能为空"); + } + + if(comActDynVO.getCommunityList()!=null && comActDynVO.getCommunityList().size()>0 ) + { + for(String communityId:comActDynVO.getCommunityList()) + { + ComActDynDO comActDynDO = new ComActDynDO(); + BeanUtils.copyProperties(comActDynVO, comActDynDO); + + comActDynDO.setCommunityId(communityId); + + switch (comActDynVO.getType()) + { + //74 + case "党务公开": + comActDynDO.setType("74"); + break; + //75 + case "服务公开": + comActDynDO.setType("75"); + break; + //77 + case "财务公开": + comActDynDO.setType("77"); + break; + case "项目公开": + comActDynDO.setType("1559820224499318786"); + break; + // + case "资金公开": + case "资产公开": + case "资源公开": + case "村集体经济组织项目": + comActDynDO.setType(comActDynService.getTypeId(communityId,comActDynVO.getType())); + break; + } + + if(StringUtils.isEmpty(comActDynVO.getType())) + { + return R.fail("分类选择错误"); + } + + + boolean save = comActDynService.save(comActDynDO); + if (save) { + if(comActDynVO.getCategory()!=null&&comActDynVO.getCategory()==4){ + comActDynVO.setId(comActDynDO.getId()); + comActDynVO.setCommunityId(communityId); + rabbitTemplate.convertAndSend("huacheng.acid.message.exchange", "huacheng.acid.message.key", comActDynVO); + } + // 最多只能设置三条置顶状态,后边设置会取消先前设置的置顶 + Integer isTopping = comActDynVO.getIsTopping(); + boolean b = isTopping.intValue() == 1; + if (b) { + List<ComActDynDO> list = comActDynService.list(new QueryWrapper<ComActDynDO>().lambda() + .eq(ComActDynDO::getIsTopping, 1).eq(ComActDynDO::getCommunityId, communityId)); + if (!ObjectUtils.isEmpty(list)) { + int size = list.size(); + if (size == 4) { + List<ComActDynDO> collect = list.stream().sorted(Comparator.comparing(ComActDynDO::getCreateAt)) + .collect(toList()); + ComActDynDO comActDynDO1 = collect.get(0); + comActDynDO1.setIsTopping(0); + boolean update = comActDynService.updateById(comActDynDO1); + if (!update) { + return R.fail("修改置顶状态失败"); + } + } + } + } + } } - // 最多只能设置三条置顶状态,后边设置会取消先前设置的置顶 - Integer isTopping = comActDynVO.getIsTopping(); - boolean b = isTopping.intValue() == 1; - if (b) { - List<ComActDynDO> list = comActDynService.list(new QueryWrapper<ComActDynDO>().lambda() - .eq(ComActDynDO::getIsTopping, 1).eq(ComActDynDO::getCommunityId, comActDynVO.getCommunityId())); - if (!ObjectUtils.isEmpty(list)) { - int size = list.size(); - if (size == 4) { - List<ComActDynDO> collect = list.stream().sorted(Comparator.comparing(ComActDynDO::getCreateAt)) - .collect(toList()); - ComActDynDO comActDynDO1 = collect.get(0); - comActDynDO1.setIsTopping(0); - boolean update = comActDynService.updateById(comActDynDO1); - if (!update) { - return R.fail("修改置顶状态失败"); + return R.ok(); + +// ComActDynDO comActDynDO = new ComActDynDO(); +// 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; +// if (b) { +// List<ComActDynDO> list = comActDynService.list(new QueryWrapper<ComActDynDO>().lambda() +// .eq(ComActDynDO::getIsTopping, 1).eq(ComActDynDO::getCommunityId, comActDynVO.getCommunityId())); +// if (!ObjectUtils.isEmpty(list)) { +// int size = list.size(); +// if (size == 4) { +// List<ComActDynDO> collect = list.stream().sorted(Comparator.comparing(ComActDynDO::getCreateAt)) +// .collect(toList()); +// ComActDynDO comActDynDO1 = collect.get(0); +// comActDynDO1.setIsTopping(0); +// boolean update = comActDynService.updateById(comActDynDO1); +// if (!update) { +// return R.fail("修改置顶状态失败"); +// } +// } +// } +// } +// return R.ok(); +// } + + } + else + { + ComActDynDO comActDynDO = new ComActDynDO(); + BeanUtils.copyProperties(comActDynVO, comActDynDO); + + comActDynDO.setCommunityId(comActDynVO.getCommunityId()); + boolean save = comActDynService.save(comActDynDO); + if (save) { + if(comActDynVO.getCategory()!=null&&comActDynVO.getCategory()==4){ + comActDynVO.setId(comActDynVO.getId()); + comActDynVO.setCommunityId(comActDynVO.getCommunityId()); + rabbitTemplate.convertAndSend("huacheng.acid.message.exchange", "huacheng.acid.message.key", comActDynVO); + } + // 最多只能设置三条置顶状态,后边设置会取消先前设置的置顶 + Integer isTopping = comActDynVO.getIsTopping(); + boolean b = isTopping.intValue() == 1; + if (b) { + List<ComActDynDO> list = comActDynService.list(new QueryWrapper<ComActDynDO>().lambda() + .eq(ComActDynDO::getIsTopping, 1).eq(ComActDynDO::getCommunityId, comActDynVO.getCommunityId())); + if (!ObjectUtils.isEmpty(list)) { + int size = list.size(); + if (size == 4) { + List<ComActDynDO> collect = list.stream().sorted(Comparator.comparing(ComActDynDO::getCreateAt)) + .collect(toList()); + ComActDynDO comActDynDO1 = collect.get(0); + comActDynDO1.setIsTopping(0); + boolean update = comActDynService.updateById(comActDynDO1); + if (!update) { + return R.fail("修改置顶状态失败"); + } } } } } return R.ok(); } - return R.fail(); } /** @@ -696,6 +813,32 @@ // comActDynVO.setCover(comActDynDO.getCover()); // } BeanUtils.copyProperties(comActDynVO, comActDynDO); + + switch (comActDynVO.getType()) + { + //74 + case "党务公开": + comActDynDO.setType("74"); + break; + //75 + case "服务公开": + comActDynDO.setType("75"); + break; + //77 + case "财务公开": + comActDynDO.setType("77"); + break; + case "项目公开": + comActDynDO.setType("1559820224499318786"); + break; + // + case "资金公开": + case "资产公开": + case "资源公开": + case "村集体经济组织项目": + comActDynDO.setType(comActDynService.getTypeId(comActDynDO.getCommunityId(),comActDynVO.getType())); + break; + } boolean update = comActDynService.updateById(comActDynDO); if (update) { @@ -787,6 +930,17 @@ } /** + * 分页查询随手拍 浪潮专用 + * + * 查询参数 + * @return 心愿列表 + */ + @GetMapping("pageEasyPhotoAdminLC") + public R pageEasyPhotoAdminLC(@RequestParam("pageNum") Long pageNum,@RequestParam("pageSize") Long pageSize) { + return comActEasyPhotoService.pageEasyPhotoAdminLC(pageNum,pageSize); + } + + /** * 城管安排 * * @param comActEasyPhotoVO @@ -804,6 +958,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); } /** @@ -860,6 +1028,11 @@ return comActMicroWishService.pageMicroWishApplets(comActMicroWishVO); } + @PostMapping("pagemicrowish/appletsDesensitize") + public R pageMicroWishAppletsDesensitize(@RequestBody ComActMicroWishVO comActMicroWishVO) { + return comActMicroWishService.pageMicroWishAppletsDesensitize(comActMicroWishVO); + } + /** * 心愿详情 * @@ -872,6 +1045,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); } /** @@ -1436,7 +1622,8 @@ */ @PostMapping("listactivity") public R listActivity(@RequestParam("userId") Long userId, - @RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type", required = false) Integer type) { + @RequestParam(value = "status", required = false) Integer status, + @RequestParam(value = "type", required = false) Integer type) { return comActActivityService.listActivity(userId, status,type); } @@ -1689,6 +1876,19 @@ return comActEasyPhotoService.pageEasyPhotoApplets(comActEasyPhotoVO); } + + /** + * 小程序分页查询随手拍 脱敏 + * + * @param comActEasyPhotoVO + * 查询参数 + * @return 返回结果 + */ + @PostMapping("pageeasyphotoappletsdesensitize") + public R pageEasyPhotoAppletsDesensitize(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) { + return comActEasyPhotoService.pageEasyPhotoAppletsDesensitize(comActEasyPhotoVO); + } + /** * 随手拍评论分页查询 * @@ -1699,6 +1899,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); } /** @@ -2388,6 +2600,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); + } /** * 读取用户随手拍奖励 * @@ -2710,12 +2926,45 @@ return automessageSysUserService.selectAutomessageSysUserById(id); } + /** + * 根据id查询重复的社区id集合 + * @return + */ + @GetMapping("selectBasicData") + public R selectBasicData(){ + return comActService.selectBasicData(); + } /** - * 获取问题清单,需求清单,报道服务活动数量 - * */ - @GetMapping("/dataCount") - public R dataCount(){ - return null; + * 统计在职干部特长 + * @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