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 | 68 +++++++++++++++++++++++++++++++--
1 files changed, 63 insertions(+), 5 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 1b2ffa3..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
@@ -7,11 +7,17 @@
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;
@@ -43,6 +49,8 @@
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
+import static java.util.Objects.isNull;
+
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
* @description: 社区服务
@@ -56,6 +64,8 @@
public class CommunityApi extends BaseController {
@Resource
private CommunityService communityService;
+ @Resource
+ private CommunityWestService communityWestService;
@Resource
private UserService userService;
@Resource
@@ -81,7 +91,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);
}
@@ -340,7 +353,7 @@
@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")
@@ -356,6 +369,20 @@
}
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) {
@@ -368,9 +395,40 @@
}
@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){
- return communityService.institutionalUnitServiceAnalysis(year,type,range,communityId);
+ 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