From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 206 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 180 insertions(+), 26 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 46c1064..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
@@ -637,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();
}
/**
@@ -697,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) {
@@ -785,6 +927,17 @@
@PostMapping("pageeasyphoto")
public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
return comActEasyPhotoService.pageEasyPhoto(comActEasyPhotoVO);
+ }
+
+ /**
+ * 分页查询随手拍 浪潮专用
+ *
+ * 查询参数
+ * @return 心愿列表
+ */
+ @GetMapping("pageEasyPhotoAdminLC")
+ public R pageEasyPhotoAdminLC(@RequestParam("pageNum") Long pageNum,@RequestParam("pageSize") Long pageSize) {
+ return comActEasyPhotoService.pageEasyPhotoAdminLC(pageNum,pageSize);
}
/**
@@ -1469,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);
}
@@ -2803,7 +2957,7 @@
* 大屏-社区活动分页
* @return
*/
- @GetMapping("pageActivityBigScreen")
+ @PostMapping("pageActivityBigScreen")
public R pageActivityBigScreen(@RequestBody PageBaseDTO pageBaseDTO){
return comActActivityService.pageActivityBigScreen(pageBaseDTO);
}
--
Gitblit v1.7.1