From 6873ee2b98283d9a876dfc6e5d878094e5de61d9 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期三, 20 一月 2021 11:30:46 +0800
Subject: [PATCH] 系统配置
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 132 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 129 insertions(+), 3 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 7140b5c..541f5f4 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
@@ -109,8 +109,8 @@
boolean ok = R.isOk(r);
if (ok) {
Integer hasPrize = comActActivityVO.getHasPrize();
+ Long actActivityVOId = comActActivityVO.getId();
if (!ObjectUtils.isEmpty(comActActPrizeVOList) && hasPrize.intValue() == 1) {
- Long actActivityVOId = comActActivityVO.getId();
comActActPrizeService.remove(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, actActivityVOId));
if (!ObjectUtils.isEmpty(comActActPrizeVOList)) {
List<ComActActPrizeDO> comActActPrizeDOS = new ArrayList<>();
@@ -125,6 +125,9 @@
return R.fail("保存奖品失败");
}
}
+ }else if(hasPrize.intValue() == 0){
+ boolean remove = comActActPrizeService.remove(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, actActivityVOId));
+ log.info("删除社区活动奖品结果【{}】，社区活动id【{}】",remove,actActivityVOId);
}
}
return r;
@@ -235,6 +238,7 @@
comActActivityVO.setActivitySignVOList(activitySignVOS);
}
}
+ comActActivityVO.setIntegral(0);
return R.ok(comActActivityVO);
}
@@ -611,7 +615,22 @@
*/
@PostMapping("batchhouse")
public R batchHouse(@RequestBody BatchhouseVO batchhouseVO) {
- return comMngStructHouseService.batchHouse(batchhouseVO);
+ R r = comMngStructHouseService.batchHouse(batchhouseVO);
+ if (R.isOk(r)) {
+ String areaCode = batchhouseVO.getAreaCode();
+ String ruleDoor = batchhouseVO.getRuleDoor();
+ String ruleConnector = batchhouseVO.getRuleConnector();
+ String ruleFloor = batchhouseVO.getRuleFloor();
+ ComMngStructAreaVO comMngStructAreaVO=new ComMngStructAreaVO();
+ comMngStructAreaVO.setRoleDoor(ruleDoor);
+ comMngStructAreaVO.setRoleFloor(ruleFloor);
+ comMngStructAreaVO.setRoleConnector(ruleConnector);
+ comMngStructAreaVO.setAreaCode(areaCode);
+ comMngStructAreaVO.setCommunityId(null);
+ comMngStructAreaVO.setIsAccumulation(null);
+ comMngStructAreaService.putArea(comMngStructAreaVO);
+ }
+ return r;
}
/**
@@ -636,7 +655,19 @@
R r=comMngStructAreaService.selectAreaByAreaCode(batchhouseVO.getAreaCode());
if (R.isOk(r)) {
ComMngStructAreaDO comMngStructAreaDO = (ComMngStructAreaDO)r.getData();
- return comMngStructHouseService.addHouse(batchhouseVO,comMngStructAreaDO);
+ try {
+ R r1 = comMngStructHouseService.addHouse(batchhouseVO, comMngStructAreaDO);
+ return r1;
+ } catch (Exception e) {
+ if (e.getMessage().contains("unique_house_name")) {
+ return R.fail("房屋地址重复");
+ }else {
+ log.error("添加同级地址失败【{}】",e.getMessage());
+ return R.fail("添加房屋失败");
+ }
+ }
+
+
}
return r;
}
@@ -940,9 +971,104 @@
return comActService.listCommunityAll();
}
+ /**
+ * 社区管理后台数据看板 代办事件
+ * @param communityId 社区id
+ * @param userId 登录用户信息
+ * @return 代办事件列表
+ */
+ @PostMapping("indexdatacommunitybackstage")
+ public R indexDataCommunityBackstage(@RequestParam("communityId") Long communityId, @RequestParam("userId")Long userId){
+ List<TodoEventsVO> todoEventsVOS=new ArrayList<>();
+ List<TodoEventsVO> todoEventsVOS1=comActEasyPhotoService.selectNeedToDo(communityId,userId);
+ List<TodoEventsVO> todoEventsVOS2=comActMicroWishService.selectNeedToDo(communityId,userId);
+ List<TodoEventsVO> todoEventsVOS3=comMngVolunteerMngService.selectNeedToDo(communityId,userId);
+ if (!ObjectUtils.isEmpty(todoEventsVOS1)) {
+ todoEventsVOS.addAll(todoEventsVOS1);
+ }
+ if (!ObjectUtils.isEmpty(todoEventsVOS2)) {
+ todoEventsVOS.addAll(todoEventsVOS2);
+ }
+ if (!ObjectUtils.isEmpty(todoEventsVOS3)) {
+ todoEventsVOS.addAll(todoEventsVOS3);
+ }
+ return R.ok(todoEventsVOS);
+ }
+ /**
+ * 删除社区
+ * @param communityId 社区id
+ * @return 删除结果
+ */
+ @PostMapping("delectcommunity")
+ public R delectCommunity(@RequestParam("communityId") Long communityId){
+ return comActService.delectCommunity(communityId);
+ }
+ /**
+ * 定时任务刷新社区动态置顶状态
+ * @return 刷新结果
+ */
+ @PostMapping("timedtaskdynistopping")
+ public R timedTaskDynIstopping(){
+ return comActDynService.timedTaskDynIstopping();
+ }
+ /**
+ * 定时任务刷新社区动态发布状态
+ * @return
+ */
+ @PostMapping("timedtaskdynstatus")
+ public R timedTaskDynStatus(){
+ return comActDynService.timedTaskDynStatus();
+ }
+ /**
+ * 定时任务查询所有要取消的社区活动
+ * @return 社区活动集合
+ */
+ @PostMapping("timedtaskactactivity")
+ public R timedTaskActActivity(){
+ return comActActivityService.timedTaskActActivity();
+ }
+
+ /**
+ * 定时任务刷新社区活动的各个状态 除取消外
+ * @return 更新结果
+ */
+ @PostMapping("timedtaskactactivityall")
+ R timedTaskActActivityAll(){
+ return comActActivityService.timedTaskActActivityAll();
+ }
+
+ /**
+ * 其他建筑详情
+ * @param id 主键id
+ * @return 建筑内容
+ */
+ @PostMapping("detailotherbuild")
+ public R detailOtherbuild(@RequestParam("id")Long id){
+ return comMngStructOtherBuildService.detailOtherbuild(id);
+ }
+
+ /**
+ * 编辑其他建筑
+ * @param comMngStructOtherBuildVO 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("putotherbuild")
+ public R putOtherbuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO){
+ return comMngStructOtherBuildService.putOtherbuild(comMngStructOtherBuildVO);
+ }
+
+ /**
+ * 删除其他建筑
+ * @param id 主键
+ * @return 删除结果
+ */
+ @PostMapping("deleteotherbuild")
+ public R deleteOtherbuild(@RequestParam("id")Long id){
+ return comMngStructOtherBuildService.deleteOtherbuild(id);
+ }
}
--
Gitblit v1.7.1