From bf46bac3cda70dc8dc7ed95e0461f1a72fba2eeb Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 01 八月 2022 14:44:43 +0800
Subject: [PATCH] Merge branch 'shuangzheng2' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 156 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 134 insertions(+), 22 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 9e3167e..7382277 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
@@ -4,7 +4,21 @@
import javax.annotation.Resource;
-import com.panzhihua.common.model.vos.community.MyActivityEvaluateVO;
+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.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.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -21,18 +35,6 @@
import com.panzhihua.common.model.dtos.community.PageVolunteerDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ActivitySignInRecordVO;
-import com.panzhihua.common.model.vos.community.ActivitySignVO;
-import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
-import com.panzhihua.common.model.vos.community.ComActActRegistVO;
-import com.panzhihua.common.model.vos.community.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.ComActDynVO;
-import com.panzhihua.common.model.vos.community.ComMngCarVO;
-import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
-import com.panzhihua.common.model.vos.community.ComMngVillageVO;
-import com.panzhihua.common.model.vos.community.ComMngVolunteerMngAppletsVO;
-import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
-import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
@@ -47,6 +49,8 @@
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
+import static java.util.Objects.isNull;
+
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
* @description: 社区服务
@@ -60,6 +64,8 @@
public class CommunityApi extends BaseController {
@Resource
private CommunityService communityService;
+ @Resource
+ private CommunityWestService communityWestService;
@Resource
private UserService userService;
@Resource
@@ -85,6 +91,10 @@
}
comActDynVO.setIsTopping(null);
comActDynVO.setStatus(1);
+ Integer category = comActDynVO.getCategory();
+ if (isNull(category)) {
+ comActDynVO.setCategory(1);
+ }
return communityService.pageDynamic(comActDynVO);
}
@@ -194,7 +204,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)) {
@@ -215,7 +225,7 @@
return R.fail("人员类型错误");
}
activitySignVO.setType(type);
- return communityService.listActivitySigns(activitySignVO);
+ return communityService.listActivitySign(activitySignVO);
}
@ApiOperation(value = "活动报名签到情况", response = ActivitySignInRecordVO.class)
@@ -238,13 +248,15 @@
@ApiOperation(value = "活动签到记录", response = ComActActRegistVO.class)
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "活动主键", required = true),
- @ApiImplicitParam(name = "type", value = "活动类型，1.居民/志愿者活动 2.党员活动", required = true)
+ @ApiImplicitParam(name = "type", value = "活动类型，1.居民/志愿者活动 2.党员活动", required = true),
+ @ApiImplicitParam(name = "userId", value = "用户id", required = true)
})
@GetMapping("activity/regist/list")
public R listRegistRecord(@RequestParam("id") Long id,
- @RequestParam("type") Integer type) {
+ @RequestParam("type") Integer type,
+ @RequestParam("userId") Long userId) {
if (type.intValue() == 1) {
- return communityService.listRegistRecord(id, this.getUserId());
+ return communityService.listRegistRecord(id, userId);
}
return R.fail("type不存在");
}
@@ -276,10 +288,9 @@
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
if (loginUserInfo != null) {
comMngVolunteerMngVO.setCommunityId(loginUserInfo.getCommunityId());
+ }else{
+ comMngVolunteerMngVO.setCommunityId(pageVolunteerDTO.getCommunityId());
}
- // Long communityId = this.getCommunityId();
-
- // comMngVolunteerMngVO.setCommunityId(communityId);
comMngVolunteerMngVO.setPageNum(pageVolunteerDTO.getPageNum());
comMngVolunteerMngVO.setPageSize(pageVolunteerDTO.getPageSize());
return communityService.pageVolunteer(comMngVolunteerMngVO);
@@ -289,6 +300,31 @@
@GetMapping("volunteer")
public R detailVolunteer(@RequestParam("id") Long id) {
return communityService.detailVolunteer(id);
+ }
+
+ @ApiOperation(value = "查询志愿者组织列表", response = ComMngVolunteerOrgTeamVo.class)
+ @GetMapping("/volunteer/org/list")
+ public R listVolunteerOrgAdmin() {
+ PageComMngVolunteerOrgTeamDto orgTeamDto = new PageComMngVolunteerOrgTeamDto();
+ orgTeamDto.setParentId(0L);
+ orgTeamDto.setCommunityId(this.getCommunityId());
+ return communityService.listVolunteerOrgAdmin(orgTeamDto);
+ }
+
+ @ApiOperation(value = "查询志愿者服务类型列表", response = ComMngVolunteerServiceTypeVo.class)
+ @GetMapping("/volunteer/service/type/list")
+ public R listVolunteerServiceTypeAdmin() {
+ PageComMngVolunteerServiceTypeDto serviceTypeDto = new PageComMngVolunteerServiceTypeDto();
+ serviceTypeDto.setCommunityId(this.getCommunityId());
+ return communityService.listServiceTypeAdmin(serviceTypeDto);
+ }
+
+ @ApiOperation(value = "查询志愿者技能列表", response = ComMngVolunteerSkillVo.class)
+ @GetMapping("/volunteer/skill/list")
+ public R listVolunteerSkillAdmin() {
+ PageComMngVolunteerSkillDto volunteerSkillDto = new PageComMngVolunteerSkillDto();
+ volunteerSkillDto.setCommunityId(this.getCommunityId());
+ return communityService.listVolunteerSkillAdmin(volunteerSkillDto);
}
@ApiOperation(value = "车辆登记")
@@ -317,6 +353,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