java/zhihuishenqu.git

			@@ -5,6 +5,18 @@
			import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
			import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
			import com.panzhihua.common.model.dtos.community.*;
			import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
			import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
			import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
			import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
			import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.*;
			import com.panzhihua.common.model.dtos.neighbor.*;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
			@@ -16,14 +28,13 @@
			import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
			import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
			import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
			import com.panzhihua.common.model.vos.IPageVO;
			import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
			import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
			import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
			import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
			import com.panzhihua.common.model.vos.R;
			import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
			import com.panzhihua.common.model.dtos.vaccines.*;
			import com.panzhihua.common.model.vos.*;
			import com.panzhihua.common.model.vos.community.*;
			import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
			import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
			import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
			import com.panzhihua.common.model.vos.community.bigscreen.PartyBuildingMemberVO;
			import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
			import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
			import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
			@@ -36,6 +47,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.*;
			@@ -196,6 +208,16 @@
			*/
			@PostMapping("detaileasyphoto")
			R detailEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

			/**
			* 随手拍删除
			*
			* @param id 随手拍主键
			* @param userId 登录用户id
			* @return 详情内容
			*/
			@PostMapping("deleteEasyPhoto")
			R deleteEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

			/**
			* 分页查询微心愿
			@@ -1182,7 +1204,7 @@
			R deleteOpsHouse(@RequestParam("id") Long id);

			/**
			* 一起议-分页查询
			* 房屋租售-分页查询
			*
			* @param pageComOpsHouseDTO 查询参数
			* @return ComOpsHouseVO
			@@ -1352,7 +1374,7 @@
			* @param list 便民服务集合
			*/
			@PostMapping("/convenient/serve/import")
			R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list, @RequestParam("communityId") Long communityId);
			R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list, @RequestParam(value = "communityId",required = false) Long communityId);

			/**
			* 导出房屋信息
			@@ -2186,11 +2208,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);

			/**
			* 微心愿删除
			@@ -2467,6 +2489,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);

			/**
			* 新增高龄认证
			@@ -2602,4 +2703,367 @@
			*/
			@PostMapping("/vaccines/admin/enroll/list")
			R getVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO);

			/**
			* 删除疫苗分类信息
			* @param id 疫苗分类id
			* @return 删除结果
			*/
			@PostMapping("/vaccines/admin/enroll/delete")
			R deleteVaccinesByAdmin(@RequestParam("id") Long id);

			/**
			* 根据条件导出登记列表
			* @param vaccinesByAdminDTO 请求参数
			* @return 登记列表
			*/
			@PostMapping("/vaccines/admin/enroll/export")
			R exportVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO);

			/**
			* 查询接种记录列表
			* @param inoculationByAdminDTO 请求参数
			* @return 接种记录列表
			*/
			@PostMapping("/vaccines/admin/inoculation/list")
			R getVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO);

			/**
			* 接种记录信息导出
			* @param inoculationByAdminDTO 请求参数
			* @return 导出结果
			*/
			@PostMapping("/vaccines/admin/inoculation/export")
			R exportVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO);

			/**
			* 查询疫苗分类列表
			* @return 疫苗分类列表
			*/
			@PostMapping("/vaccines/admin/enroll/type/list")
			R getEnrollTypeListByAdmin();

			/**
			* 查询老龄认证记录
			* @param pageComEldersRecordsDTO
			* @return
			*/
			@PostMapping("/elders/records")
			R queryEldersRecord(@RequestBody PageComEldersRecordsDTO pageComEldersRecordsDTO);

			/**
			* 查询老龄认证记录详细
			* @param id
			* @return
			*/
			@PostMapping("/elders/records/deatils")
			R<ComEldersAuthElderlyDetailsVO> comEldersAuthElderlyDetails(@RequestParam("id") Long id);

			/**
			* 查询老龄认证社区认证方式
			* @param eldersAuthTypeQueryDTO
			* @return
			*/
			@PostMapping("/elders/authtype")
			R communityElderAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);

			/**
			* 分页查询高领老人列表
			* @param pageEldersAuthElderlyDTO
			* @return
			*/
			@PostMapping("/eldersauthelderly/page")
			R pageQueryEldersAuthElderly(@RequestBody PageEldersAuthElderlyDTO pageEldersAuthElderlyDTO);

			/**
			* 批量保存高龄老人
			* @param newVoList
			* @param communityId
			* @return
			*/
			@PostMapping("/eldersauthelderly/batchSave")
			R listSaveEldersAuthElderlyExcelVO(@RequestBody List<EldersAuthElderlyExcelVO> newVoList,@RequestParam("communityId") Long communityId,@RequestParam("createBy") Long createBy);

			/**
			* 批量保存楼栋
			* @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);
			/**
			* 查看高龄老人详情
			* @param id
			* @return
			*/
			@GetMapping("/eldersauthelderly/{id}")
			R getEldersAuthElderlyById(@PathVariable("id") Long id);

			/**
			* 修改高龄老人信息
			* @param eldersAuthElderlyDTO
			* @return
			*/
			@PostMapping("/eldersauthelderly/update")
			R updateEldersAuthElderly(@RequestBody EldersAuthElderlyDTO eldersAuthElderlyDTO);

			/**
			* 删除高领老人
			* @param id
			* @return
			*/
			@PostMapping("/eldersauthelderly/delete")
			R deleteEldersAuthElderly(@RequestParam("id") Long id);

			/**
			* 通过老人用户id获取老人信息
			* @param authUserId 老人用户id
			* @return 老人信息
			*/
			@PostMapping("/elders/getAuth")
			R getEldersAuthUserByApp(@RequestParam("authUserId") Long authUserId);

			/**
			* 人脸核验新增高龄认证记录
			* @param authGetResultDTO 请求参数
			* @return 新增结果
			*/
			@PostMapping("/elders/add/auth")
			R addEldersAuthByApp(@RequestBody ComEldersAuthGetResultDTO authGetResultDTO);

			/**
			* 高龄认证分页接口
			* @param authPageDTO 请求参数
			* @return 查询结果
			*/
			@PostMapping("/elders/page/auth")
			R pageEldersByApp(@RequestBody ComEldersAuthPageDTO authPageDTO);

			/**
			* 添加高龄老人接口
			* @param authUserAddAppDTO 请求参数
			* @return 添加结果
			*/
			@PostMapping("/elders/add")
			R addEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO);

			/**
			* 修改高龄老人接口
			* @param authUserAddAppDTO 请求参数
			* @return 修改结果
			*/
			@PostMapping("/elders/edit")
			R editEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO);


			/**
			* 分页查询生存认证记录
			* @param pageEldersAuthElderlyDTO
			* @return
			*/
			@PostMapping("/elders/records/page")
			R pageQueryEldersAuthRecord(@RequestBody PageEldersAuthRecordDTO pageEldersAuthElderlyDTO);

			@PostMapping("/key_person/batch/save")
			R saveBatchKeyPerson(@RequestBody List<KeyPersonInfoDTO> list);

			@GetMapping("/screen/population/statistic")
			R statistic(@RequestParam("communityId")Long communityId);

			/**
			*
			* @param communityId
			* @param type
			* @return
			*/
			@PostMapping("/elders/setCommunityAuthType")
			R setCommunityAuthType(@RequestParam("communityId")Long communityId,@RequestParam("type") Integer type);

			@PostMapping("/elders/getAuthHistoryList")
			R getAuthHistoryList(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);

			@PostMapping("/elders/getAuthHistoryExport")
			R getAuthHistoryExport(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);

			@GetMapping("/screen/work/neighborCircle")
			R statisticNeighborCircle(@RequestParam("communityId") Long communityId);


			/**
			* 党员党支部统计信息
			* @return
			*/
			@PostMapping("/bigscreen/party/orgmembers")
			R bigscreenPartyOrgmembers(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg);

			/**
			* 党员年龄占比、男女占比
			* @return
			*/
			@PostMapping("/bigscreen/party/ageGender")
			R<BigScreenStatisticAgeGender> ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO);

			/**
			* 党建数据概览
			* @return
			*/
			@PostMapping("/bigscreen/party/partybuild/{communityId}")
			R<BigScreenStatisticPartyBuild> bigscreenPartybuild(@PathVariable("communityId") Long communityId);

			/**
			* 党员活动参加用户排行榜-TOP3
			* @return
			*/
			@PostMapping("/bigscreen/party/activitytopuser/{communityId}")
			R<List<PartyBuildingMemberVO>> bigscreenPartyactivitytopuser(@PathVariable("communityId") Long communityId);

			/**
			* 党员活动
			* @return
			*/
			@PostMapping("/bigscreen/party/bigscreenPartyactivity")
			R<List<BigScreenStatisticPartyActivity>> bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);

			/**
			* 首页大屏统计接口
			* @param communityId 社区id
			* @return 统计结果
			*/
			@GetMapping("/screen/getScreenIndex")
			R getScreenIndex(@RequestParam("communityId")Long communityId);

			/**
			* 事件大屏统计接口
			* @param communityId 社区id
			* @return 统计结果
			*/
			@GetMapping("/screen/getScreenEvent")
			R getScreenEvent(@RequestParam("communityId")Long communityId);

			/**
			* 民生大屏统计接口
			* @param communityId 社区id
			* @return 统计结果
			*/
			@GetMapping("/screen/getScreenCivil")
			R getScreenCivil(@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);

			/**
			* description 批量保存残疾人人员信息
			*
			* @param list 疾人信息列表
			* @return R 保存结果
			* @author manailin
			* @date 2021/6/10 17:00
			*/
			@PostMapping("/disable_person/batch/save")
			R saveBatchDisabledPersons(@RequestBody List<DisabledPersonsDTO> list);

			/**
			* 获取社区网格
			* @param communityId 社区id
			* @return 网格数据
			*/
			@GetMapping("/screen/getScreenGirds")
			R getScreenGirds(@RequestParam("communityId")Long communityId);

			/**
			* 事件大屏查询事件详情
			* @param eventDetailDTO 请求参数
			* @return 事件详情
			*/
			@PostMapping("/screen/getScreenEventDetail")
			R getScreenEventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO);

			/**
			* 工作大屏-一起议列表
			* @param discussListDTO 请求参数
			* @return 一起议列表
			*/
			@PostMapping("/screen/work/getScreenDiscussList")
			R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO);

			/**
			* 工作大屏-社区活动列表
			* @param actActivityListDTO 请求参数
			* @return 活动列表
			*/
			@PostMapping("/screen/work/getScreenActActivityList")
			R getScreenActActivityList(@RequestBody ScreenActActivityListDTO actActivityListDTO);

			/**
			* 工作大屏-社区活动报名人员列表
			* @param activityPeopleListDTO 请求参数
			* @return 社区活动报名人员列表
			*/
			@PostMapping("/screen/work/getActActivityPeopleList")
			R getActActivityPeopleList(@RequestBody ScreenActActivityPeopleListDTO activityPeopleListDTO);

			/**
			* 工作大屏-微心愿列表
			* @param microListDTO 请求参数
			* @return 微心愿列表
			*/
			@PostMapping("/screen/work/getScreenMicroList")
			R getScreenMicroList(@RequestBody ScreenMicroListDTO microListDTO);

			@GetMapping("/sys/conf/get")
			R getConf(@RequestParam("code") String code);

			}