From 84b51d9bfddcc8da58823fde1b322a8168db5cff Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期五, 27 五月 2022 09:35:23 +0800 Subject: [PATCH] bug修改 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 581 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 555 insertions(+), 26 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java index 7c5b52e..0718357 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java @@ -2,6 +2,43 @@ import java.util.List; +import com.panzhihua.common.model.dtos.PageBaseDTO; +import com.panzhihua.common.model.dtos.civil.*; +import com.panzhihua.common.model.dtos.common.*; +import com.panzhihua.common.model.dtos.community.acid.*; +import com.panzhihua.common.model.dtos.community.reserve.*; +import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO; +import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO; +import com.panzhihua.common.model.dtos.community.*; +import com.panzhihua.common.model.dtos.community.building.admin.*; +import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto; +import com.panzhihua.common.model.dtos.community.cluster.admin.*; +import com.panzhihua.common.model.dtos.property.CommonPage; +import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO; +import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO; +import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO; +import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO; +import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO; +import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO; +import com.panzhihua.common.model.dtos.neighbor.*; +import com.panzhihua.common.model.dtos.property.PagePropertyWorkerDTO; +import com.panzhihua.common.model.dtos.property.PropertyWorkerDTO; +import com.panzhihua.common.model.vos.*; +import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO; +import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO; +import com.panzhihua.common.model.vos.community.*; +import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO; +import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO; +import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO; +import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO; +import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoMemberVO; +import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO; +import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO; +import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO; +import com.panzhihua.common.model.vos.community.social.*; +import io.swagger.annotations.ApiOperation; +import com.panzhihua.common.model.vos.community.*; +import org.springframework.beans.BeanUtils; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.scheduling.annotation.Async; import org.springframework.web.bind.annotation.DeleteMapping; @@ -22,15 +59,6 @@ import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerEditDTO; import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerExcelVO; import com.panzhihua.common.model.dtos.civil.PageComActSocialWorkerDTO; -import com.panzhihua.common.model.dtos.common.AddComMngVolunteerOrgTeamDto; -import com.panzhihua.common.model.dtos.common.AddComMngVolunteerServiceTypeDto; -import com.panzhihua.common.model.dtos.common.AddComMngVolunteerSkillDto; -import com.panzhihua.common.model.dtos.common.EditComMngVolunteerOrgTeamDto; -import com.panzhihua.common.model.dtos.common.EditComMngVolunteerServiceTypeDto; -import com.panzhihua.common.model.dtos.common.EditComMngVolunteerSkillDto; -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.AddComActDynTypeDTO; import com.panzhihua.common.model.dtos.community.AddIdentityAuthDTO; import com.panzhihua.common.model.dtos.community.CancelRecordDTO; @@ -214,18 +242,6 @@ import com.panzhihua.common.model.dtos.community.rentingHouses.ReleaseOrCancelHouseDTO; import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHouseRegisterDTO; import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHousesConfigDTO; -import com.panzhihua.common.model.dtos.community.reserve.AddReserveAdminDTO; -import com.panzhihua.common.model.dtos.community.reserve.CancelReserveRecordDTO; -import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO; -import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO; -import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveInfoDTO; -import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveStatusDTO; -import com.panzhihua.common.model.dtos.community.reserve.EditReserveAdminDTO; -import com.panzhihua.common.model.dtos.community.reserve.MakeHandleAdminDTO; -import com.panzhihua.common.model.dtos.community.reserve.PageReserveAdminDTO; -import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO; -import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO; -import com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO; import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO; import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO; import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO; @@ -411,7 +427,7 @@ * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-12-07 15:59 **/ -@FeignClient(name = "community") +@FeignClient(name = "huacheng-community") public interface CommunityService { /** * 新增社区活动 @@ -985,7 +1001,7 @@ * @return 类型列表 */ @PostMapping("listbuildtype") - R listBuildType(); + R listBuildType(@RequestParam("communityId")Long communityId); /** * 分页查询 其他建筑 @@ -5005,12 +5021,19 @@ /** * 小程序查询邻里圈话题列表 * - * @param communityId * 社区id * @return 邻里圈话题列表 */ @GetMapping("/neighbor/getNeighborTopicByApp") - R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name); + R getNeighborTopicByApp(@RequestParam("name") String name); + + /** + * 删除话题 + * @param id + * @return + */ + @GetMapping("/neighbor/deleteNeighborTopic") + R deleteNeighborTopic(@RequestParam("id") Long id); /** * 综治后台-查询社区列表 @@ -5897,6 +5920,26 @@ */ @PostMapping("/neighbor/deleteNeighborByApp") R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO); + + + /** + * 分页查询邻里圈列表 + * + * @param neighborCircleAppDTO + * 请求参数 + * @return 邻里圈列表 + */ + @PostMapping("/neighbor/selectSolve") + R selectSolve(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO); + + + /** + * 修改数据 + * @param editNeighborCircleAdminVO + * @return + */ + @PostMapping("/neighbor/update") + R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO); /** * 获取系统配置value @@ -6949,6 +6992,14 @@ */ @PostMapping("/building/house/population/delete/admin") R deleteBuildingHousePopulationAdmin(@RequestBody DeleteBuildingHousePopulationDto housePopulationDto); + + /** + * 删除楼栋 + * @param id + * @return + */ + @GetMapping("/building/delete") + R buildingDelete(@RequestParam("id")Long id); /** * 分页查询所有数据 @@ -8623,7 +8674,7 @@ * @return 查找结果 */ @PostMapping("/comActSocialWorker/{id}") - R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(@PathVariable("id") Long id); + R<ComActSocialWorkerVO> comActSocialWorkerDetails(@PathVariable("id") Long id); /** * 批量导入社工 @@ -9332,4 +9383,482 @@ @GetMapping("/activity/partyMemberCount") R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year); + + /** + * 根据小区id查询楼栋列表 + * @param villageId 小区id + * @return 查询楼栋列表 + */ + @GetMapping("/building/getBuildListByVillageId") + R getBuildListByVillageId(@RequestParam(value = "villageId") Long villageId); + /** + * 党员活动详情数据 + * @return + */ + @PostMapping("/activity/partyMemberDetail") + R partyMemberDetail(@RequestBody CommonPage commonPage); + /** + * 导出党员活动详情数据 + * @return + */ + @PostMapping("/activity/exportPartyMemberDetail") + R exportPartyMemberDetail(@RequestBody CommonPage commonPage); + + /** + * 金沙定制页面-党建引领基础数据 + * @param communityId + * @return + */ + @GetMapping("/screen/partyBuildIng/base") + R getPartyBuildIngBaseData(@RequestParam("communityId") Long communityId); + + /** + * 党员活动展示列表 + * @param pageBaseDTO + * @return + */ + @PostMapping("/screen/partyBuildIng/partyAct") + R pagePartyBuildIngAct(@RequestBody PageBaseDTO pageBaseDTO); + + /** + * 议事投票展示列表 + * @param pageBaseDTO + * @return + */ + @PostMapping("/screen/partyBuildIng/discuss") + R pagePartyBuildIngDiscuss(@RequestBody PageBaseDTO pageBaseDTO); + + /** + * 金沙定制页面-四长四员 + * @param communityId + * @return + */ + @GetMapping("/screen/fourMember/base") + R getFourMemberBaseData(@RequestParam("communityId") Long communityId); + + /** + * 杨家坪定制页面-五微服务 + * @param communityId + * @return + */ + @GetMapping("/screen/fms/base") + R getFmsBaseData(@RequestParam("communityId") Long communityId); + + /** + * 杨家坪定制页面-微团队展示列表 + * @param pageBaseDTO + * @return + */ + @PostMapping("/screen/fms/team") + R pageFmsTeam(@RequestBody PageBaseDTO pageBaseDTO); + + /** + * 杨家坪定制页面-居家养老基础数据 + * @param communityId + * @return + */ + @GetMapping("/screen/alarm/base") + R getAlarmBaseData(@RequestParam("communityId") Long communityId); + + /** + * 杨家坪定制页面-报警记录展示列表 + * @param pageBaseDTO + * @return + */ + @PostMapping("/screen/alarm/record") + R pageAlarmRecord(@RequestBody PageBaseDTO pageBaseDTO); + + /** + * 杨家坪定制页面-报警设备点位图 + * @param communityId + * @return + */ + @GetMapping("/screen/alarm/pointMap") + R getAlarmPointMap(@RequestParam("communityId") Long communityId); + + /** + * 杨家坪定制页面-志愿服务 + * @param communityId + * @return + */ + @GetMapping("/screen/volunteer/base") + R getVolunteerBaseData(@RequestParam("communityId") Long communityId); + + /** + * 金沙定制页面-志愿线展示列表 + * @param pageBaseDTO + * @return + */ + @PostMapping("/screen/partyBuildIng/microWish") + R pagePartyBuildIngMicroWish(@RequestBody PageBaseDTO pageBaseDTO); + + /** + * 金沙定制页面-四长四员解决问题展示列表 + * @param pageBaseDTO + * @return + */ + @PostMapping("/screen/fourMember/resolve") + R pageFourMemberResolve(@RequestBody PageBaseDTO pageBaseDTO); + + /** + * 金沙定制页面-四长四员院落议事展示列表 + * @param pageBaseDTO + * @return + */ + @PostMapping("/screen/courtyard/list") + R pageCourtyardDiscuss(@RequestBody PageBaseDTO pageBaseDTO); + + /** + * 金沙定制页面-院落议事 + * @param communityId + * @return + */ + @GetMapping("/screen/courtyard/base") + R getCourtyardBaseData(@RequestParam("communityId") Long communityId); + + /** + * description queryByPage 分页查询 + * + * @param comActEasyPhotoHandler 请求参数 + * @return 分页查询返回参数 + * @author lyq + * @date 2022-03-01 13:45:10 + */ + @PostMapping("/comActEasyPhotoHandler/page") + R queryEasyPhotoHandler(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler); + + /** + * description edit 编辑数据 + * + * @param comActEasyPhotoHandler 请求参数 + * @return 编辑结果 + * @author lyq + * @date 2022-03-01 13:45:10 + */ + @PostMapping("/comActEasyPhotoHandler/edit") + R editEasyPhotoHandler(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler); + + @GetMapping("/reserve/fiveCount") + R fiveCount(@RequestParam("reserveId") Long reserveId); + + /** + * 删除数据 + * + * @param id 主键结合 + * @return 删除结果 + */ + @GetMapping("/comActEasyPhotoMember/del") + R comActEasyPhotoMemberDelete(@RequestParam("id") Long id); + + /** + * 分页查询所有数据 + * + * @param commonPage 查询实体 + * @return 所有数据 + */ + @PostMapping("/comActEasyPhotoMember/queryAll") + R comActEasyPhotoMemberSelectAll(@RequestBody CommonPage commonPage); + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("/comActEasyPhotoMember/{id}") + R comActEasyPhotoMemberSelectOne(@PathVariable("id") Long id); + + /** + * 新增数据 + * + * @param comActEasyPhotoMemberVO 实体对象 + * @return 新增结果 + */ + @PostMapping("/comActEasyPhotoMember") + R comActEasyPhotoMemberInsert(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO); + + /** + * 修改数据 + * + * @param comActEasyPhotoMemberVO 实体对象 + * @return 修改结果 + */ + @PostMapping("/comActEasyPhotoMember/update") + R comActEasyPhotoMemberUpdate(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO); + + /** + * 分页查询所有数据 + * + * @param comActAcidRecordDTO 查询实体 + * @return 所有数据 + */ + @PostMapping("/comActAcidRecord/queryAll") + R selectAllComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO); + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("/comActAcidRecord/{id}") + R selectOneComActAcidRecord(@PathVariable("id") Long id); + + /** + * 新增数据 + * + * @param comActAcidRecordVO 实体对象 + * @return 新增结果 + */ + @PostMapping("/comActAcidRecord") + R insertComActAcidRecord(@RequestBody ComActAcidRecordVO comActAcidRecordVO); + + /** + * 修改数据 + * + * @param comActAcidRecordVO 实体对象 + * @return 修改结果 + */ + @PostMapping("/comActAcidRecord/update") + R updateComActAcidRecord(@RequestBody ComActAcidRecordVO comActAcidRecordVO); + + + /** + * 小程序修改填报记录 + * + * @param comActAcidRecordVO 实体对象 + * @return 修改结果 + */ + @PostMapping("/comActAcidRecord/updateApplets") + R updateApplets(@RequestBody ComActAcidRecordVO comActAcidRecordVO); + + /** + * 删除数据 + * + * @param id 主键结合 + * @return 删除结果 + */ + @GetMapping("/comActAcidRecord/del") + R deleteComActAcidRecord(@RequestParam("id") Long id); + + @PostMapping("/comActAcidRecord/export") + R exportComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO); + + + /** + * 5项常规统计 + * @return + */ + @GetMapping("/comActAcidRecord/fiveCount") + R comActAcidRecordFiveCount(@RequestParam("localCity")String localCity); + + /** + * 7项常规统计 + * @return + */ + @GetMapping("/comActAcidRecord/fiveCountPlus") + R comActAcidRecordFiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity); + + @GetMapping("/comActAcidRecord/statics") + R comActAcidRecordStatics(@RequestParam("date")String date); + + /** + * 分页查询所有数据 + * + * @param commonPage 查询实体 + * @return 所有数据 + */ + @PostMapping("/comActReserveDangerArea/queryAll") + R selectAllComActReserveDangerArea(@RequestBody CommonPage commonPage); + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("/comActReserveDangerArea/{id}") + R selectOneComActReserveDangerArea(@PathVariable("id") Long id); + + /** + * 修改数据 + * + * @param comActReserveDangerAreaVO 实体对象 + * @return 修改结果 + */ + @PostMapping("/comActReserveDangerArea/update") + R updateComActReserveDangerArea(@RequestBody ComActReserveDangerAreaVO comActReserveDangerAreaVO); + + /** + * 删除数据 + * + * @param id 主键结合 + * @return 删除结果 + */ + @GetMapping("/comActReserveDangerArea/del") + R deleteComActReserveDangerArea(@RequestParam("id") Long id); + + /** + * 风险区数据统计 + * @return + */ + @GetMapping("/comActReserveDangerArea/statics") + R staticsComActReserveDangerArea(); + + /** + * 批量设置起始时间 + * @param editDangerBatchDTO + * @return + */ + @PostMapping("/comActReserveDangerArea/updateBatch") + R updateBatchComActReserveDangerArea(@RequestBody EditDangerBatchDTO editDangerBatchDTO); + + @GetMapping("/comAreaTownCommunity/areaTownCommunity") + R areaTownCommunity(@RequestParam("name")String name,@RequestParam("userId")Long userId); + + /** + * 物业公司详情 + * @param id + * @return + */ + @GetMapping("/comProperty/detail") + R detailProperty(@RequestParam("id") Long id); + + /** + * 添加物业工作人员 + * @param propertyWorkerDTO + * @return + */ + @PostMapping("/comPropertyWorker/add") + R addPropertyWorker(@RequestBody PropertyWorkerDTO propertyWorkerDTO); + + /** + * 编辑物业工作人员 + * @param propertyWorkerDTO + * @return + */ + @PutMapping("/comPropertyWorker/update") + R updatePropertyWorker(@RequestBody PropertyWorkerDTO propertyWorkerDTO); + + /** + * 删除物业工作人员 + * @param id + * @return + */ + @DeleteMapping("/comPropertyWorker/delete") + R deletePropertyWorker(@RequestParam("id") Long id); + + /** + * 分页查询物业工作人员 + * @param pagePropertyWorkerDTO + * @return + */ + @PostMapping("/comPropertyWorker/page") + R pagePropertyWorker(@RequestBody PagePropertyWorkerDTO pagePropertyWorkerDTO); + + /** + * 物业工作人员详情 + * @param id + * @return + */ + @GetMapping("/comPropertyWorker/detail") + R detailPropertyWorker(@RequestParam("id") Long id); + + + /** + * 分页查询所有数据 + * + * @param commonPage 查询实体 + * @return 所有数据 + */ + @PostMapping("/comActAcidMember/queryAll") + R selectAllComActAcidMember(@RequestBody ComActAcidMemberDTO commonPage); + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("/comActAcidMember/{id}") + R selectOneComActAcidMember(@PathVariable("id") Long id); + + /** + * 新增数据 + * + * @param comActAcidMemberVO 实体对象 + * @return 新增结果 + */ + @PostMapping("/comActAcidMember") + R insertComActAcidMember(@RequestBody ComActAcidMemberVO comActAcidMemberVO); + + /** + * 修改数据 + * + * @param comActAcidMemberVO 实体对象 + * @return 修改结果 + */ + @PostMapping("/comActAcidMember/update") + R updateComActAcidMember(@RequestBody ComActAcidMemberVO comActAcidMemberVO); + + /** + * 删除数据 + * + * @param id 主键结合 + * @return 删除结果 + */ + @GetMapping("/comActAcidMember/del") + R deleteComActAcidMember(@RequestParam("id") Long id); + + /** + * 分页查询风险人员 + * @param pageDangerMemberDTO + * @return + */ + @PostMapping("/comActAcidDangerMember/page") + R pageDangerMember(@RequestBody PageDangerMemberDTO pageDangerMemberDTO); + + /** + * 后台分页查询风险人员 + * @param pageDangerMemberDTO + * @return + */ + @PostMapping("/comActAcidDangerMember/queryAll") + R pageDangerMemberAdmin(@RequestBody ComActAcidDangerMemberDTO pageDangerMemberDTO); + + /** + * 列表查询 + * + * @param comActAcidCheckRecordDTO 查询实体 + * @return 所有数据 + */ + @PostMapping("/comActAcidCheckRecord/queryAll") + R selectAllComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordDTO comActAcidCheckRecordDTO); + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("/comActAcidCheckRecord/{id}") + R selectOneComActAcidCheckRecord(@PathVariable("id") Long id); + + /** + * 新增数据 + * + * @param comActAcidCheckRecordVO 实体对象 + * @return 新增结果 + */ + @PostMapping("/comActAcidCheckRecord") + R insertComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO); + + /** + * 修改数据 + * + * @param comActAcidCheckRecordVO 实体对象 + * @return 修改结果 + */ + @PostMapping("/comActAcidCheckRecord/update") + R updateComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO); } -- Gitblit v1.7.1