springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/TreeListVO.java
New file @@ -0,0 +1,16 @@ package com.panzhihua.common.model.vos; import lombok.Data; import java.util.List; @Data public class TreeListVO { private String fatherName; private String orgName; private String name; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -6,6 +6,7 @@ import com.panzhihua.common.model.dtos.PageBaseDTO; import com.panzhihua.common.model.dtos.community.*; import com.panzhihua.common.model.dtos.community.acid.*; import com.panzhihua.common.model.dtos.community.building.BuildingDto; import com.panzhihua.common.model.dtos.community.convenient.*; import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO; import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO; @@ -11853,5 +11854,25 @@ @RequestParam("userId") Long userId); @GetMapping("/largeScreen/panzhihuaMap") public R panzhihuaMap(@RequestParam("areaCode")String areaCode); @GetMapping("/largeScreen/oneTagThreeReal") public R oneTagThreeReal(@RequestParam Long streetId); @PostMapping("/largeScreen/searchStreet") public R searchStreet(@RequestBody BuildingDto buildingDto); @PostMapping("/largeScreen/huachengDyn") public R huachengDyn(@RequestBody ComActDynVO comActDynVO); @GetMapping("/largeScreen/getScreenStatics") public R getScreenStatics(); @GetMapping("/largeScreen/populationStatics") public R populationStatics(@RequestParam("streetId") Long streetId); @GetMapping("/largeScreen/probably") public R probably(@RequestParam("year") Integer year,@RequestParam("belongTo") String belongTo); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java
@@ -2,6 +2,7 @@ import com.panzhihua.common.model.dtos.common.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.TreeListVO; import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO; import org.springframework.web.bind.annotation.*; import com.panzhihua.common.constants.Constants; @@ -33,6 +34,9 @@ @PostMapping("/page") R queryByPage(@RequestBody PageComPbCheckUnitDto comPbCheckUnit); @PostMapping("/treeList") R treeList(@RequestBody TreeListVO treeListVO); /** * description insert 新增数据 * springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
@@ -4,6 +4,7 @@ import javax.annotation.Resource; import com.panzhihua.common.model.dtos.community.building.BuildingDto; import com.panzhihua.common.model.vos.community.ComActSocialOrgVO; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCourtyardStatisticsInfo; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenDpcStatisticsInfo; @@ -745,4 +746,40 @@ pageBaseDTO.setCommunityId(this.getCommunityId()); return communityService.dpcEasyPhotoList(pageBaseDTO); } @GetMapping("/panzhihuaMap") public R panzhihuaMap(@RequestParam("areaCode")String areaCode){ return communityService.panzhihuaMap(areaCode); } @GetMapping("/oneTagThreeReal") public R oneTagThreeReal(@RequestParam Long streetId){ return communityService.oneTagThreeReal(streetId); } @PostMapping("/searchStreet") public R searchStreet(@RequestBody BuildingDto buildingDto){ return communityService.searchStreet(buildingDto); } @PostMapping("/huachengDyn") public R huachengDyn(@RequestBody ComActDynVO comActDynVO){ return communityService.huachengDyn(comActDynVO); } @GetMapping("/getScreenStatics") public R getScreenStatics(){ return communityService.getScreenStatics(); } @GetMapping("/populationStatics") public R populationStatics(@RequestParam("streetId") Long streetId){ return communityService.populationStatics(streetId); } @GetMapping("/probably") public R probably(@RequestParam("year") Integer year,@RequestParam("belongTo") String belongTo){ return communityService.probably(year,belongTo); } } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPbCheckUnitApi.java
@@ -15,6 +15,7 @@ import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.TreeListVO; import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo; import com.panzhihua.common.model.vos.common.PbCheckUnitStatisticsVo; import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitErrorExcelVO; @@ -109,6 +110,14 @@ } /** * 树状列表 */ @PostMapping("/treeList") public R treeList(@RequestBody TreeListVO treeListVO){ return comPbCheckUnitService.treeList(treeListVO); } /** * description add 新增数据 * * @param comPbCheckUnit 请求参数 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/ComPbCheckUnitController.java
@@ -1,6 +1,7 @@ package com.panzhihua.service_dangjian.api; import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO; import com.panzhihua.common.model.vos.TreeListVO; import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO; import com.panzhihua.service_dangjian.service.ComPbCheckUnitService; import com.panzhihua.common.model.dtos.common.*; @@ -40,6 +41,11 @@ return this.comPbCheckUnitService.queryByPage(comPbCheckUnit); } @PostMapping("/treeList") public R treeList(@RequestBody TreeListVO treeListVO){ return this.comPbCheckUnitService.treeList(treeListVO); } /** * description add 新增数据 * springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbCheckUnitService.java
@@ -2,6 +2,7 @@ import com.panzhihua.common.model.dtos.common.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.TreeListVO; import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO; import java.util.List; @@ -28,6 +29,8 @@ */ R queryByPage(PageComPbCheckUnitDto comPbCheckUnit); R treeList(TreeListVO treeListVO); /** * description insert 新增数据 * springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java
@@ -1,6 +1,8 @@ package com.panzhihua.service_dangjian.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,6 +14,7 @@ import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto; import com.panzhihua.common.model.dtos.common.PagePbCheckUnitCommonDto; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.TreeListVO; import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo; import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitErrorExcelVO; import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO; @@ -80,6 +83,19 @@ return R.ok(checkUnitVoPage); } @Override public R treeList(TreeListVO treeListVO) { QueryWrapper<ComPbCheckUnit> wrapper = new QueryWrapper<>(); if(treeListVO.getName() != null){ wrapper.eq("belong_to",treeListVO.getName()); } if(treeListVO.getOrgName() != null){ wrapper.eq("org_name",treeListVO.getOrgName()); } List<ComPbCheckUnit> comPbCheckUnits = this.baseMapper.selectList(wrapper); return R.ok(comPbCheckUnits); } /** * description insert 新增数据 *
