修改

xyh

2021-06-16 2e475243142608af9d72f97e3b2212c052a938e1

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -17,9 +17,7 @@
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.dtos.vaccines.*;
import com.panzhihua.common.model.vos.IPageVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
@@ -33,6 +31,7 @@
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.common.utlis.ExcelSelectObject;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -2193,11 +2192,11 @@

    /**
     * 编辑实有人口
     * @param editComMngPopulationVO
     * @param populationEditDTO
     * @return
     */
    @PostMapping("/common/data/population/edit")
    R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO, @RequestParam("communityId") Long communityId);
    R editPopulation(@RequestBody ComMngPopulationEditDTO populationEditDTO, @RequestParam("communityId") Long communityId);

    /**
     * 微心愿删除
@@ -2474,6 +2473,85 @@
    @PostMapping("/common/data/population/edit/electronicArchives")
    R editUserElectronicFile(@RequestBody UserElectronicFileVO userElectronicFileVO);

    /**
     * 实有人口统计
     * @param communityId   社区id
     * @return  统计结果
     */
    @PostMapping("/common/data/population/statistics")
    R getPopulationTotalByAdmin(@RequestParam("communityId") Long communityId);

    /**
     * 查询房屋级联菜单
     * @param cascadeHouseDTO   请求参数
     * @return  菜单列表
     */
    @PostMapping("/common/data/population/cascade/list")
    R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO);

    /**
     * 分页查询房屋列表
     * @param populationHouseAdminDTO   请求参数
     * @return  房屋列表
     */
    @PostMapping("/common/data/population/page/house")
    R pageHouse(@RequestBody ComMngPopulationHouseAdminDTO populationHouseAdminDTO);

    /**
     * 根据id查询实有房屋信息
     * @param houseId   房屋id
     * @return  房屋信息
     */
    @PostMapping("/common/data/population/house/detail")
    R getHouseDetail(@RequestParam(value = "houseId") Long houseId);

    /**
     * 编辑实有房屋信息
     * @param houseEditAdminDTO 请求参数
     * @return  编辑结果
     */
    @PostMapping("/common/data/population/house/edit")
    R editHouse(@RequestBody ComMngPopulationHouseEditAdminDTO houseEditAdminDTO);

    /**
     * 根据房屋id列表删除房屋信息
     * @param Ids   请求参数
     * @return  删除结果
     */
    @PostMapping("/common/data/population/house/delete")
    R deleteHouses(@RequestBody List<Long> Ids);

    /**
     * 实有房屋统计
     * @param communityId   社区id
     * @return  统计结果
     */
    @PostMapping("/common/data/population/house/statistics")
    R getHouseTotalByAdmin(@RequestParam("communityId") Long communityId);

    /**
     * 根据社区id查询社区所有省市区
     * @param communityId   社区id
     * @return  社区所在省市区
     */
    @PostMapping("/common/data/village/getRegion")
    R getRegion(@RequestParam("communityId") Long communityId);

    /**
     * 统计社区内小区数量
     * @param communityId   社区id
     * @return  统计小区数量
     */
    @PostMapping("/common/data/village/statistics")
    R villageStatistics(@RequestParam("communityId") Long communityId);

    /**
     * 小区详情
     * @param villageId 小区id
     * @return  小区详情
     */
    @PostMapping("/village/getVillage")
    R getVillage(@RequestParam("villageId") Long villageId);

    /**
     * 新增高龄认证
@@ -2648,4 +2726,97 @@
     */
    @PostMapping("/vaccines/admin/enroll/type/list")
    R getEnrollTypeListByAdmin();

    /**
     *  批量保存楼栋
     * @param newVoList
     * @param communityId
     * @return
     */
    @PostMapping("/building/batchSave")
    R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList,@RequestParam("communityId") Long communityId);

    /**
     * 根据字典key查询字典项
     * @param key
     * @return
     */
    @GetMapping("/dictionary/listDictionaryByKey")
    R<List<BcDictionaryVO>> listDictionaryByKey(@RequestParam("key") String key);
  //  R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList,@RequestParam("communityId") Long communityId,@RequestParam("streetId")Long streetId);

    /**
     * description 批量保存重点人群人员信息
     *
     * @param list 重点人群信息
     * @return R  保存结果
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @PostMapping("/key_person/batch/save")
    R saveBatchKeyPerson(@RequestBody List<KeyPersonInfoDTO> list);

    /**
     * 大屏统计实有人口
     * @param communityId
     * @return
     */
    @GetMapping("/screen/population/statistic")
    R statistic(@RequestParam("communityId")Long communityId);


    /**
     * 大屏统计邻里圈
     * @param communityId
     * @return
     */
    @GetMapping("/screen/work/neighborCircle")
    R statisticNeighborCircle(@RequestParam("communityId") Long communityId);

    /**
     * 大屏统计邻里圈
     */
    @GetMapping("/screen/work/wish")
    R wish(@RequestParam("communityId") Long communityId);

    /**
     * 大屏统计社区-活动
     * @param communityId
     * @return
     */
    @GetMapping("/screen/work/activity")
    R activity(@RequestParam("communityId") Long communityId);

    /**
     * 大屏统计一起议
     * @param communityId
     * @return
     */
    @GetMapping("/screen/work/discuss")
    R discuss(@RequestParam("communityId") Long communityId);

    /**
     * 大屏统计党建工作
     * @param communityId
     * @return
     */
    @GetMapping("/screen/work/pbWork")
    R pbWork(@RequestParam("communityId")Long communityId);


    /**
     * 大屏统计随手拍
     * @param communityId
     * @return
     */
    @GetMapping("/screen/work/easyPhoto")
    R easyPhoto(@RequestParam("communityId")Long communityId);

    /**
     *  大屏统计工作情况
     * @param communityId
     * @return
     */
    @GetMapping("/screen/work/workCount")
    R workCount(@RequestParam("communityId")Long communityId);
}