From 1ac9d6d25f32148354e46d11b814c306f475ee0d Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 08 十月 2022 17:07:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 128 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 121 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index c35b2ea..daa40d2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -1,17 +1,30 @@
package com.panzhihua.applets.api;
import java.util.Date;
+import java.util.List;
import javax.annotation.Resource;
+import javax.validation.Valid;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerSkillDto;
+import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
+import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
+import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
+import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.common.ComMngVolunteerOrgTeamVo;
import com.panzhihua.common.model.vos.common.ComMngVolunteerServiceTypeVo;
import com.panzhihua.common.model.vos.common.ComMngVolunteerSkillVo;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.neighbor.ActivityAnalysisVO;
+import com.panzhihua.common.model.vos.neighbor.ActivityAnalysisVO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAnalysisVO;
+import com.panzhihua.common.service.community.CommunityWestService;
+import io.swagger.annotations.*;
+import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -41,6 +54,9 @@
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
+import static java.util.Objects.isNull;
+import static org.apache.commons.lang3.ObjectUtils.isEmpty;
+
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
* @description: 社区服务
@@ -54,6 +70,8 @@
public class CommunityApi extends BaseController {
@Resource
private CommunityService communityService;
+ @Resource
+ private CommunityWestService communityWestService;
@Resource
private UserService userService;
@Resource
@@ -79,7 +97,10 @@
}
comActDynVO.setIsTopping(null);
comActDynVO.setStatus(1);
- comActDynVO.setAreaCode(this.getAreaCode());
+ Integer category = comActDynVO.getCategory();
+ if (isNull(category)) {
+ comActDynVO.setCategory(1);
+ }
return communityService.pageDynamic(comActDynVO);
}
@@ -118,7 +139,6 @@
comActActivityVO.setCommunityId(loginUserInfo.getCommunityId());
}
comActActivityVO.setIsApplets(1);
- comActActivityVO.setAreaCode(this.getAreaCode());
Integer status = comActActivityVO.getStatus();
if (null != status && status.intValue() == 4) {
comActActivityVO.setIsIng(1);
@@ -149,7 +169,6 @@
public R activitySignIn(@RequestBody ComActActRegistVO comActActRegistVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
comActActRegistVO.setUserId(loginUserInfo.getUserId());
- comActActRegistVO.setIsVolunteer(loginUserInfo.getIsVolunteer());
return communityService.activitySignIn(comActActRegistVO);
}
@@ -158,7 +177,6 @@
public R activityEvaluate(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
comActActEvaluateVO.setUserId(loginUserInfo.getUserId());
- comActActEvaluateVO.setIsVolunteer(loginUserInfo.getIsVolunteer());
return communityService.activityEvaluate(comActActEvaluateVO);
}
@@ -190,7 +208,7 @@
sysUserNoticeVO.setBusinessContent(String.format("活动将于%tF %tT 开始，请按时参加", beginAt, beginAt));
sysUserNoticeVO.setBusinessId(activityId);
sysUserNoticeVO.setStatus(0);
- sysUserNoticeVO.setActivityType(isVolunteer.intValue() == 1 ? 1 : 2);
+ sysUserNoticeVO.setActivityType(comActActivityVO.getType());
sysUserNoticeVO.setBusinessStatus(2);
R r1 = userService.addNotice(sysUserNoticeVO);
if (R.isOk(r1)) {
@@ -211,7 +229,7 @@
return R.fail("人员类型错误");
}
activitySignVO.setType(type);
- return communityService.listActivitySigns(activitySignVO);
+ return communityService.listActivitySign(activitySignVO);
}
@ApiOperation(value = "活动报名签到情况", response = ActivitySignInRecordVO.class)
@@ -245,6 +263,31 @@
return communityService.listRegistRecord(id, userId);
}
return R.fail("type不存在");
+ }
+
+ @ApiOperation(value = "活动邀请列表", response = ActivityInviteVO.class)
+ @PostMapping("activity/invite/list")
+ public R pageActivityInviteList(@RequestBody @Valid PageActivityInviteDTO pageActivityInviteDTO) {
+ return communityService.pageActivityInviteList(pageActivityInviteDTO);
+ }
+
+ @ApiOperation(value = "添加邀请人员")
+ @PostMapping("activity/invite/add")
+ public R activityInviteAdd(@RequestBody @Valid List<ActivityInviteDTO> list) {
+ if (!isEmpty(list)) {
+ list.forEach(e -> e.setCreatedBy(this.getUserId()));
+ } else {
+ return R.fail("列表为空");
+ }
+ return communityService.activityInviteAdd(list);
+ }
+
+
+ @ApiOperation(value = "删除邀请人员")
+ @ApiImplicitParam(name = "id", value = "邀请主键id", required = true)
+ @DeleteMapping("activity/invite/delete")
+ public R activityInviteDelete(@RequestParam("id") Long id) {
+ return communityService.activityInviteDelete(id);
}
// @ApiOperation(value = "新增社区动态浏览记录")
@@ -339,11 +382,82 @@
@GetMapping(value = "arealist")
public R getAllArea(@ApiParam(name = "城市编码:四川510000",
required = true) @RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
- return communityService.getCityTreeByProvinceCode(provinceAdcode);
+ return communityService.getCityTreeByProvinceCode(provinceAdcode, null);
}
@ApiOperation(value = "社区详情", response = ComActVO.class)
@GetMapping("community")
public R detailCommunity() {
return communityService.detailCommunity(this.getCommunityId());
}
+
+ @ApiOperation(value = "查询活动报名名单集合",response = ActivitySignVO.class)
+ @PostMapping("listactivitysign")
+ public R listActivitySign(@RequestBody ActivitySignVO activitySignVO) {
+ if (ObjectUtils.isEmpty(activitySignVO.getActivityId())) {
+ return R.fail("活动id主键不能为空");
+ }
+ return communityService.listActivitySign(activitySignVO);
+ }
+
+ @ApiOperation(value = "查询社区列表")
+ @GetMapping("actList")
+ public R getWestCommunityLists() {
+ return communityService.getWestCommunityLists(this.getAreaCode());
+ }
+
+ @ApiOperation(value = "分页查询街道", response = PageComStreetDTO.class)
+ @PostMapping("pagestreet")
+ public R pageStreet(@RequestBody PageComStreetDTO pageComStreetDTO) {
+ pageComStreetDTO.setAreaCode(this.getAreaCode());
+ return communityService.pageStreet(pageComStreetDTO);
+ }
+
+ @ApiOperation(value = "新增服务活动")
+ @PostMapping("activity")
+ public R addActivity(@RequestBody @Validated(AddGroup.class) ComActActivityVO comActActivityVO) {
+ Long communityId = this.getCommunityId();
+ comActActivityVO.setCommunityId(communityId);
+ comActActivityVO.setUserId(this.getLoginUserInfo().getUserId());
+ comActActivityVO.setStatus(2);
+ comActActivityVO.setHasPrize(0);
+ return communityService.addActivity(comActActivityVO);
+ }
+ @ApiOperation(value = "单位活动统计",response = ActivityAnalysisVO.class)
+ @GetMapping("activity/analysis")
+ public R activityUnitAnalysis(@RequestParam(value = "year",required = false) Integer year,
+ @RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "range",required = false)Integer range,
+ @RequestParam(value = "communityId",required = false) Long communityId,
+ @RequestParam(value = "page",required = false) Integer page,
+ @RequestParam(value = "size",required = false) Integer size,
+ @RequestParam(value = "belongTo",required = false) String belongTo,
+ @RequestParam(value = "unitId",required = false) Long unitId){
+ return communityService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo,unitId,this.getLoginUserInfo().getAccount());
+ }
+
+
+ @ApiOperation(value = "分页查询服务范围数据",response = ComActColumnVO.class)
+ @PostMapping("comActColumn/queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ if(this.getLoginUserInfo().getStreetId()!=null){
+ commonPage.setStreetId(this.getLoginUserInfo().getStreetId());
+ } else {
+ commonPage.setCommunityId(this.getCommunityId());
+ }
+ return this.communityService.comActColumnSelectAll(commonPage);
+ }
+
+ @ApiOperation(value = "街道详情", response = ComStreetVO.class)
+ @ApiImplicitParam(name = "id", value = "街道id", required = true)
+ @GetMapping("street")
+ public R detailStreet(@RequestParam("id") Long id) {
+ return communityWestService.detailStreet(id);
+ }
+
+ @ApiOperation(value = "根据id查询社区详情", response = ComActVO.class)
+ @ApiImplicitParam(name = "id", value = "社区id", required = true)
+ @GetMapping("detail")
+ public R detailCommunity(@RequestParam("id") Long id) {
+ return communityService.detailCommunity(id);
+ }
}
--
Gitblit v1.7.1